fix(watch): resolve issue where changes are not detected

closes #675
aurelia · Aug 12, 2017 · 9146da2 · 9146da2
1 parent 7f5e84c
commit 9146da2
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 28 deletions.
diff --git a/lib/resources/tasks/watch.js b/lib/resources/tasks/watch.js
@@ -26,22 +26,29 @@ if (typeof project.build.copyFiles === 'object') {
 
 let watch = (callback) => {
   watchCallback = callback || watchCallback;
-  return gulpWatch(
-    Object.keys(watches),
-    {
-      read: false, // performance optimization: do not read actual file contents
-      verbose: true
-    },
-    (vinyl) => {
-      if (vinyl.path && vinyl.cwd && vinyl.path.startsWith(vinyl.cwd)) {
-        let pathToAdd = vinyl.path.substr(vinyl.cwd.length + 1);
-        log(`Watcher: Adding path ${pathToAdd} to pending build changes...`);
-        pendingRefreshPaths.push(pathToAdd);
-        refresh();
-      }
-    });
+
+  const watchPaths = Object.keys(watches);
+
+  for(let i = 0; i < watchPaths.length; i++) {
+    gulpWatch(
+      watchPaths[i],
+      {
+        read: false, // performance optimization: do not read actual file contents
+        verbose: true
+      },
+      (vinyl) => processChange(vinyl));
+  }
 };
 
+let processChange = (vinyl) => {
+  if (vinyl.path && vinyl.cwd && vinyl.path.startsWith(vinyl.cwd)) {
+    let pathToAdd = vinyl.path.substr(vinyl.cwd.length + 1);
+    log(`Watcher: Adding path ${pathToAdd} to pending build changes...`);
+    pendingRefreshPaths.push(pathToAdd);
+    refresh();
+  }
+}
+
 let refresh = debounce(() => {
   if (isBuilding) {
     log('Watcher: A build is already in progress, deferring change detection...');

diff --git a/lib/resources/tasks/watch.ts b/lib/resources/tasks/watch.ts
@@ -26,22 +26,29 @@ if (typeof project.build.copyFiles === 'object') {
 
 let watch = (callback?) => {
   watchCallback = callback || watchCallback;
-  return gulpWatch(
-    Object.keys(watches),
-    {
-      read: false, // performance optimization: do not read actual file contents
-      verbose: true
-    },
-    (vinyl) => {
-      if (vinyl.path && vinyl.cwd && vinyl.path.startsWith(vinyl.cwd)) {
-        let pathToAdd = vinyl.path.substr(vinyl.cwd.length + 1);
-        log(`Watcher: Adding path ${pathToAdd} to pending build changes...`);
-        pendingRefreshPaths.push(pathToAdd);
-        refresh();
-      }
-    });
+
+  const watchPaths = Object.keys(watches);
+
+  for(let i = 0; i < watchPaths.length; i++) {
+    gulpWatch(
+      watchPaths[i],
+      {
+        read: false, // performance optimization: do not read actual file contents
+        verbose: true
+      },
+      (vinyl) => processChange(vinyl));
+  }
 };
 
+let processChange = (vinyl) => {
+  if (vinyl.path && vinyl.cwd && vinyl.path.startsWith(vinyl.cwd)) {
+    let pathToAdd = vinyl.path.substr(vinyl.cwd.length + 1);
+    log(`Watcher: Adding path ${pathToAdd} to pending build changes...`);
+    pendingRefreshPaths.push(pathToAdd);
+    refresh();
+  }
+}
+
 let refresh = debounce(() => {
   if (isBuilding) {
     log('Watcher: A build is already in progress, deferring change detection...');