[Fixes #5297] Upgrade fs-tree-diff

ember-cli · Jul 12, 2016 · 4dac34c · 4dac34c
1 parent 830fc11
commit 4dac34c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/tasks/server/livereload-server.js b/lib/tasks/server/livereload-server.js
@@ -20,8 +20,14 @@ function createServer(options) {
   return instance;
 }
 
-function isNotDirectory(entry) {
-  return entry[2] && !entry[2].isDirectory();
+function isNotRemoved(entryTuple) {
+  var operation = entryTuple[0];
+  return operation !== 'unlink' && operation !== 'rmdir';
+}
+
+function isNotDirectory(entryTuple) {
+  var entry = entryTuple[2];
+  return entry && !entry.isDirectory();
 }
 
 function relativePath(patch) {
@@ -135,8 +141,9 @@ module.exports = Task.extend({
     var files;
 
     if (results.directory) {
-      this.tree = new FSTree.fromEntries(this.getDirectoryEntries(results.directory));
+      this.tree = new FSTree.fromEntries(this.getDirectoryEntries(results.directory), { sortAndExpand: true });
       files = previousTree.calculatePatch(this.tree)
+        .filter(isNotRemoved)
         .filter(isNotDirectory)
         .map(relativePath)
         .filter(isNotSourceMapFile);

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "broccoli-concat": "^2.0.4",
     "broccoli-config-loader": "^1.0.0",
     "broccoli-config-replace": "^1.1.2",
-    "broccoli-funnel": "^1.0.0",
+    "broccoli-funnel": "broccolijs/broccoli-funnel#ce16c44",
     "broccoli-funnel-reducer": "^1.0.0",
     "broccoli-merge-trees": "^1.1.2",
     "broccoli-sane-watcher": "^1.1.1",