Clean metro server correctly after save errors

Reviewed By: mjesun Differential Revision: D8858846 fbshipit-source-id: 95b5d7cc4c8770f30799481a4aa20646ced74761
facebook · Jul 17, 2018 · dd420e6 · dd420e6
1 parent 9b22c8b
commit dd420e6
Showing 1 changed file with 33 additions and 37 deletions.
diff --git a/packages/metro/src/index.js b/packages/metro/src/index.js
@@ -311,50 +311,46 @@ exports.runBuild = async ({
     config,
   });
 
-  const requestOptions: RequestOptions = {
-    dev,
-    entryFile: entry,
-    inlineSourceMap: sourceMap && !!sourceMapUrl,
-    minify,
-    platform,
-    sourceMapUrl: sourceMap === false ? undefined : sourceMapUrl,
-    createModuleIdFactory: config ? config.createModuleIdFactory : undefined,
-    onProgress,
-  };
-
-  if (onBegin) {
-    onBegin();
-  }
+  try {
+    const requestOptions: RequestOptions = {
+      dev,
+      entryFile: entry,
+      inlineSourceMap: sourceMap && !!sourceMapUrl,
+      minify,
+      platform,
+      sourceMapUrl: sourceMap === false ? undefined : sourceMapUrl,
+      createModuleIdFactory: config ? config.createModuleIdFactory : undefined,
+      onProgress,
+    };
 
-  let metroBundle;
+    if (onBegin) {
+      onBegin();
+    }
 
-  try {
-    metroBundle = await output.build(metroServer, requestOptions);
-  } catch (error) {
-    await metroServer.end();
-    throw error;
-  }
+    const metroBundle = await output.build(metroServer, requestOptions);
 
-  if (onComplete) {
-    onComplete();
-  }
+    if (onComplete) {
+      onComplete();
+    }
 
-  const bundleOutput = out.replace(/(\.js)?$/, '.js');
-  const sourcemapOutput =
-    sourceMap === false ? undefined : out.replace(/(\.js)?$/, '.map');
+    const bundleOutput = out.replace(/(\.js)?$/, '.js');
+    const sourcemapOutput =
+      sourceMap === false ? undefined : out.replace(/(\.js)?$/, '.map');
 
-  const outputOptions: OutputOptions = {
-    bundleOutput,
-    sourcemapOutput,
-    dev,
-    platform,
-  };
+    const outputOptions: OutputOptions = {
+      bundleOutput,
+      sourcemapOutput,
+      dev,
+      platform,
+    };
 
-  // eslint-disable-next-line no-console
-  await output.save(metroBundle, outputOptions, console.log);
-  await metroServer.end();
+    // eslint-disable-next-line no-console
+    await output.save(metroBundle, outputOptions, console.log);
 
-  return metroBundle;
+    return metroBundle;
+  } finally {
+    await metroServer.end();
+  }
 };
 
 exports.buildGraph = async function({