Skip to content

Commit 711a32e

Browse files
committed
Move to ES6 modules
Export as CommonJS and AMD Build with Grunt
1 parent a8def83 commit 711a32e

File tree

140 files changed

+1438
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1438
-167
lines changed

Diff for: .gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ node_modules
44
npm-debug.log
55
test_bundle.js
66
test-built/*
7-
.idea/
7+
.idea
8+
transpiled/*

Diff for: .jshintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
"unused": true,
1111
"boss": true,
1212
"eqnull": true,
13-
"node": true
13+
"node": true,
14+
"esnext": true
1415
}

Diff for: Gruntfile.js

+141
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
module.exports = function (grunt) {
2+
3+
grunt.initConfig({
4+
pkg: grunt.file.readJSON('package.json'),
5+
// uglify: {
6+
// options: {
7+
// banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
8+
// },
9+
// build: {
10+
// src: 'src/<%= pkg.name %>.js',
11+
// dest: 'build/<%= pkg.name %>.min.js'
12+
// }
13+
// }
14+
//
15+
transpile: {
16+
cjs: {
17+
type: 'cjs',
18+
files: [{
19+
expand: true,
20+
cwd: '.',
21+
src: ['transpiled/*.js'],
22+
dest: 'cjs/'
23+
}]
24+
},
25+
amd: {
26+
type: 'amd',
27+
anonymous: true,
28+
files: [{
29+
expand: true,
30+
cwd: '.',
31+
src: ['transpiled/*.js'],
32+
dest: 'amd/'
33+
}]
34+
}
35+
},
36+
37+
es6_module_wrap_default: {
38+
cjs: {
39+
options: {
40+
type: 'cjs'
41+
},
42+
files: [{
43+
expand: true,
44+
cwd: 'cjs/transpiled',
45+
src: ['**/*.js'],
46+
dest: 'cjs'
47+
}]
48+
},
49+
amd: {
50+
options: {
51+
type: 'amd'
52+
},
53+
files: [{
54+
expand: true,
55+
cwd: 'amd/transpiled',
56+
src: ['**/*.js'],
57+
dest: 'amd'
58+
}]
59+
}
60+
},
61+
62+
react: {
63+
src: {
64+
files: [
65+
{
66+
expand: true,
67+
cwd: 'src',
68+
src: ['**/*.*'],
69+
dest: 'transpiled',
70+
ext: '.js'
71+
}
72+
]
73+
},
74+
test: {
75+
files: [
76+
{
77+
expand: true,
78+
cwd: 'test',
79+
src: ['**/*.*'],
80+
dest: 'test-built',
81+
ext: '.js'
82+
}
83+
]
84+
}
85+
},
86+
87+
clean: {
88+
transpiled: ['transpiled'],
89+
cjs: ['cjs'],
90+
amd: ['amd']
91+
},
92+
93+
watch: {
94+
all: {
95+
files: [
96+
'src/**/*.jsx',
97+
'src/**/*.js',
98+
'test/**/*.jsx',
99+
'test/**/*.js'
100+
],
101+
tasks: ['build'],
102+
options: {
103+
spawn: false,
104+
},
105+
},
106+
},
107+
108+
browserify: {
109+
test: {
110+
files: {
111+
'test_bundle.js': ['test-built/**/*.js'],
112+
},
113+
options: {
114+
transform: ['envify']
115+
}
116+
}
117+
}
118+
});
119+
120+
grunt.loadNpmTasks('grunt-contrib-uglify');
121+
grunt.loadNpmTasks('grunt-es6-module-transpiler');
122+
grunt.loadNpmTasks('grunt-es6-module-wrap-default');
123+
grunt.loadNpmTasks('grunt-react');
124+
grunt.loadNpmTasks('grunt-contrib-clean');
125+
grunt.loadNpmTasks('grunt-contrib-watch');
126+
grunt.loadNpmTasks('grunt-es6-module-wrap-default');
127+
grunt.loadNpmTasks('grunt-browserify');
128+
129+
grunt.registerTask('build', [
130+
'clean:amd',
131+
'clean:cjs',
132+
'react',
133+
'transpile',
134+
'es6_module_wrap_default',
135+
'browserify',
136+
'clean:transpiled'
137+
]);
138+
139+
grunt.registerTask('default', ['build']);
140+
141+
};

Diff for: README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
### <a name="Button"></a>Button
2323

2424
```
25-
var Button = require('react-bootstrap/lib/Button');
25+
var Button = require('react-bootstrap/cjs/Button');
2626
2727
<Button onClick={handleClick}>Title</Button>
2828
```
2929

3030
### <a name="DropdownButton"></a>DropdownButton
3131

3232
```
33-
var DropdownButton = require('react-bootstrap/lib/DropdownButton');
34-
var MenuItem = require('react-bootstrap/lib/MenuItem');
33+
var DropdownButton = require('react-bootstrap/cjs/DropdownButton');
34+
var MenuItem = require('react-bootstrap/cjs/MenuItem');
3535
3636
function handleSelect (selectedIndex) {
3737
}
@@ -46,8 +46,8 @@ function handleSelect (selectedIndex) {
4646

4747
#### Controlled
4848
```
49-
var TabbedArea = require('react-bootstrap/lib/TabbedArea');
50-
var TabPane = require('react-bootstrap/lib/TabPane');
49+
var TabbedArea = require('react-bootstrap/cjs/TabbedArea');
50+
var TabPane = require('react-bootstrap/cjs/TabPane');
5151
5252
var key = 1;
5353
@@ -63,8 +63,8 @@ function handleSelect (selectedKey) {
6363

6464
#### Uncontrolled
6565
```
66-
var TabbedArea = require('react-bootstrap/lib/TabbedArea');
67-
var TabPane = require('react-bootstrap/lib/TabPane');
66+
var TabbedArea = require('react-bootstrap/cjs/TabbedArea');
67+
var TabPane = require('react-bootstrap/cjs/TabPane');
6868
6969
<TabbedArea title="Title" initialActiveKey={1}>
7070
<TabPane tab="Tab 1" key={1}>TabPane 1 content</TabPane>
@@ -75,7 +75,7 @@ var TabPane = require('react-bootstrap/lib/TabPane');
7575
### <a name="Alert"></a>Alert
7676

7777
```
78-
var Alert = require('react-bootstrap/lib/Alert');
78+
var Alert = require('react-bootstrap/cjs/Alert');
7979
8080
function handleDismiss () {
8181
}
@@ -87,14 +87,14 @@ function handleDismiss () {
8787

8888
### <a name="CollapsePanel"></a>CollapsePanel
8989

90-
`var CollapsePanel = require('react-bootstrap/lib/CollapsePanel')`
90+
`var CollapsePanel = require('react-bootstrap/cjs/CollapsePanel')`
9191

9292
TODO docs
9393

9494
### <a name="MenuItem"></a>MenuItem
9595

9696
```
97-
var MenuItem = require('react-bootstrap/lib/MenuItem');
97+
var MenuItem = require('react-bootstrap/cjs/MenuItem');
9898
9999
function handleSelect (key) {
100100
}

Diff for: amd/Alert.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/Alert'], function (Alert) {
2+
return Alert.default;
3+
})

Diff for: amd/BootstrapMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/BootstrapMixin'], function (BootstrapMixin) {
2+
return BootstrapMixin.default;
3+
})

Diff for: amd/Button.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/Button'], function (Button) {
2+
return Button.default;
3+
})

Diff for: amd/CollapsePanel.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/CollapsePanel'], function (CollapsePanel) {
2+
return CollapsePanel.default;
3+
})

Diff for: amd/DangerMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/DangerMixin'], function (DangerMixin) {
2+
return DangerMixin.default;
3+
})

Diff for: amd/DefaultMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/DefaultMixin'], function (DefaultMixin) {
2+
return DefaultMixin.default;
3+
})

Diff for: amd/DropdownButton.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/DropdownButton'], function (DropdownButton) {
2+
return DropdownButton.default;
3+
})

Diff for: amd/InfoMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/InfoMixin'], function (InfoMixin) {
2+
return InfoMixin.default;
3+
})

Diff for: amd/InlineMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/InlineMixin'], function (InlineMixin) {
2+
return InlineMixin.default;
3+
})

Diff for: amd/Input.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/Input'], function (Input) {
2+
return Input.default;
3+
})

Diff for: amd/LargeMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/LargeMixin'], function (LargeMixin) {
2+
return LargeMixin.default;
3+
})

Diff for: amd/LinkMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/LinkMixin'], function (LinkMixin) {
2+
return LinkMixin.default;
3+
})

Diff for: amd/MediumMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/MediumMixin'], function (MediumMixin) {
2+
return MediumMixin.default;
3+
})

Diff for: amd/MenuItem.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/MenuItem'], function (MenuItem) {
2+
return MenuItem.default;
3+
})

Diff for: amd/PrimaryMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/PrimaryMixin'], function (PrimaryMixin) {
2+
return PrimaryMixin.default;
3+
})

Diff for: amd/SmallMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/SmallMixin'], function (SmallMixin) {
2+
return SmallMixin.default;
3+
})

Diff for: amd/SplitButton.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/SplitButton'], function (SplitButton) {
2+
return SplitButton.default;
3+
})

Diff for: amd/SuccessMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/SuccessMixin'], function (SuccessMixin) {
2+
return SuccessMixin.default;
3+
})

Diff for: amd/Tab.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/Tab'], function (Tab) {
2+
return Tab.default;
3+
})

Diff for: amd/TabPane.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/TabPane'], function (TabPane) {
2+
return TabPane.default;
3+
})

Diff for: amd/TabbedArea.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/TabbedArea'], function (TabbedArea) {
2+
return TabbedArea.default;
3+
})

Diff for: amd/WarningMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/WarningMixin'], function (WarningMixin) {
2+
return WarningMixin.default;
3+
})

Diff for: amd/XSmallMixin.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/XSmallMixin'], function (XSmallMixin) {
2+
return XSmallMixin.default;
3+
})

Diff for: amd/constants.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
define(['./transpiled/constants'], function (constants) {
2+
return constants.default;
3+
})

0 commit comments

Comments
 (0)