Skip to content

Commit fafe46f

Browse files
author
Jimmy Jia
committedJun 13, 2015
[changed] Use named exports in index files
Fixes react-bootstrap#350
·
v2.5.0-beta.0v0.24.0-alpha.3
1 parent 36358d6 commit fafe46f

File tree

9 files changed

+77
-144
lines changed

9 files changed

+77
-144
lines changed
 

‎.babelrc

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
{
2-
"optional": [
3-
"es7.objectRestSpread"
4-
]
2+
"stage": 1
53
}

‎docs/src/GettingStartedPage.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ $ npm install react-bootstrap`
4343
codeText={
4444
`var Alert = require('react-bootstrap/lib/Alert');
4545
// or
46-
var Alert = require('react-bootstrap').Alert;`
46+
var Alert = require('react-bootstrap').Alert;
47+
48+
// with ES6 modules
49+
import Alert from 'react-bootstrap/lib/Alert';
50+
// or
51+
import {Alert} from 'react-bootstrap';`
4752
}
4853
/>
4954
</div>

‎docs/src/ReactPlayground.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import * as modClassNames from 'classnames';
33
import * as modAccordion from '../../src/Accordion';
44
import * as modAlert from '../../src/Alert';
55
import * as modBadge from '../../src/Badge';
6-
import * as modmodButton from '../../src/Button';
6+
import * as modButton from '../../src/Button';
77
import * as modButtonGroup from '../../src/ButtonGroup';
88
import * as modButtonInput from '../../src/ButtonInput';
9-
import * as modmodButtonToolbar from '../../src/ButtonToolbar';
9+
import * as modButtonToolbar from '../../src/ButtonToolbar';
1010
import * as modCollapsibleNav from '../../src/CollapsibleNav';
1111
import * as modCollapsibleMixin from '../../src/CollapsibleMixin';
1212
import * as modCarousel from '../../src/Carousel';
@@ -56,17 +56,17 @@ const React = modReact.default;
5656
const Accordion = modAccordion.default;
5757
const Alert = modAlert.default;
5858
const Badge = modBadge.default;
59-
const Button = modmodButton.default;
59+
const Button = modButton.default;
6060
const ButtonGroup = modButtonGroup.default;
6161
const ButtonInput = modButtonInput.default;
62-
const ButtonToolbar = modmodButtonToolbar.default;
62+
const ButtonToolbar = modButtonToolbar.default;
6363
const CollapsibleNav = modCollapsibleNav.default;
6464
const CollapsibleMixin = modCollapsibleMixin.default;
6565
const Carousel = modCarousel.default;
6666
const CarouselItem = modCarouselItem.default;
6767
const Col = modCol.default;
6868
const DropdownButton = modDropdownButton.default;
69-
const FormControls = modFormControls.default;
69+
const FormControls = modFormControls;
7070
const Glyphicon = modGlyphicon.default;
7171
const Grid = modGrid.default;
7272
const Input = modInput.default;

‎src/FormControls/index.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
import Static from './Static';
2-
3-
export default {
4-
Static
5-
};
1+
export Static from './Static';

‎src/Input.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import InputBase from './InputBase';
3-
import FormControls from './FormControls';
3+
import * as FormControls from './FormControls';
44
import deprecationWarning from './utils/deprecationWarning';
55

66
class Input extends InputBase {

‎src/index.js

+56-114
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,57 @@
1-
import Accordion from './Accordion';
2-
import Affix from './Affix';
3-
import AffixMixin from './AffixMixin';
4-
import Alert from './Alert';
5-
import BootstrapMixin from './BootstrapMixin';
6-
import Badge from './Badge';
7-
import Button from './Button';
8-
import ButtonGroup from './ButtonGroup';
9-
import ButtonInput from './ButtonInput';
10-
import ButtonToolbar from './ButtonToolbar';
11-
import CollapsibleNav from './CollapsibleNav';
12-
import Carousel from './Carousel';
13-
import CarouselItem from './CarouselItem';
14-
import Col from './Col';
15-
import CollapsibleMixin from './CollapsibleMixin';
16-
import DropdownButton from './DropdownButton';
17-
import DropdownMenu from './DropdownMenu';
18-
import DropdownStateMixin from './DropdownStateMixin';
19-
import FadeMixin from './FadeMixin';
20-
import FormControls from './FormControls';
21-
import Glyphicon from './Glyphicon';
22-
import Grid from './Grid';
23-
import Input from './Input';
24-
import Interpolate from './Interpolate';
25-
import Jumbotron from './Jumbotron';
26-
import Label from './Label';
27-
import ListGroup from './ListGroup';
28-
import ListGroupItem from './ListGroupItem';
29-
import MenuItem from './MenuItem';
30-
import Modal from './Modal';
31-
import Nav from './Nav';
32-
import Navbar from './Navbar';
33-
import NavItem from './NavItem';
34-
import ModalTrigger from './ModalTrigger';
35-
import OverlayTrigger from './OverlayTrigger';
36-
import OverlayMixin from './OverlayMixin';
37-
import PageHeader from './PageHeader';
38-
import Pagination from './Pagination';
39-
import Panel from './Panel';
40-
import PanelGroup from './PanelGroup';
41-
import PageItem from './PageItem';
42-
import Pager from './Pager';
43-
import Popover from './Popover';
44-
import ProgressBar from './ProgressBar';
45-
import Row from './Row';
46-
import SafeAnchor from './SafeAnchor';
47-
import SplitButton from './SplitButton';
48-
import SubNav from './SubNav';
49-
import TabbedArea from './TabbedArea';
50-
import Table from './Table';
51-
import TabPane from './TabPane';
52-
import Thumbnail from './Thumbnail';
53-
import Tooltip from './Tooltip';
54-
import utils from './utils';
55-
import Well from './Well';
56-
import styleMaps from './styleMaps';
1+
export Accordion from './Accordion';
2+
export Affix from './Affix';
3+
export AffixMixin from './AffixMixin';
4+
export Alert from './Alert';
5+
export Badge from './Badge';
6+
export BootstrapMixin from './BootstrapMixin';
7+
export Button from './Button';
8+
export ButtonGroup from './ButtonGroup';
9+
export ButtonInput from './ButtonInput';
10+
export ButtonToolbar from './ButtonToolbar';
11+
export Carousel from './Carousel';
12+
export CarouselItem from './CarouselItem';
13+
export Col from './Col';
14+
export CollapsibleMixin from './CollapsibleMixin';
15+
export CollapsibleNav from './CollapsibleNav';
16+
export DropdownButton from './DropdownButton';
17+
export DropdownMenu from './DropdownMenu';
18+
export DropdownStateMixin from './DropdownStateMixin';
19+
export FadeMixin from './FadeMixin';
20+
export Glyphicon from './Glyphicon';
21+
export Grid from './Grid';
22+
export Input from './Input';
23+
export Interpolate from './Interpolate';
24+
export Jumbotron from './Jumbotron';
25+
export Label from './Label';
26+
export ListGroup from './ListGroup';
27+
export ListGroupItem from './ListGroupItem';
28+
export MenuItem from './MenuItem';
29+
export Modal from './Modal';
30+
export ModalTrigger from './ModalTrigger';
31+
export Nav from './Nav';
32+
export Navbar from './Navbar';
33+
export NavItem from './NavItem';
34+
export OverlayMixin from './OverlayMixin';
35+
export OverlayTrigger from './OverlayTrigger';
36+
export PageHeader from './PageHeader';
37+
export PageItem from './PageItem';
38+
export Pager from './Pager';
39+
export Pagination from './Pagination';
40+
export Panel from './Panel';
41+
export PanelGroup from './PanelGroup';
42+
export Popover from './Popover';
43+
export ProgressBar from './ProgressBar';
44+
export Row from './Row';
45+
export SafeAnchor from './SafeAnchor';
46+
export SplitButton from './SplitButton';
47+
export styleMaps from './styleMaps';
48+
export SubNav from './SubNav';
49+
export TabbedArea from './TabbedArea';
50+
export Table from './Table';
51+
export TabPane from './TabPane';
52+
export Thumbnail from './Thumbnail';
53+
export Tooltip from './Tooltip';
54+
export Well from './Well';
5755

58-
export default {
59-
Accordion,
60-
Affix,
61-
AffixMixin,
62-
Alert,
63-
BootstrapMixin,
64-
Badge,
65-
Button,
66-
ButtonGroup,
67-
ButtonInput,
68-
ButtonToolbar,
69-
CollapsibleNav,
70-
Carousel,
71-
CarouselItem,
72-
Col,
73-
CollapsibleMixin,
74-
DropdownButton,
75-
DropdownMenu,
76-
DropdownStateMixin,
77-
FadeMixin,
78-
FormControls,
79-
Glyphicon,
80-
Grid,
81-
Input,
82-
Interpolate,
83-
Jumbotron,
84-
Label,
85-
ListGroup,
86-
ListGroupItem,
87-
MenuItem,
88-
Modal,
89-
Nav,
90-
Navbar,
91-
NavItem,
92-
ModalTrigger,
93-
OverlayTrigger,
94-
OverlayMixin,
95-
PageHeader,
96-
Panel,
97-
PanelGroup,
98-
PageItem,
99-
Pager,
100-
Pagination,
101-
Popover,
102-
ProgressBar,
103-
Row,
104-
SafeAnchor,
105-
SplitButton,
106-
SubNav,
107-
TabbedArea,
108-
Table,
109-
TabPane,
110-
Thumbnail,
111-
Tooltip,
112-
utils,
113-
Well,
114-
styleMaps
115-
};
56+
export * as FormControls from './FormControls';
57+
export * as utils from './utils';

‎src/utils/index.js

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
import childrenValueInputValidation from './childrenValueInputValidation';
2-
import createChainedFunction from './createChainedFunction';
3-
import CustomPropTypes from './CustomPropTypes';
4-
import domUtils from './domUtils';
5-
import ValidComponentChildren from './ValidComponentChildren';
6-
7-
export default {
8-
childrenValueInputValidation,
9-
createChainedFunction,
10-
CustomPropTypes,
11-
domUtils,
12-
ValidComponentChildren
13-
};
1+
export childrenValueInputValidation from './childrenValueInputValidation';
2+
export createChainedFunction from './createChainedFunction';
3+
export CustomPropTypes from './CustomPropTypes';
4+
export domUtils from './domUtils';
5+
export ValidComponentChildren from './ValidComponentChildren';

‎test/FormControlsSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import ReactTestUtils from 'react/lib/ReactTestUtils';
3-
import FormControls from '../src/FormControls';
3+
import * as FormControls from '../src/FormControls';
44

55
describe('Form Controls', function () {
66
describe('Static', function () {

‎tools/public-components.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import index from '../src/index';
2+
import * as index from '../src/index';
33

44
let components = [];
55
Object.keys(index).forEach(function (item) {

0 commit comments

Comments
 (0)
Please sign in to comment.