=BG= merge merge conflicts

Merge branch 'master' into task-yargs-rev-merge

Conflicts:
	lib/test/karma.js
	lib/util/jshint-reporter.js
	npm-shrinkwrap.json
	package.json
	tasks/init.js
	tasks/javascript.js
	tasks/watch.js
	tasks/webstorm.js

Author: bguiz

.editorconfig

@@ -1,3 +1,6 @@
 [*.js]
 indent_style = space
-indent_size = 2
+indent_size = 2
+
+[*]
+end_of_line = lf

bin/cli.js

@@ -19,7 +19,6 @@ var taskYargs     = require('../lib/util/task-yargs'),
 
 // TODO @bholloway menus
 // var mainMenu = require('../lib/cli/mainMenu');
-require('../index');
 
 // we need to duplicate some event handlers from the gulp cli since we have bypassed it
 gulp.on('task_start', function (e) {
@@ -77,9 +76,13 @@ taskYargsRun.taskYargs.register('help', {
   checks: []
 });
 
+require('../index');
+
+//TODO move these to ../index.js
 require('../tasks/html')(taskYargsRun);
 require('../tasks/css')(taskYargsRun);
 require('../tasks/javascript')(taskYargsRun);
+require('../tasks/test')(taskYargsRun);
 require('../tasks/build')(taskYargsRun);
 require('../tasks/release')(taskYargsRun);
 require('../tasks/server')(taskYargsRun);

index.js

@@ -1 +1 @@
-require('require-dir')('./tasks');
+'use strict';

lib/build/browserify.js

@@ -1,14 +1,17 @@
-var fs              = require('fs');
-var path            = require('path');
-var through         = require('through2');
-var trackFilenames  = require('gulp-track-filenames');
-var transformTools  = require('browserify-transform-tools');
-var browserify      = require('browserify');
-var gutil           = require('gulp-util');
-var minifyify       = require('minifyify');
-var moldSourceMap   = require('mold-source-map');
-var slash           = require('gulp-slash');
-var bowerDir        = require('bower-directory');
+'use strict';
+
+var fs              = require('fs'),
+    path            = require('path'),
+    through         = require('through2'),
+    merge           = require('lodash.merge'),
+    trackFilenames  = require('gulp-track-filenames'),
+    transformTools  = require('browserify-transform-tools'),
+    browserify      = require('browserify'),
+    convert         = require('convert-source-map'),
+    gutil           = require('gulp-util'),
+    minifyify       = require('minifyify'),
+    slash           = require('gulp-slash'),
+    bowerDir        = require('bower-directory');
 
 /**
  * Test a given esprima AST node as a literal with one of the possible given values
@@ -17,7 +20,6 @@ var bowerDir        = require('bower-directory');
  * @returns {boolean} True on valid node and valid match, else false
  */
 function isLiteralAST(node) {
-  'use strict';
   var candidates = Array.prototype.slice.call(arguments, 1);
   return (node) && (node.type === 'Literal') && candidates.some(function (candidate) {
     return (node.value === candidate)
@@ -32,7 +34,6 @@ function isLiteralAST(node) {
  * @returns {boolean} True on valid node and valid match, else false
  */
 function isMethodAST(node) {
-  'use strict';
   var candidates = Array.prototype.slice.call(arguments, 1);
   var result = (node) && (node.type === 'CallExpression') && (node.callee) && candidates.some(function (candidate) {
     var callee = node.callee;
@@ -48,7 +49,6 @@ function isMethodAST(node) {
  * @return A jasmine transform
  */
 function jasmineTransform(symbol) {
-  'use strict';
   return transformTools.makeFalafelTransform('jasmineTransform', null, function (node, options, done) {
     var isValid = isLiteralAST(node, symbol) && isMethodAST(node.parent, 'describe', 'module');
     if (isValid) {
@@ -66,7 +66,6 @@ function jasmineTransform(symbol) {
  * @returns {stream.Through} A through stream that performs the operation of a gulp stream
  */
 function compile(bannerWidth, transforms) {
-  'use strict';
   var output = [];
 
   /**
@@ -86,39 +85,48 @@ function compile(bannerWidth, transforms) {
    * Mapping function that injects new-line return between dissimilar messages
    */
   function groupByFilename(value, i, array) {
-    var current      = String(value).split(/\:\d+/)[0];
-    var previous     = String(array[i - 1]).split(/\:\d+/)[0];
+    var current = String(value).split(/\:\d+/)[0];
+    var previous = String(array[i - 1]).split(/\:\d+/)[0];
     var isDissimilar = (i > 0) && (i < array.length) && (current !== previous);
-    var result       = isDissimilar ? ('\n' + value) : value;
+    var result = isDissimilar ? ('\n' + value) : value;
     return result;
   }
 
-  /**
-   * Determine the root relative form of the given file path.
-   * If the file path is outside the project directory then just return its name.
-   * @param {string} filePath Full file path
-   * @returns {string} Give path relative to process.cwd()
-   */
-  function rootRelative(filePath) {
-    var rootRelative = slash(path.relative(process.cwd(), filePath));
-    var isProject    = (rootRelative.slice(0, 2) !== '..');
-    return '/' + (isProject ? rootRelative : path.basename(rootRelative));
-  }
-
   /**
    * Compile any number of files into a bundle
    * @param {stream.Through} stream A stream to push files to
    * @param {Array.<string>|string} files Any number of files to bundle
    * @param {string} bundlename The name for the output file
    * @param {function|boolean} [minify] Determines whether minification is performed
+   * @param {string} [sourceMapBase] Base path for source map file
    * @param {function} done Callback for completion
    */
-  function bundle(stream, files, bundlename, minify, done) {
+  function bundle(stream, files, bundlename, minify, sourceMapBase, done) {
+
+    /**
+     * Determine the root relative form of the given file path.
+     * If the file path is outside the project directory then just return its name.
+     * @param {string} filePath The input path string
+     * @param {number} An index for <code>Array.map()</code> type operations
+     * @param {object} The array for <code>Array.map()</code> type operations
+     * @return {string} The transformed file path
+     */
+    function rootRelative(filePath, i, array) {
+      var rootRelative = slash(path.relative(process.cwd(), path.resolve(filePath))); // resolve relative references
+      var isProject    = (rootRelative.slice(0, 2) !== '..');
+      var result       = [
+        sourceMapBase || '',
+        isProject ? rootRelative : path.basename(rootRelative)
+      ].join(path.sep);
+      if ((typeof i === 'number') && (typeof array === 'object')) {
+        array[i] = result;
+      }
+      return result;
+    }
 
     // Simulate bower components (and optionally current project) as node modules that may be require()'d
     var anonymised = trackFilenames().create();
     function requireTransform(allowProjectRelative) {
-      'use strict';
       var BOWER = path.relative(process.cwd(), bowerDir.sync());
       return transformTools.makeRequireTransform('requireTransform', null, function (args, opts, done) {
 
@@ -159,12 +167,11 @@ function compile(bannerWidth, transforms) {
     }
 
     // setup
-    var cwd = process.cwd();
-    var outPath = path.join(cwd, bundlename);
-    var mapPath = path.basename(bundlename) + '.map';
+    var outPath  = path.resolve(bundlename);
+    var mapPath  = path.basename(bundlename) + '.map';
     var isMinify = (minify) && ((typeof minify !== 'function') || minify(bundlename));
-    var count = 0;
-    var bundler = browserify({
+    var count    = 0;
+    var bundler  = browserify({
       debug: true
     });
 
@@ -223,17 +230,19 @@ function compile(bannerWidth, transforms) {
     // stream output
     function pushFileToStream(path, text) {
       stream.push(new gutil.File({
-        cwd: cwd, base: cwd, path: path, contents: new Buffer(text)
+        path    : path,
+        contents: new Buffer(text)
       }));
     }
 
     // transforms
     transforms
       .concat(requireTransform(false))
-      .filter(function (candidate) {
-        return (typeof candidate === 'function');
-      }).forEach(function (item) {
-        bundler.transform(item, { global: true });
+      .forEach(function (item, i, list) {
+        if (typeof item === 'function') {
+          var opts = (typeof list[i+1] === 'object') ? merge({ global: true }, list[i+1]) : { global: true };
+          bundler.transform(item, opts);
+        }
       });
 
     // require statements
@@ -242,48 +251,40 @@ function compile(bannerWidth, transforms) {
         bundler.require(item, {entry: true});
       });
 
-    // minify requires callback style
+    // configure minification
     if (isMinify) {
-      var minifyOptions = {
-        map         : mapPath,
-        compressPath: rootRelative,
-        uglify      : {
-          compress : { // anything that changes semicolons to commas will cause debugger problems
+      minifyify(bundler, {
+        map      : mapPath,
+        uglify   : {
+          compress: { // anything that changes semicolons to commas will cause debugger problems
             sequences: false,
             join_vars: false
-          }, mangle: {
+          },
+          mangle : {
             toplevel: true
           }
         }
-      };
-      minifyify(bundler, minifyOptions);
-      bundler.bundle(function (error, code, map) {
-        if (!error) {
-          var sourcemap = JSON.parse(map);
-          delete sourcemap.file;
-          delete sourcemap.sourcesContent;
-          pushFileToStream(outPath + '.map', JSON.stringify(sourcemap, null, 2));
-          pushFileToStream(outPath, anonymised.replace(code, '"', '"'));   // anonymise module paths
-        }
-        done(); // complete overall
-      }).on('error', errorHandler);
-
-      // non-minify requires stream style
-    } else {
-      bundler.bundle()
-        .on('error', errorHandler)
-        .pipe(moldSourceMap.transform(function (molder, complete) {
-          molder.mapSources(rootRelative);
-          molder.sourcemap.setProperty('file');
-          molder.sourcemap.setProperty('sourcesContent');
-          molder.sourcemap.setProperty('sourceRoot');
-          pushFileToStream(outPath + '.map', molder.sourcemap.toJSON(2));
-          complete('//# sourceMappingURL=' + mapPath);
-        })).on('data', function (contents) {
-          pushFileToStream(outPath, contents);
-          done(); // complete overall
-        });
+      });
     }
+
+    // when we use minification we will get: error, code, source-map
+    // when we don't we will get: error, buffer(with embedded source map)
+    bundler.bundle(function (error, codeOrBuffer, map) {
+      if (!error) {
+        var code      = codeOrBuffer.toString();
+        var sourceMap = map ? JSON.parse(map) : convert.fromComment(code).toObject();
+        var external  = map ? code : code.replace(convert.commentRegex, '//# sourceMappingURL=' + mapPath);
+        var anonymous = isMinify ? anonymised.replace(external, '"', '"') : external;   // anonymise module paths
+        delete sourceMap.file;
+        delete sourceMap.sourcesContent;
+        sourceMap.sources
+          .forEach(rootRelative);
+        pushFileToStream(outPath + '.map', JSON.stringify(sourceMap, null, 2));
+        pushFileToStream(outPath, anonymous);
+      }
+      done(); // complete overall
+    })
+      .on('error', errorHandler);
   }
 
   // return a set of streams
@@ -292,11 +293,12 @@ function compile(bannerWidth, transforms) {
     /**
      * A stream that produces a bundle for each file in the stream
      * @param {function|boolean} [isMinify] Determines whether minification is performed
+     * @param {string} [sourceMapBase] Base path for source map file
      * @returns {stream.Through}
      */
-    each: function (isMinify) {
+    each: function (isMinify, sourceMapBase) {
       return through.obj(function (file, encoding, done) {
-        bundle(this, [file.path], file.relative, isMinify, done);
+        bundle(this, [file.path], file.relative, isMinify, sourceMapBase, done);
       }, function (done) {
         flushErrors();
         done();
@@ -307,16 +309,17 @@ function compile(bannerWidth, transforms) {
      * A stream that produces a bundle containing all files in the stream
      * @param {string} outPath A relative path for the output file
      * @param {function|boolean} [isMinify] Determines whether minification is performed
+     * @param {string} [sourceMapBase] Base path for source map file
      * @returns {stream.Through}
      */
-    all: function (outPath, isMinify) {
+    all: function (outPath, isMinify, sourceMapBase) {
       var pending = [];
       return through.obj(function (file, encoding, done) {
         pending.push(file.path);
         done();
       }, function (done) {
         if (pending.length) {
-          bundle(this, pending, outPath, isMinify, function () {
+          bundle(this, pending, outPath, isMinify, sourceMapBase, function () {
             flushErrors();
             done();
           });
@@ -330,5 +333,5 @@ function compile(bannerWidth, transforms) {
 
 module.exports = {
   jasmineTransform: jasmineTransform,
-  compile:          compile
+  compile         : compile
 };