maxjhandsome
/
react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup jsx tasks 

debug and release are now identical, so there's no need to have both.
This commit is contained in:
Paul O’Shannessy 2014-02-06 15:59:57 -08:00
parent bc27325d31
commit b199de29a0
2 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Gruntfile.js
View File

@ -48,7 +48,7 @@ module.exports = function(grunt) {
} }
}); });
// Register jsx:debug and :release tasks. // Register jsx:normal and :release tasks.
grunt.registerMultiTask('jsx', jsxTask); grunt.registerMultiTask('jsx', jsxTask);
// Our own browserify-based tasks to build a single JS file build // Our own browserify-based tasks to build a single JS file build
@ -69,18 +69,18 @@ module.exports = function(grunt) {
grunt.registerTask('version-check', versionCheckTask); grunt.registerTask('version-check', versionCheckTask);
grunt.registerTask('build:basic', ['jsx:debug', 'version-check', 'browserify:basic']); grunt.registerTask('build:basic', ['jsx:normal', 'version-check', 'browserify:basic']);
grunt.registerTask('build:addons', ['jsx:debug', 'browserify:addons']); grunt.registerTask('build:addons', ['jsx:normal', 'browserify:addons']);
grunt.registerTask('build:transformer', ['jsx:debug', 'browserify:transformer']); grunt.registerTask('build:transformer', ['jsx:normal', 'browserify:transformer']);
grunt.registerTask('build:min', ['jsx:release', 'version-check', 'browserify:min']); grunt.registerTask('build:min', ['jsx:normal', 'version-check', 'browserify:min']);
grunt.registerTask('build:addons-min', ['jsx:debug', 'browserify:addonsMin']); grunt.registerTask('build:addons-min', ['jsx:normal', 'browserify:addonsMin']);
grunt.registerTask('build:withCodeCoverageLogging', [ grunt.registerTask('build:withCodeCoverageLogging', [
'jsx:debug', 'jsx:normal',
'version-check', 'version-check',
'browserify:withCodeCoverageLogging' 'browserify:withCodeCoverageLogging'
]); ]);
grunt.registerTask('build:perf', [ grunt.registerTask('build:perf', [
'jsx:release', 'jsx:normal',
'version-check', 'version-check',
'browserify:transformer', 'browserify:transformer',
'browserify:basic', 'browserify:basic',
@ -93,7 +93,7 @@ module.exports = function(grunt) {
'version-check', 'version-check',
'populist:test' 'populist:test'
]); ]);
grunt.registerTask('build:npm-react', ['version-check', 'jsx:release', 'npm-react:release']); grunt.registerTask('build:npm-react', ['version-check', 'jsx:normal', 'npm-react:release']);
grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask); grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);
@ -182,15 +182,14 @@ module.exports = function(grunt) {
grunt.registerTask('npm:test', ['build', 'npm:pack']); grunt.registerTask('npm:test', ['build', 'npm:pack']);
// Optimized build task that does all of our builds. The subtasks will be run // Optimized build task that does all of our builds. The subtasks will be run
// in order so we can take advantage of that and only run jsx:debug once. // in order so we can take advantage of that and only run jsx:normal once.
grunt.registerTask('build', [ grunt.registerTask('build', [
'delete-build-modules', 'delete-build-modules',
'jsx:debug', 'jsx:normal',
'version-check', 'version-check',
'browserify:basic', 'browserify:basic',
'browserify:transformer', 'browserify:transformer',
'browserify:addons', 'browserify:addons',
'jsx:release',
'browserify:min', 'browserify:min',
'browserify:addonsMin', 'browserify:addonsMin',
'npm-react:release', 'npm-react:release',

51
grunt/config/jsx.js
View File

@ -1,56 +1,38 @@
'use strict'; 'use strict';
var grunt = require('grunt'); var grunt = require('grunt');
var _ = require('lodash');
var rootIDs = [ var rootIDs = [
"React", "React",
"ReactWithAddons" "ReactWithAddons"
]; ];
var getDebugConfig = function() {
return {
"commonerConfig": grunt.config.data.pkg.commonerConfig,
"constants": {
"__VERSION__": grunt.config.data.pkg.version
}
};
};
var debug = { var normal = {
rootIDs: rootIDs, rootIDs: rootIDs,
getConfig: getDebugConfig, getConfig: function() {
return {
commonerConfig: grunt.config.data.pkg.commonerConfig,
constants: {
__VERSION__: grunt.config.data.pkg.version
}
};
},
sourceDir: "src", sourceDir: "src",
outputDir: "build/modules" outputDir: "build/modules"
}; };
var test = { var test = {
rootIDs: rootIDs.concat([ rootIDs: rootIDs.concat([
"test/all.js", "test/all.js",
"**/__tests__/*.js" "**/__tests__/*.js"
]), ]),
getConfig: function() { getConfig: function() {
return { return _.merge({}, normal.getConfig(), {
"mocking": true, mocking: true
"commonerConfig": grunt.config.data.pkg.commonerConfig, });
"constants": {
"__VERSION__": grunt.config.data.pkg.version
}
};
},
sourceDir: "src",
outputDir: "build/modules"
};
var release = {
rootIDs: rootIDs,
getConfig: function() {
return {
"commonerConfig": grunt.config.data.pkg.commonerConfig,
"constants": {
"__VERSION__": grunt.config.data.pkg.version
}
};
}, },
sourceDir: "src", sourceDir: "src",
outputDir: "build/modules" outputDir: "build/modules"
@ -58,7 +40,6 @@ var release = {
module.exports = { module.exports = {
debug: debug, normal: normal,
test: test, test: test
release: release
}; };