Renamed commojs task to bundle, added failing build if bundler failed.
Ingvar Stepanyan committed
Mar 17, 2014 at 16:53 UTC
3f3187c14f81987ab397f46b9f5c2c06b8e0189c
3 files changed
+20
-20
Gruntfile.js
+18
-18
@@ -2,7 +2,7 @@
2
3
var exec = require('child_process').exec;
4
var jsxTask = require('./grunt/tasks/jsx');
5
-var commonjsTask = require('./grunt/tasks/commonjs');
5
+var bundleTask = require('./grunt/tasks/bundle');
6
var populistTask = require('./grunt/tasks/populist');
7
var webdriverPhantomJSTask = require('./grunt/tasks/webdriver-phantomjs');
8
var webdriverJasmineTasks = require('./grunt/tasks/webdriver-jasmine');
@@ -19,7 +19,7 @@ module.exports = function(grunt) {
19
pkg: grunt.file.readJSON('package.json'),
20
copy: require('./grunt/config/copy'),
21
jsx: require('./grunt/config/jsx'),
22
- commonjs: require('./grunt/config/commonjs'),
22
+ bundle: require('./grunt/config/bundle'),
23
populist: require('./grunt/config/populist'),
24
connect: require('./grunt/config/server')(grunt),
25
"webdriver-jasmine": require('./grunt/config/webdriver-jasmine'),
@@ -52,8 +52,8 @@ module.exports = function(grunt) {
52
// Register jsx:normal and :release tasks.
53
grunt.registerMultiTask('jsx', jsxTask);
54
55
- // Our own commonjs-based tasks to build a single JS file build
56
- grunt.registerMultiTask('commonjs', commonjsTask);
55
+ // Our own bundle-based tasks to build a single JS file build
56
+ grunt.registerMultiTask('bundle', bundleTask);
57
58
grunt.registerMultiTask('populist', populistTask);
59
@@ -71,22 +71,22 @@ module.exports = function(grunt) {
71
72
grunt.registerTask('version-check', versionCheckTask);
73
74
- grunt.registerTask('build:basic', ['jsx:normal', 'version-check', 'commonjs:basic']);
75
- grunt.registerTask('build:addons', ['jsx:normal', 'commonjs:addons']);
76
- grunt.registerTask('build:transformer', ['jsx:normal', 'commonjs:transformer']);
77
- grunt.registerTask('build:min', ['jsx:normal', 'version-check', 'commonjs:min']);
78
- grunt.registerTask('build:addons-min', ['jsx:normal', 'commonjs:addonsMin']);
74
+ grunt.registerTask('build:basic', ['jsx:normal', 'version-check', 'bundle:basic']);
75
+ grunt.registerTask('build:addons', ['jsx:normal', 'bundle:addons']);
76
+ grunt.registerTask('build:transformer', ['jsx:normal', 'bundle:transformer']);
77
+ grunt.registerTask('build:min', ['jsx:normal', 'version-check', 'bundle:min']);
78
+ grunt.registerTask('build:addons-min', ['jsx:normal', 'bundle:addonsMin']);
79
grunt.registerTask('build:withCodeCoverageLogging', [
80
'jsx:normal',
81
'version-check',
82
- 'commonjs:withCodeCoverageLogging'
82
+ 'bundle:withCodeCoverageLogging'
83
]);
84
grunt.registerTask('build:perf', [
85
'jsx:normal',
86
'version-check',
87
- 'commonjs:transformer',
88
- 'commonjs:basic',
89
- 'commonjs:min',
87
+ 'bundle:transformer',
88
+ 'bundle:basic',
89
+ 'bundle:min',
90
'download-previous-version'
91
]);
92
grunt.registerTask('build:test', [
@@ -195,11 +195,11 @@ module.exports = function(grunt) {
195
'delete-build-modules',
196
'jsx:normal',
197
'version-check',
198
- 'commonjs:basic',
199
- 'commonjs:transformer',
200
- 'commonjs:addons',
201
- 'commonjs:min',
202
- 'commonjs:addonsMin',
198
+ 'bundle:basic',
199
+ 'bundle:transformer',
200
+ 'bundle:addons',
201
+ 'bundle:min',
202
+ 'bundle:addonsMin',
203
'npm-react:release',
204
'npm-react:pack',
205
'npm-react-tools:pack',
grunt/config/bundle.js
renamed
grunt/tasks/bundle.js
renamed
+2
-2
@@ -26,13 +26,13 @@ module.exports = function() {
26
var _this = this;
27
28
cjs.transform(options).then(function(result) {
29
- grunt.file.write(_this.files[0].dest, config.after.reduce(function(src, fn) {
29
+ grunt.file.write(result.options.output, config.after.reduce(function(src, fn) {
30
return fn.call(_this, src);
31
}, result.code));
32
33
done();
34
}, function(err) {
35
grunt.log.error(err);
36
- done();
36
+ done(false);
37
});
38
};