From a805a36161a54cab4ca3ff1b8e52e4c849718e08 Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Sat, 2 Aug 2025 21:37:35 -0700
Subject: [PATCH 01/16] chore: refactor async callbacks

---
 packages/cli/src/commands/build.js            |   8 +-
 packages/cli/src/lifecycles/bundle.js         | 128 ++++++++----------
 packages/cli/src/lifecycles/config.js         |  32 +++--
 packages/cli/src/lifecycles/copy.js           |   6 +-
 packages/cli/src/lifecycles/prerender.js      |  34 ++---
 packages/cli/src/lifecycles/serve.js          |  67 ++++-----
 .../src/puppeteer-handler.js                  |  22 +--
 test/smoke-test.js                            |   2 +-
 8 files changed, 135 insertions(+), 164 deletions(-)

diff --git a/packages/cli/src/commands/build.js b/packages/cli/src/commands/build.js
index 9579c8240..4c8a211d0 100644
--- a/packages/cli/src/commands/build.js
+++ b/packages/cli/src/commands/build.js
@@ -38,13 +38,7 @@ const runProductionBuild = async (compilation) => {
       });
     }
 
-    await Promise.all(
-      servers.map(async (server) => {
-        await server.start();
-
-        return Promise.resolve(server);
-      }),
-    );
+    await Promise.all(servers.map((server) => server.start()));
 
     if (prerenderPlugin.executeModuleUrl) {
       await preRenderCompilationWorker(compilation, prerenderPlugin);
diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index e72146e62..56e9529a4 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -123,36 +123,40 @@ async function optimizeStaticPages(compilation, plugins) {
           (page.isSSR && page.prerender) ||
           (page.isSSR && compilation.config.prerender),
       )
-      .map(async (page) => {
-        const { route, outputHref } = page;
-        const outputDirUrl = new URL(outputHref.replace("index.html", "").replace("404.html", ""));
-        const url = new URL(`http://localhost:${compilation.config.port}${route}`);
-        const contents = await fs.readFile(
-          new URL(`./${outputHref.replace(outputDir.href, "")}`, scratchDir),
-          "utf-8",
-        );
-        const headers = new Headers({ "Content-Type": "text/html" });
-        let response = new Response(contents, { headers });
-
-        if (!(await checkResourceExists(outputDirUrl))) {
-          await fs.mkdir(outputDirUrl, {
-            recursive: true,
-          });
-        }
+      .map((page) =>
+        (async () => {
+          const { route, outputHref } = page;
+          const outputDirUrl = new URL(
+            outputHref.replace("index.html", "").replace("404.html", ""),
+          );
+          const url = new URL(`http://localhost:${compilation.config.port}${route}`);
+          const contents = await fs.readFile(
+            new URL(`./${outputHref.replace(outputDir.href, "")}`, scratchDir),
+            "utf-8",
+          );
+          const headers = new Headers({ "Content-Type": "text/html" });
+          let response = new Response(contents, { headers });
+
+          if (!(await checkResourceExists(outputDirUrl))) {
+            await fs.mkdir(outputDirUrl, {
+              recursive: true,
+            });
+          }
 
-        for (const plugin of plugins) {
-          if (plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()))) {
-            const currentResponse = await plugin.optimize(url, response.clone());
+          for (const plugin of plugins) {
+            if (plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()))) {
+              const currentResponse = await plugin.optimize(url, response.clone());
 
-            response = mergeResponse(response.clone(), currentResponse.clone());
+              response = mergeResponse(response.clone(), currentResponse.clone());
+            }
           }
-        }
 
-        // clean up optimization markers
-        const body = (await response.text()).replace(/data-gwd-opt=".*?[a-z]"/g, "");
+          // clean up optimization markers
+          const body = (await response.text()).replace(/data-gwd-opt=".*?[a-z]"/g, "");
 
-        await fs.writeFile(new URL(outputHref), body);
-      }),
+          await fs.writeFile(new URL(outputHref), body);
+        })(),
+      ),
   );
 }
 
@@ -202,84 +206,58 @@ async function bundleStyleResources(compilation, resourcePlugins) {
       const request = new Request(url, { headers });
       const initResponse = new Response(contents, { headers });
 
-      let response = await resourcePlugins.reduce(async (responsePromise, plugin) => {
-        const intermediateResponse = await responsePromise;
+      let response = initResponse;
+
+      for (const plugin of resourcePlugins) {
         const shouldServe = plugin.shouldServe && (await plugin.shouldServe(url, request));
 
         if (shouldServe) {
           const currentResponse = await plugin.serve(url, request);
-          const mergedResponse = mergeResponse(
-            intermediateResponse.clone(),
-            currentResponse.clone(),
-          );
+          const mergedResponse = mergeResponse(response.clone(), currentResponse.clone());
 
           if (mergedResponse.headers.get("Content-Type").indexOf(contentType) >= 0) {
-            return Promise.resolve(mergedResponse.clone());
+            response = mergedResponse.clone();
           }
         }
+      }
 
-        return Promise.resolve(responsePromise);
-      }, Promise.resolve(initResponse));
-
-      response = await resourcePlugins.reduce(async (responsePromise, plugin) => {
-        const intermediateResponse = await responsePromise;
+      for (const plugin of resourcePlugins) {
         const shouldPreIntercept =
           plugin.shouldPreIntercept &&
-          (await plugin.shouldPreIntercept(url, request, intermediateResponse.clone()));
+          (await plugin.shouldPreIntercept(url, request, response.clone()));
 
         if (shouldPreIntercept) {
-          const currentResponse = await plugin.preIntercept(
-            url,
-            request,
-            intermediateResponse.clone(),
-          );
-          const mergedResponse = mergeResponse(
-            intermediateResponse.clone(),
-            currentResponse.clone(),
-          );
+          const currentResponse = await plugin.preIntercept(url, request, response.clone());
+          const mergedResponse = mergeResponse(response.clone(), currentResponse.clone());
 
           if (mergedResponse.headers.get("Content-Type").indexOf(contentType) >= 0) {
-            return Promise.resolve(mergedResponse.clone());
+            response = mergedResponse.clone();
           }
         }
+      }
 
-        return Promise.resolve(responsePromise);
-      }, Promise.resolve(response.clone()));
-
-      response = await resourcePlugins.reduce(async (responsePromise, plugin) => {
-        const intermediateResponse = await responsePromise;
+      for (const plugin of resourcePlugins) {
         const shouldIntercept =
-          plugin.shouldIntercept &&
-          (await plugin.shouldIntercept(url, request, intermediateResponse.clone()));
+          plugin.shouldIntercept && (await plugin.shouldIntercept(url, request, response.clone()));
 
         if (shouldIntercept) {
-          const currentResponse = await plugin.intercept(
-            url,
-            request,
-            intermediateResponse.clone(),
-          );
-          const mergedResponse = mergeResponse(
-            intermediateResponse.clone(),
-            currentResponse.clone(),
-          );
+          const currentResponse = await plugin.intercept(url, request, response.clone());
+          const mergedResponse = mergeResponse(response.clone(), currentResponse.clone());
 
           if (mergedResponse.headers.get("Content-Type").indexOf(contentType) >= 0) {
-            return Promise.resolve(mergedResponse.clone());
+            response = mergedResponse.clone();
           }
         }
+      }
 
-        return Promise.resolve(responsePromise);
-      }, Promise.resolve(response.clone()));
-
-      response = await resourcePlugins.reduce(async (responsePromise, plugin) => {
-        const intermediateResponse = await responsePromise;
+      for (const plugin of resourcePlugins) {
         const shouldOptimize =
-          plugin.shouldOptimize && (await plugin.shouldOptimize(url, intermediateResponse.clone()));
+          plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()));
 
-        return shouldOptimize
-          ? Promise.resolve(await plugin.optimize(url, intermediateResponse.clone()))
-          : Promise.resolve(responsePromise);
-      }, Promise.resolve(response.clone()));
+        if (shouldOptimize) {
+          response = await plugin.optimize(url, response.clone());
+        }
+      }
 
       optimizedFileContents = await response.text();
 
diff --git a/packages/cli/src/lifecycles/config.js b/packages/cli/src/lifecycles/config.js
index f3ab21ede..570ce513c 100644
--- a/packages/cli/src/lifecycles/config.js
+++ b/packages/cli/src/lifecycles/config.js
@@ -15,20 +15,24 @@ const greenwoodPlugins = (
       new URL("./renderer/", greenwoodPluginsDirectoryUrl),
       new URL("./resource/", greenwoodPluginsDirectoryUrl),
       new URL("./server/", greenwoodPluginsDirectoryUrl),
-    ].map(async (pluginDirectoryUrl) => {
-      const files = await fs.readdir(pluginDirectoryUrl);
-
-      return await Promise.all(
-        files.map(async (file) => {
-          const importUrl = new URL(`./${file}`, pluginDirectoryUrl);
-          // @ts-expect-error see https://github.com/microsoft/TypeScript/issues/42866
-          const pluginImport = await import(importUrl);
-          const plugin = pluginImport[Object.keys(pluginImport)[0]];
-
-          return Array.isArray(plugin) ? plugin : [plugin];
-        }),
-      );
-    }),
+    ].map((pluginDirectoryUrl) =>
+      (async () => {
+        const files = await fs.readdir(pluginDirectoryUrl);
+
+        return await Promise.all(
+          files.map((file) =>
+            (async () => {
+              const importUrl = new URL(`./${file}`, pluginDirectoryUrl);
+              // @ts-expect-error see https://github.com/microsoft/TypeScript/issues/42866
+              const pluginImport = await import(importUrl);
+              const plugin = pluginImport[Object.keys(pluginImport)[0]];
+
+              return Array.isArray(plugin) ? plugin : [plugin];
+            })(),
+          ),
+        );
+      })(),
+    ),
   )
 )
   .flat(PLUGINS_FLATTENED_DEPTH)
diff --git a/packages/cli/src/lifecycles/copy.js b/packages/cli/src/lifecycles/copy.js
index 83672d9c8..525e0e19f 100644
--- a/packages/cli/src/lifecycles/copy.js
+++ b/packages/cli/src/lifecycles/copy.js
@@ -7,10 +7,10 @@ async function rreaddir(dir, allFiles = []) {
   allFiles.push(...files);
 
   await Promise.all(
-    files.map(
-      async (f) =>
+    files.map((f) =>
+      (async () =>
         (await fs.stat(f)).isDirectory() &&
-        (await rreaddir(new URL(`file://${f.pathname}/`), allFiles)),
+        (await rreaddir(new URL(`file://${f.pathname}/`), allFiles)))(),
     ),
   );
 
diff --git a/packages/cli/src/lifecycles/prerender.js b/packages/cli/src/lifecycles/prerender.js
index d34f0385f..88b75e482 100644
--- a/packages/cli/src/lifecycles/prerender.js
+++ b/packages/cli/src/lifecycles/prerender.js
@@ -187,23 +187,23 @@ async function staticRenderCompilation(compilation) {
   console.info("pages to generate", `\n ${pages.map((page) => page.route).join("\n ")}`);
 
   await Promise.all(
-    pages.map(async (page) => {
-      const { route, outputHref } = page;
-      const scratchUrl = toScratchUrl(outputHref, context);
-      const url = new URL(`http://localhost:${config.port}${route}`);
-      const request = new Request(url);
-
-      let body = await (await servePage(url, request, plugins)).text();
-      body = await (await interceptPage(url, request, plugins, body)).text();
-
-      await trackResourcesForRoute(body, compilation, route);
-      await createOutputDirectory(route, new URL(scratchUrl.href.replace("index.html", "")));
-      await fs.writeFile(scratchUrl, body);
-
-      console.info("generated page...", route);
-
-      return Promise.resolve();
-    }),
+    pages.map((page) =>
+      (async () => {
+        const { route, outputHref } = page;
+        const scratchUrl = toScratchUrl(outputHref, context);
+        const url = new URL(`http://localhost:${config.port}${route}`);
+        const request = new Request(url);
+
+        let body = await (await servePage(url, request, plugins)).text();
+        body = await (await interceptPage(url, request, plugins, body)).text();
+
+        await trackResourcesForRoute(body, compilation, route);
+        await createOutputDirectory(route, new URL(scratchUrl.href.replace("index.html", "")));
+        await fs.writeFile(scratchUrl, body);
+
+        console.info("generated page...", route);
+      })(),
+    ),
   );
 }
 
diff --git a/packages/cli/src/lifecycles/serve.js b/packages/cli/src/lifecycles/serve.js
index 375bd6c62..49c8d0a5d 100644
--- a/packages/cli/src/lifecycles/serve.js
+++ b/packages/cli/src/lifecycles/serve.js
@@ -40,13 +40,13 @@ async function getDevServer(compilation) {
     try {
       const url = new URL(`http://localhost:${compilation.config.port}${ctx.url}`);
       const initRequest = transformKoaRequestIntoStandardRequest(url, ctx.request);
-      const request = await resourcePlugins.reduce(async (requestPromise, plugin) => {
-        const intermediateRequest = await requestPromise;
-        return plugin.shouldResolve &&
-          (await plugin.shouldResolve(url, intermediateRequest.clone()))
-          ? Promise.resolve(await plugin.resolve(url, intermediateRequest.clone()))
-          : Promise.resolve(await requestPromise);
-      }, Promise.resolve(initRequest));
+
+      let request = initRequest;
+      for (const plugin of resourcePlugins) {
+        if (plugin.shouldResolve && (await plugin.shouldResolve(url, request.clone()))) {
+          request = await plugin.resolve(url, request.clone());
+        }
+      }
 
       ctx.url = request.url;
     } catch (e) {
@@ -69,9 +69,8 @@ async function getDevServer(compilation) {
       for (const plugin of resourcePlugins) {
         if (plugin.shouldServe && (await plugin.shouldServe(url, request))) {
           const current = await plugin.serve(url, request);
-          const merged = mergeResponse(response.clone(), current.clone());
 
-          response = merged.clone();
+          response = mergeResponse(response.clone(), current.clone());
         }
       }
 
@@ -100,24 +99,18 @@ async function getDevServer(compilation) {
         status,
         headers: new Headers(header),
       });
-      const response = await resourcePlugins.reduce(async (responsePromise, plugin) => {
-        const intermediateResponse = await responsePromise;
+
+      let response = initResponse;
+      for (const plugin of resourcePlugins) {
         if (
           plugin.shouldPreIntercept &&
-          (await plugin.shouldPreIntercept(url, request, intermediateResponse.clone()))
+          (await plugin.shouldPreIntercept(url, request, response.clone()))
         ) {
-          const current = await plugin.preIntercept(
-            url,
-            request,
-            await intermediateResponse.clone(),
-          );
-          const merged = mergeResponse(intermediateResponse.clone(), current);
-
-          return Promise.resolve(merged);
-        } else {
-          return Promise.resolve(await responsePromise);
+          const current = await plugin.preIntercept(url, request, response.clone());
+
+          response = mergeResponse(response.clone(), current);
         }
-      }, Promise.resolve(initResponse.clone()));
+      }
 
       ctx.body = response.body ? Readable.from(response.body) : "";
       ctx.message = response.statusText;
@@ -143,20 +136,18 @@ async function getDevServer(compilation) {
         status,
         headers: new Headers(header),
       });
-      const response = await resourcePlugins.reduce(async (responsePromise, plugin) => {
-        const intermediateResponse = await responsePromise;
+
+      let response = initResponse;
+      for (const plugin of resourcePlugins) {
         if (
           plugin.shouldIntercept &&
-          (await plugin.shouldIntercept(url, request, intermediateResponse.clone()))
+          (await plugin.shouldIntercept(url, request, response.clone()))
         ) {
-          const current = await plugin.intercept(url, request, await intermediateResponse.clone());
-          const merged = mergeResponse(intermediateResponse.clone(), current);
+          const current = await plugin.intercept(url, request, response.clone());
 
-          return Promise.resolve(merged);
-        } else {
-          return Promise.resolve(await responsePromise);
+          response = mergeResponse(response.clone(), current);
         }
-      }, Promise.resolve(initResponse.clone()));
+      }
 
       ctx.body = response.body ? Readable.from(response.body) : "";
       ctx.message = response.statusText;
@@ -302,11 +293,13 @@ async function getStaticServer(compilation, composable) {
           status: ctx.response.status,
           headers: new Headers(ctx.response.header),
         });
-        const response = await resourcePlugins.reduce(async (responsePromise, plugin) => {
-          return plugin.shouldServe && (await plugin.shouldServe(url, request))
-            ? Promise.resolve(await plugin.serve(url, request))
-            : responsePromise;
-        }, Promise.resolve(initResponse));
+
+        let response = initResponse;
+        for (const plugin of resourcePlugins) {
+          if (plugin.shouldServe && (await plugin.shouldServe(url, request))) {
+            response = await plugin.serve(url, request);
+          }
+        }
 
         if (response.ok) {
           ctx.body = Readable.from(response.body);
diff --git a/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js b/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
index fcc729b44..fff9c3753 100644
--- a/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
+++ b/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
@@ -5,19 +5,21 @@ export default async function (compilation, callback) {
   const runBrowser = async (serverUrl, pages) => {
     try {
       return Promise.all(
-        pages.map(async (page) => {
-          const { route } = page;
-          console.info("prerendering page...", route);
+        pages.map((page) =>
+          (async () => {
+            const { route } = page;
+            console.info("prerendering page...", route);
 
-          return await browserRunner.serialize(`${serverUrl}${route}`).then(async (html) => {
-            console.info(`prerendering complete for page ${route}.`);
+            return await browserRunner.serialize(`${serverUrl}${route}`).then(async (html) => {
+              console.info(`prerendering complete for page ${route}.`);
 
-            // clean this up here to avoid sending webcomponents-bundle to rollup
-            html = html.replace(/<script src="(.*webcomponents-bundle.js)"><\/script>/, "");
+              // clean this up here to avoid sending webcomponents-bundle to rollup
+              html = html.replace(/<script src="(.*webcomponents-bundle.js)"><\/script>/, "");
 
-            await callback(page, html);
-          });
-        }),
+              await callback(page, html);
+            });
+          })(),
+        ),
       );
     } catch (e) {
       console.error(e);
diff --git a/test/smoke-test.js b/test/smoke-test.js
index a6cf9c809..aa45504de 100644
--- a/test/smoke-test.js
+++ b/test/smoke-test.js
@@ -269,7 +269,7 @@ function serve(label) {
 }
 
 async function runSmokeTest(testCases, label) {
-  testCases.forEach(async (testCase) => {
+  testCases.forEach((testCase) => {
     switch (testCase) {
       case "index":
         defaultIndex(label);

From 5aa3439e185a4d43ac99501f83109cd1923d3187 Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Sun, 3 Aug 2025 20:29:18 -0700
Subject: [PATCH 02/16] chore: remove promise.resolve/reject in async functions

These are not necessary because async functions implicitly wrap their returns in Promises
---
 packages/cli/src/lifecycles/compile.js        |  6 +--
 packages/cli/src/lifecycles/config.js         | 44 +++++++++----------
 packages/cli/src/lifecycles/context.js        |  2 +-
 packages/cli/src/lifecycles/graph.js          |  6 +--
 packages/plugin-graphql/src/schema/graph.js   |  4 +-
 .../src/plugins/server.js                     |  2 -
 .../src/puppeteer-handler.js                  |  3 +-
 www/pages/plugins/server.md                   |  4 +-
 8 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/packages/cli/src/lifecycles/compile.js b/packages/cli/src/lifecycles/compile.js
index c00426efb..4ce912c1d 100644
--- a/packages/cli/src/lifecycles/compile.js
+++ b/packages/cli/src/lifecycles/compile.js
@@ -58,9 +58,7 @@ const generateCompilation = async () => {
     console.info("Loading graph from build output...");
 
     if (!(await checkResourceExists(new URL("./graph.json", outputDir)))) {
-      return Promise.reject(
-        new Error("No build output detected.  Make sure you have run greenwood build"),
-      );
+      throw new Error("No build output detected.  Make sure you have run greenwood build");
     }
 
     compilation.graph = JSON.parse(await fs.readFile(new URL("./graph.json", outputDir), "utf-8"));
@@ -131,7 +129,7 @@ const generateCompilation = async () => {
     await fs.writeFile(new URL("./graph.json", scratchDir), JSON.stringify(compilation.graph));
   }
 
-  return Promise.resolve(compilation);
+  return compilation;
 };
 
 export { generateCompilation };
diff --git a/packages/cli/src/lifecycles/config.js b/packages/cli/src/lifecycles/config.js
index 570ce513c..17a82e826 100644
--- a/packages/cli/src/lifecycles/config.js
+++ b/packages/cli/src/lifecycles/config.js
@@ -129,13 +129,13 @@ const readAndMergeConfig = async () => {
     // workspace validation
     if (workspace) {
       if (!(workspace instanceof URL)) {
-        return Promise.reject("Configuration error: workspace must be an instance of URL");
+        throw new Error("Configuration error: workspace must be an instance of URL");
       }
 
       if (await checkResourceExists(workspace)) {
         customConfig.workspace = workspace;
       } else {
-        return Promise.reject(
+        throw new Error(
           "Configuration error: Workspace doesn't exist! Please double check your configuration.",
         );
       }
@@ -147,14 +147,14 @@ const readAndMergeConfig = async () => {
     ) {
       customConfig.optimization = optimization;
     } else if (optimization) {
-      return Promise.reject(
+      throw new Error(
         `Configuration error: provided optimization "${optimization}" is not supported.  Please use one of: ${optimizations.join(", ")}.`,
       );
     }
 
     if (activeContent) {
       if (typeof activeContent !== "boolean") {
-        return Promise.reject("Configuration error: activeContent must be a boolean");
+        throw new Error("Configuration error: activeContent must be a boolean");
       }
       customConfig.activeContent = activeContent;
     }
@@ -164,7 +164,7 @@ const readAndMergeConfig = async () => {
 
       flattened.forEach((plugin) => {
         if (!plugin.type || pluginTypes.indexOf(plugin.type) < 0) {
-          return Promise.reject(
+          throw new Error(
             `Configuration error: plugins must be one of type "${pluginTypes.join(", ")}". got "${plugin.type}" instead.`,
           );
         }
@@ -172,7 +172,7 @@ const readAndMergeConfig = async () => {
         if (!plugin.provider || typeof plugin.provider !== "function") {
           const providerTypeof = typeof plugin.provider;
 
-          return Promise.reject(
+          throw new Error(
             `Configuration error: plugins provider must be a function. got ${providerTypeof} instead.`,
           );
         }
@@ -180,7 +180,7 @@ const readAndMergeConfig = async () => {
         if (!plugin.name || typeof plugin.name !== "string") {
           const nameTypeof = typeof plugin.name;
 
-          return Promise.reject(
+          throw new Error(
             `Configuration error: plugins must have a name. got ${nameTypeof} instead.`,
           );
         }
@@ -208,7 +208,7 @@ const readAndMergeConfig = async () => {
         if (typeof devServer.hud === "boolean") {
           customConfig.devServer.hud = devServer.hud;
         } else {
-          return Promise.reject(
+          throw new Error(
             `Configuration error: devServer hud options must be a boolean.  Passed value was: ${devServer.hud}`,
           );
         }
@@ -216,7 +216,7 @@ const readAndMergeConfig = async () => {
 
       if (devServer.port) {
         if (!Number.isInteger(devServer.port)) {
-          return Promise.reject(
+          throw new Error(
             `Configuration error: devServer port must be an integer.  Passed value was: ${devServer.port}`,
           );
         } else {
@@ -232,7 +232,7 @@ const readAndMergeConfig = async () => {
         if (Array.isArray(devServer.extensions)) {
           customConfig.devServer.extensions = devServer.extensions;
         } else {
-          return Promise.reject(
+          throw new Error(
             "Configuration error: provided extensions is not an array.  Please provide an array like ['txt', 'foo']",
           );
         }
@@ -246,9 +246,7 @@ const readAndMergeConfig = async () => {
 
     if (port) {
       if (!Number.isInteger(port)) {
-        return Promise.reject(
-          `Configuration error: port must be an integer.  Passed value was: ${port}`,
-        );
+        throw new Error(`Configuration error: port must be an integer.  Passed value was: ${port}`);
       } else {
         customConfig.port = port;
       }
@@ -256,7 +254,7 @@ const readAndMergeConfig = async () => {
 
     if (basePath) {
       if (typeof basePath !== "string") {
-        return Promise.reject(
+        throw new Error(
           `Configuration error: basePath must be a string.  Passed value was: ${basePath}`,
         );
       } else {
@@ -267,7 +265,7 @@ const readAndMergeConfig = async () => {
     if (pagesDirectory && typeof pagesDirectory === "string") {
       customConfig.pagesDirectory = pagesDirectory;
     } else if (pagesDirectory) {
-      return Promise.reject(
+      throw new Error(
         `Configuration error: provided pagesDirectory "${pagesDirectory}" is not supported.  Please make sure to pass something like 'docs/'`,
       );
     }
@@ -275,7 +273,7 @@ const readAndMergeConfig = async () => {
     if (layoutsDirectory && typeof layoutsDirectory === "string") {
       customConfig.layoutsDirectory = layoutsDirectory;
     } else if (layoutsDirectory) {
-      return Promise.reject(
+      throw new Error(
         `Configuration error: provided layoutsDirectory "${layoutsDirectory}" is not supported.  Please make sure to pass something like 'layouts/'`,
       );
     }
@@ -284,7 +282,7 @@ const readAndMergeConfig = async () => {
       if (typeof prerender === "boolean") {
         customConfig.prerender = prerender;
       } else {
-        return Promise.reject(
+        throw new Error(
           `Configuration error: prerender must be a boolean; true or false.  Passed value was typeof: ${typeof prerender}`,
         );
       }
@@ -299,7 +297,7 @@ const readAndMergeConfig = async () => {
       if (typeof isolation === "boolean") {
         customConfig.isolation = isolation;
       } else {
-        return Promise.reject(
+        throw new Error(
           `Configuration error: isolation must be a boolean; true or false.  Passed value was typeof: ${typeof staticRouter}`,
         );
       }
@@ -309,7 +307,7 @@ const readAndMergeConfig = async () => {
       if (typeof staticRouter === "boolean") {
         customConfig.staticRouter = staticRouter;
       } else {
-        return Promise.reject(
+        throw new Error(
           `Configuration error: staticRouter must be a boolean; true or false.  Passed value was typeof: ${typeof staticRouter}`,
         );
       }
@@ -324,7 +322,7 @@ const readAndMergeConfig = async () => {
         if (typeof importMaps === "boolean") {
           customConfig.polyfills.importMaps = true;
         } else {
-          return Promise.reject(
+          throw new Error(
             `Configuration error: polyfills.importMaps must be a boolean; true or false.  Passed value was typeof: ${typeof importMaps}`,
           );
         }
@@ -334,7 +332,7 @@ const readAndMergeConfig = async () => {
         if (Array.isArray(importAttributes)) {
           customConfig.polyfills.importAttributes = importAttributes;
         } else {
-          Promise.reject(
+          throw new Error(
             `Configuration error: polyfills.importAttributes must be an array of types; ['css', 'json'].  Passed value was typeof: ${typeof importAttributes}`,
           );
         }
@@ -345,7 +343,7 @@ const readAndMergeConfig = async () => {
       if (typeof useTsc === "boolean") {
         customConfig.useTsc = useTsc;
       } else {
-        return Promise.reject(
+        throw new Error(
           `Configuration error: useTsc must be a boolean; true or false.  Passed value was typeof: ${typeof useTsc}`,
         );
       }
@@ -357,7 +355,7 @@ const readAndMergeConfig = async () => {
     }
   }
 
-  return Promise.resolve({ ...defaultConfig, ...customConfig });
+  return { ...defaultConfig, ...customConfig };
 };
 
 export { readAndMergeConfig };
diff --git a/packages/cli/src/lifecycles/context.js b/packages/cli/src/lifecycles/context.js
index 6d34a040e..89133e1bd 100644
--- a/packages/cli/src/lifecycles/context.js
+++ b/packages/cli/src/lifecycles/context.js
@@ -22,7 +22,7 @@ const initContext = async ({ config }) => {
     layoutsDir,
   };
 
-  return Promise.resolve(context);
+  return context;
 };
 
 export { initContext };
diff --git a/packages/cli/src/lifecycles/graph.js b/packages/cli/src/lifecycles/graph.js
index c6f28ec2b..917a19ac0 100644
--- a/packages/cli/src/lifecycles/graph.js
+++ b/packages/cli/src/lifecycles/graph.js
@@ -206,7 +206,7 @@ const generateGraph = async (compilation) => {
               worker.on("error", reject);
               worker.on("exit", (code) => {
                 if (code !== 0) {
-                  return Promise.reject(new Error(`Worker stopped with exit code ${code}`));
+                  throw new Error(`Worker stopped with exit code ${code}`);
                 }
               });
 
@@ -380,7 +380,7 @@ const generateGraph = async (compilation) => {
         if (!body || !route) {
           const missingKey = !body ? "body" : "route";
 
-          return Promise.reject(`ERROR: provided node does not provide a ${missingKey} property.`);
+          throw new Error(`ERROR: provided node does not provide a ${missingKey} property.`);
         }
 
         const page = {
@@ -404,7 +404,7 @@ const generateGraph = async (compilation) => {
     }
   }
 
-  return Promise.resolve(compilation);
+  return compilation;
 };
 
 export { generateGraph };
diff --git a/packages/plugin-graphql/src/schema/graph.js b/packages/plugin-graphql/src/schema/graph.js
index 29bca1707..02990c8fb 100644
--- a/packages/plugin-graphql/src/schema/graph.js
+++ b/packages/plugin-graphql/src/schema/graph.js
@@ -66,7 +66,7 @@ const getParsedHeadingsFromPage = (tableOfContents = [], headingLevel) => {
 };
 
 const getPagesFromGraph = async (root, query, context) => {
-  return Promise.resolve(context.graph);
+  return context.graph;
 };
 
 const getChildrenFromParentRoute = async (root, query, context) => {
@@ -84,7 +84,7 @@ const getChildrenFromParentRoute = async (root, query, context) => {
     }
   });
 
-  return Promise.resolve(pages);
+  return pages;
 };
 
 const graphTypeDefs = gql`
diff --git a/packages/plugin-renderer-puppeteer/src/plugins/server.js b/packages/plugin-renderer-puppeteer/src/plugins/server.js
index 558e9e5a1..eaa648f37 100644
--- a/packages/plugin-renderer-puppeteer/src/plugins/server.js
+++ b/packages/plugin-renderer-puppeteer/src/plugins/server.js
@@ -15,8 +15,6 @@ class PuppeteerServer {
       (await getDevServer(this.compilation)).listen(offsetPort, async () => {
         console.info(`Started puppeteer prerender server at http://localhost:${offsetPort}`);
       });
-    } else {
-      await Promise.resolve();
     }
   }
 }
diff --git a/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js b/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
index fff9c3753..91edef41c 100644
--- a/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
+++ b/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
@@ -47,8 +47,7 @@ export default async function (compilation, callback) {
     console.info(
       "For more information please see this guide - https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md",
     );
-
-    return Promise.reject();
+    throw e;
   }
 
   const pages = compilation.graph.filter((page) => !page.isSSR);
diff --git a/www/pages/plugins/server.md b/www/pages/plugins/server.md
index c3f613431..2a7691219 100644
--- a/www/pages/plugins/server.md
+++ b/www/pages/plugins/server.md
@@ -46,9 +46,9 @@ class LiveReloadServer extends ServerInterface {
   async start() {
     const { userWorkspace } = this.compilation.context;
 
-    return this.liveReloadServer.watch(userWorkspace, () => {
+    return this.liveReloadServer.watch(userWorkspace, async () => {
       console.info(`Now watching directory "${userWorkspace}" for changes.`);
-      return Promise.resolve(true);
+      return true;
     });
   }
 }

From 2a8fcf835e41a26d4fbd50958efbf75911f068c4 Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Sun, 3 Aug 2025 20:57:50 -0700
Subject: [PATCH 03/16] Revert "chore: remove promise.resolve/reject in async
 functions"

This reverts commit 5aa3439e185a4d43ac99501f83109cd1923d3187.
---
 packages/cli/src/lifecycles/compile.js        |  6 ++-
 packages/cli/src/lifecycles/config.js         | 44 ++++++++++---------
 packages/cli/src/lifecycles/context.js        |  2 +-
 packages/cli/src/lifecycles/graph.js          |  6 +--
 packages/plugin-graphql/src/schema/graph.js   |  4 +-
 .../src/plugins/server.js                     |  2 +
 .../src/puppeteer-handler.js                  |  3 +-
 www/pages/plugins/server.md                   |  4 +-
 8 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/packages/cli/src/lifecycles/compile.js b/packages/cli/src/lifecycles/compile.js
index 4ce912c1d..fb1d0b626 100644
--- a/packages/cli/src/lifecycles/compile.js
+++ b/packages/cli/src/lifecycles/compile.js
@@ -58,7 +58,9 @@ const generateCompilation = async () => {
     console.info("Loading graph from build output...");
 
     if (!(await checkResourceExists(new URL("./graph.json", outputDir)))) {
-      throw new Error("No build output detected.  Make sure you have run greenwood build");
+      return Promise.reject(
+        new Error("No build output detected. Make sure you have run greenwood build"),
+      );
     }
 
     compilation.graph = JSON.parse(await fs.readFile(new URL("./graph.json", outputDir), "utf-8"));
@@ -129,7 +131,7 @@ const generateCompilation = async () => {
     await fs.writeFile(new URL("./graph.json", scratchDir), JSON.stringify(compilation.graph));
   }
 
-  return compilation;
+  return Promise.resolve(compilation);
 };
 
 export { generateCompilation };
diff --git a/packages/cli/src/lifecycles/config.js b/packages/cli/src/lifecycles/config.js
index 17a82e826..570ce513c 100644
--- a/packages/cli/src/lifecycles/config.js
+++ b/packages/cli/src/lifecycles/config.js
@@ -129,13 +129,13 @@ const readAndMergeConfig = async () => {
     // workspace validation
     if (workspace) {
       if (!(workspace instanceof URL)) {
-        throw new Error("Configuration error: workspace must be an instance of URL");
+        return Promise.reject("Configuration error: workspace must be an instance of URL");
       }
 
       if (await checkResourceExists(workspace)) {
         customConfig.workspace = workspace;
       } else {
-        throw new Error(
+        return Promise.reject(
           "Configuration error: Workspace doesn't exist! Please double check your configuration.",
         );
       }
@@ -147,14 +147,14 @@ const readAndMergeConfig = async () => {
     ) {
       customConfig.optimization = optimization;
     } else if (optimization) {
-      throw new Error(
+      return Promise.reject(
         `Configuration error: provided optimization "${optimization}" is not supported.  Please use one of: ${optimizations.join(", ")}.`,
       );
     }
 
     if (activeContent) {
       if (typeof activeContent !== "boolean") {
-        throw new Error("Configuration error: activeContent must be a boolean");
+        return Promise.reject("Configuration error: activeContent must be a boolean");
       }
       customConfig.activeContent = activeContent;
     }
@@ -164,7 +164,7 @@ const readAndMergeConfig = async () => {
 
       flattened.forEach((plugin) => {
         if (!plugin.type || pluginTypes.indexOf(plugin.type) < 0) {
-          throw new Error(
+          return Promise.reject(
             `Configuration error: plugins must be one of type "${pluginTypes.join(", ")}". got "${plugin.type}" instead.`,
           );
         }
@@ -172,7 +172,7 @@ const readAndMergeConfig = async () => {
         if (!plugin.provider || typeof plugin.provider !== "function") {
           const providerTypeof = typeof plugin.provider;
 
-          throw new Error(
+          return Promise.reject(
             `Configuration error: plugins provider must be a function. got ${providerTypeof} instead.`,
           );
         }
@@ -180,7 +180,7 @@ const readAndMergeConfig = async () => {
         if (!plugin.name || typeof plugin.name !== "string") {
           const nameTypeof = typeof plugin.name;
 
-          throw new Error(
+          return Promise.reject(
             `Configuration error: plugins must have a name. got ${nameTypeof} instead.`,
           );
         }
@@ -208,7 +208,7 @@ const readAndMergeConfig = async () => {
         if (typeof devServer.hud === "boolean") {
           customConfig.devServer.hud = devServer.hud;
         } else {
-          throw new Error(
+          return Promise.reject(
             `Configuration error: devServer hud options must be a boolean.  Passed value was: ${devServer.hud}`,
           );
         }
@@ -216,7 +216,7 @@ const readAndMergeConfig = async () => {
 
       if (devServer.port) {
         if (!Number.isInteger(devServer.port)) {
-          throw new Error(
+          return Promise.reject(
             `Configuration error: devServer port must be an integer.  Passed value was: ${devServer.port}`,
           );
         } else {
@@ -232,7 +232,7 @@ const readAndMergeConfig = async () => {
         if (Array.isArray(devServer.extensions)) {
           customConfig.devServer.extensions = devServer.extensions;
         } else {
-          throw new Error(
+          return Promise.reject(
             "Configuration error: provided extensions is not an array.  Please provide an array like ['txt', 'foo']",
           );
         }
@@ -246,7 +246,9 @@ const readAndMergeConfig = async () => {
 
     if (port) {
       if (!Number.isInteger(port)) {
-        throw new Error(`Configuration error: port must be an integer.  Passed value was: ${port}`);
+        return Promise.reject(
+          `Configuration error: port must be an integer.  Passed value was: ${port}`,
+        );
       } else {
         customConfig.port = port;
       }
@@ -254,7 +256,7 @@ const readAndMergeConfig = async () => {
 
     if (basePath) {
       if (typeof basePath !== "string") {
-        throw new Error(
+        return Promise.reject(
           `Configuration error: basePath must be a string.  Passed value was: ${basePath}`,
         );
       } else {
@@ -265,7 +267,7 @@ const readAndMergeConfig = async () => {
     if (pagesDirectory && typeof pagesDirectory === "string") {
       customConfig.pagesDirectory = pagesDirectory;
     } else if (pagesDirectory) {
-      throw new Error(
+      return Promise.reject(
         `Configuration error: provided pagesDirectory "${pagesDirectory}" is not supported.  Please make sure to pass something like 'docs/'`,
       );
     }
@@ -273,7 +275,7 @@ const readAndMergeConfig = async () => {
     if (layoutsDirectory && typeof layoutsDirectory === "string") {
       customConfig.layoutsDirectory = layoutsDirectory;
     } else if (layoutsDirectory) {
-      throw new Error(
+      return Promise.reject(
         `Configuration error: provided layoutsDirectory "${layoutsDirectory}" is not supported.  Please make sure to pass something like 'layouts/'`,
       );
     }
@@ -282,7 +284,7 @@ const readAndMergeConfig = async () => {
       if (typeof prerender === "boolean") {
         customConfig.prerender = prerender;
       } else {
-        throw new Error(
+        return Promise.reject(
           `Configuration error: prerender must be a boolean; true or false.  Passed value was typeof: ${typeof prerender}`,
         );
       }
@@ -297,7 +299,7 @@ const readAndMergeConfig = async () => {
       if (typeof isolation === "boolean") {
         customConfig.isolation = isolation;
       } else {
-        throw new Error(
+        return Promise.reject(
           `Configuration error: isolation must be a boolean; true or false.  Passed value was typeof: ${typeof staticRouter}`,
         );
       }
@@ -307,7 +309,7 @@ const readAndMergeConfig = async () => {
       if (typeof staticRouter === "boolean") {
         customConfig.staticRouter = staticRouter;
       } else {
-        throw new Error(
+        return Promise.reject(
           `Configuration error: staticRouter must be a boolean; true or false.  Passed value was typeof: ${typeof staticRouter}`,
         );
       }
@@ -322,7 +324,7 @@ const readAndMergeConfig = async () => {
         if (typeof importMaps === "boolean") {
           customConfig.polyfills.importMaps = true;
         } else {
-          throw new Error(
+          return Promise.reject(
             `Configuration error: polyfills.importMaps must be a boolean; true or false.  Passed value was typeof: ${typeof importMaps}`,
           );
         }
@@ -332,7 +334,7 @@ const readAndMergeConfig = async () => {
         if (Array.isArray(importAttributes)) {
           customConfig.polyfills.importAttributes = importAttributes;
         } else {
-          throw new Error(
+          Promise.reject(
             `Configuration error: polyfills.importAttributes must be an array of types; ['css', 'json'].  Passed value was typeof: ${typeof importAttributes}`,
           );
         }
@@ -343,7 +345,7 @@ const readAndMergeConfig = async () => {
       if (typeof useTsc === "boolean") {
         customConfig.useTsc = useTsc;
       } else {
-        throw new Error(
+        return Promise.reject(
           `Configuration error: useTsc must be a boolean; true or false.  Passed value was typeof: ${typeof useTsc}`,
         );
       }
@@ -355,7 +357,7 @@ const readAndMergeConfig = async () => {
     }
   }
 
-  return { ...defaultConfig, ...customConfig };
+  return Promise.resolve({ ...defaultConfig, ...customConfig });
 };
 
 export { readAndMergeConfig };
diff --git a/packages/cli/src/lifecycles/context.js b/packages/cli/src/lifecycles/context.js
index 89133e1bd..6d34a040e 100644
--- a/packages/cli/src/lifecycles/context.js
+++ b/packages/cli/src/lifecycles/context.js
@@ -22,7 +22,7 @@ const initContext = async ({ config }) => {
     layoutsDir,
   };
 
-  return context;
+  return Promise.resolve(context);
 };
 
 export { initContext };
diff --git a/packages/cli/src/lifecycles/graph.js b/packages/cli/src/lifecycles/graph.js
index 917a19ac0..c6f28ec2b 100644
--- a/packages/cli/src/lifecycles/graph.js
+++ b/packages/cli/src/lifecycles/graph.js
@@ -206,7 +206,7 @@ const generateGraph = async (compilation) => {
               worker.on("error", reject);
               worker.on("exit", (code) => {
                 if (code !== 0) {
-                  throw new Error(`Worker stopped with exit code ${code}`);
+                  return Promise.reject(new Error(`Worker stopped with exit code ${code}`));
                 }
               });
 
@@ -380,7 +380,7 @@ const generateGraph = async (compilation) => {
         if (!body || !route) {
           const missingKey = !body ? "body" : "route";
 
-          throw new Error(`ERROR: provided node does not provide a ${missingKey} property.`);
+          return Promise.reject(`ERROR: provided node does not provide a ${missingKey} property.`);
         }
 
         const page = {
@@ -404,7 +404,7 @@ const generateGraph = async (compilation) => {
     }
   }
 
-  return compilation;
+  return Promise.resolve(compilation);
 };
 
 export { generateGraph };
diff --git a/packages/plugin-graphql/src/schema/graph.js b/packages/plugin-graphql/src/schema/graph.js
index 02990c8fb..29bca1707 100644
--- a/packages/plugin-graphql/src/schema/graph.js
+++ b/packages/plugin-graphql/src/schema/graph.js
@@ -66,7 +66,7 @@ const getParsedHeadingsFromPage = (tableOfContents = [], headingLevel) => {
 };
 
 const getPagesFromGraph = async (root, query, context) => {
-  return context.graph;
+  return Promise.resolve(context.graph);
 };
 
 const getChildrenFromParentRoute = async (root, query, context) => {
@@ -84,7 +84,7 @@ const getChildrenFromParentRoute = async (root, query, context) => {
     }
   });
 
-  return pages;
+  return Promise.resolve(pages);
 };
 
 const graphTypeDefs = gql`
diff --git a/packages/plugin-renderer-puppeteer/src/plugins/server.js b/packages/plugin-renderer-puppeteer/src/plugins/server.js
index eaa648f37..558e9e5a1 100644
--- a/packages/plugin-renderer-puppeteer/src/plugins/server.js
+++ b/packages/plugin-renderer-puppeteer/src/plugins/server.js
@@ -15,6 +15,8 @@ class PuppeteerServer {
       (await getDevServer(this.compilation)).listen(offsetPort, async () => {
         console.info(`Started puppeteer prerender server at http://localhost:${offsetPort}`);
       });
+    } else {
+      await Promise.resolve();
     }
   }
 }
diff --git a/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js b/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
index 91edef41c..fff9c3753 100644
--- a/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
+++ b/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
@@ -47,7 +47,8 @@ export default async function (compilation, callback) {
     console.info(
       "For more information please see this guide - https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md",
     );
-    throw e;
+
+    return Promise.reject();
   }
 
   const pages = compilation.graph.filter((page) => !page.isSSR);
diff --git a/www/pages/plugins/server.md b/www/pages/plugins/server.md
index 2a7691219..c3f613431 100644
--- a/www/pages/plugins/server.md
+++ b/www/pages/plugins/server.md
@@ -46,9 +46,9 @@ class LiveReloadServer extends ServerInterface {
   async start() {
     const { userWorkspace } = this.compilation.context;
 
-    return this.liveReloadServer.watch(userWorkspace, async () => {
+    return this.liveReloadServer.watch(userWorkspace, () => {
       console.info(`Now watching directory "${userWorkspace}" for changes.`);
-      return true;
+      return Promise.resolve(true);
     });
   }
 }

From 12332146b293bade5ac683ff5df2355ee9d47c4f Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Wed, 6 Aug 2025 20:22:59 -0700
Subject: [PATCH 04/16] refactor one function

---
 packages/cli/src/lifecycles/bundle.js | 80 +++++++++++++--------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index 56e9529a4..a3e31eb4d 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -112,52 +112,52 @@ async function cleanUpResources(compilation) {
   }
 }
 
-async function optimizeStaticPages(compilation, plugins) {
+function optimizeStaticPages(compilation, plugins) {
+  const pages = compilation.graph.filter(
+    (page) =>
+      !page.isSSR || (page.isSSR && page.prerender) || (page.isSSR && compilation.config.prerender),
+  );
+
+  const promises = [];
+  for (const page of pages) {
+    const promise = _writeOptimizedStaticPage(page, compilation, plugins);
+    promises.push(promise);
+  }
+
+  return Promise.all(promises);
+}
+
+async function _writeOptimizedStaticPage(page, compilation, plugins) {
+  const { route, outputHref } = page;
   const { scratchDir, outputDir } = compilation.context;
+  const { port } = compilation.config;
+  const outputDirUrl = new URL(outputHref.replace("index.html", "").replace("404.html", ""));
+  const url = new URL(`http://localhost:${port}${route}`);
+  const contents = await fs.readFile(
+    new URL(`./${outputHref.replace(outputDir.href, "")}`, scratchDir),
+    "utf-8",
+  );
+  const headers = new Headers({ "Content-Type": "text/html" });
+  let response = new Response(contents, { headers });
 
-  return Promise.all(
-    compilation.graph
-      .filter(
-        (page) =>
-          !page.isSSR ||
-          (page.isSSR && page.prerender) ||
-          (page.isSSR && compilation.config.prerender),
-      )
-      .map((page) =>
-        (async () => {
-          const { route, outputHref } = page;
-          const outputDirUrl = new URL(
-            outputHref.replace("index.html", "").replace("404.html", ""),
-          );
-          const url = new URL(`http://localhost:${compilation.config.port}${route}`);
-          const contents = await fs.readFile(
-            new URL(`./${outputHref.replace(outputDir.href, "")}`, scratchDir),
-            "utf-8",
-          );
-          const headers = new Headers({ "Content-Type": "text/html" });
-          let response = new Response(contents, { headers });
-
-          if (!(await checkResourceExists(outputDirUrl))) {
-            await fs.mkdir(outputDirUrl, {
-              recursive: true,
-            });
-          }
+  if (!(await checkResourceExists(outputDirUrl))) {
+    await fs.mkdir(outputDirUrl, {
+      recursive: true,
+    });
+  }
 
-          for (const plugin of plugins) {
-            if (plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()))) {
-              const currentResponse = await plugin.optimize(url, response.clone());
+  for (const plugin of plugins) {
+    if (plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()))) {
+      const currentResponse = await plugin.optimize(url, response.clone());
 
-              response = mergeResponse(response.clone(), currentResponse.clone());
-            }
-          }
+      response = mergeResponse(response.clone(), currentResponse.clone());
+    }
+  }
 
-          // clean up optimization markers
-          const body = (await response.text()).replace(/data-gwd-opt=".*?[a-z]"/g, "");
+  // clean up optimization markers
+  const body = (await response.text()).replace(/data-gwd-opt=".*?[a-z]"/g, "");
 
-          await fs.writeFile(new URL(outputHref), body);
-        })(),
-      ),
-  );
+  await fs.writeFile(new URL(outputHref), body);
 }
 
 async function bundleStyleResources(compilation, resourcePlugins) {

From f3575b82e5311e9c355a36e4d11acf91ad7251d1 Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Mon, 11 Aug 2025 11:45:54 -0700
Subject: [PATCH 05/16] use clone consistently

---
 packages/cli/src/lifecycles/serve.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/lifecycles/serve.js b/packages/cli/src/lifecycles/serve.js
index 49c8d0a5d..fd2abd8f7 100644
--- a/packages/cli/src/lifecycles/serve.js
+++ b/packages/cli/src/lifecycles/serve.js
@@ -108,7 +108,7 @@ async function getDevServer(compilation) {
         ) {
           const current = await plugin.preIntercept(url, request, response.clone());
 
-          response = mergeResponse(response.clone(), current);
+          response = mergeResponse(response.clone(), current.clone());
         }
       }
 
@@ -145,7 +145,7 @@ async function getDevServer(compilation) {
         ) {
           const current = await plugin.intercept(url, request, response.clone());
 
-          response = mergeResponse(response.clone(), current);
+          response = mergeResponse(response.clone(), current.clone());
         }
       }
 

From b730cbd6de9c5d1f01c6629b29b5a62a2935f7dc Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Mon, 11 Aug 2025 12:12:37 -0700
Subject: [PATCH 06/16] Revert "refactor one function"

This reverts commit 12332146b293bade5ac683ff5df2355ee9d47c4f.
---
 packages/cli/src/lifecycles/bundle.js | 80 +++++++++++++--------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index a3e31eb4d..56e9529a4 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -112,52 +112,52 @@ async function cleanUpResources(compilation) {
   }
 }
 
-function optimizeStaticPages(compilation, plugins) {
-  const pages = compilation.graph.filter(
-    (page) =>
-      !page.isSSR || (page.isSSR && page.prerender) || (page.isSSR && compilation.config.prerender),
-  );
-
-  const promises = [];
-  for (const page of pages) {
-    const promise = _writeOptimizedStaticPage(page, compilation, plugins);
-    promises.push(promise);
-  }
-
-  return Promise.all(promises);
-}
-
-async function _writeOptimizedStaticPage(page, compilation, plugins) {
-  const { route, outputHref } = page;
+async function optimizeStaticPages(compilation, plugins) {
   const { scratchDir, outputDir } = compilation.context;
-  const { port } = compilation.config;
-  const outputDirUrl = new URL(outputHref.replace("index.html", "").replace("404.html", ""));
-  const url = new URL(`http://localhost:${port}${route}`);
-  const contents = await fs.readFile(
-    new URL(`./${outputHref.replace(outputDir.href, "")}`, scratchDir),
-    "utf-8",
-  );
-  const headers = new Headers({ "Content-Type": "text/html" });
-  let response = new Response(contents, { headers });
 
-  if (!(await checkResourceExists(outputDirUrl))) {
-    await fs.mkdir(outputDirUrl, {
-      recursive: true,
-    });
-  }
+  return Promise.all(
+    compilation.graph
+      .filter(
+        (page) =>
+          !page.isSSR ||
+          (page.isSSR && page.prerender) ||
+          (page.isSSR && compilation.config.prerender),
+      )
+      .map((page) =>
+        (async () => {
+          const { route, outputHref } = page;
+          const outputDirUrl = new URL(
+            outputHref.replace("index.html", "").replace("404.html", ""),
+          );
+          const url = new URL(`http://localhost:${compilation.config.port}${route}`);
+          const contents = await fs.readFile(
+            new URL(`./${outputHref.replace(outputDir.href, "")}`, scratchDir),
+            "utf-8",
+          );
+          const headers = new Headers({ "Content-Type": "text/html" });
+          let response = new Response(contents, { headers });
+
+          if (!(await checkResourceExists(outputDirUrl))) {
+            await fs.mkdir(outputDirUrl, {
+              recursive: true,
+            });
+          }
 
-  for (const plugin of plugins) {
-    if (plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()))) {
-      const currentResponse = await plugin.optimize(url, response.clone());
+          for (const plugin of plugins) {
+            if (plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()))) {
+              const currentResponse = await plugin.optimize(url, response.clone());
 
-      response = mergeResponse(response.clone(), currentResponse.clone());
-    }
-  }
+              response = mergeResponse(response.clone(), currentResponse.clone());
+            }
+          }
 
-  // clean up optimization markers
-  const body = (await response.text()).replace(/data-gwd-opt=".*?[a-z]"/g, "");
+          // clean up optimization markers
+          const body = (await response.text()).replace(/data-gwd-opt=".*?[a-z]"/g, "");
 
-  await fs.writeFile(new URL(outputHref), body);
+          await fs.writeFile(new URL(outputHref), body);
+        })(),
+      ),
+  );
 }
 
 async function bundleStyleResources(compilation, resourcePlugins) {

From 4ecc2bf19d585090cdac634259b374422688b6a9 Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Mon, 11 Aug 2025 12:20:49 -0700
Subject: [PATCH 07/16] Update asyncMap

---
 packages/cli/src/lib/async-utils.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/lib/async-utils.js b/packages/cli/src/lib/async-utils.js
index 9cedd3626..b083680b1 100644
--- a/packages/cli/src/lib/async-utils.js
+++ b/packages/cli/src/lib/async-utils.js
@@ -14,14 +14,15 @@ async function asyncFilter(arr, cb) {
 }
 
 // https://stackoverflow.com/a/71278238/417806
+// Constraint: mapper functions must not depend on each other
 async function asyncMap(items, mapper) {
-  const mappedItems = [];
+  const promises = [];
 
   for (const item of items) {
-    mappedItems.push(await mapper(item));
+    promises.push(mapper(item));
   }
 
-  return mappedItems;
+  return Promise.all(promises);
 }
 
 export { asyncFilter, asyncMap };

From 5674288dae7c747cf2c58577ccb97193f18aba4d Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Mon, 11 Aug 2025 12:53:08 -0700
Subject: [PATCH 08/16] use asyncMap

---
 packages/cli/src/lifecycles/bundle.js         | 71 +++++++++----------
 packages/cli/src/lifecycles/config.js         | 34 ++++-----
 packages/cli/src/lifecycles/copy.js           | 12 ++--
 packages/cli/src/lifecycles/prerender.js      | 31 ++++----
 .../src/puppeteer-handler.js                  | 32 ++++-----
 5 files changed, 83 insertions(+), 97 deletions(-)

diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index 56e9529a4..3a933722d 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -16,6 +16,7 @@ import {
 import path from "node:path";
 import { rollup } from "rollup";
 import { pruneGraph } from "../lib/content-utils.js";
+import { asyncMap } from "../lib/async-utils.js";
 
 async function interceptPage(url, request, plugins, body) {
   let response = new Response(body, {
@@ -115,49 +116,41 @@ async function cleanUpResources(compilation) {
 async function optimizeStaticPages(compilation, plugins) {
   const { scratchDir, outputDir } = compilation.context;
 
-  return Promise.all(
-    compilation.graph
-      .filter(
-        (page) =>
-          !page.isSSR ||
-          (page.isSSR && page.prerender) ||
-          (page.isSSR && compilation.config.prerender),
-      )
-      .map((page) =>
-        (async () => {
-          const { route, outputHref } = page;
-          const outputDirUrl = new URL(
-            outputHref.replace("index.html", "").replace("404.html", ""),
-          );
-          const url = new URL(`http://localhost:${compilation.config.port}${route}`);
-          const contents = await fs.readFile(
-            new URL(`./${outputHref.replace(outputDir.href, "")}`, scratchDir),
-            "utf-8",
-          );
-          const headers = new Headers({ "Content-Type": "text/html" });
-          let response = new Response(contents, { headers });
-
-          if (!(await checkResourceExists(outputDirUrl))) {
-            await fs.mkdir(outputDirUrl, {
-              recursive: true,
-            });
-          }
+  const pages = compilation.graph.filter(
+    (page) =>
+      !page.isSSR || (page.isSSR && page.prerender) || (page.isSSR && compilation.config.prerender),
+  );
 
-          for (const plugin of plugins) {
-            if (plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()))) {
-              const currentResponse = await plugin.optimize(url, response.clone());
+  await asyncMap(pages, async (page) => {
+    const { route, outputHref } = page;
+    const outputDirUrl = new URL(outputHref.replace("index.html", "").replace("404.html", ""));
+    const url = new URL(`http://localhost:${compilation.config.port}${route}`);
+    const contents = await fs.readFile(
+      new URL(`./${outputHref.replace(outputDir.href, "")}`, scratchDir),
+      "utf-8",
+    );
+    const headers = new Headers({ "Content-Type": "text/html" });
+    let response = new Response(contents, { headers });
+
+    if (!(await checkResourceExists(outputDirUrl))) {
+      await fs.mkdir(outputDirUrl, {
+        recursive: true,
+      });
+    }
 
-              response = mergeResponse(response.clone(), currentResponse.clone());
-            }
-          }
+    for (const plugin of plugins) {
+      if (plugin.shouldOptimize && (await plugin.shouldOptimize(url, response.clone()))) {
+        const currentResponse = await plugin.optimize(url, response.clone());
 
-          // clean up optimization markers
-          const body = (await response.text()).replace(/data-gwd-opt=".*?[a-z]"/g, "");
+        response = mergeResponse(response.clone(), currentResponse.clone());
+      }
+    }
 
-          await fs.writeFile(new URL(outputHref), body);
-        })(),
-      ),
-  );
+    // clean up optimization markers
+    const body = (await response.text()).replace(/data-gwd-opt=".*?[a-z]"/g, "");
+
+    await fs.writeFile(new URL(outputHref), body);
+  });
 }
 
 async function bundleStyleResources(compilation, resourcePlugins) {
diff --git a/packages/cli/src/lifecycles/config.js b/packages/cli/src/lifecycles/config.js
index 570ce513c..6d03ba237 100644
--- a/packages/cli/src/lifecycles/config.js
+++ b/packages/cli/src/lifecycles/config.js
@@ -1,6 +1,7 @@
 // @ts-nocheck
 import fs from "node:fs/promises";
 import { checkResourceExists } from "../lib/resource-utils.js";
+import { asyncMap } from "../lib/async-utils.js";
 
 const cwd = new URL(`file://${process.cwd()}/`);
 const greenwoodPluginsDirectoryUrl = new URL("../plugins/", import.meta.url);
@@ -9,30 +10,25 @@ const PLUGINS_FLATTENED_DEPTH = 2;
 // get and "tag" all plugins provided / maintained by the @greenwood/cli
 // and include as the default set, with all user plugins getting appended
 const greenwoodPlugins = (
-  await Promise.all(
+  await asyncMap(
     [
       new URL("./copy/", greenwoodPluginsDirectoryUrl),
       new URL("./renderer/", greenwoodPluginsDirectoryUrl),
       new URL("./resource/", greenwoodPluginsDirectoryUrl),
       new URL("./server/", greenwoodPluginsDirectoryUrl),
-    ].map((pluginDirectoryUrl) =>
-      (async () => {
-        const files = await fs.readdir(pluginDirectoryUrl);
-
-        return await Promise.all(
-          files.map((file) =>
-            (async () => {
-              const importUrl = new URL(`./${file}`, pluginDirectoryUrl);
-              // @ts-expect-error see https://github.com/microsoft/TypeScript/issues/42866
-              const pluginImport = await import(importUrl);
-              const plugin = pluginImport[Object.keys(pluginImport)[0]];
-
-              return Array.isArray(plugin) ? plugin : [plugin];
-            })(),
-          ),
-        );
-      })(),
-    ),
+    ],
+    async (pluginDirectoryUrl) => {
+      const files = await fs.readdir(pluginDirectoryUrl);
+
+      return asyncMap(files, async (file) => {
+        const importUrl = new URL(`./${file}`, pluginDirectoryUrl);
+        // @ts-expect-error see https://github.com/microsoft/TypeScript/issues/42866
+        const pluginImport = await import(importUrl);
+        const plugin = pluginImport[Object.keys(pluginImport)[0]];
+
+        return Array.isArray(plugin) ? plugin : [plugin];
+      });
+    },
   )
 )
   .flat(PLUGINS_FLATTENED_DEPTH)
diff --git a/packages/cli/src/lifecycles/copy.js b/packages/cli/src/lifecycles/copy.js
index 525e0e19f..af3ac095e 100644
--- a/packages/cli/src/lifecycles/copy.js
+++ b/packages/cli/src/lifecycles/copy.js
@@ -1,17 +1,17 @@
 import fs from "node:fs/promises";
 import { checkResourceExists } from "../lib/resource-utils.js";
+import { asyncMap } from "../lib/async-utils.js";
 
 async function rreaddir(dir, allFiles = []) {
   const files = (await fs.readdir(dir)).map((f) => new URL(`./${f}`, dir));
 
   allFiles.push(...files);
 
-  await Promise.all(
-    files.map((f) =>
-      (async () =>
-        (await fs.stat(f)).isDirectory() &&
-        (await rreaddir(new URL(`file://${f.pathname}/`), allFiles)))(),
-    ),
+  await asyncMap(
+    files,
+    async (f) =>
+      (await fs.stat(f)).isDirectory() &&
+      (await rreaddir(new URL(`file://${f.pathname}/`), allFiles)),
   );
 
   return allFiles;
diff --git a/packages/cli/src/lifecycles/prerender.js b/packages/cli/src/lifecycles/prerender.js
index 88b75e482..fe59abe4a 100644
--- a/packages/cli/src/lifecycles/prerender.js
+++ b/packages/cli/src/lifecycles/prerender.js
@@ -6,6 +6,7 @@ import {
 } from "../lib/resource-utils.js";
 import os from "node:os";
 import { WorkerPool } from "../lib/threadpool.js";
+import { asyncMap } from "../lib/async-utils.js";
 
 async function createOutputDirectory(route, outputDir) {
   if (!route.endsWith("/404/") && !(await checkResourceExists(outputDir))) {
@@ -186,25 +187,23 @@ async function staticRenderCompilation(compilation) {
 
   console.info("pages to generate", `\n ${pages.map((page) => page.route).join("\n ")}`);
 
-  await Promise.all(
-    pages.map((page) =>
-      (async () => {
-        const { route, outputHref } = page;
-        const scratchUrl = toScratchUrl(outputHref, context);
-        const url = new URL(`http://localhost:${config.port}${route}`);
-        const request = new Request(url);
+  await asyncMap(pages, async (page) => {
+    const { route, outputHref } = page;
+    const scratchUrl = toScratchUrl(outputHref, context);
+    const url = new URL(`http://localhost:${config.port}${route}`);
+    const request = new Request(url);
 
-        let body = await (await servePage(url, request, plugins)).text();
-        body = await (await interceptPage(url, request, plugins, body)).text();
+    let body = await (await servePage(url, request, plugins)).text();
+    body = await (await interceptPage(url, request, plugins, body)).text();
 
-        await trackResourcesForRoute(body, compilation, route);
-        await createOutputDirectory(route, new URL(scratchUrl.href.replace("index.html", "")));
-        await fs.writeFile(scratchUrl, body);
+    await trackResourcesForRoute(body, compilation, route);
+    await createOutputDirectory(route, new URL(scratchUrl.href.replace("index.html", "")));
+    await fs.writeFile(scratchUrl, body);
 
-        console.info("generated page...", route);
-      })(),
-    ),
-  );
+    console.info("generated page...", route);
+
+    return Promise.resolve();
+  });
 }
 
 export { preRenderCompilationWorker, preRenderCompilationCustom, staticRenderCompilation };
diff --git a/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js b/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
index fff9c3753..ca2fc3d8e 100644
--- a/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
+++ b/packages/plugin-renderer-puppeteer/src/puppeteer-handler.js
@@ -1,26 +1,24 @@
+import { asyncMap } from "../../cli/src/lib/async-utils.js";
+
 export default async function (compilation, callback) {
   const BrowserRunner = (await import("./lib/browser.js")).BrowserRunner;
   const browserRunner = new BrowserRunner();
 
   const runBrowser = async (serverUrl, pages) => {
     try {
-      return Promise.all(
-        pages.map((page) =>
-          (async () => {
-            const { route } = page;
-            console.info("prerendering page...", route);
-
-            return await browserRunner.serialize(`${serverUrl}${route}`).then(async (html) => {
-              console.info(`prerendering complete for page ${route}.`);
-
-              // clean this up here to avoid sending webcomponents-bundle to rollup
-              html = html.replace(/<script src="(.*webcomponents-bundle.js)"><\/script>/, "");
-
-              await callback(page, html);
-            });
-          })(),
-        ),
-      );
+      return asyncMap(pages, async (page) => {
+        const { route } = page;
+        console.info("prerendering page...", route);
+
+        return await browserRunner.serialize(`${serverUrl}${route}`).then(async (html) => {
+          console.info(`prerendering complete for page ${route}.`);
+
+          // clean this up here to avoid sending webcomponents-bundle to rollup
+          html = html.replace(/<script src="(.*webcomponents-bundle.js)"><\/script>/, "");
+
+          await callback(page, html);
+        });
+      });
     } catch (e) {
       console.error(e);
       return false;

From b65ee02e68df2cf6fbb6031ef9d6ce82c920cf5f Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Fri, 15 Aug 2025 21:54:47 -0700
Subject: [PATCH 09/16] use asyncForEach

---
 packages/cli/src/lib/async-utils.js      | 6 +++++-
 packages/cli/src/lifecycles/bundle.js    | 4 ++--
 packages/cli/src/lifecycles/copy.js      | 4 ++--
 packages/cli/src/lifecycles/prerender.js | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/lib/async-utils.js b/packages/cli/src/lib/async-utils.js
index b083680b1..1865c2bcf 100644
--- a/packages/cli/src/lib/async-utils.js
+++ b/packages/cli/src/lib/async-utils.js
@@ -25,4 +25,8 @@ async function asyncMap(items, mapper) {
   return Promise.all(promises);
 }
 
-export { asyncFilter, asyncMap };
+async function asyncForEach(items, callback) {
+  await asyncMap(items, callback);
+}
+
+export { asyncFilter, asyncMap, asyncForEach };
diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index 3a933722d..804747171 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -16,7 +16,7 @@ import {
 import path from "node:path";
 import { rollup } from "rollup";
 import { pruneGraph } from "../lib/content-utils.js";
-import { asyncMap } from "../lib/async-utils.js";
+import { asyncForEach } from "../lib/async-utils.js";
 
 async function interceptPage(url, request, plugins, body) {
   let response = new Response(body, {
@@ -121,7 +121,7 @@ async function optimizeStaticPages(compilation, plugins) {
       !page.isSSR || (page.isSSR && page.prerender) || (page.isSSR && compilation.config.prerender),
   );
 
-  await asyncMap(pages, async (page) => {
+  await asyncForEach(pages, async (page) => {
     const { route, outputHref } = page;
     const outputDirUrl = new URL(outputHref.replace("index.html", "").replace("404.html", ""));
     const url = new URL(`http://localhost:${compilation.config.port}${route}`);
diff --git a/packages/cli/src/lifecycles/copy.js b/packages/cli/src/lifecycles/copy.js
index af3ac095e..0a4e77320 100644
--- a/packages/cli/src/lifecycles/copy.js
+++ b/packages/cli/src/lifecycles/copy.js
@@ -1,13 +1,13 @@
 import fs from "node:fs/promises";
 import { checkResourceExists } from "../lib/resource-utils.js";
-import { asyncMap } from "../lib/async-utils.js";
+import { asyncForEach } from "../lib/async-utils.js";
 
 async function rreaddir(dir, allFiles = []) {
   const files = (await fs.readdir(dir)).map((f) => new URL(`./${f}`, dir));
 
   allFiles.push(...files);
 
-  await asyncMap(
+  await asyncForEach(
     files,
     async (f) =>
       (await fs.stat(f)).isDirectory() &&
diff --git a/packages/cli/src/lifecycles/prerender.js b/packages/cli/src/lifecycles/prerender.js
index fe59abe4a..cb0e7f01b 100644
--- a/packages/cli/src/lifecycles/prerender.js
+++ b/packages/cli/src/lifecycles/prerender.js
@@ -6,7 +6,7 @@ import {
 } from "../lib/resource-utils.js";
 import os from "node:os";
 import { WorkerPool } from "../lib/threadpool.js";
-import { asyncMap } from "../lib/async-utils.js";
+import { asyncForEach } from "../lib/async-utils.js";
 
 async function createOutputDirectory(route, outputDir) {
   if (!route.endsWith("/404/") && !(await checkResourceExists(outputDir))) {
@@ -187,7 +187,7 @@ async function staticRenderCompilation(compilation) {
 
   console.info("pages to generate", `\n ${pages.map((page) => page.route).join("\n ")}`);
 
-  await asyncMap(pages, async (page) => {
+  await asyncForEach(pages, async (page) => {
     const { route, outputHref } = page;
     const scratchUrl = toScratchUrl(outputHref, context);
     const url = new URL(`http://localhost:${config.port}${route}`);

From 41e0acc6bde663f20b1872b32ef1a27ff5e9df9a Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Mon, 18 Aug 2025 22:43:33 -0700
Subject: [PATCH 10/16] Add eslint await in loop rule

Set to "warn" because there are a lot of reduce exceptions and commenting them each would be tedious.

Resolved some by switching to the new asyncForEach function
---
 eslint.config.js                         |  1 +
 packages/cli/src/lib/async-utils.js      |  5 +++--
 packages/cli/src/lifecycles/bundle.js    | 26 +++++++++++-------------
 packages/cli/src/lifecycles/copy.js      | 12 +++++------
 packages/cli/src/lifecycles/prerender.js |  4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index 2f1267209..32354fbd6 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -47,6 +47,7 @@ export default [
       "no-only-tests/no-only-tests": "error",
       "import/no-unresolved": "off",
       "import/enforce-node-protocol-usage": ["error", "always"],
+      "no-await-in-loop": "warn",
     },
     plugins: {
       "no-only-tests": noOnlyTests,
diff --git a/packages/cli/src/lib/async-utils.js b/packages/cli/src/lib/async-utils.js
index 1865c2bcf..945151df6 100644
--- a/packages/cli/src/lib/async-utils.js
+++ b/packages/cli/src/lib/async-utils.js
@@ -1,14 +1,15 @@
 // https://stackoverflow.com/a/76974728/417806
+// Constraint: callback functions must not depend on each other
 async function asyncFilter(arr, cb) {
   const filtered = [];
 
-  for (const element of arr) {
+  await asyncForEach(arr, async (element) => {
     const needAdd = await cb(element);
 
     if (needAdd) {
       filtered.push(element);
     }
-  }
+  });
 
   return filtered;
 }
diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index 804747171..e63708893 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -102,7 +102,7 @@ async function emitResources(compilation) {
 async function cleanUpResources(compilation) {
   const { outputDir } = compilation.context;
 
-  for (const resource of compilation.resources.values()) {
+  asyncForEach(compilation.resources.values(), async (resource) => {
     const { src, optimizedFileName, optimizationAttr } = resource;
     const optConfig = ["inline", "static"].indexOf(compilation.config.optimization) >= 0;
     const optAttr = ["inline", "static"].indexOf(optimizationAttr) >= 0;
@@ -110,7 +110,7 @@ async function cleanUpResources(compilation) {
     if (optimizedFileName && (!src || optAttr || optConfig)) {
       await fs.unlink(new URL(`./${optimizedFileName}`, outputDir));
     }
-  }
+  });
 }
 
 async function optimizeStaticPages(compilation, plugins) {
@@ -156,7 +156,7 @@ async function optimizeStaticPages(compilation, plugins) {
 async function bundleStyleResources(compilation, resourcePlugins) {
   const { outputDir } = compilation.context;
 
-  for (const resource of compilation.resources.values()) {
+  await asyncForEach(compilation.resources.values(), async (resource) => {
     const { contents, src = "", type } = resource;
 
     if (["style", "link"].includes(type)) {
@@ -262,7 +262,7 @@ async function bundleStyleResources(compilation, resourcePlugins) {
 
       await fs.writeFile(new URL(`./${optimizedFileName}`, outputDir), optimizedFileContents);
     }
-  }
+  });
 }
 
 async function bundleApiRoutes(compilation) {
@@ -271,11 +271,10 @@ async function bundleApiRoutes(compilation) {
 
   if (apiConfigs.length > 0 && apiConfigs[0].input.length !== 0) {
     console.info("bundling API routes...");
-    for (const configIndex in apiConfigs) {
-      const rollupConfig = apiConfigs[configIndex];
+    await asyncForEach(apiConfigs, async (rollupConfig) => {
       const bundle = await rollup(rollupConfig);
       await bundle.write(rollupConfig.output);
-    }
+    });
   }
 }
 
@@ -297,7 +296,7 @@ async function bundleSsrPages(compilation, optimizePlugins) {
     // one pass to generate initial static HTML and to track all combined static resources across layouts
     // and before we optimize so that all bundled assets can tracked up front
     // would be nice to see if this can be done in a single pass though...
-    for (const page of ssrPages) {
+    await asyncForEach(ssrPages, async (page) => {
       const { route } = page;
       let staticHtml = "<content-outlet></content-outlet>";
 
@@ -317,7 +316,7 @@ async function bundleSsrPages(compilation, optimizePlugins) {
       await trackResourcesForRoute(staticHtml, compilation, route);
 
       ssrPrerenderPagesRouteMapper[route] = staticHtml;
-    }
+    });
 
     // technically this happens in the start of bundleCompilation once
     // so might be nice to detect those static assets to see if they have be "de-duped" from bundling here
@@ -325,7 +324,7 @@ async function bundleSsrPages(compilation, optimizePlugins) {
     await bundleStyleResources(compilation, optimizePlugins);
 
     // second pass to link all bundled assets to their resources before optimizing and generating SSR bundles
-    for (const page of ssrPages) {
+    await asyncForEach(ssrPages, async (page) => {
       const { id, route, pageHref } = page;
       const pagePath = new URL(pageHref).pathname.replace(pagesDir.pathname, "./");
       const entryFileUrl = new URL(pageHref);
@@ -393,17 +392,16 @@ async function bundleSsrPages(compilation, optimizePlugins) {
         id,
         inputPath: normalizePathnameForWindows(entryFileOutputUrl),
       });
-    }
+    });
 
     const ssrConfigs = await getRollupConfigForSsrPages(compilation, input);
 
     if (ssrConfigs.length > 0 && ssrConfigs[0].input !== "") {
       console.info("bundling dynamic pages...");
-      for (const configIndex in ssrConfigs) {
-        const rollupConfig = ssrConfigs[configIndex];
+      await asyncForEach(ssrConfigs, async (rollupConfig) => {
         const bundle = await rollup(rollupConfig);
         await bundle.write(rollupConfig.output);
-      }
+      });
     }
   }
 }
diff --git a/packages/cli/src/lifecycles/copy.js b/packages/cli/src/lifecycles/copy.js
index 0a4e77320..0c3eb780f 100644
--- a/packages/cli/src/lifecycles/copy.js
+++ b/packages/cli/src/lifecycles/copy.js
@@ -39,7 +39,7 @@ async function copyDirectory(fromUrl, toUrl, projectDirectory) {
         });
       }
 
-      for (const fileUrl of files) {
+      asyncForEach(files, async (fileUrl) => {
         const targetUrl = new URL(
           `file://${fileUrl.pathname.replace(fromUrl.pathname, toUrl.pathname)}`,
         );
@@ -52,7 +52,7 @@ async function copyDirectory(fromUrl, toUrl, projectDirectory) {
         } else if (!isDirectory) {
           await copyFile(fileUrl, targetUrl, projectDirectory);
         }
-      }
+      });
     }
   } catch (e) {
     console.error("ERROR", e);
@@ -63,10 +63,10 @@ const copyAssets = async (compilation) => {
   const copyPlugins = compilation.config.plugins.filter((plugin) => plugin.type === "copy");
   const { projectDirectory } = compilation.context;
 
-  for (const plugin of copyPlugins) {
+  asyncForEach(copyPlugins, async (plugin) => {
     const locations = await plugin.provider(compilation);
 
-    for (const location of locations) {
+    asyncForEach(locations, async (location) => {
       const { from, to } = location;
 
       if (from.pathname.endsWith("/")) {
@@ -74,8 +74,8 @@ const copyAssets = async (compilation) => {
       } else {
         await copyFile(from, to, projectDirectory);
       }
-    }
-  }
+    });
+  });
 };
 
 export { copyAssets };
diff --git a/packages/cli/src/lifecycles/prerender.js b/packages/cli/src/lifecycles/prerender.js
index 93277f035..71e4917a1 100644
--- a/packages/cli/src/lifecycles/prerender.js
+++ b/packages/cli/src/lifecycles/prerender.js
@@ -82,7 +82,7 @@ async function preRenderCompilationWorker(compilation, workerPrerender) {
     new URL("../lib/ssr-route-worker.js", import.meta.url),
   );
 
-  for (const page of pages) {
+  asyncForEach(pages, async (page) => {
     const { route, outputHref } = page;
     const scratchUrl = toScratchUrl(outputHref, context);
     const url = new URL(`http://localhost:${config.port}${route}`);
@@ -144,7 +144,7 @@ async function preRenderCompilationWorker(compilation, workerPrerender) {
     await fs.writeFile(scratchUrl, body);
 
     console.info("generated page...", route);
-  }
+  });
 }
 
 async function preRenderCompilationCustom(compilation, customPrerender) {

From 7e3f0c8cf80541a3ea12630a0868848cb99ac986 Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Wed, 20 Aug 2025 19:19:22 -0700
Subject: [PATCH 11/16] fix: revert merged response .clone cleanup

---
 packages/cli/src/lifecycles/serve.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/lifecycles/serve.js b/packages/cli/src/lifecycles/serve.js
index 70c5ceeb6..ea5a1711d 100644
--- a/packages/cli/src/lifecycles/serve.js
+++ b/packages/cli/src/lifecycles/serve.js
@@ -69,8 +69,9 @@ async function getDevServer(compilation) {
       for (const plugin of resourcePlugins) {
         if (plugin.shouldServe && (await plugin.shouldServe(url, request))) {
           const current = await plugin.serve(url, request);
+          const merged = mergeResponse(response.clone(), current.clone());
 
-          response = mergeResponse(response.clone(), current.clone());
+          response = merged.clone();
         }
       }
 

From a5af45828536d28b9c48acddaeca4628832b684c Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Wed, 20 Aug 2025 19:29:47 -0700
Subject: [PATCH 12/16] use `return await` for better stack trace

https://eslint.org/docs/latest/rules/no-return-await
---
 packages/cli/src/lifecycles/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/lifecycles/config.js b/packages/cli/src/lifecycles/config.js
index 6d03ba237..fa74e5a3f 100644
--- a/packages/cli/src/lifecycles/config.js
+++ b/packages/cli/src/lifecycles/config.js
@@ -20,7 +20,7 @@ const greenwoodPlugins = (
     async (pluginDirectoryUrl) => {
       const files = await fs.readdir(pluginDirectoryUrl);
 
-      return asyncMap(files, async (file) => {
+      return await asyncMap(files, async (file) => {
         const importUrl = new URL(`./${file}`, pluginDirectoryUrl);
         // @ts-expect-error see https://github.com/microsoft/TypeScript/issues/42866
         const pluginImport = await import(importUrl);

From 21598324c5e7c9c1b804be459a11343b4599ccde Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Wed, 20 Aug 2025 19:32:02 -0700
Subject: [PATCH 13/16] await forEach

---
 packages/cli/src/lifecycles/copy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/lifecycles/copy.js b/packages/cli/src/lifecycles/copy.js
index 0c3eb780f..4b9f47fe8 100644
--- a/packages/cli/src/lifecycles/copy.js
+++ b/packages/cli/src/lifecycles/copy.js
@@ -63,10 +63,10 @@ const copyAssets = async (compilation) => {
   const copyPlugins = compilation.config.plugins.filter((plugin) => plugin.type === "copy");
   const { projectDirectory } = compilation.context;
 
-  asyncForEach(copyPlugins, async (plugin) => {
+  await asyncForEach(copyPlugins, async (plugin) => {
     const locations = await plugin.provider(compilation);
 
-    asyncForEach(locations, async (location) => {
+    await asyncForEach(locations, async (location) => {
       const { from, to } = location;
 
       if (from.pathname.endsWith("/")) {

From 80afa74fac26e60bca878e1402e2ade747eeb3e2 Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Wed, 20 Aug 2025 19:46:21 -0700
Subject: [PATCH 14/16] await more forEach

---
 packages/cli/src/lifecycles/bundle.js    | 2 +-
 packages/cli/src/lifecycles/copy.js      | 2 +-
 packages/cli/src/lifecycles/prerender.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/lifecycles/bundle.js b/packages/cli/src/lifecycles/bundle.js
index e63708893..60ab9f215 100644
--- a/packages/cli/src/lifecycles/bundle.js
+++ b/packages/cli/src/lifecycles/bundle.js
@@ -102,7 +102,7 @@ async function emitResources(compilation) {
 async function cleanUpResources(compilation) {
   const { outputDir } = compilation.context;
 
-  asyncForEach(compilation.resources.values(), async (resource) => {
+  await asyncForEach(compilation.resources.values(), async (resource) => {
     const { src, optimizedFileName, optimizationAttr } = resource;
     const optConfig = ["inline", "static"].indexOf(compilation.config.optimization) >= 0;
     const optAttr = ["inline", "static"].indexOf(optimizationAttr) >= 0;
diff --git a/packages/cli/src/lifecycles/copy.js b/packages/cli/src/lifecycles/copy.js
index 4b9f47fe8..070adc003 100644
--- a/packages/cli/src/lifecycles/copy.js
+++ b/packages/cli/src/lifecycles/copy.js
@@ -39,7 +39,7 @@ async function copyDirectory(fromUrl, toUrl, projectDirectory) {
         });
       }
 
-      asyncForEach(files, async (fileUrl) => {
+      await asyncForEach(files, async (fileUrl) => {
         const targetUrl = new URL(
           `file://${fileUrl.pathname.replace(fromUrl.pathname, toUrl.pathname)}`,
         );
diff --git a/packages/cli/src/lifecycles/prerender.js b/packages/cli/src/lifecycles/prerender.js
index 71e4917a1..e3f29b79c 100644
--- a/packages/cli/src/lifecycles/prerender.js
+++ b/packages/cli/src/lifecycles/prerender.js
@@ -82,7 +82,7 @@ async function preRenderCompilationWorker(compilation, workerPrerender) {
     new URL("../lib/ssr-route-worker.js", import.meta.url),
   );
 
-  asyncForEach(pages, async (page) => {
+  await asyncForEach(pages, async (page) => {
     const { route, outputHref } = page;
     const scratchUrl = toScratchUrl(outputHref, context);
     const url = new URL(`http://localhost:${config.port}${route}`);

From 2a591b0bbc7e31c89a3b4f84bff972ab094e7e45 Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Wed, 20 Aug 2025 19:47:36 -0700
Subject: [PATCH 15/16] revert no await in loop eslint rule

---
 eslint.config.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eslint.config.js b/eslint.config.js
index 32354fbd6..2f1267209 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -47,7 +47,6 @@ export default [
       "no-only-tests/no-only-tests": "error",
       "import/no-unresolved": "off",
       "import/enforce-node-protocol-usage": ["error", "always"],
-      "no-await-in-loop": "warn",
     },
     plugins: {
       "no-only-tests": noOnlyTests,

From 6da1e3b2e11051f4d1b2cb3677f94f21cb5e75ad Mon Sep 17 00:00:00 2001
From: Kai Prince <34746763+KaiPrince@users.noreply.github.com>
Date: Thu, 21 Aug 2025 09:23:46 -0700
Subject: [PATCH 16/16] add return await for better stack trace

---
 packages/cli/src/lib/async-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/lib/async-utils.js b/packages/cli/src/lib/async-utils.js
index 945151df6..1c086853b 100644
--- a/packages/cli/src/lib/async-utils.js
+++ b/packages/cli/src/lib/async-utils.js
@@ -23,7 +23,7 @@ async function asyncMap(items, mapper) {
     promises.push(mapper(item));
   }
 
-  return Promise.all(promises);
+  return await Promise.all(promises);
 }
 
 async function asyncForEach(items, callback) {