From bbbc18c4ee9b13a5aeca10edcb29694db3f15769 Mon Sep 17 00:00:00 2001
From: Peter van der Zee <kuvos@fb.com>
Date: Fri, 12 Jan 2018 06:23:16 -0800
Subject: [PATCH] Remove unused `packagerInstance` option and rename it to
 `server`

Reviewed By: rafeca

Differential Revision: D6435505

fbshipit-source-id: e1912f20be517be49648b0eeb52c53f66e3fae55
---
 local-cli/bundle/buildBundle.js | 88 +++++++++++++++------------------
 local-cli/bundle/bundle.js      | 10 ++--
 local-cli/bundle/unbundle.js    |  4 +-
 3 files changed, 44 insertions(+), 58 deletions(-)

diff --git a/local-cli/bundle/buildBundle.js b/local-cli/bundle/buildBundle.js
index e121edf17..5d664097e 100644
--- a/local-cli/bundle/buildBundle.js
+++ b/local-cli/bundle/buildBundle.js
@@ -57,7 +57,6 @@ async function buildBundle(
   },
   config: ConfigT,
   output = outputBundle,
-  packagerInstance,
 ) {
   // This is used by a bazillion of npm modules we don't control so we don't
   // have other choice than defining it as an env variable here.
@@ -76,60 +75,53 @@ async function buildBundle(
     platform: args.platform,
   };
 
-  // If a packager instance was not provided, then just create one for this
-  // bundle command and close it down afterwards.
-  var shouldClosePackager = false;
-  if (!packagerInstance) {
-    const assetExts = (config.getAssetExts && config.getAssetExts()) || [];
-    const sourceExts = (config.getSourceExts && config.getSourceExts()) || [];
-    const platforms = (config.getPlatforms && config.getPlatforms()) || [];
+  const assetExts = (config.getAssetExts && config.getAssetExts()) || [];
+  const sourceExts = (config.getSourceExts && config.getSourceExts()) || [];
+  const platforms = (config.getPlatforms && config.getPlatforms()) || [];
 
-    const transformModulePath = args.transformer
-      ? path.resolve(args.transformer)
-      : config.getTransformModulePath();
+  const transformModulePath = args.transformer
+    ? path.resolve(args.transformer)
+    : config.getTransformModulePath();
 
-    const providesModuleNodeModules =
-      typeof config.getProvidesModuleNodeModules === 'function'
-        ? config.getProvidesModuleNodeModules()
-        : defaultProvidesModuleNodeModules;
+  const providesModuleNodeModules =
+    typeof config.getProvidesModuleNodeModules === 'function'
+      ? config.getProvidesModuleNodeModules()
+      : defaultProvidesModuleNodeModules;
 
-    const terminal = new Terminal(process.stdout);
-    const options = {
-      assetExts: defaultAssetExts.concat(assetExts),
-      assetRegistryPath: ASSET_REGISTRY_PATH,
-      blacklistRE: config.getBlacklistRE(),
-      extraNodeModules: config.extraNodeModules,
-      getModulesRunBeforeMainModule: config.getModulesRunBeforeMainModule,
-      getPolyfills: config.getPolyfills,
-      getTransformOptions: config.getTransformOptions,
-      globalTransformCache: null,
-      hasteImpl: config.hasteImpl,
-      maxWorkers: args.maxWorkers,
-      platforms: defaultPlatforms.concat(platforms),
-      postMinifyProcess: config.postMinifyProcess,
-      postProcessModules: config.postProcessModules,
-      postProcessBundleSourcemap: config.postProcessBundleSourcemap,
-      projectRoots: config.getProjectRoots(),
-      providesModuleNodeModules: providesModuleNodeModules,
-      resetCache: args.resetCache,
-      reporter: new TerminalReporter(terminal),
-      sourceExts: defaultSourceExts.concat(sourceExts),
-      transformCache: TransformCaching.useTempDir(),
-      transformModulePath: transformModulePath,
-      watch: false,
-      workerPath: config.getWorkerPath && config.getWorkerPath(),
-    };
+  const terminal = new Terminal(process.stdout);
 
-    packagerInstance = new Server(options);
-    shouldClosePackager = true;
-  }
+  const server = new Server({
+    assetExts: defaultAssetExts.concat(assetExts),
+    assetRegistryPath: ASSET_REGISTRY_PATH,
+    blacklistRE: config.getBlacklistRE(),
+    extraNodeModules: config.extraNodeModules,
+    getModulesRunBeforeMainModule: config.getModulesRunBeforeMainModule,
+    getPolyfills: config.getPolyfills,
+    getTransformOptions: config.getTransformOptions,
+    globalTransformCache: null,
+    hasteImpl: config.hasteImpl,
+    maxWorkers: args.maxWorkers,
+    platforms: defaultPlatforms.concat(platforms),
+    postMinifyProcess: config.postMinifyProcess,
+    postProcessModules: config.postProcessModules,
+    postProcessBundleSourcemap: config.postProcessBundleSourcemap,
+    projectRoots: config.getProjectRoots(),
+    providesModuleNodeModules: providesModuleNodeModules,
+    resetCache: args.resetCache,
+    reporter: new TerminalReporter(terminal),
+    sourceExts: defaultSourceExts.concat(sourceExts),
+    transformCache: TransformCaching.useTempDir(),
+    transformModulePath: transformModulePath,
+    watch: false,
+    workerPath: config.getWorkerPath && config.getWorkerPath(),
+  });
 
-  const bundle = await output.build(packagerInstance, requestOpts);
+  const bundle = await output.build(server, requestOpts);
 
   await output.save(bundle, args, log);
 
   // Save the assets of the bundle
-  const outputAssets = await packagerInstance.getAssets({
+  const outputAssets = await server.getAssets({
     ...Server.DEFAULT_BUNDLE_OPTIONS,
     ...requestOpts,
     bundleType: 'todo',
@@ -142,9 +134,7 @@ async function buildBundle(
     args.assetsDest,
   );
 
-  if (shouldClosePackager) {
-    packagerInstance.end();
-  }
+  server.end();
 
   return assets;
 }
diff --git a/local-cli/bundle/bundle.js b/local-cli/bundle/bundle.js
index b8884a96d..3a177bd96 100644
--- a/local-cli/bundle/bundle.js
+++ b/local-cli/bundle/bundle.js
@@ -15,21 +15,17 @@ const outputBundle = require('metro/src/shared/output/bundle');
 /**
  * Builds the bundle starting to look for dependencies at the given entry path.
  */
-function bundleWithOutput(argv, config, args, output, packagerInstance) {
+function bundleWithOutput(argv, config, args, output) {
   if (!output) {
     output = outputBundle;
   }
-  return buildBundle(args, config, output, packagerInstance);
-}
-
-function bundle(argv, config, args, packagerInstance) {
-  return bundleWithOutput(argv, config, args, undefined, packagerInstance);
+  return buildBundle(args, config, output);
 }
 
 module.exports = {
   name: 'bundle',
   description: 'builds the javascript bundle for offline use',
-  func: bundle,
+  func: bundleWithOutput,
   options: bundleCommandLineArgs,
 
   // not used by the CLI itself
diff --git a/local-cli/bundle/unbundle.js b/local-cli/bundle/unbundle.js
index e4caeb2d4..1081edc29 100644
--- a/local-cli/bundle/unbundle.js
+++ b/local-cli/bundle/unbundle.js
@@ -15,8 +15,8 @@ const outputUnbundle = require('metro/src/shared/output/unbundle');
 /**
  * Builds the bundle starting to look for dependencies at the given entry path.
  */
-function unbundle(argv, config, args, packagerInstance) {
-  return bundleWithOutput(argv, config, args, outputUnbundle, packagerInstance);
+function unbundle(argv, config, args) {
+  return bundleWithOutput(argv, config, args, outputUnbundle);
 }
 
 module.exports = {