Skip to content
This repository was archived by the owner on Nov 16, 2018. It is now read-only.

Commit 417bf48

Browse files
chollierchollier
committed
Convert source module format from ES6 to CommonJS
see react-bootstrap/react-bootstrap@4739d2e#diff-b9cfc7f2cdf78a7f4b91a753d10865a2R31
1 parent 6b1eb4d commit 417bf48

38 files changed

+180
-17586
lines changed

‎Gruntfile.js

Lines changed: 69 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,59 @@ module.exports = function (grunt) {
33
grunt.initConfig({
44
pkg: grunt.file.readJSON('package.json'),
55

6-
transpile: {
7-
cjs: {
8-
type: 'cjs',
9-
files: [{
10-
expand: true,
11-
cwd: '.',
12-
src: ['transpiled/**/*.js'],
13-
dest: 'cjs/'
14-
}]
15-
},
16-
amd: {
17-
type: 'amd',
18-
anonymous: true,
19-
files: [{
20-
expand: true,
21-
cwd: '.',
22-
src: ['transpiled/**/*.js'],
23-
dest: 'amd/'
24-
}]
25-
}
26-
},
6+
// transpile: {
7+
// cjs: {
8+
// type: 'cjs',
9+
// files: [{
10+
// expand: true,
11+
// cwd: '.',
12+
// src: ['transpiled/**/*.js'],
13+
// dest: 'cjs/'
14+
// }]
15+
// },
16+
// amd: {
17+
// type: 'amd',
18+
// anonymous: true,
19+
// files: [{
20+
// expand: true,
21+
// cwd: '.',
22+
// src: ['transpiled/**/*.js'],
23+
// dest: 'amd/'
24+
// }]
25+
// }
26+
// },
2727

28-
es6_module_wrap_default: {
29-
cjs: {
30-
options: {
31-
type: 'cjs'
32-
},
33-
files: [{
34-
expand: true,
35-
cwd: 'cjs/transpiled',
36-
src: ['*.js'],
37-
dest: 'cjs'
38-
}]
39-
},
40-
amd: {
41-
options: {
42-
type: 'amd'
43-
},
44-
files: [{
45-
expand: true,
46-
cwd: 'amd/transpiled',
47-
src: ['*.js'],
48-
dest: 'amd'
49-
}]
28+
// es6_module_wrap_default: {
29+
// cjs: {
30+
// options: {
31+
// type: 'cjs'
32+
// },
33+
// files: [{
34+
// expand: true,
35+
// cwd: 'cjs/transpiled',
36+
// src: ['*.js'],
37+
// dest: 'cjs'
38+
// }]
39+
// },
40+
// amd: {
41+
// options: {
42+
// type: 'amd'
43+
// },
44+
// files: [{
45+
// expand: true,
46+
// cwd: 'amd/transpiled',
47+
// src: ['*.js'],
48+
// dest: 'amd'
49+
// }]
50+
// }
51+
// },
52+
53+
amdwrap: {
54+
src: {
55+
expand: true,
56+
cwd: 'transpiled/',
57+
src: ['**/*.js'],
58+
dest: 'amd/'
5059
}
5160
},
5261

@@ -63,6 +72,12 @@ module.exports = function (grunt) {
6372
},
6473
cjs: {
6574
files: [
75+
{
76+
expand: true,
77+
cwd: 'transpiled/',
78+
src: ['**/*.js'],
79+
dest: 'cjs/'
80+
},
6681
{
6782
src: ['**/*'],
6883
dest: 'cjs/',
@@ -145,16 +160,21 @@ module.exports = function (grunt) {
145160
baseUrl: "amd",
146161
paths: {
147162
"react-bootstrap-datetimepicker": "./index",
148-
almond: "../tools/vendor/almond",
149-
react: "../tools/vendor/react-0.9.0"
150163
},
164+
packages: [
165+
{ name: 'react', location: '../node_modules/react', main: './react' }
166+
],
151167
include: ["almond", "react-bootstrap-datetimepicker"],
152168
exclude: ["react"],
153169
out: "amd/react-bootstrap-datetimepicker.js",
170+
cjsTranslate: true,
154171
wrap: {
155172
startFile: "tools/wrap.start",
156173
endFile: "tools/wrap.end"
157174
},
175+
rawText: {
176+
'react': 'define({});'
177+
},
158178
optimize: "none"
159179
}
160180
}
@@ -217,9 +237,8 @@ module.exports = function (grunt) {
217237
});
218238

219239
grunt.loadNpmTasks('grunt-contrib-uglify');
220-
grunt.loadNpmTasks('grunt-es6-module-transpiler');
221-
grunt.loadNpmTasks('grunt-es6-module-wrap-default');
222240
grunt.loadNpmTasks('grunt-react');
241+
grunt.loadNpmTasks("grunt-amd-wrap");
223242
grunt.loadNpmTasks('grunt-contrib-clean');
224243
grunt.loadNpmTasks('grunt-contrib-watch');
225244
grunt.loadNpmTasks('grunt-contrib-copy');
@@ -235,12 +254,11 @@ module.exports = function (grunt) {
235254
'coffee:test',
236255
'react:src',
237256
'react:test',
238-
'transpile',
239-
'es6_module_wrap_default',
257+
'amdwrap',
240258
'copy',
241259
'browserify:test',
242-
'requirejs:dev',
243-
'uglify:build',
260+
// 'requirejs:dev',
261+
// 'uglify:build',
244262
'clean:transpiled'
245263
]);
246264

‎package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,36 @@
1919
"react": ">=0.9"
2020
},
2121
"devDependencies": {
22-
"karma-chai": "0.0.2",
23-
"mocha": "~1.16.2",
24-
"karma-script-launcher": "~0.1.0",
25-
"karma-chrome-launcher": "~0.1.2",
26-
"karma-html2js-preprocessor": "~0.1.0",
27-
"karma-firefox-launcher": "~0.1.3",
28-
"karma-jasmine": "~0.1.5",
29-
"karma-coffee-preprocessor": "~0.1.2",
30-
"requirejs": "~2.1.9",
31-
"karma-requirejs": "~0.2.1",
32-
"karma-phantomjs-launcher": "~0.1.1",
33-
"karma": "~0.10.9",
34-
"karma-mocha": "~0.1.1",
35-
"react": "0.10.0",
3622
"envify": "~1.2.1",
37-
"grunt-es6-module-transpiler": "~0.6.0",
3823
"grunt": "~0.4.2",
24+
"grunt-amd-wrap": "^1.0.1",
25+
"grunt-browserify": "~1.3.0",
26+
"grunt-cli": "~0.1.13",
27+
"grunt-contrib-clean": "~0.5.0",
3928
"grunt-contrib-coffee": "~0.10.1",
29+
"grunt-contrib-copy": "~0.5.0",
30+
"grunt-contrib-requirejs": "~0.4.1",
4031
"grunt-contrib-uglify": "~0.3.2",
41-
"grunt-contrib-clean": "~0.5.0",
42-
"grunt-es6-module-wrap-default": "~0.2.0",
4332
"grunt-contrib-watch": "~0.5.3",
44-
"grunt-browserify": "~1.3.0",
45-
"grunt-cli": "~0.1.13",
4633
"grunt-react": "~0.6.0",
47-
"grunt-contrib-requirejs": "~0.4.1",
4834
"grunt-shell": "~0.6.4",
49-
"grunt-contrib-copy": "~0.5.0"
35+
"karma": "~0.10.9",
36+
"karma-chai": "0.0.2",
37+
"karma-chrome-launcher": "~0.1.2",
38+
"karma-coffee-preprocessor": "~0.1.2",
39+
"karma-firefox-launcher": "~0.1.3",
40+
"karma-html2js-preprocessor": "~0.1.0",
41+
"karma-jasmine": "~0.1.5",
42+
"karma-mocha": "~0.1.1",
43+
"karma-phantomjs-launcher": "~0.1.1",
44+
"karma-requirejs": "~0.2.1",
45+
"karma-script-launcher": "~0.1.0",
46+
"mocha": "~1.16.2",
47+
"react": "0.10.0",
48+
"requirejs": "~2.1.9"
5049
},
5150
"dependencies": {
51+
"moment": "^2.8.2",
5252
"react-bootstrap": "^0.11.1"
5353
}
5454
}

‎src/DateTimeField.jsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11

22
/** @jsx React.DOM */
3-
import React from './react-es6';
4-
import DateTimePicker from './DateTimePicker';
5-
var DateTimeField, Glyphicon;
3+
var DateTimeField, DateTimePicker, Glyphicon, React, moment;
4+
5+
React = require('react');
6+
7+
DateTimePicker = require('./DateTimePicker');
8+
9+
moment = require('moment');
610

711
Glyphicon = require('react-bootstrap/Glyphicon');
812

@@ -277,4 +281,4 @@ DateTimeField = React.createClass({
277281
}
278282
});
279283

280-
export default = DateTimeField;
284+
module.exports = DateTimeField;

‎src/DateTimePicker.jsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11

22
/** @jsx React.DOM */
3-
import React from './react-es6';
4-
import DateTimePickerDate from './DateTimePickerDate';
5-
import DateTimePickerTime from './DateTimePickerTime';
6-
var DateTimePicker, Glyphicon;
3+
var DateTimePicker, DateTimePickerDate, DateTimePickerTime, Glyphicon, React;
4+
5+
React = require('react');
6+
7+
DateTimePickerDate = require('./DateTimePickerDate');
8+
9+
DateTimePickerTime = require('./DateTimePickerTime');
710

811
Glyphicon = require('react-bootstrap/Glyphicon');
912

@@ -84,4 +87,4 @@ DateTimePicker = React.createClass({
8487
}
8588
});
8689

87-
export default = DateTimePicker;
90+
module.exports = DateTimePicker;

‎src/DateTimePickerDate.jsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11

22
/** @jsx React.DOM */
3-
import React from './react-es6';
4-
import DateTimePickerDays from './DateTimePickerDays';
5-
import DateTimePickerMonths from './DateTimePickerMonths';
6-
import DateTimePickerYears from './DateTimePickerYears';
7-
var DateTimePickerDate;
3+
var DateTimePickerDate, DateTimePickerDays, DateTimePickerMonths, DateTimePickerYears, React;
4+
5+
React = require('react');
6+
7+
DateTimePickerDays = require('./DateTimePickerDays');
8+
9+
DateTimePickerMonths = require('./DateTimePickerMonths');
10+
11+
DateTimePickerYears = require('./DateTimePickerYears');
812

913
DateTimePickerDate = React.createClass({
1014
propTypes: {
@@ -117,4 +121,4 @@ DateTimePickerDate = React.createClass({
117121
}
118122
});
119123

120-
export default = DateTimePickerDate;
124+
module.exports = DateTimePickerDate;

‎src/DateTimePickerDays.jsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11

22
/** @jsx React.DOM */
3-
import React from './react-es6';
4-
var DateTimePickerDays;
3+
var DateTimePickerDays, React, moment;
4+
5+
React = require('react');
6+
7+
moment = require('moment');
58

69
DateTimePickerDays = React.createClass({
710
propTypes: {
@@ -109,4 +112,4 @@ DateTimePickerDays = React.createClass({
109112
}
110113
});
111114

112-
export default = DateTimePickerDays;
115+
module.exports = DateTimePickerDays;

‎src/DateTimePickerHours.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

22
/** @jsx React.DOM */
3-
import React from './react-es6';
4-
var DateTimePickerHours;
3+
var DateTimePickerHours, React;
4+
5+
React = require('react');
56

67
DateTimePickerHours = React.createClass({
78
propTypes: {
@@ -78,4 +79,4 @@ DateTimePickerHours = React.createClass({
7879
}
7980
});
8081

81-
export default = DateTimePickerHours;
82+
module.exports = DateTimePickerHours;

‎src/DateTimePickerMinutes.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

22
/** @jsx React.DOM */
3-
import React from './react-es6';
4-
var DateTimePickerMinutes;
3+
var DateTimePickerMinutes, React;
4+
5+
React = require('react');
56

67
DateTimePickerMinutes = React.createClass({
78
propTypes: {
@@ -48,4 +49,4 @@ DateTimePickerMinutes = React.createClass({
4849
}
4950
});
5051

51-
export default = DateTimePickerMinutes;
52+
module.exports = DateTimePickerMinutes;

‎src/DateTimePickerMonths.jsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11

22
/** @jsx React.DOM */
3-
import React from './react-es6';
4-
var DateTimePickerMonths;
3+
var DateTimePickerMonths, React, moment;
4+
5+
React = require('react');
6+
7+
moment = require('moment');
58

69
DateTimePickerMonths = React.createClass({
710
propTypes: {
@@ -53,4 +56,4 @@ DateTimePickerMonths = React.createClass({
5356
}
5457
});
5558

56-
export default = DateTimePickerMonths;
59+
module.exports = DateTimePickerMonths;

‎src/DateTimePickerTime.jsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11

22
/** @jsx React.DOM */
3-
import React from './react-es6';
4-
import DateTimePickerMinutes from './DateTimePickerMinutes';
5-
import DateTimePickerHours from './DateTimePickerHours';
6-
var DateTimePickerTime, Glyphicon;
3+
var DateTimePickerHours, DateTimePickerMinutes, DateTimePickerTime, Glyphicon, React;
4+
5+
React = require('react');
6+
7+
DateTimePickerMinutes = require('./DateTimePickerMinutes');
8+
9+
DateTimePickerHours = require('./DateTimePickerHours');
710

811
Glyphicon = require('react-bootstrap/Glyphicon');
912

@@ -115,4 +118,4 @@ DateTimePickerTime = React.createClass({
115118
}
116119
});
117120

118-
export default = DateTimePickerTime;
121+
module.exports = DateTimePickerTime;

0 commit comments

Comments
 (0)