Skip file removal on HMR interface

Summary:
public

We're not planning to accept file removals in the short term on the HMR interface so lets bail when a file is removed (before this this we were throwing when trying to get the shallow dependencies).

Reviewed By: yungsters

Differential Revision: D2810534

fb-gh-sync-id: f2733382f4a2619e22bdf1163aa4180694fff9f8

local-cli/server/util/attachHMRServer.js

@@ -106,80 +106,85 @@ function attachHMRServer({httpServer, path, packagerServer}) {
           shallowDependencies,
         };
 
-        packagerServer.setHMRFileChangeListener(filename => {
+        packagerServer.setHMRFileChangeListener((filename, stat) => {
           if (!client) {
             return;
           }
 
-          return packagerServer.getShallowDependencies(filename)
-            .then(deps => {
-              if (!client) {
-                return [];
-              }
-
-              // if the file dependencies have change we need to invalidate the
-              // dependencies caches because the list of files we need to send
-              // to the client may have changed
-              const oldDependencies = client.shallowDependencies[filename];
-              if (arrayEquals(deps, oldDependencies)) {
-                return [packagerServer.getModuleForPath(filename)];
-              }
-
-              // if there're new dependencies compare the full list of
-              // dependencies we used to have with the one we now have
-              return getDependencies(client.platform, client.bundleEntry)
-                .then(({
-                  dependenciesCache,
-                  dependenciesModulesCache,
-                  shallowDependencies,
-                }) => {
-                  if (!client) {
-                    return [];
-                  }
-
-                  // build list of modules for which we'll send HMR updates
-                  const modulesToUpdate = [];
-                  Object.keys(dependenciesModulesCache).forEach(module => {
-                    if (!client.dependenciesModulesCache[module]) {
-                      modulesToUpdate.push(dependenciesModulesCache[module]);
+          stat.then(() => {
+            return packagerServer.getShallowDependencies(filename)
+              .then(deps => {
+                if (!client) {
+                  return [];
+                }
+
+                // if the file dependencies have change we need to invalidate the
+                // dependencies caches because the list of files we need to send
+                // to the client may have changed
+                const oldDependencies = client.shallowDependencies[filename];
+                if (arrayEquals(deps, oldDependencies)) {
+                  return [packagerServer.getModuleForPath(filename)];
+                }
+
+                // if there're new dependencies compare the full list of
+                // dependencies we used to have with the one we now have
+                return getDependencies(client.platform, client.bundleEntry)
+                  .then(({
+                    dependenciesCache,
+                    dependenciesModulesCache,
+                    shallowDependencies,
+                  }) => {
+                    if (!client) {
+                      return [];
                     }
-                  });
 
-                  // invalidate caches
-                  client.dependenciesCache = dependenciesCache;
-                  client.dependenciesModulesCache = dependenciesModulesCache;
-                  client.shallowDependencies = shallowDependencies;
+                    // build list of modules for which we'll send HMR updates
+                    const modulesToUpdate = [];
+                    Object.keys(dependenciesModulesCache).forEach(module => {
+                      if (!client.dependenciesModulesCache[module]) {
+                        modulesToUpdate.push(dependenciesModulesCache[module]);
+                      }
+                    });
 
-                  return modulesToUpdate;
+                    // invalidate caches
+                    client.dependenciesCache = dependenciesCache;
+                    client.dependenciesModulesCache = dependenciesModulesCache;
+                    client.shallowDependencies = shallowDependencies;
+
+                    return modulesToUpdate;
+                  });
+              })
+              .then(modulesToUpdate => {
+                if (!client) {
+                  return;
+                }
+
+                // make sure the file was modified is part of the bundle
+                if (!client.shallowDependencies[filename]) {
+                  return;
+                }
+
+                return packagerServer.buildBundleForHMR({
+                  entryFile: client.bundleEntry,
+                  platform: client.platform,
+                  modules: modulesToUpdate,
                 });
-            })
-            .then(modulesToUpdate => {
-              if (!client) {
-                return;
-              }
-
-              // make sure the file was modified is part of the bundle
-              if (!client.shallowDependencies[filename]) {
-                return;
-              }
-
-              return packagerServer.buildBundleForHMR({
-                entryFile: client.bundleEntry,
-                platform: client.platform,
-                modules: modulesToUpdate,
+              })
+              .then(bundle => {
+                if (!client) {
+                  return;
+                }
+
+                // check we actually want to send an HMR update
+                if (bundle) {
+                  client.ws.send(bundle);
+                }
               });
-            })
-            .then(bundle => {
-              if (!client) {
-                return;
-              }
-
-              // check we actually want to send an HMR update
-              if (bundle) {
-                client.ws.send(bundle);
-              }
-            })
-            .done();
+            },
+            () => {
+              // do nothing, file was removed
+            },
+          ).done();
         });
 
         client.ws.on('error', e => {

packager/react-packager/src/Bundler/index.js

@@ -320,6 +320,10 @@ class Bundler {
     return this._resolver.getShallowDependencies(entryFile);
   }
 
+  stat(filePath) {
+    return this._resolver.stat(filePath);
+  }
+
   getModuleForPath(entryFile) {
     return this._resolver.getModuleForPath(entryFile);
   }

packager/react-packager/src/DependencyResolver/DependencyGraph/index.js

@@ -145,6 +145,10 @@ class DependencyGraph {
     return this._moduleCache.getModule(entryPath).getDependencies();
   }
 
+  stat(filePath) {
+    return this._fastfs.stat(filePath);
+  }
+
   /**
    * Returns the module object for the given path.
    */

packager/react-packager/src/Resolver/index.js

@@ -105,6 +105,10 @@ class Resolver {
     return this._depGraph.getShallowDependencies(entryFile);
   }
 
+  stat(filePath) {
+    return this._depGraph.stat(filePath);
+  }
+
   getModuleForPath(entryFile) {
     return this._depGraph.getModuleForPath(entryFile);
   }

packager/react-packager/src/Server/index.js

@@ -184,7 +184,7 @@ class Server {
       // updates. Instead, send the HMR updates right away and once that
       // finishes, invoke any other file change listener.
       if (this._hmrFileChangeListener) {
-        this._hmrFileChangeListener(filePath);
+        this._hmrFileChangeListener(filePath, this._bundler.stat(filePath));
         return;
       }