@cedarjs/cli 0.9.1-next.21 → 0.9.1-next.23

package/dist/commands/prerenderHandler.js

@@ -2,9 +2,7 @@ import path from "path";
 import fs from "fs-extra";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { runPrerender, writePrerenderedHtmlFile } from "@cedarjs/prerender";
-import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
-import { getConfig, getPaths } from "@cedarjs/project-config";
+import { getConfig, getPaths, projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../lib/colors.js";
 import { runScriptFunction } from "../lib/exec.js";
@@ -70,7 +68,8 @@ async function expandRouteParameters(route) {
   return [route];
 }
 const getTasks = async (dryrun, routerPathFilter = null) => {
-  const prerenderRoutes = detectPrerenderRoutes().filter((route) => route.path);
+  const detector = projectIsEsm() ? await import("@cedarjs/prerender/detection") : await import("@cedarjs/prerender/cjs/detection");
+  const prerenderRoutes = detector.detectPrerenderRoutes().filter((route) => route.path);
   const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (prerenderRoutes.length === 0) {
     console.log("\nSkipping prerender...");
@@ -91,6 +90,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
   const expandedRouteParameters = await Promise.all(
     prerenderRoutes.map((route) => expandRouteParameters(route))
   );
+  const prerenderer = projectIsEsm() ? await import("@cedarjs/prerender") : await import("@cedarjs/prerender/cjs");
   const listrTasks = expandedRouteParameters.flatMap((routesToPrerender) => {
     const queryCache = {};
     const shouldFold = routesToPrerender.length > 16;
@@ -110,6 +110,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
                 continue;
               }
               await prerenderRoute(
+                prerenderer,
                 queryCache,
                 routeToPrerender,
                 dryrun,
@@ -133,6 +134,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
         title: `Prerendering ${routeToPrerender.path} -> ${outputHtmlPath}`,
         task: async () => {
           await prerenderRoute(
+            prerenderer,
             queryCache,
             routeToPrerender,
             dryrun,
@@ -194,19 +196,19 @@ const diagnosticCheck = () => {
     console.log("\u2714 Diagnostics checks passed \n");
   }
 };
-const prerenderRoute = async (queryCache, routeToPrerender, dryrun, outputHtmlPath) => {
+const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun, outputHtmlPath) => {
   if (/\{.*}/.test(routeToPrerender.path)) {
     throw new PathParamError(
       `Could not retrieve route parameters for ${routeToPrerender.path}`
     );
   }
   try {
-    const prerenderedHtml = await runPrerender({
+    const prerenderedHtml = await prerenderer.runPrerender({
       queryCache,
       renderPath: routeToPrerender.path
     });
     if (!dryrun) {
-      writePrerenderedHtmlFile(outputHtmlPath, prerenderedHtml);
+      prerenderer.writePrerenderedHtmlFile(outputHtmlPath, prerenderedHtml);
     }
   } catch (e) {
     console.log();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "0.9.1-next.21+b4cbd34c0",
+  "version": "0.9.1-next.23+f994b4719",
   "description": "The Redwood Command Line",
   "repository": {
     "type": "git",
@@ -32,15 +32,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.27.1",
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/api-server": "0.9.1-next.21+b4cbd34c0",
-    "@cedarjs/cli-helpers": "0.9.1-next.21+b4cbd34c0",
-    "@cedarjs/fastify-web": "0.9.1-next.21+b4cbd34c0",
-    "@cedarjs/internal": "0.9.1-next.21+b4cbd34c0",
-    "@cedarjs/prerender": "0.9.1-next.21+b4cbd34c0",
-    "@cedarjs/project-config": "0.9.1-next.21+b4cbd34c0",
-    "@cedarjs/structure": "0.9.1-next.21+b4cbd34c0",
-    "@cedarjs/telemetry": "0.9.1-next.21+b4cbd34c0",
-    "@cedarjs/web-server": "0.9.1-next.21+b4cbd34c0",
+    "@cedarjs/api-server": "0.9.1-next.23+f994b4719",
+    "@cedarjs/cli-helpers": "0.9.1-next.23+f994b4719",
+    "@cedarjs/fastify-web": "0.9.1-next.23+f994b4719",
+    "@cedarjs/internal": "0.9.1-next.23+f994b4719",
+    "@cedarjs/prerender": "0.9.1-next.23+f994b4719",
+    "@cedarjs/project-config": "0.9.1-next.23+f994b4719",
+    "@cedarjs/structure": "0.9.1-next.23+f994b4719",
+    "@cedarjs/telemetry": "0.9.1-next.23+f994b4719",
+    "@cedarjs/web-server": "0.9.1-next.23+f994b4719",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -102,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b4cbd34c0f1da375a4885bbd1dcc168c5d2004a3"
+  "gitHead": "f994b471993683ea2bdfab8d339b3e26c4d25c20"
 }