Added compress option to node-js tech

enb · Aug 24, 2015 · 0974033 · 0974033
1 parent cee0376
commit 0974033
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/techs/node-js.js b/techs/node-js.js
@@ -1,5 +1,6 @@
 var EOL = require('os').EOL,
     browserify = require('browserify'),
+    minify = require('uglify-js').minify,
     promisify = require('vow-node').promisify;
 
 /**
@@ -21,6 +22,9 @@ var EOL = require('os').EOL,
  *                                                                        in the assembly.
  * @param {Boolean}   [options.devMode=true]                              Drops cache for `require` of source modules.
  * @param {Boolean}   [options.bundled=false]                             Builds CommonJS files in one file.
+ * @param {Boolean}   [options.compress=false]                            Minifies and compresses JS code.
+ *                                                                        Works if `bundled` option is enabled.
+
  *
  * @example
  * // Code in a file system before build:
@@ -58,6 +62,7 @@ module.exports = require('enb/lib/build-flow').create()
     .useFileList(['vanilla.js', 'node.js'])
     .defineOption('devMode', true)
     .defineOption('bundled', false)
+    .defineOption('compress', false)
     .builder(function (sourceFiles) {
         var node = this.node,
             dropRequireCacheFunc = [
@@ -94,8 +99,14 @@ module.exports = require('enb/lib/build-flow').create()
 
             return bundle()
                 .then(function (buf) {
-                    return buf.toString('utf-8');
-                });
+                    var str = buf.toString();
+
+                    if (this._compress) {
+                        return minify(str, { fromString: true }).code;
+                    }
+
+                    return str;
+                }, this);
         }
 
         return [

diff --git a/test/techs/node-js.test.js b/test/techs/node-js.test.js
@@ -55,6 +55,30 @@ describe('node-js', function () {
         });
     });
 
+    describe('compress', function () {
+        var scheme = {
+                blocks: {
+                    'block0.vanilla.js': 'var b = function () {};',
+                    'block1.node.js': 'if (foo) { bar(); }'
+                }
+            };
+
+        it('must compress files', function () {
+            return build(scheme, { compress: true, bundled: true })
+                .spread(function (content) {
+                    content.should.include('foo&&bar()');
+                });
+        });
+
+        it('must not compress if files is not bundled', function () {
+            return build(scheme, { compress: true })
+                .spread(function (content) {
+                    content.should.include('require("../blocks/block0.vanilla.js");')
+                        .and.include('require("../blocks/block1.node.js");');
+                });
+        });
+    });
+
     describe('devMode', function () {
         var scheme = {
                 blocks: {
@@ -214,5 +238,5 @@ function build(scheme, options) {
 
     bundle.provideTechData('?.files', fileList);
 
-    return bundle.runTech(NodeJsTech, options);
+    return bundle.runTechAndGetContent(NodeJsTech, options);
 }