Cleanup jsx tasks
debug and release are now identical, so there's no need to have both.
Paul O’Shannessy committed
Feb 6, 2014 at 15:59 UTC
b199de29a06a714c55a387b214097ccff508e8f5
2 files changed
+26
-46
Gruntfile.js
+11
-12
@@ -48,7 +48,7 @@ module.exports = function(grunt) {
48
}
49
});
50
51
- // Register jsx:debug and :release tasks.
51
+ // Register jsx:normal and :release tasks.
52
grunt.registerMultiTask('jsx', jsxTask);
53
54
// Our own browserify-based tasks to build a single JS file build
@@ -69,18 +69,18 @@ module.exports = function(grunt) {
69
70
grunt.registerTask('version-check', versionCheckTask);
71
72
- grunt.registerTask('build:basic', ['jsx:debug', 'version-check', 'browserify:basic']);
73
- grunt.registerTask('build:addons', ['jsx:debug', 'browserify:addons']);
74
- grunt.registerTask('build:transformer', ['jsx:debug', 'browserify:transformer']);
75
- grunt.registerTask('build:min', ['jsx:release', 'version-check', 'browserify:min']);
76
- grunt.registerTask('build:addons-min', ['jsx:debug', 'browserify:addonsMin']);
72
+ grunt.registerTask('build:basic', ['jsx:normal', 'version-check', 'browserify:basic']);
73
+ grunt.registerTask('build:addons', ['jsx:normal', 'browserify:addons']);
74
+ grunt.registerTask('build:transformer', ['jsx:normal', 'browserify:transformer']);
75
+ grunt.registerTask('build:min', ['jsx:normal', 'version-check', 'browserify:min']);
76
+ grunt.registerTask('build:addons-min', ['jsx:normal', 'browserify:addonsMin']);
77
grunt.registerTask('build:withCodeCoverageLogging', [
78
- 'jsx:debug',
78
+ 'jsx:normal',
79
'version-check',
80
'browserify:withCodeCoverageLogging'
81
]);
82
grunt.registerTask('build:perf', [
83
- 'jsx:release',
83
+ 'jsx:normal',
84
'version-check',
85
'browserify:transformer',
86
'browserify:basic',
@@ -93,7 +93,7 @@ module.exports = function(grunt) {
93
'version-check',
94
'populist:test'
95
]);
96
- grunt.registerTask('build:npm-react', ['version-check', 'jsx:release', 'npm-react:release']);
96
+ grunt.registerTask('build:npm-react', ['version-check', 'jsx:normal', 'npm-react:release']);
97
98
grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);
99
@@ -182,15 +182,14 @@ module.exports = function(grunt) {
182
grunt.registerTask('npm:test', ['build', 'npm:pack']);
183
184
// Optimized build task that does all of our builds. The subtasks will be run
185
- // in order so we can take advantage of that and only run jsx:debug once.
185
+ // in order so we can take advantage of that and only run jsx:normal once.
186
grunt.registerTask('build', [
187
'delete-build-modules',
188
- 'jsx:debug',
188
+ 'jsx:normal',
189
'version-check',
190
'browserify:basic',
191
'browserify:transformer',
192
'browserify:addons',
193
- 'jsx:release',
193
'browserify:min',
194
'browserify:addonsMin',
195
'npm-react:release',
grunt/config/jsx.js
+15
-34
@@ -1,39 +1,21 @@
1
'use strict';
2
3
var grunt = require('grunt');
4
+var _ = require('lodash');
5
6
var rootIDs = [
7
"React",
8
"ReactWithAddons"
9
];
10
10
-var getDebugConfig = function() {
11
- return {
12
- "commonerConfig": grunt.config.data.pkg.commonerConfig,
13
- "constants": {
14
- "__VERSION__": grunt.config.data.pkg.version
15
- }
16
- };
17
-};
11
19
-var debug = {
12
+var normal = {
13
rootIDs: rootIDs,
21
- getConfig: getDebugConfig,
22
- sourceDir: "src",
23
- outputDir: "build/modules"
24
-};
25
-
26
-var test = {
27
- rootIDs: rootIDs.concat([
28
- "test/all.js",
29
- "**/__tests__/*.js"
30
- ]),
14
getConfig: function() {
15
return {
33
- "mocking": true,
34
- "commonerConfig": grunt.config.data.pkg.commonerConfig,
35
- "constants": {
36
- "__VERSION__": grunt.config.data.pkg.version
16
+ commonerConfig: grunt.config.data.pkg.commonerConfig,
17
+ constants: {
18
+ __VERSION__: grunt.config.data.pkg.version
19
}
20
};
21
},
@@ -42,15 +24,15 @@ var test = {
24
};
25
26
45
-var release = {
46
- rootIDs: rootIDs,
27
+var test = {
28
+ rootIDs: rootIDs.concat([
29
+ "test/all.js",
30
+ "**/__tests__/*.js"
31
+ ]),
32
getConfig: function() {
48
- return {
49
- "commonerConfig": grunt.config.data.pkg.commonerConfig,
50
- "constants": {
51
- "__VERSION__": grunt.config.data.pkg.version
52
- }
53
- };
33
+ return _.merge({}, normal.getConfig(), {
34
+ mocking: true
35
+ });
36
},
37
sourceDir: "src",
38
outputDir: "build/modules"
@@ -58,7 +40,6 @@ var release = {
40
41
42
module.exports = {
61
- debug: debug,
62
- test: test,
63
- release: release
43
+ normal: normal,
44
+ test: test
45
};