Add deleted modules to HMR update

Reviewed By: mjesun Differential Revision: D10489002 fbshipit-source-id: a7df2a65b4be2b2f7442e57cca1f58446c78c81c
facebook · Oct 29, 2018 · 95441e8 · 95441e8
1 parent b73212a
commit 95441e8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/packages/metro/src/DeltaBundler/Serializers/hmrJSBundle.js b/packages/metro/src/DeltaBundler/Serializers/hmrJSBundle.js
@@ -31,6 +31,7 @@ function hmrJSBundle(
   options: Options,
 ): {|
   +modules: ModuleMap,
+  +deleted: $ReadOnlyArray<number>,
   +sourceMappingURLs: $ReadOnlyArray<string>,
   +sourceURLs: $ReadOnlyArray<string>,
 |} {
@@ -59,7 +60,12 @@ function hmrJSBundle(
     }
   }
 
-  return {modules, sourceMappingURLs, sourceURLs};
+  return {
+    modules,
+    deleted: [...delta.deleted].map(path => options.createModuleId(path)),
+    sourceMappingURLs,
+    sourceURLs,
+  };
 }
 
 function _prepareModule(

diff --git a/packages/metro/src/HmrServer.js b/packages/metro/src/HmrServer.js
@@ -183,7 +183,7 @@ class HmrServer<TClient: Client> {
 
       client.revisionId = revision.id;
 
-      const {modules, sourceMappingURLs, sourceURLs} = hmrJSBundle(
+      const {modules, deleted, sourceMappingURLs, sourceURLs} = hmrJSBundle(
         delta,
         revision.graph,
         {
@@ -197,6 +197,7 @@ class HmrServer<TClient: Client> {
         body: {
           revisionId: revision.id,
           modules,
+          deleted,
           sourceMappingURLs,
           sourceURLs,
         },

diff --git a/packages/metro/src/HmrServer/__tests__/HmrServer-test.js b/packages/metro/src/HmrServer/__tests__/HmrServer-test.js
@@ -172,6 +172,7 @@ describe('HmrServer', () => {
         },
         delta: {
           modified: new Map([['/root/hi', hiModule]]),
+          deleted: new Set(['/root/bye']),
         },
       }),
     );
@@ -196,6 +197,7 @@ describe('HmrServer', () => {
               '__d(function() { alert("hi"); },"/root/hi-id",[],"hi",{});',
             ],
           ],
+          deleted: ['/root/bye-id'],
           sourceURLs: ['/root/hi'],
         },
       },

diff --git a/packages/metro/src/lib/bundle-modules/types.flow.js b/packages/metro/src/lib/bundle-modules/types.flow.js
@@ -36,6 +36,7 @@ export type FormattedError = {|
 export type HmrUpdate = {|
   +revisionId: string,
   +modules: ModuleMap,
+  +deleted: $ReadOnlyArray<number>,
   +sourceMappingURLs: $ReadOnlyArray<string>,
   +sourceURLs: $ReadOnlyArray<string>,
 |};