From 610a1dcf6077e797d43892b04cd02de6f0754c4b Mon Sep 17 00:00:00 2001 From: Jeff Carbonella Date: Mon, 3 Oct 2016 17:11:03 -0400 Subject: [PATCH] chore(imports): Remove index files in type folders --- src/addons/index.js | 5 - src/collections/index.js | 37 ------ src/elements/Button/Button.js | 4 +- src/elements/Label/Label.js | 4 +- src/elements/List/ListIcon.js | 2 +- src/elements/index.js | 47 ------- src/index.js | 160 +++++++++++++++++++++++- src/modules/index.js | 26 ---- src/umd.js | 12 +- src/views/index.js | 31 ----- test/specs/addons/Confirm-test.js | 4 +- test/specs/addons/Portal/Portal-test.js | 2 +- test/specs/commonTests.js | 5 +- test/specs/modules/Modal/Modal-test.js | 2 +- 14 files changed, 172 insertions(+), 169 deletions(-) delete mode 100644 src/addons/index.js delete mode 100644 src/collections/index.js delete mode 100644 src/elements/index.js delete mode 100644 src/modules/index.js delete mode 100644 src/views/index.js diff --git a/src/addons/index.js b/src/addons/index.js deleted file mode 100644 index 4b183d53a3..0000000000 --- a/src/addons/index.js +++ /dev/null @@ -1,5 +0,0 @@ -export { default as Confirm } from './Confirm/Confirm' -export { default as Portal } from './Portal/Portal' -export { default as Radio } from './Radio/Radio' -export { default as Select } from './Select/Select' -export { default as TextArea } from './TextArea/TextArea' diff --git a/src/collections/index.js b/src/collections/index.js deleted file mode 100644 index 7468f552b7..0000000000 --- a/src/collections/index.js +++ /dev/null @@ -1,37 +0,0 @@ -export { default as Breadcrumb } from './Breadcrumb/Breadcrumb' -export { default as BreadcrumbDivider } from './Breadcrumb/BreadcrumbDivider' -export { default as BreadcrumbSection } from './Breadcrumb/BreadcrumbSection' - -export { default as Form } from './Form/Form' -export { default as FormButton } from './Form/FormButton' -export { default as FormCheckbox } from './Form/FormCheckbox' -export { default as FormDropdown } from './Form/FormDropdown' -export { default as FormField } from './Form/FormField' -export { default as FormGroup } from './Form/FormGroup' -export { default as FormInput } from './Form/FormInput' -export { default as FormRadio } from './Form/FormRadio' -export { default as FormSelect } from './Form/FormSelect' -export { default as FormTextArea } from './Form/FormTextArea' - -export { default as Grid } from './Grid/Grid' -export { default as GridColumn } from './Grid/GridColumn' -export { default as GridRow } from './Grid/GridRow' - -export { default as Menu } from './Menu/Menu' -export { default as MenuHeader } from './Menu/MenuHeader' -export { default as MenuItem } from './Menu/MenuItem' -export { default as MenuMenu } from './Menu/MenuMenu' - -export { default as Message } from './Message/Message' -export { default as MessageContent } from './Message/MessageContent' -export { default as MessageHeader } from './Message/MessageHeader' -export { default as MessageItem } from './Message/MessageItem' -export { default as MessageList } from './Message/MessageList' - -export { default as Table } from './Table/Table' -export { default as TableBody } from './Table/TableBody' -export { default as TableCell } from './Table/TableCell' -export { default as TableFooter } from './Table/TableFooter' -export { default as TableHeader } from './Table/TableHeader' -export { default as TableHeaderCell } from './Table/TableHeaderCell' -export { default as TableRow } from './Table/TableRow' diff --git a/src/elements/Button/Button.js b/src/elements/Button/Button.js index ca7dd041e2..bab3c62b0d 100644 --- a/src/elements/Button/Button.js +++ b/src/elements/Button/Button.js @@ -13,7 +13,9 @@ import { useKeyOrValueAndKey, useValueAndKey, } from '../../lib' -import { Icon, Label } from '../' +import Icon from '../Icon/Icon' +import Label from '../Label/Label' + import ButtonContent from './ButtonContent' import ButtonGroup from './ButtonGroup' import ButtonOr from './ButtonOr' diff --git a/src/elements/Label/Label.js b/src/elements/Label/Label.js index a547a5a047..e60adff6a4 100644 --- a/src/elements/Label/Label.js +++ b/src/elements/Label/Label.js @@ -13,7 +13,9 @@ import { useKeyOrValueAndKey, useValueAndKey, } from '../../lib' -import { Icon, Image } from '../' +import Icon from '../Icon/Icon' +import Image from '../Image/Image' + import LabelDetail from './LabelDetail' import LabelGroup from './LabelGroup' diff --git a/src/elements/List/ListIcon.js b/src/elements/List/ListIcon.js index e52213925e..684d6bca45 100644 --- a/src/elements/List/ListIcon.js +++ b/src/elements/List/ListIcon.js @@ -7,7 +7,7 @@ import { SUI, useVerticalAlignProp, } from '../../lib' -import { Icon } from '../' +import Icon from '../Icon/Icon' function ListIcon(props) { const { className, verticalAlign } = props diff --git a/src/elements/index.js b/src/elements/index.js deleted file mode 100644 index 2d1bd60a06..0000000000 --- a/src/elements/index.js +++ /dev/null @@ -1,47 +0,0 @@ -export { default as Button } from './Button/Button' -export { default as ButtonContent } from './Button/ButtonContent' -export { default as ButtonGroup } from './Button/ButtonGroup' -export { default as ButtonOr } from './Button/ButtonOr' - -export { default as Container } from './Container/Container' - -export { default as Divider } from './Divider/Divider' - -export { default as Flag } from './Flag/Flag' - -export { default as Header } from './Header/Header' -export { default as HeaderContent } from './Header/HeaderContent' -export { default as HeaderSubheader } from './Header/HeaderSubheader' - -export { default as Icon } from './Icon/Icon' -export { default as IconGroup } from './Icon/IconGroup' - -export { default as Image } from './Image/Image' -export { default as ImageGroup } from './Image/ImageGroup' - -export { default as Input } from './Input/Input' - -export { default as Label } from './Label/Label' -export { default as LabelDetail } from './Label/LabelDetail' -export { default as LabelGroup } from './Label/LabelGroup' - -export { default as List } from './List/List' -export { default as ListContent } from './List/ListContent' -export { default as ListDescription } from './List/ListDescription' -export { default as ListHeader } from './List/ListHeader' -export { default as ListIcon } from './List/ListIcon' -export { default as ListItem } from './List/ListItem' -export { default as ListList } from './List/ListList' - -export { default as Loader } from './Loader/Loader' - -export { default as Rail } from './Rail/Rail' - -export { default as Segment } from './Segment/Segment' -export { default as SegmentGroup } from './Segment/SegmentGroup' - -export { default as Step } from './Step/Step' -export { default as StepContent } from './Step/StepContent' -export { default as StepDescription } from './Step/StepDescription' -export { default as StepGroup } from './Step/StepGroup' -export { default as StepTitle } from './Step/StepTitle' diff --git a/src/index.js b/src/index.js index e595fcd6b5..14d84dd88c 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,155 @@ -export * from './addons' -export * from './collections' -export * from './elements' -export * from './modules' -export * from './views' +// Addons +export { default as Confirm } from './addons/Confirm/Confirm' +export { default as Portal } from './addons/Portal/Portal' +export { default as Radio } from './addons/Radio/Radio' +export { default as Select } from './addons/Select/Select' +export { default as TextArea } from './addons/TextArea/TextArea' + +// Collections +export { default as Breadcrumb } from './collections/Breadcrumb/Breadcrumb' +export { default as BreadcrumbDivider } from './collections/Breadcrumb/BreadcrumbDivider' +export { default as BreadcrumbSection } from './collections/Breadcrumb/BreadcrumbSection' + +export { default as Form } from './collections/Form/Form' +export { default as FormButton } from './collections/Form/FormButton' +export { default as FormCheckbox } from './collections/Form/FormCheckbox' +export { default as FormDropdown } from './collections/Form/FormDropdown' +export { default as FormField } from './collections/Form/FormField' +export { default as FormGroup } from './collections/Form/FormGroup' +export { default as FormInput } from './collections/Form/FormInput' +export { default as FormRadio } from './collections/Form/FormRadio' +export { default as FormSelect } from './collections/Form/FormSelect' +export { default as FormTextArea } from './collections/Form/FormTextArea' + +export { default as Grid } from './collections/Grid/Grid' +export { default as GridColumn } from './collections/Grid/GridColumn' +export { default as GridRow } from './collections/Grid/GridRow' + +export { default as Menu } from './collections/Menu/Menu' +export { default as MenuHeader } from './collections/Menu/MenuHeader' +export { default as MenuItem } from './collections/Menu/MenuItem' +export { default as MenuMenu } from './collections/Menu/MenuMenu' + +export { default as Message } from './collections/Message/Message' +export { default as MessageContent } from './collections/Message/MessageContent' +export { default as MessageHeader } from './collections/Message/MessageHeader' +export { default as MessageItem } from './collections/Message/MessageItem' +export { default as MessageList } from './collections/Message/MessageList' + +export { default as Table } from './collections/Table/Table' +export { default as TableBody } from './collections/Table/TableBody' +export { default as TableCell } from './collections/Table/TableCell' +export { default as TableFooter } from './collections/Table/TableFooter' +export { default as TableHeader } from './collections/Table/TableHeader' +export { default as TableHeaderCell } from './collections/Table/TableHeaderCell' +export { default as TableRow } from './collections/Table/TableRow' + +// Elements +export { default as Button } from './elements/Button/Button' +export { default as ButtonContent } from './elements/Button/ButtonContent' +export { default as ButtonGroup } from './elements/Button/ButtonGroup' +export { default as ButtonOr } from './elements/Button/ButtonOr' + +export { default as Container } from './elements/Container/Container' + +export { default as Divider } from './elements/Divider/Divider' + +export { default as Flag } from './elements/Flag/Flag' + +export { default as Header } from './elements/Header/Header' +export { default as HeaderContent } from './elements/Header/HeaderContent' +export { default as HeaderSubheader } from './elements/Header/HeaderSubheader' + +export { default as Icon } from './elements/Icon/Icon' +export { default as IconGroup } from './elements/Icon/IconGroup' + +export { default as Image } from './elements/Image/Image' +export { default as ImageGroup } from './elements/Image/ImageGroup' + +export { default as Input } from './elements/Input/Input' + +export { default as Label } from './elements/Label/Label' +export { default as LabelDetail } from './elements/Label/LabelDetail' +export { default as LabelGroup } from './elements/Label/LabelGroup' + +export { default as List } from './elements/List/List' +export { default as ListContent } from './elements/List/ListContent' +export { default as ListDescription } from './elements/List/ListDescription' +export { default as ListHeader } from './elements/List/ListHeader' +export { default as ListIcon } from './elements/List/ListIcon' +export { default as ListItem } from './elements/List/ListItem' +export { default as ListList } from './elements/List/ListList' + +export { default as Loader } from './elements/Loader/Loader' + +export { default as Rail } from './elements/Rail/Rail' + +export { default as Segment } from './elements/Segment/Segment' +export { default as SegmentGroup } from './elements/Segment/SegmentGroup' + +export { default as Step } from './elements/Step/Step' +export { default as StepContent } from './elements/Step/StepContent' +export { default as StepDescription } from './elements/Step/StepDescription' +export { default as StepGroup } from './elements/Step/StepGroup' +export { default as StepTitle } from './elements/Step/StepTitle' + +// Modules +export { default as Accordion } from './modules/Accordion/Accordion' +export { default as AccordionContent } from './modules/Accordion/AccordionContent' +export { default as AccordionTitle } from './modules/Accordion/AccordionTitle' + +export { default as Checkbox } from './modules/Checkbox/Checkbox' + +export { default as Dropdown } from './modules/Dropdown/Dropdown' +export { default as DropdownDivider } from './modules/Dropdown/DropdownDivider' +export { default as DropdownHeader } from './modules/Dropdown/DropdownHeader' +export { default as DropdownItem } from './modules/Dropdown/DropdownItem' +export { default as DropdownMenu } from './modules/Dropdown/DropdownMenu' + +export { default as Modal } from './modules/Modal/Modal' +export { default as ModalActions } from './modules/Modal/ModalActions' +export { default as ModalContent } from './modules/Modal/ModalContent' +export { default as ModalDescription } from './modules/Modal/ModalDescription' +export { default as ModalHeader } from './modules/Modal/ModalHeader' + +export { default as Progress } from './modules/Progress/Progress' + +export { default as Rating } from './modules/Rating/Rating' + +export { default as Search } from './modules/Search/Search' +export { default as SearchCategory } from './modules/Search/SearchCategory' +export { default as SearchResult } from './modules/Search/SearchResult' +export { default as SearchResults } from './modules/Search/SearchResults' + +// Views +export { default as Card } from './views/Card/Card' +export { default as CardContent } from './views/Card/CardContent' +export { default as CardDescription } from './views/Card/CardDescription' +export { default as CardGroup } from './views/Card/CardGroup' +export { default as CardHeader } from './views/Card/CardHeader' +export { default as CardMeta } from './views/Card/CardMeta' + +export { default as Feed } from './views/Feed/Feed' +export { default as FeedContent } from './views/Feed/FeedContent' +export { default as FeedDate } from './views/Feed/FeedDate' +export { default as FeedEvent } from './views/Feed/FeedEvent' +export { default as FeedExtra } from './views/Feed/FeedExtra' +export { default as FeedLabel } from './views/Feed/FeedLabel' +export { default as FeedLike } from './views/Feed/FeedLike' +export { default as FeedMeta } from './views/Feed/FeedMeta' +export { default as FeedSummary } from './views/Feed/FeedSummary' +export { default as FeedUser } from './views/Feed/FeedUser' + +export { default as Item } from './views/Item/Item' +export { default as ItemContent } from './views/Item/ItemContent' +export { default as ItemDescription } from './views/Item/ItemDescription' +export { default as ItemExtra } from './views/Item/ItemExtra' +export { default as ItemGroup } from './views/Item/ItemGroup' +export { default as ItemHeader } from './views/Item/ItemHeader' +export { default as ItemImage } from './views/Item/ItemImage' +export { default as ItemMeta } from './views/Item/ItemMeta' + +export { default as Statistic } from './views/Statistic/Statistic' +export { default as StatisticGroup } from './views/Statistic/StatisticGroup' +export { default as StatisticLabel } from './views/Statistic/StatisticLabel' +export { default as StatisticValue } from './views/Statistic/StatisticValue' diff --git a/src/modules/index.js b/src/modules/index.js deleted file mode 100644 index 0fa89702be..0000000000 --- a/src/modules/index.js +++ /dev/null @@ -1,26 +0,0 @@ -export { default as Accordion } from './Accordion/Accordion' -export { default as AccordionContent } from './Accordion/AccordionContent' -export { default as AccordionTitle } from './Accordion/AccordionTitle' - -export { default as Checkbox } from './Checkbox/Checkbox' - -export { default as Dropdown } from './Dropdown/Dropdown' -export { default as DropdownDivider } from './Dropdown/DropdownDivider' -export { default as DropdownHeader } from './Dropdown/DropdownHeader' -export { default as DropdownItem } from './Dropdown/DropdownItem' -export { default as DropdownMenu } from './Dropdown/DropdownMenu' - -export { default as Modal } from './Modal/Modal' -export { default as ModalActions } from './Modal/ModalActions' -export { default as ModalContent } from './Modal/ModalContent' -export { default as ModalDescription } from './Modal/ModalDescription' -export { default as ModalHeader } from './Modal/ModalHeader' - -export { default as Progress } from './Progress/Progress' - -export { default as Rating } from './Rating/Rating' - -export { default as Search } from './Search/Search' -export { default as SearchCategory } from './Search/SearchCategory' -export { default as SearchResult } from './Search/SearchResult' -export { default as SearchResults } from './Search/SearchResults' diff --git a/src/umd.js b/src/umd.js index 57607dc25e..e9e80e5f78 100644 --- a/src/umd.js +++ b/src/umd.js @@ -3,16 +3,8 @@ // Do not replace this with named exports. // We need to export an object here for browser builds. // Otherwise, we end up with every component on the window. -import * as addons from './addons' -import * as collections from './collections' -import * as elements from './elements' -import * as modules from './modules' -import * as views from './views' +import * as components from './index' module.exports = { - ...addons, - ...collections, - ...elements, - ...modules, - ...views, + ...components, } diff --git a/src/views/index.js b/src/views/index.js deleted file mode 100644 index 0102e05740..0000000000 --- a/src/views/index.js +++ /dev/null @@ -1,31 +0,0 @@ -export { default as Card } from './Card/Card' -export { default as CardContent } from './Card/CardContent' -export { default as CardDescription } from './Card/CardDescription' -export { default as CardGroup } from './Card/CardGroup' -export { default as CardHeader } from './Card/CardHeader' -export { default as CardMeta } from './Card/CardMeta' - -export { default as Feed } from './Feed/Feed' -export { default as FeedContent } from './Feed/FeedContent' -export { default as FeedDate } from './Feed/FeedDate' -export { default as FeedEvent } from './Feed/FeedEvent' -export { default as FeedExtra } from './Feed/FeedExtra' -export { default as FeedLabel } from './Feed/FeedLabel' -export { default as FeedLike } from './Feed/FeedLike' -export { default as FeedMeta } from './Feed/FeedMeta' -export { default as FeedSummary } from './Feed/FeedSummary' -export { default as FeedUser } from './Feed/FeedUser' - -export { default as Item } from './Item/Item' -export { default as ItemContent } from './Item/ItemContent' -export { default as ItemDescription } from './Item/ItemDescription' -export { default as ItemExtra } from './Item/ItemExtra' -export { default as ItemGroup } from './Item/ItemGroup' -export { default as ItemHeader } from './Item/ItemHeader' -export { default as ItemImage } from './Item/ItemImage' -export { default as ItemMeta } from './Item/ItemMeta' - -export { default as Statistic } from './Statistic/Statistic' -export { default as StatisticGroup } from './Statistic/StatisticGroup' -export { default as StatisticLabel } from './Statistic/StatisticLabel' -export { default as StatisticValue } from './Statistic/StatisticValue' diff --git a/test/specs/addons/Confirm-test.js b/test/specs/addons/Confirm-test.js index 9ec866f869..af3c03eca9 100644 --- a/test/specs/addons/Confirm-test.js +++ b/test/specs/addons/Confirm-test.js @@ -1,7 +1,7 @@ import React from 'react' -import { Confirm } from 'src/addons' -import { Modal } from 'src/modules' +import Confirm from 'src/addons/Confirm/Confirm' +import Modal from 'src/modules/Modal/Modal' import { sandbox } from 'test/utils' import * as common from 'test/specs/commonTests' diff --git a/test/specs/addons/Portal/Portal-test.js b/test/specs/addons/Portal/Portal-test.js index d611145c44..b004fedbf0 100644 --- a/test/specs/addons/Portal/Portal-test.js +++ b/test/specs/addons/Portal/Portal-test.js @@ -3,7 +3,7 @@ import React from 'react' import { unmountComponentAtNode } from 'react-dom' import { domEvent, sandbox } from 'test/utils' -import { Portal } from 'src/addons' +import Portal from 'src/addons/Portal/Portal' let attachTo let wrapper diff --git a/test/specs/commonTests.js b/test/specs/commonTests.js index 2d0901364d..663122a7e8 100644 --- a/test/specs/commonTests.js +++ b/test/specs/commonTests.js @@ -8,7 +8,10 @@ import { createShorthand, META, numberToWord } from 'src/lib' import { consoleUtil, sandbox, syntheticEvent } from 'test/utils' import * as stardust from 'stardust' -import { Button, Icon, Image, Label } from 'src/elements' +import Button from 'src/elements/Button/Button' +import Icon from 'src/elements/Icon/Icon' +import Image from 'src/elements/Image/Image' +import Label from 'src/elements/Label/Label' const commonTestHelpers = (testName, Component) => { const throwError = msg => { diff --git a/test/specs/modules/Modal/Modal-test.js b/test/specs/modules/Modal/Modal-test.js index 977372cb98..e8868464b1 100644 --- a/test/specs/modules/Modal/Modal-test.js +++ b/test/specs/modules/Modal/Modal-test.js @@ -6,7 +6,7 @@ import ModalHeader from 'src/modules/Modal/ModalHeader' import ModalContent from 'src/modules/Modal/ModalContent' import ModalActions from 'src/modules/Modal/ModalActions' import ModalDescription from 'src/modules/Modal/ModalDescription' -import { Portal } from 'src/addons' +import Portal from 'src/addons/Portal/Portal' import { keyboardKey } from 'src/lib' import { domEvent, sandbox } from 'test/utils'