@cedarjs/prerender 7.0.0-canary.3258 → 7.0.0-rc.123

package/dist/{runPrerender.js → runPrerenderEsm.js}

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import React from "react";
-import { ApolloClient, ApolloLink, InMemoryCache } from "@apollo/client";
+import * as apolloClient from "@apollo/client";
 import { load as loadHtml } from "cheerio";
 import ReactDOMServer from "react-dom/server";
 import {
@@ -21,21 +21,9 @@ import {
 import { executeQuery, getGqlHandler } from "./graphql/graphql.js";
 import { NodeRunner } from "./graphql/node-runner.js";
 import { getRootHtmlPath, registerShims, writeToDist } from "./internal.js";
-const prerenderApolloClient = new ApolloClient({
-  cache: new InMemoryCache(),
-  link: ApolloLink.empty()
-});
-async function recursivelyRender(args) {
-  const {
-    App,
-    Routes,
-    CellCacheContextProvider,
-    LocationProvider,
-    renderPath,
-    fileImporter,
-    gqlHandler,
-    queryCache
-  } = args;
+const { ApolloClient, InMemoryCache } = apolloClient.default;
+const prerenderApolloClient = new ApolloClient({ cache: new InMemoryCache() });
+async function recursivelyRender(App, Routes, CellCacheContextProvider, LocationProvider, renderPath, fileImporter, gqlHandler, queryCache) {
   const { getOperationName } = await import("@cedarjs/web");
   let shouldShowGraphqlHandlerNotFoundWarn = false;
   await Promise.all(
@@ -52,13 +40,13 @@ async function recursivelyRender(args) {
         );
         let result;
         try {
-          result = JSON.parse(resultString ?? "");
+          result = JSON.parse(resultString);
         } catch (e) {
           if (e instanceof SyntaxError) {
             throw new JSONParseError({
               query: value.query,
               variables: value.variables,
-              result: resultString ?? ""
+              result: resultString
             });
           }
         }
@@ -102,7 +90,16 @@ async function recursivelyRender(args) {
     /* @__PURE__ */ React.createElement(LocationProvider, { location: new URL(prerenderUrl) }, /* @__PURE__ */ React.createElement(CellCacheContextProvider, { queryCache }, /* @__PURE__ */ React.createElement(App, null, /* @__PURE__ */ React.createElement(Routes, null))))
   );
   if (Object.values(queryCache).some((value) => !value.hasProcessed)) {
-    return recursivelyRender(args);
+    return recursivelyRender(
+      App,
+      Routes,
+      CellCacheContextProvider,
+      LocationProvider,
+      renderPath,
+      fileImporter,
+      gqlHandler,
+      queryCache
+    );
   } else {
     if (shouldShowGraphqlHandlerNotFoundWarn) {
       console.warn(
@@ -184,54 +181,48 @@ const runPrerender = async ({
 }) => {
   registerShims(renderPath);
   const nodeRunner = new NodeRunner();
-  let componentAsHtml;
-  try {
-    const gqlHandler = await getGqlHandler(
-      nodeRunner.importFile.bind(nodeRunner)
-    );
-    const prerenderDistPath = path.join(getPaths().web.dist, "__prerender");
-    fs.mkdirSync(prerenderDistPath, { recursive: true });
-    if (!renderCache.App) {
-      const entryPath = await createCombinedEntry({
-        appPath: getPaths().web.app,
-        routesPath: getPaths().web.routes,
-        outDir: prerenderDistPath
-      });
-      const required = await buildAndImport({
-        filepath: entryPath,
-        preserveTemporaryFile: true
-      });
-      renderCache.App = required.App;
-      renderCache.Routes = required.Routes;
-      renderCache.CellCacheContextProvider = required.CellCacheContextProvider;
-      renderCache.LocationProvider = required.LocationProvider;
-    }
-    const { LocationProvider, App, Routes, CellCacheContextProvider } = renderCache;
-    if (!App) {
-      throw new Error("App not found");
-    }
-    if (!Routes) {
-      throw new Error("Routes not found");
-    }
-    if (!CellCacheContextProvider) {
-      throw new Error("CellCacheContextProvider not found");
-    }
-    if (!LocationProvider) {
-      throw new Error("LocationProvider not found");
-    }
-    componentAsHtml = await recursivelyRender({
-      App,
-      Routes,
-      CellCacheContextProvider,
-      LocationProvider,
-      renderPath,
-      fileImporter: nodeRunner.importFile.bind(nodeRunner),
-      gqlHandler,
-      queryCache
+  const gqlHandler = await getGqlHandler(nodeRunner.importFile.bind(nodeRunner));
+  const prerenderDistPath = path.join(getPaths().web.dist, "__prerender");
+  fs.mkdirSync(prerenderDistPath, { recursive: true });
+  if (!renderCache.App) {
+    const entryPath = await createCombinedEntry({
+      appPath: getPaths().web.app,
+      routesPath: getPaths().web.routes,
+      outDir: prerenderDistPath
+    });
+    const required = await buildAndImport({
+      filepath: entryPath,
+      preserveTemporaryFile: true
     });
-  } finally {
-    await nodeRunner.close();
+    renderCache.App = required.App;
+    renderCache.Routes = required.Routes;
+    renderCache.CellCacheContextProvider = required.CellCacheContextProvider;
+    renderCache.LocationProvider = required.LocationProvider;
+  }
+  const { LocationProvider, App, Routes, CellCacheContextProvider } = renderCache;
+  if (!App) {
+    throw new Error("App not found");
+  }
+  if (!Routes) {
+    throw new Error("Routes not found");
   }
+  if (!CellCacheContextProvider) {
+    throw new Error("CellCacheContextProvider not found");
+  }
+  if (!LocationProvider) {
+    throw new Error("LocationProvider not found");
+  }
+  const componentAsHtml = await recursivelyRender(
+    App,
+    Routes,
+    CellCacheContextProvider,
+    LocationProvider,
+    renderPath,
+    nodeRunner.importFile.bind(nodeRunner),
+    gqlHandler,
+    queryCache
+  );
+  nodeRunner.close();
   const { helmet } = globalThis.__REDWOOD__HELMET_CONTEXT;
   Object.keys(queryCache).forEach((queryKey) => {
     const { query, variables, data } = queryCache[queryKey];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/prerender",
-  "version": "7.0.0-canary.3258",
+  "version": "7.0.0-rc.123",
   "description": "CedarJS prerender",
   "repository": {
     "type": "git",
@@ -11,18 +11,46 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "import": {
+        "types": "./dist/runPrerenderEsm.d.ts",
+        "default": "./dist/runPrerenderEsm.js"
+      },
+      "require": {
+        "types": "./dist/cjs/runPrerender.d.ts",
+        "default": "./dist/cjs/runPrerender.js"
+      }
+    },
+    "./cjs": {
+      "types": "./dist/cjs/runPrerender.d.ts",
+      "default": "./dist/cjs/runPrerender.js"
     },
     "./browserUtils": {
-      "types": "./dist/browserUtils/index.d.ts",
-      "default": "./dist/browserUtils/index.js"
+      "import": {
+        "types": "./dist/browserUtils/index.d.ts",
+        "default": "./dist/browserUtils/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/browserUtils/index.d.ts",
+        "default": "./dist/cjs/browserUtils/index.js"
+      }
     },
     "./detection": {
-      "types": "./dist/detection/detection.d.ts",
-      "default": "./dist/detection/detection.js"
+      "import": {
+        "types": "./dist/detection/detection.d.ts",
+        "default": "./dist/detection/detection.js"
+      },
+      "require": {
+        "types": "./dist/cjs/detection/detection.d.ts",
+        "default": "./dist/cjs/detection/detection.js"
+      }
+    },
+    "./cjs/detection": {
+      "types": "./dist/cjs/detection/detection.d.ts",
+      "default": "./dist/cjs/detection/detection.js"
     }
   },
+  "main": "dist/cjs/index.js",
+  "types": "./dist/cjs/index.d.ts",
   "files": [
     "dist"
   ],
@@ -30,6 +58,7 @@
     "build": "node ./build.mts && yarn build:types",
     "build:pack": "yarn pack -o cedarjs-prerender.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
+    "build:types-cjs": "tsc --build --verbose ./tsconfig.cjs.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx,template\" --ignore dist --exec \"yarn build\"",
     "check:attw": "yarn cedar-fwtools-attw",
     "check:package": "concurrently npm:check:attw yarn:publint",
@@ -41,16 +70,17 @@
     "@babel/generator": "7.29.8",
     "@babel/parser": "7.29.9",
     "@babel/traverse": "7.29.8",
-    "@babel/types": "7.29.8",
-    "@cedarjs/project-config": "7.0.0-canary.3258",
-    "@cedarjs/structure": "7.0.0-canary.3258",
-    "@cedarjs/vite": "7.0.0-canary.3258",
+    "@cedarjs/babel-config": "7.0.0-rc.123",
+    "@cedarjs/project-config": "7.0.0-rc.123",
+    "@cedarjs/structure": "7.0.0-rc.123",
+    "@cedarjs/vite": "7.0.0-rc.123",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-commonjs": "28.0.9",
     "@rollup/plugin-node-resolve": "16.0.3",
     "@rollup/plugin-replace": "6.0.3",
     "@swc/core": "1.16.2",
-    "@whatwg-node/fetch": "0.12.0",
+    "@whatwg-node/fetch": "0.10.13",
+    "babel-plugin-ignore-html-and-css-imports": "0.1.0",
     "cheerio": "1.2.0",
     "graphql": "16.14.2",
     "mime-types": "2.1.35",
@@ -61,21 +91,22 @@
     "vite": "7.3.6"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.3258",
-    "@cedarjs/router": "7.0.0-canary.3258",
-    "@cedarjs/web": "7.0.0-canary.3258",
+    "@cedarjs/framework-tools": "7.0.0-rc.123",
+    "@cedarjs/router": "7.0.0-rc.123",
+    "@cedarjs/web": "7.0.0-rc.123",
     "@types/mime-types": "2.1.4",
-    "@types/react": "^19.2.0",
+    "@types/react": "^18.2.55",
+    "babel-plugin-tester": "11.0.4",
     "concurrently": "9.2.4",
     "publint": "0.3.24",
     "typescript": "5.9.3",
     "vitest": "4.1.11"
   },
   "peerDependencies": {
-    "@cedarjs/router": "7.0.0-canary.3258",
-    "@cedarjs/web": "7.0.0-canary.3258",
-    "react": "19.3.0",
-    "react-dom": "19.3.0"
+    "@cedarjs/router": "7.0.0-rc.123",
+    "@cedarjs/web": "7.0.0-rc.123",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "engines": {
     "node": ">=24"

package/dist/index.js

@@ -1 +0,0 @@
-export * from "./runPrerender.js";

package/dist/runPrerender.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"runPrerender.d.ts","sourceRoot":"","sources":["../src/runPrerender.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AA8Q7C,UAAU,eAAe;IACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACrC,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,YAAY,GAAU,6BAGhC,eAAe,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAqIzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,GACnC,gBAAgB,MAAM,EACtB,SAAS,MAAM,SAchB,CAAA"}