Merge pull request #12647 from adobe/shell-node6

Make file watching compatible with node version 6.x (runs on 0.10 too)

Author: ficristo

Gruntfile.js

@@ -347,6 +347,7 @@ module.exports = function (grunt) {
         /*'cssmin',*/
         /*'uglify',*/
         'copy',
+        'npm-install',
         'cleanempty',
         'usemin',
         'build-config'

npm-shrinkwrap.json

@@ -12,6 +12,10 @@
         "branch": "",
         "SHA": ""
     },
+    "dependencies": {
+        "anymatch": "1.3.0",
+        "chokidar": "1.6.0"
+    },
     "devDependencies": {
         "grunt": "0.4.5",
         "jasmine-node": "1.11.0",

package.json

@@ -35,6 +35,10 @@
         "branch": "",
         "SHA": ""
     },
+    "dependencies": {
+        "anymatch": "1.3.0",
+        "chokidar": "1.6.0"
+    },
     "devDependencies": {
         "grunt": "0.4.5",
         "jasmine-node": "1.11.0",

src/config.json

@@ -261,7 +261,8 @@ define(function (require, exports, module) {
     FileSystem.prototype._watchOrUnwatchEntry = function (entry, watchedRoot, callback, shouldWatch) {
         var impl = this._impl,
             recursiveWatch = impl.recursiveWatch,
-            commandName = shouldWatch ? "watchPath" : "unwatchPath";
+            commandName = shouldWatch ? "watchPath" : "unwatchPath",
+            filterGlobs = watchedRoot.filterGlobs;
 
         if (recursiveWatch) {
             // The impl can watch the entire subtree with one call on the root (we also fall into this case for
@@ -273,7 +274,7 @@ define(function (require, exports, module) {
             } else {
                 // The impl will handle finding all subdirectories to watch.
                 this._enqueueWatchRequest(function (requestCb) {
-                    impl[commandName].call(impl, entry.fullPath, requestCb);
+                    impl[commandName].call(impl, entry.fullPath, filterGlobs, requestCb);
                 }.bind(this), callback);
             }
         } else if (shouldWatch) {
@@ -314,7 +315,7 @@ define(function (require, exports, module) {
                     };
 
                     entriesToWatch.forEach(function (entry) {
-                        impl.watchPath(entry.fullPath, watchCallback);
+                        impl.watchPath(entry.fullPath, filterGlobs, watchCallback);
                     });
                 });
             }, callback);
@@ -851,11 +852,19 @@ define(function (require, exports, module) {
      * @param {function(string): boolean} filter - Returns true if a particular item should
      *      be watched, given its name (not full path). Items that are ignored are also
      *      filtered from Directory.getContents() results within this subtree.
+     * @param {Array<string>} filterGlobs - glob compatible string definitions for
+     *      filtering out events on the node side.
      * @param {function(?string)=} callback - A function that is called when the watch has
      *      completed. If the watch fails, the function will have a non-null FileSystemError
      *      string parametr.
      */
-    FileSystem.prototype.watch = function (entry, filter, callback) {
+    FileSystem.prototype.watch = function (entry, filter, filterGlobs, callback) {
+        // make filterGlobs an optional argument to stay backwards compatible
+        if (typeof callback === "undefined" && typeof filterGlobs === "function") {
+            callback = filterGlobs;
+            filterGlobs = null;
+        }
+
         var fullPath = entry.fullPath;
 
         callback = callback || function () {};
@@ -882,7 +891,7 @@ define(function (require, exports, module) {
             return;
         }
 
-        var watchedRoot = new WatchedRoot(entry, filter);
+        var watchedRoot = new WatchedRoot(entry, filter, filterGlobs);
 
         this._watchedRoots[fullPath] = watchedRoot;
 

src/filesystem/FileSystem.js

@@ -36,9 +36,13 @@ define(function (require, exports, module) {
 
         this._isFile = isFile;
         this._isDirectory = !isFile;
-        this._mtime = options.mtime;
+        // in case of stats transferred over a node-domain,
+        // mtime will have JSON-ified value which needs to be restored
+        this._mtime = options.mtime instanceof Date ? options.mtime : new Date(options.mtime);
         this._size = options.size;
-        this._hash = options.hash;
+        // hash is a property introduced by brackets and it's calculated
+        // as a valueOf modification time -> calculate here if it's not present
+        this._hash = options.hash || this._mtime.valueOf();
 
         var realPath = options.realPath;
         if (realPath) {