Merge pull request #55 from areusjs/feature/plugin-options

add pluginOptions config option. Fixes #50

examples/full/bundle.config.js

@@ -13,7 +13,7 @@ function isLessFile(file) {
 }
 
 var styleTransforms = lazypipe()
-  .pipe(function() {
+  .pipe(function () {
     return gif(isLessFile, less());
   });
 
@@ -82,6 +82,11 @@ module.exports = {
         transforms: {
           scripts: transformHelper.coffee(),
           styles: styleTransforms // stream that will transform less
+        },
+        pluginOptions: { // pass additional options to underlying gulp plugins. By default the options object is empty
+          'gulp-minify-css': {processImport: false},
+          'gulp-uglify': {mangle: false},
+          'gulp-concat': {stat: {mode: 0666}}
         }
       }
     },

examples/full/manifest.json

@@ -7,15 +7,15 @@
     "scripts": "<script src='/public/vendor-b9c14db4.js' type='text/javascript'></script>"
   },
   "header": {
-    "scripts": "<script src='/public/header-c380f873.js' type='text/javascript'></script>",
-    "styles": "<link href='/public/header-450a885f.css' media='all' rel='stylesheet' type='text/css'/>"
+    "styles": "<link href='/public/header-450a885f.css' media='all' rel='stylesheet' type='text/css'/>",
+    "scripts": "<script src='/public/header-c380f873.js' type='text/javascript'></script>"
   },
   "article": {
     "styles": "<link href='/public/article-eb84c68e.css' media='all' rel='stylesheet' type='text/css'/>",
-    "scripts": "<script src='/public/article-1abef37b.js' type='text/javascript'></script>"
+    "scripts": "<script src='/public/article-19f4f978.js' type='text/javascript'></script>"
   },
   "main": {
-    "scripts": "<script src='/public/main-a2f0720d.js' type='text/javascript'></script>",
-    "styles": "<link href='/public/main-56c9e7f7.css' media='all' rel='stylesheet' type='text/css'/>"
+    "styles": "<link href='/public/main-56c9e7f7.css' media='all' rel='stylesheet' type='text/css'/>",
+    "scripts": "<script src='/public/main-a2f0720d.js' type='text/javascript'></script>"
   }
 }

lib/init-option-defaults.js

@@ -7,4 +7,8 @@ module.exports = function (bundle) {
   bundle[BundleKeys.OPTIONS].transforms[BundleKeys.SCRIPTS] = bundle[BundleKeys.OPTIONS].transforms[BundleKeys.SCRIPTS] || gutil.noop;
   bundle[BundleKeys.OPTIONS].transforms[BundleKeys.STYLES] = bundle[BundleKeys.OPTIONS].transforms[BundleKeys.STYLES] || gutil.noop;
   bundle[BundleKeys.OPTIONS].watch = bundle[BundleKeys.OPTIONS].watch || {};
+  bundle[BundleKeys.OPTIONS].pluginOptions = bundle[BundleKeys.OPTIONS].pluginOptions || {};
+  bundle[BundleKeys.OPTIONS].pluginOptions['gulp-minify-css'] = bundle[BundleKeys.OPTIONS].pluginOptions['gulp-minify-css'] || {};
+  bundle[BundleKeys.OPTIONS].pluginOptions['gulp-uglify'] = bundle[BundleKeys.OPTIONS].pluginOptions['gulp-uglify'] || {};
+  bundle[BundleKeys.OPTIONS].pluginOptions['gulp-concat'] = bundle[BundleKeys.OPTIONS].pluginOptions['gulp-concat'] || {};
 };

lib/stream-files.js

@@ -14,7 +14,8 @@ var gulp = require('gulp'),
   isOptionEnabled = require('./is-option-enabled'),
   addBundleResultsToFile = require('./results/add-bundle-results-to-file'),
   BundleKeys = require('./model/bundle-keys'),
-  isMinEnabled = require('./is-min-enabled');
+  isMinEnabled = require('./is-min-enabled'),
+  defaults = require('lodash').defaults;
 
 module.exports.handleTransformError = function (thisStream, isWatch, bundleName, bundleKey, err) {
   logger.log(gutil.colors.red("ERROR in custom transforms for '" + bundleName + "." + bundleKey + "':"));
@@ -38,7 +39,11 @@ module.exports.attachStreamOptions = function (file, opts) {
 };
 
 module.exports.scripts = function (opts) {
-  var self = this;
+  var self = this,
+    concatOpts = defaults({
+      path: opts.bundleName + ((opts.isBundleAll && opts.env) ? '.' + opts.env : '') + '.js'
+    }, opts.bundleOptions.pluginOptions['gulp-concat']);
+
   return gulp.src(opts.src, {base: opts.base})
     .pipe(using.bundle(opts.bundleName, BundleKeys.SCRIPTS, opts.env, opts.isBundleAll))
     .pipe(through.obj(function (file, enc, cb) {
@@ -65,17 +70,17 @@ module.exports.scripts = function (opts) {
           return file.isStream();
         },
         streamify(
-          uglify()),
-        uglify()
+          uglify(opts.bundleOptions.pluginOptions['gulp-uglify'])),
+        uglify(opts.bundleOptions.pluginOptions['gulp-uglify'])
       )))
     .on('error', function (e) {
       self.handleTransformError(this, opts.isWatch, opts.bundleName, BundleKeys.SCRIPTS, e);
     })
     .pipe(gif(function (file) {
         return file.isStream();
       },
-      streamify(concat(opts.bundleName + ((opts.isBundleAll && opts.env) ? '.' + opts.env : '') + '.js')),
-      concat(opts.bundleName + ((opts.isBundleAll && opts.env) ? '.' + opts.env : '') + '.js')
+      streamify(concat(concatOpts)),
+      concat(concatOpts)
     ))
     .pipe(gif(isOptionEnabled(opts.bundleOptions.rev, opts.env),
       gif(function (file) {
@@ -113,7 +118,7 @@ module.exports.styles = function (opts) {
     ))
     .pipe(gif(function (file) {
       return isMinEnabled.css(file, opts);
-    }, minifyCSS()))
+    }, minifyCSS(opts.bundleOptions.pluginOptions['gulp-minify-css'])))
     .pipe(concat(opts.bundleName + ((opts.isBundleAll && opts.env) ? '.' + opts.env : '') + '.css'))
     .pipe(gif(isOptionEnabled(opts.bundleOptions.rev, opts.env), rev()))
     .pipe(gif(function (file) {

test/integ/index-test.js

@@ -374,7 +374,7 @@ describe('integration tests', function () {
       VENDOR_CSS_CONTENT_MIN_MINIFIED = '.angular-csp-min {\n  font-weight: bold;\n}\n',
       VENDOR_CSS_CONTENT_NOT_MINIFIED = '.angular-csp {\n  font-weight: bold;\n}\n',
       ARTICLE_CONTENT_NOT_UGLIFIED = 'console.log(\"page\")\nconsole.log(\"scroll\")\n(function() {\n  var number, square;\n\n  number = 42;\n\n  square = function(x) {\n    return x * x;\n  };\n\n}).call(this);\n\n',
-      ARTICLE_CONTENT_UGLIFIED = 'console.log(\"page\");\nconsole.log(\"scroll\");\n(function(){var n,t;n=42,t=function(n){return n*n}}).call(this);\n',
+      ARTICLE_CONTENT_UGLIFIED = 'console.log(\"page\");\nconsole.log(\"scroll\");\n(function(){var number,square;number=42,square=function(x){return x*x}}).call(this);\n',
       ARTICLE_CSS_CONTENT_MINIFIED = '.page{background-color:red}\n',
       ARTICLE_CSS_CONTENT_NOT_MINIFIED = '.other-sass {\n  background-color: darkred; }\n\n.page {\n  background-color: red;\n}\n\n',
       MAIN_CONTENT_NOT_UGLIFIED = 'console.log(\"app\")\nconsole.log(\"controllers\")\nconsole.log(\"directives\")\nconsole.log(\"filters\")\n',
@@ -406,7 +406,7 @@ describe('integration tests', function () {
           fileContents.should.eql(
               VENDOR_CSS_CONTENT_MIN_MINIFIED +
               helpers.getCssSrcMapLine(file.relative));
-        } else if (file.relative === 'article-1abef37b.js') {
+        } else if (file.relative === 'article-19f4f978.js') {
           fileContents.should.eql(
               ARTICLE_CONTENT_UGLIFIED +
               helpers.getJsSrcMapLine(file.relative));

test/unit/stream-files-test.js

@@ -34,6 +34,11 @@ describe('stream-files', function () {
             result: null,
             transforms: {
               styles: transformHelper.less()
+            },
+            pluginOptions: {
+              'gulp-minify-css': {},
+              'gulp-uglify': {},
+              'gulp-concat': {}
             }
           }
         };
@@ -64,6 +69,11 @@ describe('stream-files', function () {
             result: null,
             transforms: {
               scripts: transformHelper.coffee()
+            },
+            pluginOptions: {
+              'gulp-minify-css': {},
+              'gulp-uglify': {},
+              'gulp-concat': {}
             }
           }
         };