match against deps patterns (#1451)

* match against deps patterns

* fix travis

.travis.yml

@@ -4,8 +4,9 @@ os:
   - linux
   - osx
 node_js:
-  - '4'
-  - '5'
-  - '6'
+  - 4
+  - 5
+  - 6
 before_install:
   - npm install bower@^1 -g
+  - npm install npm@3 -g

lib/fs_utils/file_list.js

@@ -9,6 +9,7 @@ const formatError = require('../helpers').formatError;
 const Asset = require('./asset');
 const SourceFile = require('./source_file');
 const BrunchError = require('../error');
+const anymatch = require('anymatch');
 
 const normalizePath = path => sysPath.slashes(path);
 
@@ -124,7 +125,7 @@ class FileList extends EventEmitter {
     const files = isStatic ? this.staticFiles : this.files;
     files.forEach((dependent, fpath) => {
       const deps = dependent.dependencies;
-      const isDep = deps && deps.includes(path) && !this.compiled.has(fpath);
+      const isDep = anymatch(deps, path) && !this.compiled.has(fpath);
       if (!isDep) return;
       paths.push(fpath);
       parents.push(dependent);
@@ -139,30 +140,28 @@ class FileList extends EventEmitter {
     file.removed = false;
     if (this.compiling.has(path)) {
       this.resetTimer();
-    } else {
-      const reset = p => {
-        this.compiling.delete(path);
-        this.resetTimer();
-        return p;
-      };
-      this.compiling.add(path);
-      file.compile()
-          .then(reset, reset)
-          .then(() => {
-            debug(`Compiled ${path}`);
-            this.compiled.add(path);
-            this.emit('compiled', path);
-          });
+      return;
     }
+    const reset = () => {
+      this.compiling.delete(path);
+      this.resetTimer();
+    };
+    this.compiling.add(path);
+    file.compile()
+      .then(reset, reset)
+      .then(() => {
+        debug(`Compiled ${path}`);
+        this.compiled.add(path);
+        this.emit('compiled', path);
+      });
   }
 
   copy(asset) {
     const path = asset.path;
-    const resetCopy = p => {
-      if (this.disposed) return p;
+    const resetCopy = () => {
+      if (this.disposed) return;
       this.copying.delete(path);
       this.resetTimer();
-      return p;
     };
 
     this.copying.add(path);

lib/fs_utils/pipeline.js

@@ -37,7 +37,9 @@ const getDependencies = (file, compiler) => {
   const name = compiler.constructor.name;
   debug(`Fetching dependencies ${file.path} @ ${name}`);
   return callPlugin(compiler, 'getDependencies', file)
-    .then(deps => deps.map(sysPath.normalize))
+    .then(deps => {
+      return deps.map(sysPath.normalize).concat(deps.patterns);
+    })
     .catch(rethrow('Dependency parsing'));
 };
 

lib/watch.js

@@ -55,17 +55,16 @@ const checkProjectDependencies = config => {
   });
 };
 
-const MAX_JOBS = 32;
-const setDefaultJobsCount = options => {
-  const envy = process.env.BRUNCH_JOBS;
-  if (!options.jobs && !envy) return;
-  if (options.jobs === true) options.jobs = undefined;
+const setDefaultJobsCount = jobs => {
+  const MAX_JOBS = 32;
+  const env = process.env.BRUNCH_JOBS;
+  if (!jobs && !env || jobs === true) return;
   // Mitigates Intel Hyperthreading.
-  const str = options.jobs || envy || cpus / 2;
-  const parsed = parseInt(str);
-  const jobs = isNaN(parsed) || parsed < 1 || parsed > MAX_JOBS ? 1 : parsed;
-  options.jobs = jobs;
-  return jobs;
+  const str = jobs || env || cpus / 2;
+  const int = Math.round(str);
+  return isNaN(int) ||
+    int < 1 ||
+    int > MAX_JOBS ? 1 : int;
 };
 
 /* persistent - Boolean: should brunch build the app only once or watch it?
@@ -85,7 +84,7 @@ class BrunchWatcher {
     this._startTime = Date.now() - speed.sinceStart;
     this._isFirstRun = true;
     this._onReload = options._onReload;
-    setDefaultJobsCount(options);
+    options.jobs = setDefaultJobsCount(options.jobs);
 
     application.loadConfig(persistent, options)
       .then(cfg => {
@@ -138,7 +137,7 @@ class BrunchWatcher {
         if (!this._startTime) return;
         this.compile(this._endCompilation(), this.watcherIsReady);
       })
-      .on('bundled', this._endBundle.bind(this));
+      .on('bundled', () => this._endBundle());
 
     // Emit `change` event for each file that is included with plugins.
     // Wish it worked like `watcher.add includes`.

lib/workers/job-processor.js

@@ -18,15 +18,13 @@ const CompileJob = require('../fs_utils/pipeline').CompileJob;
 
 const jobs = {OptimizeJob, CompileJob};
 
-const processMsg = msg => {
+process.on('message', msg => {
   const type = msg.type;
   const data = msg.data;
 
   const job = jobs[type];
   const hash = job.deserialize({plugins}, data.hash);
-  return job.work(hash);
-};
-
-process.on('message', msg => {
-  processMsg(msg).then(result => process.send({result}), error => process.send({error: error.message}));
+  job.work(hash).then(result => process.send({result}),
+    error => process.send({error: error.message})
+  );
 });

lib/workers/manager.js

@@ -37,7 +37,7 @@ class WorkerManager {
     let num = options.jobs;
     debug(`Spinning ${num} workers`);
     while (num--) this.fork();
-    this._checker = setInterval(() => this.sendMessage(), 1);
+    this._checker = setInterval(() => this.sendMessage());
   }
 
   fork() {
@@ -88,12 +88,12 @@ class WorkerManager {
     });
   }
 
-  getFreeWorkerIdx() {
+  get freeWorkerIdx() {
     return Object.keys(this.workers).find(idx => this.pending[idx] === false);
   }
 
   sendMessage() {
-    const workerIdx = this.getFreeWorkerIdx();
+    const workerIdx = this.freeWorkerIdx;
     if (!workerIdx) return;
     const job = this.jobs.dequeue();
     if (!job) return;

test/build.js

@@ -388,7 +388,7 @@ test.serial.cb('npm integration', t => {
       // finally, modules with .js in their name are correctly processed
       contains('require.alias("bignumber.js/bignumber.js", "bignumber.js");');
 
-      outputContains(t, /compiled (180|181) files into app\.js/);
+      outputContains(t, /compiled (\d{3}) files into app\.js/);
       noError(t);
 
       t.end();