fix response clone bug

greenwood.config.js

@@ -4,6 +4,7 @@ import { greenwoodPluginPolyfills } from "@greenwood/plugin-polyfills";
 import { greenwoodPluginPostCss } from "@greenwood/plugin-postcss";
 import { greenwoodPluginImportRaw } from "@greenwood/plugin-import-raw";
 import { greenwoodPluginRendererPuppeteer } from "@greenwood/plugin-renderer-puppeteer";
+import { greenwoodPluginMarkdown } from "@greenwood/plugin-markdown";
 import rollupPluginAnalyzer from "rollup-plugin-analyzer";
 
 /** @type {import('@greenwood/cli').Config} */
@@ -14,6 +15,9 @@ export default {
   activeContent: true,
   prerender: true,
   plugins: [
+    greenwoodPluginMarkdown({
+      plugins: ["@mapbox/rehype-prism", "rehype-slug", "rehype-autolink-headings", "remark-github"],
+    }),
     greenwoodPluginGraphQL(),
     greenwoodPluginPolyfills({
       lit: true,
@@ -39,7 +43,4 @@ export default {
       },
     },
   ],
-  markdown: {
-    plugins: ["@mapbox/rehype-prism", "rehype-slug", "rehype-autolink-headings", "remark-github"],
-  },
 };

greenwood.config.test-types.ts

@@ -10,6 +10,7 @@ import { greenwoodPluginImportCommonJs } from "@greenwood/plugin-import-commonjs
 import { greenwoodPluginImportJsx } from "@greenwood/plugin-import-jsx";
 import { greenwoodPluginImportRaw } from "@greenwood/plugin-import-raw";
 import { greenwoodPluginIncludeHTML } from "@greenwood/plugin-include-html";
+import { greenwoodPluginMarkdown } from "@greenwood/plugin-markdown";
 import { greenwoodPluginPolyfills } from "@greenwood/plugin-polyfills";
 import { greenwoodPluginPostCss } from "@greenwood/plugin-postcss";
 import { greenwoodPluginRendererLit } from "@greenwood/plugin-renderer-lit";
@@ -46,15 +47,6 @@ const config: Config = {
   isolation: true,
   layoutsDirectory: "/my-layouts",
   optimization: "default",
-  markdown: {
-    plugins: [
-      "@mapbox/rehype-prism",
-      {
-        name: "rehype-autolink-headings",
-        options: { behavior: "append" },
-      },
-    ],
-  },
   pagesDirectory: "/my-pages",
   plugins: [
     greenwoodPluginAdapterAws(),
@@ -68,6 +60,15 @@ const config: Config = {
     greenwoodPluginImportJsx(),
     greenwoodPluginImportRaw,
     greenwoodPluginIncludeHTML(),
+    greenwoodPluginMarkdown({
+      plugins: [
+        "@mapbox/rehype-prism",
+        {
+          name: "rehype-autolink-headings",
+          options: { behavior: "append" },
+        },
+      ],
+    }),
     greenwoodPluginPolyfills(),
     greenwoodPluginPostCss(),
     greenwoodPluginRendererLit(),

packages/cli/package.json

@@ -59,21 +59,13 @@
     "koa": "^3.0.1",
     "koa-body": "^6.0.1",
     "livereload": "^0.9.1",
-    "markdown-toc": "^1.2.0",
     "node-html-parser": "^7.0.1",
-    "rehype-raw": "^7.0.0",
-    "rehype-stringify": "^10.0.1",
-    "remark-frontmatter": "^5.0.0",
-    "remark-parse": "^11.0.0",
-    "remark-rehype": "^11.1.1",
     "rollup": "^4.26.0",
-    "unified": "^11.0.5",
     "wc-compiler": "~0.17.0"
   },
   "devDependencies": {
     "@aws-sdk/client-cloudfront": "^3.726.0",
     "@beforesemicolon/markup": "^1.14.1",
-    "@mapbox/rehype-prism": "^0.5.0",
     "@shoelace-style/shoelace": "^2.18.0",
     "@spectrum-css/card": "^9.3.0",
     "@spectrum-web-components/action-menu": "^1.0.1",
@@ -92,8 +84,6 @@
     "pwa-helpers": "^0.9.1",
     "redux": "^5.0.1",
     "redux-thunk": "^3.1.0",
-    "rehype-autolink-headings": "^4.0.0",
-    "rehype-slug": "^3.0.0",
     "signal-utils": "^0.21.1",
     "simpledotcss": "^1.0.0",
     "tslib": "^2.8.1"

packages/cli/src/lib/layout-utils.js

@@ -229,7 +229,9 @@ async function mergeContentIntoLayout(
             : childRoot.querySelector("html") && childBody
               ? childBody
               : !childRoot.querySelector("html")
-                ? childContents
+                ? childRoot.querySelector("body")
+                  ? childBody
+                  : childContents
                 : "";
 
     // we wrap SSR content in comments so we can extract it during prerendering to avoid double pre-rendering

packages/cli/src/lifecycles/config.js

@@ -66,7 +66,6 @@ const defaultConfig = {
   },
   isolation: false,
   layoutsDirectory: "layouts",
-  markdown: { plugins: [] },
   optimization: optimizations[0],
   pagesDirectory: "pages",
   plugins: greenwoodPlugins,

packages/cli/src/lifecycles/graph.js

@@ -3,7 +3,6 @@ import fs from "node:fs/promises";
 import fm from "front-matter";
 import { checkResourceExists, requestAsObject } from "../lib/resource-utils.js";
 import { activeFrontmatterKeys } from "../lib/content-utils.js";
-import toc from "markdown-toc";
 import { Worker } from "node:worker_threads";
 
 function getLabelFromRoute(_route) {
@@ -27,7 +26,7 @@ function getLabelFromRoute(_route) {
 }
 
 function getIdFromRelativePathPath(relativePathPath, extension) {
-  return relativePathPath.replace(extension, "").replace("./", "").replace(/\//g, "-");
+  return relativePathPath.replace(`.${extension}`, "").replace("./", "").replace(/\//g, "-");
 }
 
 function trackCollectionsForPage(page, collections) {
@@ -79,29 +78,26 @@ const generateGraph = async (compilation) => {
         pages = nextPages.pages;
         apiRoutes = nextPages.apiRoutes;
       } else {
-        const extension = `.${filenameUrl.pathname.split(".").pop()}`;
+        const extension = `${filenameUrl.pathname.split(".").pop()}`;
         const relativePagePath = filenameUrl.pathname.replace(pagesDir.pathname, "./");
         const isApiRoute = relativePagePath.startsWith("./api");
-        const req = isApiRoute
-          ? new Request(filenameUrl, { headers: { Accept: "text/javascript" } })
-          : new Request(filenameUrl, { headers: { Accept: "text/html" } });
         let isCustom = null;
 
         for (const plugin of customPageFormatPlugins) {
-          if (plugin.shouldServe && (await plugin.shouldServe(filenameUrl, req))) {
+          if (plugin.servePage && plugin.extensions.includes(extension)) {
             isCustom = plugin.servePage;
             break;
           }
         }
 
-        const isStatic = isCustom === "static" || extension === ".md" || extension === ".html";
-        const isDynamic = isCustom === "dynamic" || extension === ".js" || extension === ".ts";
+        const isStatic = isCustom === "static" || extension === "html";
+        const isDynamic = isCustom === "dynamic" || extension === "js" || extension === "ts";
         const isPage = isStatic || isDynamic;
-        let route = `${relativePagePath.replace(".", "").replace(`${extension}`, "")}`;
+        let route = `${relativePagePath.replace(".", "").replace(`.${extension}`, "")}`;
         let fileContents;
 
         if (isApiRoute) {
-          if (extension !== ".js" && extension !== ".ts" && !isCustom) {
+          if (extension !== "js" && extension !== "ts" && !isCustom) {
             console.warn(`${filenameUrl} is not a supported API file extension, skipping...`);
             return;
           }
@@ -123,12 +119,14 @@ const generateGraph = async (compilation) => {
               getIdFromRelativePathPath(relativePagePath, extension).replace("api-", ""),
             ),
             pageHref: new URL(relativePagePath, pagesDir).href,
-            outputHref: new URL(relativePagePath, outputDir).href.replace(extension, ".js"),
+            outputHref: new URL(relativePagePath, outputDir).href.replace(`.${extension}`, ".js"),
             route: `${basePath}${route}`,
             isolation,
           });
         } else if (isPage) {
-          let root = filename.split("/")[filename.split("/").length - 1].replace(extension, "");
+          let root = filename
+            .split("/")
+            [filename.split("/").length - 1].replace(`.${extension}`, "");
           // should we even have a default page layout?
           // https://github.com/ProjectEvergreen/greenwood/issues/1271
           let layout = "page";
@@ -223,36 +221,11 @@ const generateGraph = async (compilation) => {
             }
           }
 
-          /*
-           * Custom front matter - Variable Definitions
-           * --------------------------------------------------
-           * collection: the name of the collection for the page (as a string or array)
-           * order: the order of this item within the collection
-           * tocHeading: heading size to use a Table of Contents for a page
-           * tableOfContents: json object containing page's table of contents (list of headings)
-           */
-
-          // prune "reserved" attributes that are supported by Greenwood
+          // prune "reserved" frontmatter that are supported by Greenwood
           [...activeFrontmatterKeys, "layout"].forEach((key) => {
             delete customData[key];
           });
 
-          // set flag whether to gather a list of headings on a page as menu items
-          customData.tocHeading = customData.tocHeading || 0;
-          customData.tableOfContents = [];
-
-          if (fileContents && customData.tocHeading > 0 && customData.tocHeading <= 6) {
-            // parse markdown for table of contents and output to json
-            customData.tableOfContents = toc(fileContents).json;
-
-            // parse table of contents for only the pages user wants linked
-            if (customData.tableOfContents.length > 0 && customData.tocHeading > 0) {
-              customData.tableOfContents = customData.tableOfContents.filter(
-                (item) => item.lvl === customData.tocHeading,
-              );
-            }
-          }
-
           /*
            * Page Properties
            *----------------------

packages/cli/src/lifecycles/serve.js

@@ -16,21 +16,13 @@ async function getDevServer(compilation) {
   const app = new Koa();
   const compilationCopy = Object.assign({}, compilation);
   const resourcePlugins = [
-    // Greenwood default standard resource and import plugins
     ...compilation.config.plugins
       .filter((plugin) => {
-        return plugin.type === "resource" && plugin.isGreenwoodDefaultPlugin;
+        return plugin.type === "resource";
       })
       .map((plugin) => {
         return plugin.provider(compilationCopy);
       }),
-
-    // custom user resource plugins
-    ...compilation.config.plugins
-      .filter((plugin) => {
-        return plugin.type === "resource" && !plugin.isGreenwoodDefaultPlugin;
-      })
-      .map((plugin) => plugin.provider(compilationCopy)),
   ];
 
   app.use(koaBody());
@@ -57,7 +49,7 @@ async function getDevServer(compilation) {
     await next();
   });
 
-  // handle creating responses from urls
+  // handle serving responses from urls
   app.use(async (ctx, next) => {
     try {
       const url = new URL(ctx.url);
@@ -66,15 +58,43 @@ async function getDevServer(compilation) {
       // intentionally ignore initial statusText to avoid false positives from 404s
       let response = new Response(null, { status });
 
+      const pluginNames = [];
+      const wasUsed = [];
+
       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());
+        // ignore plugins that serve pages, as those will be handled by Greenwood's standard HTML plugin
+        if (
+          !plugin.servePage &&
+          plugin.shouldServe &&
+          (await plugin.shouldServe(url, request, response.clone()))
+        ) {
+          pluginNames.push(plugin.constructor.name);
+          wasUsed.push(response.bodyUsed);
+          try {
+            const newLocal = response.clone();
+            wasUsed.push(response.bodyUsed);
+            const current = await plugin.serve(
+              url,
+              request,
+              ["StandardAudioResource", "StandardJavaScriptResource"].includes(
+                plugin.constructor.name,
+              )
+                ? newLocal
+                : response.clone(),
+            );
+            wasUsed.push(response.bodyUsed);
+            const merged = mergeResponse(response.clone(), current.clone());
 
-          response = merged.clone();
+            response = merged.clone();
+          } catch (err) {
+            console.log("Error!", pluginNames, wasUsed, err);
+            throw err;
+          }
         }
       }
 
+      console.log("No error!", pluginNames, wasUsed);
+
       ctx.body = response.body ? Readable.from(response.body) : "";
       ctx.status = response.status;
       ctx.message = response.statusText;
@@ -177,7 +197,7 @@ async function getDevServer(compilation) {
         statusText: message,
         status,
         headers: new Headers(header),
-      }).clone();
+      });
       const splitResponse = response.clone();
       const contents = await splitResponse.text();
       const inm = ctx.headers["if-none-match"];
@@ -250,6 +270,7 @@ async function getStaticServer(compilation, composable) {
         }
       } else {
         ctx.body = "Not Found";
+        ctx.message = "Not Found";
         ctx.status = 404;
         ctx.set("Content-Type", "text/plain");
       }
@@ -323,6 +344,7 @@ async function getStaticServer(compilation, composable) {
 
         ctx.body = body;
         ctx.status = 200;
+        ctx.message = "OK";
         ctx.set("Content-Type", "text/html");
       }
     } catch (e) {
@@ -392,6 +414,7 @@ async function getHybridServer(compilation) {
         }
 
         ctx.body = html;
+        ctx.message = "OK";
         ctx.set("Content-Type", "text/html");
         ctx.status = 200;
       } else if (isApiRoute) {