From 0e764686e1f115465f93fa45af9ea28c93194472 Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Thu, 26 Oct 2017 03:09:47 -0700
Subject: [PATCH] Add id to DeltaEntry object

Reviewed By: mjesun

Differential Revision: D6158753

fbshipit-source-id: 5997e36c8d85da750113250e5180a1f54ee14b76
---
 .../src/DeltaBundler/DeltaTransformer.js      | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/metro-bundler/src/DeltaBundler/DeltaTransformer.js b/packages/metro-bundler/src/DeltaBundler/DeltaTransformer.js
index 013a60de..640eabe9 100644
--- a/packages/metro-bundler/src/DeltaBundler/DeltaTransformer.js
+++ b/packages/metro-bundler/src/DeltaBundler/DeltaTransformer.js
@@ -36,6 +36,7 @@ export type DeltaEntryType =
 
 export type DeltaEntry = {|
   +code: string,
+  +id: number,
   +map: ?Array<RawMapping>,
   +name: string,
   +path: string,
@@ -182,6 +183,12 @@ class DeltaTransformer extends EventEmitter {
     const transformerOptions = await this._deltaCalculator.getTransformerOptions();
     const dependencyEdges = this._deltaCalculator.getDependencyEdges();
 
+    // Return the source code that gets prepended to all the modules. This
+    // contains polyfills and startup code (like the require() implementation).
+    const prependSources = reset
+      ? await this._getPrepend(transformerOptions, dependencyEdges)
+      : new Map();
+
     // Precalculate all module ids sequentially. We do this to be sure that the
     // mapping between module -> moduleId is deterministic between runs.
     const modules = Array.from(modified.values());
@@ -198,12 +205,6 @@ class DeltaTransformer extends EventEmitter {
       modifiedDelta.set(this._getModuleId({path: id}), null);
     });
 
-    // Return the source code that gets prepended to all the modules. This
-    // contains polyfills and startup code (like the require() implementation).
-    const prependSources = reset
-      ? await this._getPrepend(transformerOptions, dependencyEdges)
-      : new Map();
-
     // Return the source code that gets appended to all the modules. This
     // contains the require() calls to startup the execution of the modules.
     const appendSources = reset
@@ -282,6 +283,7 @@ class DeltaTransformer extends EventEmitter {
             moduleId,
             {
               code,
+              id: moduleId,
               map: null,
               name,
               source: code,
@@ -294,9 +296,11 @@ class DeltaTransformer extends EventEmitter {
 
     if (this._bundleOptions.sourceMapUrl) {
       const code = '//# sourceMappingURL=' + this._bundleOptions.sourceMapUrl;
+      const id = this._getModuleId({path: '/sourcemap.js'});
 
-      append.set(this._getModuleId({path: '/sourcemap.js'}), {
+      append.set(id, {
         code,
+        id,
         map: null,
         name: 'sourcemap.js',
         path: '/sourcemap.js',
@@ -381,10 +385,13 @@ class DeltaTransformer extends EventEmitter {
     // uglifyJS only returns standard Source Maps).
     const map = Array.isArray(wrapped.map) ? wrapped.map : undefined;
 
+    const id = this._getModuleId(module);
+
     return [
-      this._getModuleId(module),
+      id,
       {
         code: ';' + wrapped.code,
+        id,
         map,
         name,
         source: metadata.source,