Merge branch 'master' into data-src

Author: mdziarkach

lib/main.js

@@ -185,7 +185,7 @@ var pushFileToS3 = function(S3, text, fileName, headers, callback) {
       req.end();
     });
   });
-}
+};
 
 var compile = function(fileName, assets, S3, options, method, type, timestamp, callback) {
   return function(err, results) {
@@ -207,19 +207,15 @@ var compile = function(fileName, assets, S3, options, method, type, timestamp, c
       case 'uglify':
         if (results instanceof Array)
           results = results.join("\n");
-        try {
-          var final_code = uglify.minify(results, {
-            fromString: true,
-            output: {
-              comments: /license/
-            }
-          }).code;
-          pushFileToS3(S3, final_code, fileName, headers, callback);
-        } catch(err) {
+        var uglifyResult = uglify.minify(results);
+
+        if (uglifyResult.error !== undefined) {
           logger({
             task: 'express-cdn',
-            message: 'Failed to minify ' + fileName + ' due to uglify-js error.'})
-          throw err
+            message: 'Failed to minify ' + fileName + ' due to uglify-js error.'});
+          throwError(uglifyResult.error);
+        } else {
+          pushFileToS3(S3, uglifyResult.code, fileName, headers, callback);
         }
         break;
       case 'minify':

package.json

@@ -1,7 +1,7 @@
 {
   "name": "express-cdn",
   "description": "Node.js module for delivering optimized, minified, mangled, gzipped, and CDN-hosted assets in Express using S3 and CloudFront.",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "author": {
     "name": "Nick Baugh",
     "email": "[email protected]"