Remove redundant calls for addModuleIdsToModuleWrapper

Reviewed By: davidaurelio

Differential Revision: D5526561

fbshipit-source-id: e3452899062587d3b4b5f87a7de01cb0be7a3cb9

packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js

@@ -13,7 +13,8 @@
 declare var jest: any;
 
 const indexedRamBundle = require('../indexed-ram-bundle');
-const {addModuleIdsToModuleWrapper} = require('../util');
+
+const {getModuleCode} = require('../util');
 
 declare var describe: any;
 declare var expect: any;
@@ -240,10 +241,7 @@ function makeDependency(name) {
 }
 
 function expectedCode(module) {
-  const {file} = module;
-  return file.type === 'module'
-    ? addModuleIdsToModuleWrapper(module, idForPath)
-    : file.code;
+  return getModuleCode(module, idForPath);
 }
 
 function getId(path) {

packages/metro-bundler/src/ModuleGraph/output/__tests__/multiple-files-ram-bundle-test.js

@@ -14,7 +14,7 @@ declare var jest: any;
 
 const multipleFilesRamBundle = require('../multiple-files-ram-bundle');
 
-const {addModuleIdsToModuleWrapper} = require('../util');
+const {getModuleCode} = require('../util');
 
 declare var describe: any;
 declare var expect: any;
@@ -76,7 +76,7 @@ it('bundles each file separately', () => {
   modules.forEach((module, i) => {
     // $FlowFixMe "extraFiles" is always defined at this point.
     expect(extraFiles.get(`js-modules/${i}.js`).toString())
-      .toBe(expectedCode(modules[i]));
+      .toBe(getModuleCode(modules[i], idForPath));
   });
 });
 
@@ -132,13 +132,6 @@ function makeDependency(name) {
   };
 }
 
-function expectedCode(module) {
-  const {file} = module;
-  return file.type === 'module'
-    ? addModuleIdsToModuleWrapper(module, idForPath)
-    : file.code;
-}
-
 function getId(path) {
   if (path === requireCall.file.path) {
     return -1;

packages/metro-bundler/src/ModuleGraph/output/plain-bundle.js

@@ -13,7 +13,7 @@
 const meta = require('../../shared/output/meta');
 
 const {createIndexMap} = require('./source-map');
-const {addModuleIdsToModuleWrapper, concat} = require('./util');
+const {getModuleCode, concat} = require('./util');
 
 import type {OutputFn} from '../types.flow';
 
@@ -30,9 +30,7 @@ function asPlainBundle({
 
   for (const module of concat(modules, requireCalls)) {
     const {file} = module;
-    const moduleCode = file.type === 'module'
-      ? addModuleIdsToModuleWrapper(module, idForPath)
-      : file.code;
+    const moduleCode = getModuleCode(module, idForPath);
 
     code += moduleCode + '\n';
     if (file.map) {