Fixed to work with RN 0.58+ (#307)

* Fixed to work with RN 0.58+

* Removed unused import for new patcher

* Fixed to pass eslint check

* Fixed to work with both <0.58 and >0.58

* fixed typo

* fixed typo #2

Author: Eugnis

app/middlewares/delta/DeltaPatcher.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- */
+*/
 
 import { checkFetchExists, patchFetchPolyfill } from './patchFetchPolyfill';
 
@@ -29,10 +29,10 @@ import { checkFetchExists, patchFetchPolyfill } from './patchFetchPolyfill';
 export default class DeltaPatcher {
   constructor() {
     this._lastBundle = {
+      id: undefined,
       pre: new Map(),
       post: new Map(),
       modules: new Map(),
-      id: undefined,
     };
     this._initialized = false;
     this._lastNumModifiedFiles = 0;
@@ -54,35 +54,65 @@ export default class DeltaPatcher {
    * Applies a Delta Bundle to the current bundle.
    */
   applyDelta(deltaBundle) {
+    const isOld = deltaBundle.id;
     // Make sure that the first received delta is a fresh one.
-    if (!this._initialized && !deltaBundle.reset) {
+    if (isOld ? !this._initialized && !deltaBundle.reset :
+      !this._initialized && !deltaBundle.base) {
       throw new Error('DeltaPatcher should receive a fresh Delta when being initialized');
     }
 
     this._initialized = true;
 
     // Reset the current delta when we receive a fresh delta.
-    if (deltaBundle.reset) {
+    if (deltaBundle.reset && isOld) {
       this._lastBundle = {
         pre: new Map(),
         post: new Map(),
         modules: new Map(),
         id: undefined,
       };
+    } else if (deltaBundle.base) {
+      this._lastBundle = {
+        id: deltaBundle.revisionId,
+        pre: deltaBundle.pre,
+        post: deltaBundle.post,
+        modules: new Map(deltaBundle.modules),
+      };
+    }
+
+    this._lastNumModifiedFiles = isOld ?
+      deltaBundle.pre.size + deltaBundle.post.size + deltaBundle.delta.size :
+      deltaBundle.modules.length;
+
+    if (deltaBundle.deleted) {
+      this._lastNumModifiedFiles += deltaBundle.deleted.length;
     }
 
-    this._lastNumModifiedFiles =
-      deltaBundle.pre.size + deltaBundle.post.size + deltaBundle.delta.size;
+    this._lastBundle.id = isOld ? deltaBundle.id : deltaBundle.revisionId;
 
     if (this._lastNumModifiedFiles > 0) {
       this._lastModifiedDate = new Date();
     }
 
-    this._patchMap(this._lastBundle.pre, deltaBundle.pre);
-    this._patchMap(this._lastBundle.post, deltaBundle.post);
-    this._patchMap(this._lastBundle.modules, deltaBundle.delta);
+    if (isOld) {
+      this._patchMap(this._lastBundle.pre, deltaBundle.pre);
+      this._patchMap(this._lastBundle.post, deltaBundle.post);
+      this._patchMap(this._lastBundle.modules, deltaBundle.delta);
+
+      this._lastBundle.id = deltaBundle.id;
+    } else {
+      for (const [key, value] of deltaBundle.modules) {
+        this._lastBundle.modules.set(key, value);
+      }
 
-    this._lastBundle.id = deltaBundle.id;
+      if (deltaBundle.deleted) {
+        for (const id of deltaBundle.deleted) {
+          this._lastBundle.modules.delete(id);
+        }
+      }
+
+      this._lastBundle.id = deltaBundle.revisionId;
+    }
 
     return this;
   }
@@ -105,11 +135,15 @@ export default class DeltaPatcher {
     return this._lastModifiedDate;
   }
 
-  getAllModules() {
-    return [].concat(
+  getAllModules(isOld) {
+    return isOld ? [].concat(
       Array.from(this._lastBundle.pre.values()),
       Array.from(this._lastBundle.modules.values()),
       Array.from(this._lastBundle.post.values())
+    ) : [].concat(
+      [this._lastBundle.pre],
+      Array.from(this._lastBundle.modules.values()),
+      [this._lastBundle.post]
     );
   }
 

app/middlewares/delta/deltaUrlToBlobUrl.js

@@ -26,13 +26,15 @@ export default async function deltaUrlToBlobUrl(deltaUrl) {
   const data = await fetch(deltaUrl + deltaBundleId);
   const bundle = await data.json();
 
-  const deltaPatcher = client.applyDelta({
+  const isOld = bundle.id;
+
+  const deltaPatcher = client.applyDelta(isOld ? {
     id: bundle.id,
     pre: new Map(bundle.pre),
     post: new Map(bundle.post),
     delta: new Map(bundle.delta),
     reset: bundle.reset,
-  });
+  } : bundle);
 
   const cachedBundle = cachedBundleUrls.get(deltaUrl);
 
@@ -49,7 +51,7 @@ export default async function deltaUrlToBlobUrl(deltaUrl) {
 
   // To make Source Maps work correctly, we need to add a newline between
   // modules.
-  const blobContent = deltaPatcher.getAllModules().map(module => `${module}\n`);
+  const blobContent = deltaPatcher.getAllModules(isOld).map(module => `${module}\n`);
 
   // Build the blob with the whole JS bundle.
   const blob = new Blob(blobContent, {