switch over visual-diff task to directly use doServe instead of sta…

…rtServer
ampproject · Feb 26, 2021 · e5ce46a · e5ce46a
1 parent ad55ad4
commit e5ce46a
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/build-system/tasks/serve.js b/build-system/tasks/serve.js
@@ -121,6 +121,9 @@ async function startServer(
   serverOptions = {},
   modeOptions = {}
 ) {
+  if (modeOptions.esm || argv.esm) {
+    buildNewServer();
+  }
   if (serverOptions.lazyBuild) {
     lazyBuild = serverOptions.lazyBuild;
   }
@@ -226,23 +229,19 @@ async function serve() {
 
 /**
  * Starts a webserver at the repository root to serve built files.
- * @param {ServerOptionsDef=} serverOptions
- * @param {ModeOptionsDef=} modeOptions
+ * @param {?ServerOptionsDef} serverOptions
+ * @param {?ModeOptionsDef} modeOptions
  */
 async function doServe(serverOptions = {}, modeOptions = {}) {
   createCtrlcHandler('serve');
   const watchFunc = async () => {
     await restartServer(serverOptions, modeOptions);
   };
   watch(serverFiles).on('change', debounce(watchFunc, watchDebounceDelay));
-  if (modeOptions.esm || argv.esm) {
-    buildNewServer();
-  }
-  await startServer(
-    {},
-    {lazyBuild: serverOptions.lazyBuild},
-    {esm: 'esm' in modeOptions ? modeOptions.esm : argv.esm}
-  );
+  await startServer({}, serverOptions, {
+    ...modeOptions,
+    esm: 'esm' in modeOptions ? modeOptions.esm : argv.esm,
+  });
   if (serverOptions.lazyBuild) {
     await performPreBuildSteps();
   }