Merge pull request #82 from carrot/watchfix

Watch mode fixes

Author: Jeff Escalante

lib/index.js

@@ -23,35 +23,17 @@ export default class Roots extends EventEmitter {
     const id = this._id()
     const compiler = webpack(this.config)
 
-    compiler.run((err, stats) => {
-      if (err) {
-        return this.emit('error', new RootsError({ id: id, message: err }))
-      }
-
-      // Webpack "soft errors" are classified as warnings in roots. An error is
-      // an error. If it doesn't break the build, it's a warning.
-      const jsonStats = stats.toJson()
-      if (jsonStats.errors.length > 0) {
-        this.emit('warning', new RootsWarning({ id: id, message: jsonStats.errors }))
-      }
-      if (jsonStats.warnings.length > 0) {
-        this.emit('warning', new RootsWarning({ id: id, message: jsonStats.warnings }))
-      }
-
-      this.emit('compile', { id: id, stats: stats })
-    })
+    compiler.run(compileCallback.bind(this, id))
 
     // Returns the compilation's ID synchronously, this can be checked against
     // events emitted from the project instance.
     return [id, compiler]
   }
 
-  watch (opts) {
-    const [, compiler] = this.compile()
-    return compiler.watch(opts, (err, stats) => {
-      if (err) { return this.emit('error', err) }
-      this.emit('compile', { stats: stats })
-    })
+  watch (opts = {}) {
+    const id = this._id()
+    const compiler = webpack(this.config)
+    return compiler.watch(opts, compileCallback.bind(this, id))
   }
 
   clean () {
@@ -117,3 +99,21 @@ export default class Roots extends EventEmitter {
 function npmInstall (opts) {
   return node.call(exec, 'npm install', { cwd: opts.root })
 }
+
+function compileCallback (id, err, stats) {
+  if (err) {
+    return this.emit('error', new RootsError({ id: id, message: err }))
+  }
+
+  // Webpack "soft errors" are classified as warnings in roots. An error is
+  // an error. If it doesn't break the build, it's a warning.
+  const jsonStats = stats.toJson()
+  if (jsonStats.errors.length) {
+    this.emit('warning', new RootsWarning({ id: id, message: jsonStats.errors }))
+  }
+  if (jsonStats.warnings.length) {
+    this.emit('warning', new RootsWarning({ id: id, message: jsonStats.warnings }))
+  }
+
+  this.emit('compile', { id: id, stats: stats })
+}

lib/plugins/fs_plugin.js

@@ -10,10 +10,12 @@ export default class FsWebpackPlugin {
   }
 
   apply (compiler) {
-    // read file tree and get all files
-    compiler.plugin('run', (compilation, done) => {
-      compiler.options.files = util.getFilesFromGlob(compiler, this.opts)
-      done()
-    })
+    compiler.plugin('run', run.bind(this, compiler))
+    compiler.plugin('watch-run', run.bind(this, compiler))
   }
 }
+
+function run (compiler, compilation, done) {
+  compiler.options.files = util.getFilesFromGlob(compiler, this.opts)
+  done()
+}

test/watch.js

@@ -15,15 +15,14 @@ test.cb('watches the project, reloads on modification', (t) => {
   })
   let i = 0
 
-  // right now it compiles twice on the first shot for some reason
   project.on('compile', (res) => {
     i++
-    if (i > 1) {
+    if (i === 1) {
       const file = path.join(fixturesPath, 'watch/index.jade')
       fs.appendFileSync(file, ' ')
       fs.writeFileSync(file, fs.readFileSync(file, 'utf8').trim())
     }
-    if (i > 2) {
+    if (i === 2) {
       watcher.close()
       t.end()
     }