Skip to content

Commit

Permalink
Merge pull request #140 from TechnologyAdvice/fix/import-paths
Browse files Browse the repository at this point in the history
fix(imports): remove resolve.root config in webpack to prevent distri…
  • Loading branch information
levithomason committed Jan 3, 2016
2 parents 119c528 + d540821 commit 82b11f6
Show file tree
Hide file tree
Showing 56 changed files with 108 additions and 114 deletions.
2 changes: 0 additions & 2 deletions karma.conf.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@ export default (config) => {
]
},
resolve: {
root: paths.root,
modulesDirectories: [
'node_modules',
'.',
],
alias: {
// When these key names are require()'d, the value will be supplied instead
Expand Down
10 changes: 5 additions & 5 deletions src/addons/Confirm/Confirm.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React, {Component, PropTypes} from 'react';
import Promise from 'bluebird';
import classNames from 'classnames';

import META from 'src/utils/Meta.js';
import Modal from 'src/modules/Modal/Modal';
import ModalContent from 'src/modules/Modal/ModalContent';
import ModalFooter from 'src/modules/Modal/ModalFooter';
import ModalHeader from 'src/modules/Modal/ModalHeader';
import META from '../../utils/Meta.js';
import Modal from '../../modules/Modal/Modal';
import ModalContent from '../../modules/Modal/ModalContent';
import ModalFooter from '../../modules/Modal/ModalFooter';
import ModalHeader from '../../modules/Modal/ModalHeader';

export default class Confirm extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/addons/Textarea/Textarea.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Textarea extends Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions src/collections/Form/Field.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import numberToWord from 'src/utils/numberToWord';
import META from 'src/utils/Meta.js';
import numberToWord from '../../utils/numberToWord';
import META from '../../utils/Meta.js';

export default class Field extends Component {
static propTypes = {
Expand Down
6 changes: 3 additions & 3 deletions src/collections/Form/Fields.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import _ from 'lodash';
import React, {Children, Component, PropTypes} from 'react';
import classNames from 'classnames';
import getUnhandledProps from 'src/utils/getUnhandledProps';
import numberToWord from 'src/utils/numberToWord';
import META from 'src/utils/Meta.js';
import getUnhandledProps from '../../utils/getUnhandledProps';
import numberToWord from '../../utils/numberToWord';
import META from '../../utils/Meta.js';

export default class Fields extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/collections/Form/Form.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import $ from 'jquery';
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Form extends Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions src/collections/Grid/Column.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import _ from 'lodash';
import classNames from 'classnames';
import React, {Component, PropTypes} from 'react';
import numberToWord from 'src/utils/numberToWord';
import META from 'src/utils/Meta.js';
import numberToWord from '../../utils/numberToWord';
import META from '../../utils/Meta.js';

export default class Column extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/collections/Grid/Grid.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classNames from 'classnames';
import React, {Component, PropTypes} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Grid extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/collections/Grid/Row.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import classNames from 'classnames';
import React, {Component, PropTypes} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Row extends Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions src/collections/Menu/Menu.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import getUnhandledProps from 'src/utils/getUnhandledProps';
import META from '../../utils/Meta';
import getUnhandledProps from '../../utils/getUnhandledProps';

export default class Menu extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/collections/Menu/MenuItem.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class MenuItem extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/collections/Message/Message.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import $ from 'jquery';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Message extends Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions src/collections/Table/Table.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import _ from 'lodash';
import React, {Children, Component, PropTypes} from 'react';
import classNames from 'classnames';
import {ofComponentTypes} from 'src/utils/customPropTypes';
import META from 'src/utils/Meta';
import {ofComponentTypes} from '../../utils/customPropTypes';
import META from '../../utils/Meta';

export default class Table extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/collections/Table/TableColumn.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class TableColumn extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Button/Button.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Button extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Button/Buttons.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Buttons extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Container/Container.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

/**
* A container that gives your content some side padding.
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Divider/Divider.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Divider extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Header/H1.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';
import _Header from './_Header';

export default class H1 extends Component {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Header/H2.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';
import _Header from './_Header';

export default class H2 extends Component {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Header/H3.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';
import _Header from './_Header';

export default class H3 extends Component {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Header/H4.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';
import _Header from './_Header';

export default class H4 extends Component {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Header/H5.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';
import _Header from './_Header';

export default class H5 extends Component {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Header/H6.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';
import _Header from './_Header';

export default class H6 extends Component {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Header/Header.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';
import _Header from './_Header';
import H1 from './H1';
import H2 from './H2';
Expand Down
4 changes: 2 additions & 2 deletions src/elements/Header/Subheader.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import getUnhandledProps from 'src/utils/getUnhandledProps';
import META from '../../utils/Meta';
import getUnhandledProps from '../../utils/getUnhandledProps';

export default class Subheader extends Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions src/elements/Header/_Header.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import _ from 'lodash';
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import getUnhandledProps from 'src/utils/getUnhandledProps';
import META from '../../utils/Meta';
import getUnhandledProps from '../../utils/getUnhandledProps';

export default class _Header extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Image/Image.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class Image extends Component {
static propTypes = {
Expand Down
4 changes: 2 additions & 2 deletions src/elements/Input/Input.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import _ from 'lodash';
import classNames from 'classnames';
import React, {Component, PropTypes, Children} from 'react';
import META from 'src/utils/Meta';
import getUnhandledProps from 'src/utils/getUnhandledProps';
import META from '../../utils/Meta';
import getUnhandledProps from '../../utils/getUnhandledProps';

export default class Input extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/List/List.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class List extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/List/ListItem.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import _ from 'lodash';
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';

export default class ListItem extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/Segment/Segment.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import META from '../../utils/Meta';
import Segments from './Segments';

/**
Expand Down
4 changes: 2 additions & 2 deletions src/elements/Segment/Segments.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import META from 'src/utils/Meta';
import {ofComponentTypes} from 'src/utils/customPropTypes';
import META from '../../utils/Meta';
import {ofComponentTypes} from '../../utils/customPropTypes';

/**
* A group of segments can be formatted to appear together.
Expand Down
68 changes: 34 additions & 34 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
// Addons
import Confirm from 'src/addons/Confirm/Confirm';
import Textarea from 'src/addons/Textarea/Textarea';
import Confirm from './addons/Confirm/Confirm';
import Textarea from './addons/Textarea/Textarea';

// Collections
import Column from 'src/collections/Grid/Column';
import Field from 'src/collections/Form/Field';
import Fields from 'src/collections/Form/Fields';
import Form from 'src/collections/Form/Form';
import Grid from 'src/collections/Grid/Grid';
import Row from 'src/collections/Grid/Row';
import Menu from 'src/collections/Menu/Menu';
import MenuItem from 'src/collections/Menu/MenuItem';
import Message from 'src/collections/Message/Message';
import Table from 'src/collections/Table/Table';
import TableColumn from 'src/collections/Table/TableColumn';
import Column from './collections/Grid/Column';
import Field from './collections/Form/Field';
import Fields from './collections/Form/Fields';
import Form from './collections/Form/Form';
import Grid from './collections/Grid/Grid';
import Row from './collections/Grid/Row';
import Menu from './collections/Menu/Menu';
import MenuItem from './collections/Menu/MenuItem';
import Message from './collections/Message/Message';
import Table from './collections/Table/Table';
import TableColumn from './collections/Table/TableColumn';

// Elements
import Button from 'src/elements/Button/Button';
import Buttons from 'src/elements/Button/Buttons';
import Container from 'src/elements/Container/Container';
import Divider from 'src/elements/Divider/Divider';
import Header from 'src/elements/Header/Header';
import Image from 'src/elements/Image/Image';
import Input from 'src/elements/Input/Input';
import List from 'src/elements/List/List';
import ListItem from 'src/elements/List/ListItem';
import Segment from 'src/elements/Segment/Segment';
import Segments from 'src/elements/Segment/Segments';
import Button from './elements/Button/Button';
import Buttons from './elements/Button/Buttons';
import Container from './elements/Container/Container';
import Divider from './elements/Divider/Divider';
import Header from './elements/Header/Header';
import Image from './elements/Image/Image';
import Input from './elements/Input/Input';
import List from './elements/List/List';
import ListItem from './elements/List/ListItem';
import Segment from './elements/Segment/Segment';
import Segments from './elements/Segment/Segments';

// Modules
import Checkbox from 'src/modules/Checkbox/Checkbox';
import Progress from 'src/modules/Progress/Progress';
import Modal from 'src/modules/Modal/Modal';
import ModalContent from 'src/modules/Modal/ModalContent';
import ModalFooter from 'src/modules/Modal/ModalFooter';
import ModalHeader from 'src/modules/Modal/ModalHeader';
import Dropdown from 'src/modules/Dropdown/Dropdown';
import Checkbox from './modules/Checkbox/Checkbox';
import Progress from './modules/Progress/Progress';
import Modal from './modules/Modal/Modal';
import ModalContent from './modules/Modal/ModalContent';
import ModalFooter from './modules/Modal/ModalFooter';
import ModalHeader from './modules/Modal/ModalHeader';
import Dropdown from './modules/Dropdown/Dropdown';

// Views
import Item from 'src/views/Items/Item';
import Items from 'src/views/Items/Items';
import Statistic from 'src/views/Statistic/Statistic';
import Item from './views/Items/Item';
import Items from './views/Items/Items';
import Statistic from './views/Statistic/Statistic';

const stardust = {
// Addons
Expand Down
4 changes: 2 additions & 2 deletions src/modules/Checkbox/Checkbox.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';
import META from 'src/utils/Meta';
import getUnhandledProps from 'src/utils/getUnhandledProps';
import META from '../../utils/Meta';
import getUnhandledProps from '../../utils/getUnhandledProps';
import React, {Component, PropTypes} from 'react';
import classNames from 'classnames';
import $ from 'jquery';
Expand Down
4 changes: 2 additions & 2 deletions src/modules/Dropdown/Dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import _ from 'lodash';
import $ from 'jquery';
import classNames from 'classnames';
import React, {Component, PropTypes} from 'react';
import META from 'src/utils/Meta';
import getUnhandledProps from 'src/utils/getUnhandledProps';
import META from '../../utils/Meta';
import getUnhandledProps from '../../utils/getUnhandledProps';

export default class Dropdown extends Component {
static propTypes = {
Expand Down
Loading

0 comments on commit 82b11f6

Please sign in to comment.