fix(files): Fix a regression where strings within the 'files' option were split on commas - fixes #1080

Author: shakyShane

lib/cli/cli-options.js

@@ -297,9 +297,7 @@ opts.makeFilesArg = function (value) {
     if (isList(value) && value.size) {
         value.forEach(function (value) {
             if (_.isString(value)) {
-                globs = globs.concat(
-                    opts.utils.explodeFilesArg(value)
-                );
+                globs.push(value);
             } else {
                 if (isMap(value)) {
                     objs.push(value);

lib/cli/command.start.js

@@ -4,6 +4,7 @@ var path  = require("path");
 var fs    = require("fs");
 var _     = require("lodash");
 var utils = require("../utils");
+var opts  = require("./cli-options").utils;
 
 /**
  * $ browser-sync start <options>
@@ -16,7 +17,7 @@ var utils = require("../utils");
  */
 module.exports = function (opts) {
 
-    var flags    = stripUndefined(opts.cli.flags);
+    var flags    = preprocessFlags(opts.cli.flags);
     var maybepkg = path.resolve(process.cwd(), "package.json");
     var input    = flags;
 
@@ -43,6 +44,19 @@ module.exports = function (opts) {
         .init(input, opts.cb);
 };
 
+/**
+ * @param flags
+ * @returns {*}
+ */
+function preprocessFlags (flags) {
+    return [
+        stripUndefined,
+        legacyFilesArgs
+    ].reduce(function (flags, fn) {
+        return fn.call(null, flags);
+    }, flags);
+}
+
 /**
  * Incoming undefined values are problematic as
  * they interfere with Immutable.Map.mergeDeep
@@ -59,3 +73,16 @@ function stripUndefined (subject) {
         return acc;
     }, {});
 }
+
+/**
+ * @param flags
+ * @returns {*}
+ */
+function legacyFilesArgs(flags) {
+    if (flags.files && flags.files.length) {
+        flags.files = flags.files.reduce(function (acc, item) {
+            return acc.concat(opts.explodeFilesArg(item));
+        }, []);
+    }
+    return flags;
+}

test/specs/cli/cli.options.files.js

@@ -13,13 +13,6 @@ describe("CLI: Options: Merging Options: Files", function () {
             objs: []
         });
     });
-    it("should return the files property from Array given with strings in legacy format", function () {
-        var imm = merge({files: ["css/*.css,*.html"]});
-        assert.deepEqual(imm.get("files").get("core").toJS(), {
-            globs: ["css/*.css", "*.html"],
-            objs: []
-        });
-    });
     it("should return the files property from array given", function () {
         var imm = merge({files: ["css/*.css", "*.html"]});
         assert.deepEqual(imm.get("files").get("core").toJS(), {

test/specs/e2e/cli/e2e.cli.files.js

@@ -16,7 +16,7 @@ describe("E2E CLI `files` arg - multi globs", function () {
                 flags: {
                     logLevel: "silent",
                     open: false,
-                    files: "*.html, css/*.css"
+                    files: ["*.html, css/*.css"]
                 }
             },
             cb: function (err, bs) {
@@ -38,7 +38,7 @@ describe("E2E CLI `files` arg, single glob", function () {
                 flags: {
                     logLevel: "silent",
                     open: false,
-                    files: "*.html"
+                    files: ["*.html"]
                 }
             },
             cb: function (err, bs) {
@@ -50,3 +50,25 @@ describe("E2E CLI `files` arg, single glob", function () {
         });
     });
 });
+
+describe("E2E CLI `files` arg, with commas", function () {
+    it("Converts cli files arg", function (done) {
+        browserSync.reset();
+        cli({
+            cli: {
+                input: ["start"],
+                flags: {
+                    logLevel: "silent",
+                    open: false,
+                    files: ["*.css,*.html"]
+                }
+            },
+            cb: function (err, bs) {
+                assert.equal(bs.options.getIn(["files", "core", "globs"]).size, 2);
+                assert.isTrue(Array.isArray(bs.watchers.core.watchers));
+                bs.cleanup();
+                done();
+            }
+        });
+    });
+});

test/specs/files/files.watching.js

@@ -134,4 +134,21 @@ describe("File Watcher Module", function () {
             done();
         });
     });
+    it("should allow arrays with , in API mode", function (done) {
+
+        browserSync.reset();
+        var bs = browserSync.create();
+
+        bs.init({
+            files: ["test/fixtures/**/*.{css,html}"],
+            ui: false,
+            online: false,
+            logSnippet: false,
+            logLevel: "silent"
+        }, function (err, bs) {
+            assert.equal(bs.options.getIn(["files", "core", "globs"]).size, 1);
+            bs.cleanup();
+            done();
+        });
+    });
 });