Abnormal termination when CSS compilation fails.

toolness · Jan 16, 2013 · ba88096 · ba88096
1 parent 80c2f3d
commit ba88096
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/bin/build-require.js b/bin/build-require.js
@@ -4,21 +4,19 @@ var requirejs = require('requirejs'),
   requireConfig = require('../js/require-config'),
   rootDir = resolve(__dirname, '..', 'js'),
   name = 'friendlycode',
-  out = resolve(rootDir, 'friendlycode-built.js');
+  cssIn = resolve(rootDir, "..", "css", "friendlycode.css"),
+  cssOut = resolve(rootDir, "..", "css", "friendlycode-built.css"),
+  jsOut = resolve(rootDir, 'friendlycode-built.js');
 
-function optimize(done) {
+var bailOnError = function(err) {
-  requirejs.optimize(generateConfig(), done, function(err) {
+  process.stderr.write(err.toString());
-    process.stderr.write(err.toString());
+  process.exit(1);
-    process.exit(1);
+};
-  });
-}
-
-exports.rootDir = rootDir;
 
 var generateConfig = exports.generateConfig = function() {
   var config = {
     name: name,
-    out: out,
+    out: jsOut,
     // use none optimize for debugging
     optimize: "none",
     // optimize: 'uglify',
@@ -36,32 +34,33 @@ var generateConfig = exports.generateConfig = function() {
           QuerySelector: true
         }
       });
-    },
+    }
-    // TODO  above config setting is temporary, it shuould use mainConfigFile
+    // TODO: Consider using mainConfigFile here. For more info, see:
-    // https://github.com/toolness/friendlycode/pull/112#issuecomment-6625412
+    // https://github.com/mozilla/friendlycode/pull/112#issuecomment-6625412
-    // mainConfigFile: "./js/main.js",
   };
   Object.keys(requireConfig).forEach(function(name) {
     config[name] = requireConfig[name];
   });
   config.baseUrl = rootDir;
   return config;
-}
+};
+
+exports.rootDir = rootDir;
 
 if (!module.parent) {
-  console.log("Generating", out);
+  console.log("Generating", jsOut);
 
-  optimize(function (buildResponse) {
+  requirejs.optimize(generateConfig(), function (buildResponse) {
     // buildResponse is just a text output of the modules
     // included.
     console.log("Done. About " + buildResponse.split('\n').length +
                 " modules are inside the generated JS file.");
     requirejs.optimize({
-      cssIn: "css/friendlycode.css",
+      cssIn: cssIn,
-      out: "css/friendlycode-built.css"
+      out: cssOut
     }, function() {
       console.log("Optimized CSS.");
       process.exit();
-    });
+    }, bailOnError);
-  });
+  }, bailOnError);
 }