Fixed: CLI --watch doesn't make some duplicate rebuild anymore. (1.3.1)

Author: MoOx

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.1 - 2015-05-01
+
+- Fixed: CLI `--watch` doesn't make some duplicate rebuild anymore.
+
 # 1.3.0 - 2015-04-15
 
 - Added: hexadecimal fallback for rgba() color

bin/cssnext.js

@@ -83,7 +83,6 @@ if (input && !fs.existsSync(input)) {
 }
 
 config.from = input
-
 // init & adjust watcher with postcss-import dependencies
 var watcher
 if (config.watch) {
@@ -104,11 +103,18 @@ if (config.watch) {
       })
     }
 
+    const rebaseFile = function(file) {
+      return path.relative(process.cwd(), file)
+    }
+
     var watcherOnImport = function(imported) {
-      var filesToUnWatch = arrayDiff(importedFiles, imported)
-      watcher.unwatch(filesToUnWatch)
+      arrayDiff(importedFiles, imported).forEach(function(file) {
+        watcher.unwatch(rebaseFile(file))
+      })
+      arrayDiff(imported, importedFiles).forEach(function(file) {
+        watcher.add(rebaseFile(file))
+      })
       importedFiles = imported
-      watcher.add(importedFiles)
     }
 
     // import need an object so we can pass onImport() cb
@@ -171,7 +177,8 @@ if (watcher) {
     if (verbose) {
       log(colors.cyan("Watching"), input)
     }
-    watcher.on("all", transform)
+
+    watcher.on("change", transform)
   })
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cssnext",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Use tomorrow's CSS syntax, today",
   "keywords": [
     "css",

test/cli.js

@@ -2,7 +2,6 @@
  * Test dependencies
  */
 var exec = require("child_process").exec
-var fs = require("fs")
 
 var test = require("tape")
 
@@ -127,76 +126,5 @@ test("cli", function(t) {
   })
   planned+=2
 
-  // I don't success to call the kill() process from node and both Travis CI and Appveyor
-  // so we avoid this test on this environnements
-  if (!process.env.TRAVIS && !process.env.APPVEYOR) {
-    var watchProcess = exec(cssnextBin + " --watch test/fixtures/cli.error.css test/fixtures/cli.output--watch.css", function(err) {
-      t.ok(err && err.signal === "SIGTERM", "should only be killed by an interrupt when `--watch` option passed")
-      if (err && !err.killed) { throw err }
-    })
-
-    var msgWatch = "should output error messages when `--watch` option passed"
-    var watchTimeout = setTimeout(function() {
-      t.fail(msgWatch)
-      watchProcess.kill()
-    }, 5000)
-    watchProcess.stderr.on("data", function(data) {
-      if (utils.contains(data, "encounters an error")) {
-        t.pass(msgWatch)
-        clearTimeout(watchTimeout)
-        watchProcess.kill()
-      }
-    })
-    planned+=2
-
-    // watch/import tests
-    var watchOut = "test/fixtures/cli.output--watch-import.css"
-    var watchImportProcess = exec(cssnextBin + " --watch test/fixtures/cli.watch-import.css " + watchOut, function(err) {
-      if (err && !err.killed) { throw err }
-    })
-
-    // watch an empty file doesn't seems to work great, so I am using
-    // /**/ to get a content
-    // yeah...
-
-    // trigger a change in cli.import.css to add a new watched file cli.import2.css
-    fs.writeFileSync("test/fixtures/cli.watch-import.css", "/**/ @import 'cli.watch-import-import.css';")
-
-    // we are using setTimeout for the watcher to do his job
-    setTimeout(function() {
-      // check the output has been updated (watcher works)
-      t.equal(fs.readFileSync(watchOut, {encoding:"utf8"}), "/**/ watch{}", "should update the file")
-
-      // remove this newly imported file
-      fs.writeFileSync("test/fixtures/cli.watch-import.css", "/**/")
-
-      // check the output has been update
-      setTimeout(function() {
-        t.equal(fs.readFileSync(watchOut, {encoding:"utf8"}), "/**/", "should update the file, again")
-
-        // previously imported file should not be watched anymore
-        // to check that we read output mtime, modify the file that should not be watched
-        // and check back that the output file has the same mtime
-        var outStat = fs.statSync(watchOut)
-        setTimeout(function() {
-          // trigger a change in previously imported file
-          var now = (new Date()).getTime()
-          fs.utimesSync("test/fixtures/cli.watch-import-import.css", now, now)
-
-          setTimeout(function() {
-            // this time, it should not trigger anything
-            var outStatAfter = fs.statSync(watchOut)
-            t.equal(outStat.mtime.getTime(), outStatAfter.mtime.getTime(), "should not modify a file if a previously imported file is modified")
-
-            utils.remove("cli.output--watch-import")
-            watchImportProcess.kill()
-          }, 2000)
-        }, 2000)
-      }, 2000)
-    }, 4000)
-
-    planned+=3
-  }
-
   t.plan(planned)
 })

test/cli.watcher.js

@@ -0,0 +1,93 @@
+/**
+ * Test dependencies
+ */
+var exec = require("child_process").exec
+var spawn = require("child_process").spawn
+var fs = require("fs")
+
+var test = require("tape")
+
+var utils = require("./utils")
+
+var cssnextBin = "node bin/cssnext" // node bin is used to help for windows
+
+test("cli/watcher", function(t) {
+  var planned = 0
+
+  // I don't success to call the kill() process from node and both Travis CI and Appveyor
+  // so we avoid this test on this environnements
+  if (!process.env.TRAVIS && !process.env.APPVEYOR) {
+    var watchProcess = exec(cssnextBin + " --watch test/fixtures/cli.error.css test/fixtures/cli.output--watch.css", function(err) {
+      t.ok(err && err.signal === "SIGTERM", "should only be killed by an interrupt when `--watch` option passed")
+      if (err && !err.killed) { throw err }
+    })
+
+    var msgWatch = "should output error messages when `--watch` option passed"
+    var watchTimeout = setTimeout(function() {
+      t.fail(msgWatch)
+      watchProcess.kill()
+    }, 5000)
+    watchProcess.stderr.on("data", function(data) {
+      if (utils.contains(data, "encounters an error")) {
+        t.pass(msgWatch)
+        clearTimeout(watchTimeout)
+        watchProcess.kill()
+      }
+    })
+    planned+=2
+
+    // watch/import tests
+    var watchOut = "test/fixtures/cli.output--watch-import.css"
+
+    var watchImportProcess = spawn("node", ["bin/cssnext", "--watch", "test/fixtures/cli.watch-import.css", watchOut], {stdio: "inherit"})
+
+    // watch an empty file doesn't seems to work great, so I am using
+    // /**/ to get a content
+    // yeah...
+
+    // trigger a change in cli.import.css to add a new watched file cli.import2.css
+    fs.writeFileSync("test/fixtures/cli.watch-import.css", "/**/ @import 'cli.watch-import-import.css';")
+
+    // we are using setTimeout for the watcher to do his job
+    setTimeout(function() {
+      // check the output has been updated (watcher works)
+      t.equal(fs.readFileSync(watchOut, {encoding:"utf8"}), "/**/ watch{}", "should update the file")
+
+      // remove this newly imported file
+      fs.writeFileSync("test/fixtures/cli.watch-import.css", "/**/")
+
+      // check the output has been update
+      setTimeout(function() {
+        t.equal(fs.readFileSync(watchOut, {encoding:"utf8"}), "/**/", "should update the file, again")
+
+        setTimeout(function() {
+          // previously imported file should not be watched anymore
+          // to check that we read output mtime, modify the file that should not be watched
+          // and check back that the output file has the same mtime
+
+          // trigger a change in previously imported file
+          var now = (new Date()).getTime()
+          fs.utimesSync("test/fixtures/cli.watch-import-import.css", now, now)
+
+          // not sure why but it's better with the statSync on the watched file in this delayed call
+          setTimeout(function() {
+            var outStat = fs.statSync(watchOut)
+
+            setTimeout(function() {
+              // this time, it should not trigger anything
+              var outStatAfter = fs.statSync(watchOut)
+              t.equal(outStat.mtime.getTime(), outStatAfter.mtime.getTime(), "should not modify a file if a previously imported file is modified")
+
+              utils.remove("cli.output--watch-import")
+              watchImportProcess.kill()
+            }, 1000)
+          }, 1000)
+        }, 1000)
+      }, 1000)
+    }, 1000)
+
+    planned+=3
+  }
+
+  t.plan(planned)
+})