From 3f3187c14f81987ab397f46b9f5c2c06b8e0189c Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <me@rreverser.com>
Date: Mon, 17 Mar 2014 16:53:02 +0200
Subject: [PATCH] Renamed commojs task to bundle, added failing build if
 bundler failed.

---
 Gruntfile.js                            | 36 ++++++++++++-------------
 grunt/config/{commonjs.js => bundle.js} |  0
 grunt/tasks/{commonjs.js => bundle.js}  |  4 +--
 3 files changed, 20 insertions(+), 20 deletions(-)
 rename grunt/config/{commonjs.js => bundle.js} (100%)
 rename grunt/tasks/{commonjs.js => bundle.js} (87%)

diff --git a/Gruntfile.js b/Gruntfile.js
index 285fbf9916e95..f6f8ebf877878 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,7 +2,7 @@
 
 var exec = require('child_process').exec;
 var jsxTask = require('./grunt/tasks/jsx');
-var commonjsTask = require('./grunt/tasks/commonjs');
+var bundleTask = require('./grunt/tasks/bundle');
 var populistTask = require('./grunt/tasks/populist');
 var webdriverPhantomJSTask = require('./grunt/tasks/webdriver-phantomjs');
 var webdriverJasmineTasks = require('./grunt/tasks/webdriver-jasmine');
@@ -19,7 +19,7 @@ module.exports = function(grunt) {
     pkg: grunt.file.readJSON('package.json'),
     copy: require('./grunt/config/copy'),
     jsx: require('./grunt/config/jsx'),
-    commonjs: require('./grunt/config/commonjs'),
+    bundle: require('./grunt/config/bundle'),
     populist: require('./grunt/config/populist'),
     connect: require('./grunt/config/server')(grunt),
     "webdriver-jasmine": require('./grunt/config/webdriver-jasmine'),
@@ -52,8 +52,8 @@ module.exports = function(grunt) {
   // Register jsx:normal and :release tasks.
   grunt.registerMultiTask('jsx', jsxTask);
 
-  // Our own commonjs-based tasks to build a single JS file build
-  grunt.registerMultiTask('commonjs', commonjsTask);
+  // Our own bundle-based tasks to build a single JS file build
+  grunt.registerMultiTask('bundle', bundleTask);
 
   grunt.registerMultiTask('populist', populistTask);
 
@@ -71,22 +71,22 @@ module.exports = function(grunt) {
 
   grunt.registerTask('version-check', versionCheckTask);
 
-  grunt.registerTask('build:basic', ['jsx:normal', 'version-check', 'commonjs:basic']);
-  grunt.registerTask('build:addons', ['jsx:normal', 'commonjs:addons']);
-  grunt.registerTask('build:transformer', ['jsx:normal', 'commonjs:transformer']);
-  grunt.registerTask('build:min', ['jsx:normal', 'version-check', 'commonjs:min']);
-  grunt.registerTask('build:addons-min', ['jsx:normal', 'commonjs:addonsMin']);
+  grunt.registerTask('build:basic', ['jsx:normal', 'version-check', 'bundle:basic']);
+  grunt.registerTask('build:addons', ['jsx:normal', 'bundle:addons']);
+  grunt.registerTask('build:transformer', ['jsx:normal', 'bundle:transformer']);
+  grunt.registerTask('build:min', ['jsx:normal', 'version-check', 'bundle:min']);
+  grunt.registerTask('build:addons-min', ['jsx:normal', 'bundle:addonsMin']);
   grunt.registerTask('build:withCodeCoverageLogging', [
     'jsx:normal',
     'version-check',
-    'commonjs:withCodeCoverageLogging'
+    'bundle:withCodeCoverageLogging'
   ]);
   grunt.registerTask('build:perf', [
     'jsx:normal',
     'version-check',
-    'commonjs:transformer',
-    'commonjs:basic',
-    'commonjs:min',
+    'bundle:transformer',
+    'bundle:basic',
+    'bundle:min',
     'download-previous-version'
   ]);
   grunt.registerTask('build:test', [
@@ -195,11 +195,11 @@ module.exports = function(grunt) {
     'delete-build-modules',
     'jsx:normal',
     'version-check',
-    'commonjs:basic',
-    'commonjs:transformer',
-    'commonjs:addons',
-    'commonjs:min',
-    'commonjs:addonsMin',
+    'bundle:basic',
+    'bundle:transformer',
+    'bundle:addons',
+    'bundle:min',
+    'bundle:addonsMin',
     'npm-react:release',
     'npm-react:pack',
     'npm-react-tools:pack',
diff --git a/grunt/config/commonjs.js b/grunt/config/bundle.js
similarity index 100%
rename from grunt/config/commonjs.js
rename to grunt/config/bundle.js
diff --git a/grunt/tasks/commonjs.js b/grunt/tasks/bundle.js
similarity index 87%
rename from grunt/tasks/commonjs.js
rename to grunt/tasks/bundle.js
index ff15d6ef16c9c..692c55642c308 100644
--- a/grunt/tasks/commonjs.js
+++ b/grunt/tasks/bundle.js
@@ -26,13 +26,13 @@ module.exports = function() {
   var _this = this;
 
   cjs.transform(options).then(function(result) {
-    grunt.file.write(_this.files[0].dest, config.after.reduce(function(src, fn) {
+    grunt.file.write(result.options.output, config.after.reduce(function(src, fn) {
       return fn.call(_this, src);
     }, result.code));
 
     done();
   }, function(err) {
     grunt.log.error(err);
-    done();
+    done(false);
   });
 };