BREAKING CHANGE - The "default" (non-minified) bundle is no longer created automatically, unless you don't specify ANY output options. But if you specify an output option such as --test or --minify, then ONLY the outputs that you explicitly specify are created. If you ALSO want a non-minified bundle created, then add --bundle.

Author: JamesMessinger

Diff for: bin/simplifyify.js

@@ -18,9 +18,10 @@ function parseArguments() {
     .option('-o, --outfile <filespec>', 'The output file or directory. May include a filename pattern (e.g. "*.bundle.js")')
     .option('-u, --exclude <filespec>', 'File path or glob pattern to exclude')
     .option('-s, --standalone <name>', 'Export as a named UMD bundle')
-    .option('-d, --debug', 'Output source maps for debugging (.map)')
-    .option('-m, --minify', 'Output a minified copy of the bundle (.min.js)')
-    .option('-v, --test', 'Output a bundle with code-coverage instrumentation for testing (.test.js)')
+    .option('-b, --bundle', 'Create a non-minified bundle for development (.js)')
+    .option('-d, --debug', 'Create a source map for debugging (.js.map)')
+    .option('-m, --minify', 'Create a minified bundle for production (.min.js)')
+    .option('-v, --test', 'Create a bundle with code-coverage instrumentation for testing (.test.js)')
     .option('-w, --watch', 'Watch source file(s) and rebuild the bundle(s) automatically')
     .on('--help', function() {
       console.log(
@@ -33,7 +34,7 @@ function parseArguments() {
         '\n' +
         '  Examples:\n' +
         '\n' +
-        '    simplifyify src/index.js --outfile dist/bundle.js --debug --minify --test\n' +
+        '    simplifyify src/index.js --outfile dist/bundle.js --bundle --debug --minify --test\n' +
         '\n' +
         '    Output Files: \n' +
         '      dist/bundle.js\n' +
@@ -43,7 +44,7 @@ function parseArguments() {
         '      dist/bundle.test.js\n' +
         '\n' +
         '\n' +
-        '    simplifyify "src/module-*.js" --outfile "dist/*.bundle.js" --minify\n' +
+        '    simplifyify "src/module-*.js" --outfile "dist/*.bundle.js" --bundle --minify\n' +
         '\n' +
         '    Output Files: \n' +
         '      dist/module-one.bundle.js\n' +

Diff for: lib/index.js

@@ -11,6 +11,7 @@ module.exports = simplifyify;
  *  outfile: string,
  *  exclude: string,
  *  standalone: string,
+ *  bundle: boolean,
  *  debug: boolean,
  *  minify: boolean,
  *  test: boolean,

Diff for: lib/write-bundles.js

@@ -12,6 +12,20 @@ var browserify = require('browserify'),
 
 module.exports = writeBundles;
 
+var uglifyifyOptions = {
+  global: true,
+  exts: ['.js', '.json'],
+  output: {
+    // Keep important comments when minifying
+    comments: /^!|^\*!|@preserve|@license|@cc_on/
+  }
+};
+
+var istanbulOptions = {
+  ignore: ['**/*.json', '**/*.html', '**/*.md', '**/*.txt'],
+  defaultIgnore: false
+};
+
 /**
  * Writes Browserify bundles for the given entry file.
  * At least one bundle is created (the outputFile), but additional ones may be
@@ -22,42 +36,23 @@ module.exports = writeBundles;
  * @param {Options} options - Bundling options
  */
 function writeBundles(mainFiles, events, options) {
-  var bundles = [];
-  var bundleFiles = [];
+  var bundlers = [];
 
-  // Create the main bundle
-  var mainBundle = newify(mainFiles, events, options);
-  bundles.push(mainBundle);
-  bundleFiles.push(mainFiles);
+  // If no output options are specified, then default to --bundle
+  if (!options.bundle && !options.minify && !options.test) {
+    options.bundle = true;
+  }
 
-  if (options.minify) {
-    // The files for the minified bundle
-    var minifiedFiles = new FileSet();
-    minifiedFiles.entryFile = mainFiles.entryFile;
-    minifiedFiles.outputFile = util.appendToFileName(mainFiles.outputFile, '.min');
-    if (options.debug) {
-      minifiedFiles.mapFile = minifiedFiles.outputFile + '.map';
-    }
-    bundleFiles.push(minifiedFiles);
+  if (options.bundle) {
+    bundlers.push(createMainBundler(mainFiles, events, options));
+  }
 
-    // Create the minified bundle
-    var minifiedBundle = newify(minifiedFiles, events, options);
-    addMinifyTransform(minifiedBundle);
-    bundles.push(minifiedBundle);
+  if (options.minify) {
+    bundlers.push(createMinifiedBundler(mainFiles, events, options));
   }
 
   if (options.test) {
-    // The files for the test bundle
-    var testFiles = new FileSet();
-    testFiles.entryFile = mainFiles.entryFile;
-    testFiles.outputFile = util.appendToFileName(mainFiles.outputFile, '.test');
-    bundleFiles.push(testFiles);
-
-    // Create the test bundle
-    var testBundle = newify(testFiles, events, options);
-    addCoverageTransform(testBundle);
-    addMinifyTransform(testBundle);
-    bundles.push(testBundle);
+    bundlers.push(createTestBundler(mainFiles, events, options));
   }
 
   /**
@@ -67,12 +62,12 @@ function writeBundles(mainFiles, events, options) {
    * @param {number} index - The bundle to build (from the {@link bundles} array)
    **/
   function writeBundle(index) {
-    if (bundles[index]) {
+    if (bundlers[index]) {
       // Write this bundle
-      bundle(bundles[index], bundleFiles[index]);
+      bundle(bundlers[index]);
 
       // Write the next bundle when this one finishes
-      bundles[index].once('end', function() {
+      bundlers[index].once('end', function() {
         writeBundle(index + 1);
       });
     }
@@ -81,6 +76,78 @@ function writeBundles(mainFiles, events, options) {
   writeBundle(0);
 }
 
+/**
+ * Creates a Browserify instance that outputs the main (non-minified) bundle for the given entry file.
+ *
+ * @param {FileSet} mainFiles - The input & output files
+ * @param {EventEmitter} events - Browserify events will be propagated to this EventEmitter
+ * @param {Options} options - Bundling options
+ * @returns {Browserify}
+ */
+function createMainBundler(mainFiles, events, options) {
+  return newify(mainFiles, events, options);
+}
+
+/**
+ * Creates a Browserify instance that outputs the minified bundle for the given entry file.
+ *
+ * @param {FileSet} mainFiles - The input & output files
+ * @param {EventEmitter} events - Browserify events will be propagated to this EventEmitter
+ * @param {Options} options - Bundling options
+ * @returns {Browserify}
+ */
+function createMinifiedBundler(mainFiles, events, options) {
+  var minifiedFiles = new FileSet();
+
+  if (options.bundle || options.test) {
+    // We're creating multiple output files, so append ".min" to the minified file
+    minifiedFiles.entryFile = mainFiles.entryFile;
+    minifiedFiles.outputFile = util.appendToFileName(mainFiles.outputFile, '.min');
+    if (options.debug) {
+      minifiedFiles.mapFile = minifiedFiles.outputFile + '.map';
+    }
+  }
+  else {
+    // We're ONLY creating a minified file, so this is the main output file
+    minifiedFiles = mainFiles;
+  }
+
+  var bundler = newify(minifiedFiles, events, options);
+  bundler.transform(uglifyify, uglifyifyOptions);
+  return bundler;
+}
+
+/**
+ * Creates a Browserify instance that outputs the test bundle (with code-coverage instrumentation)
+ * for the given entry file.
+ *
+ * @param {FileSet} mainFiles - The input & output files
+ * @param {EventEmitter} events - Browserify events will be propagated to this EventEmitter
+ * @param {Options} options - Bundling options
+ * @returns {Browserify}
+ */
+function createTestBundler(mainFiles, events, options) {
+  var testFiles = new FileSet();
+
+  if (options.bundle || options.minify) {
+    // We're creating multiple output files, so append ".test" to the test file
+    testFiles.entryFile = mainFiles.entryFile;
+    testFiles.outputFile = util.appendToFileName(mainFiles.outputFile, '.test');
+  }
+  else {
+    // We're ONLY creating a test file, so this is the main output file
+    testFiles = mainFiles;
+
+    // Don't produce source maps for test files (Istanbul doesn't support source maps anyway)
+    testFiles.mapFile = '';
+  }
+
+  var bundler = newify(testFiles, events, options);
+  bundler.transform(uglifyify, uglifyifyOptions);
+  bundler.transform(istanbul(istanbulOptions));
+  return bundler;
+}
+
 /**
  * Creates a new Browserify or Watchify instance
  *
@@ -122,54 +189,28 @@ function newify(fileSet, events, options) {
     });
   }
 
-  return b;
-}
+  // Remember the input/output files for this bundler
+  b.files = fileSet;
 
-/**
- * Uses the Uglifyify transform to minify the given Browserify bundle
- *
- * @param {Browserify} b - The Browserify object to transform
- */
-function addMinifyTransform(b) {
-  b.transform(uglifyify, {
-    global: true,
-    exts: ['.js', '.json'],
-    output: {
-      // Keep important comments when minifying
-      comments: /^!|^\*!|@preserve|@license|@cc_on/
-    }
-  });
-}
-
-/**
- * Uses the Istanbul transform to add code-coverage instrumentation the given Browserify bundle
- *
- * @param {Browserify} b - The Browserify object to transform
- */
-function addCoverageTransform(b) {
-  b.transform(istanbul({
-    ignore: ['**/*.json', '**/*.html', '**/*.md', '**/*.txt'],
-    defaultIgnore: false
-  }));
+  return b;
 }
 
 /**
  * Writes the output file (and possibly its .map file) for the given Browserify object
  *
  * @param {Browserify} b - The Browserify object to bundle
- * @param {FileSet} fileSet - The input & output files for this bundle
  */
-function bundle(b, fileSet) {
+function bundle(b) {
   var stream = b.bundle();
   stream.on('end', b.emit.bind(b, 'end'));
   stream.on('error', b.emit.bind(b, 'error'));
 
-  if (fileSet.mapFile) {
-    util.ensureFileExists(fileSet.mapFile);
-    var dirname = path.dirname(fileSet.mapFile);
-    stream = stream.pipe(exorcist(fileSet.mapFile, null, null, dirname));
+  if (b.files.mapFile) {
+    util.ensureFileExists(b.files.mapFile);
+    var dirname = path.dirname(b.files.mapFile);
+    stream = stream.pipe(exorcist(b.files.mapFile, null, null, dirname));
   }
 
-  util.ensureFileExists(fileSet.outputFile);
-  stream.pipe(fs.createWriteStream(fileSet.outputFile));
+  util.ensureFileExists(b.files.outputFile);
+  stream.pipe(fs.createWriteStream(b.files.outputFile));
 }

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplifyify",
-  "version": "1.6.0",
+  "version": "2.0.0-beta.0",
   "description": "A simplified Browserify and Watchify CLI",
   "keywords": [
     "browserify",
@@ -37,6 +37,7 @@
     "url": "https://github.com/BigstickCarpet/simplifyify.git"
   },
   "devDependencies": {
+    "babelify": "^7.2.0",
     "chai": "^3.4.1",
     "coveralls": "^2.11.6",
     "del": "^2.2.0",

Diff for: tests/specs/debug.spec.js

@@ -90,7 +90,7 @@ describe('simplifyify --debug', function() {
   });
 
   it('should create source maps for multiple minified files', function(done) {
-    cli.run('es5/lib/**/index.js --debug --minify --outfile es5/dist/',
+    cli.run('es5/lib/**/index.js --bundle --debug --minify --outfile es5/dist/',
       function(err, stdout) {
         if (err) {
           return done(err);
@@ -146,7 +146,7 @@ describe('simplifyify --debug', function() {
   });
 
   it('should append ".map" when renaming output files', function(done) {
-    cli.run('es5/lib/**/*.js --debug --minify --outfile es5/dist/*.bundle.es',
+    cli.run('es5/lib/**/*.js --bundle --debug --minify --outfile es5/dist/*.bundle.es',
       function(err, stdout) {
         if (err) {
           return done(err);

Diff for: tests/specs/minify.spec.js

@@ -7,6 +7,27 @@ var cli    = require('../fixtures/cli'),
 describe('simplifyify --minify', function() {
   it('should minify a single file', function(done) {
     cli.run('es5/lib/index.js --minify --outfile es5/dist/',
+      function(err, stdout) {
+        if (err) {
+          return done(err);
+        }
+
+        expect(stdout).to.contain('es5/lib/index.js --> es5/dist/index.js');
+
+        assert.directoryContents('es5/dist', 'index.js');
+
+        assert.fileContents('es5/dist/index.js', function(contents) {
+          assert.hasPreamble(contents);
+          assert.isMinified(contents);
+          assert.noSourceMap(contents);
+          assert.noCoverage(contents);
+        });
+        done();
+      });
+  });
+
+  it('should create a minified and non-minified file', function(done) {
+    cli.run('es5/lib/index.js --bundle --minify --outfile es5/dist/',
       function(err, stdout) {
         if (err) {
           return done(err);
@@ -44,24 +65,14 @@ describe('simplifyify --minify', function() {
         }
 
         expect(stdout).to.contain('es5/lib/index.js --> es5/dist/index.js');
-        expect(stdout).to.contain('es5/lib/index.js --> es5/dist/index.min.js');
         expect(stdout).to.contain('es5/lib/say/index.js --> es5/dist/say/index.js');
-        expect(stdout).to.contain('es5/lib/say/index.js --> es5/dist/say/index.min.js');
 
         assert.directoryContents('es5/dist', [
           'index.js',
-          'index.min.js',
           'say/index.js',
-          'say/index.min.js'
         ]);
 
         assert.fileContents('es5/dist', ['index.js', 'say/index.js'], function(contents) {
-          assert.hasPreamble(contents);
-          assert.notMinified(contents);
-          assert.noSourceMap(contents);
-          assert.noCoverage(contents);
-        });
-        assert.fileContents('es5/dist', ['index.min.js', 'say/index.min.js'], function(contents) {
           assert.hasPreamble(contents);
           assert.isMinified(contents);
           assert.noSourceMap(contents);
@@ -71,8 +82,35 @@ describe('simplifyify --minify', function() {
       });
   });
 
-  it('should append ".min" when renaming output files', function(done) {
+  it('should NOT append ".min" when renaming output files', function(done) {
     cli.run('es5/lib/**/*.js --minify --outfile es5/dist/*.foo.es5',
+      function(err, stdout) {
+        if (err) {
+          return done(err);
+        }
+
+        expect(stdout).to.contain('es5/lib/index.js --> es5/dist/index.foo.es5');
+        expect(stdout).to.contain('es5/lib/hello-world.js --> es5/dist/hello-world.foo.es5');
+        expect(stdout).to.contain('es5/lib/say/index.js --> es5/dist/say/index.foo.es5');
+
+        assert.directoryContents('es5/dist', [
+          'index.foo.es5',
+          'hello-world.foo.es5',
+          'say/index.foo.es5',
+        ]);
+
+        assert.fileContents('es5/dist', ['index.foo.es5', 'hello-world.foo.es5', 'say/index.foo.es5'], function(contents) {
+            assert.hasPreamble(contents);
+            assert.isMinified(contents);
+            assert.noSourceMap(contents);
+            assert.noCoverage(contents);
+          });
+        done();
+      });
+  });
+
+  it('should append ".min" when renaming output files and producing multiple bundles', function(done) {
+    cli.run('es5/lib/**/*.js --bundle --minify --outfile es5/dist/*.foo.es5',
       function(err, stdout) {
         if (err) {
           return done(err);