@cedarjs/prerender 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/apolloState.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Whether an extracted Apollo cache state is non-empty and worth inlining
+ * into the prerendered HTML as a bootstrap `<script>`.
+ *
+ * Only emit the Apollo state bootstrap when there is state to restore. Both
+ * consumers (`CedarApolloProvider` and the suspense provider) already do
+ * `.restore(globalThis?.__CEDAR__APOLLO_STATE ?? {})`, so an empty payload is
+ * a no-op. It is still an inline `<script>` though, which every strict-CSP app
+ * has to allow-list with a hash that goes stale whenever the payload changes.
+ * A page that prerenders no Cells emits nothing.
+ */
+export declare function hasApolloState(state: unknown): state is Record<string, unknown>;
+//# sourceMappingURL=apolloState.d.ts.map

package/dist/apolloState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apolloState.d.ts","sourceRoot":"","sources":["../src/apolloState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAIlC"}

package/dist/apolloState.js

@@ -0,0 +1,6 @@
+function hasApolloState(state) {
+  return typeof state === "object" && state !== null && Object.keys(state).length > 0;
+}
+export {
+  hasApolloState
+};

package/dist/browserUtils/index.d.ts

@@ -4,5 +4,5 @@ export declare const isBrowser: boolean;
 export declare const useIsBrowser: () => boolean;
 export declare const BrowserOnly: ({ children }: {
     children: ReactElement;
-}) => ReactElement<any, string | React.JSXElementConstructor<any>> | null;
+}) => ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | null;
 //# sourceMappingURL=index.d.ts.map

package/dist/browserUtils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browserUtils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAKzC,eAAO,MAAM,cAAc,QAAO,OAEjC,CAAA;AAED,eAAO,MAAM,SAAS,SAAoB,CAAA;AAE1C,eAAO,MAAM,YAAY,eAIxB,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,cAAc;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,wEAInE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browserUtils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAKzC,eAAO,MAAM,cAAc,QAAO,OAEjC,CAAA;AAED,eAAO,MAAM,SAAS,SAAoB,CAAA;AAE1C,eAAO,MAAM,YAAY,eAIxB,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,cAAc;IAAE,QAAQ,EAAE,YAAY,CAAA;CAAE,sFAInE,CAAA"}

package/dist/build-and-import/buildAndImport.d.ts

@@ -7,6 +7,6 @@ interface Options {
      */
     preserveTemporaryFile?: boolean;
 }
-export declare function buildAndImport(options: Options): Promise<Record<string, React.FunctionComponent>>;
+export declare function buildAndImport(options: Options): Promise<Record<string, React.ElementType>>;
 export {};
 //# sourceMappingURL=buildAndImport.d.ts.map

package/dist/build-and-import/buildAndImport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildAndImport.d.ts","sourceRoot":"","sources":["../../src/build-and-import/buildAndImport.ts"],"names":[],"mappings":"AAoCA,UAAU,OAAO;IACf,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAmIlD"}
+{"version":3,"file":"buildAndImport.d.ts","sourceRoot":"","sources":["../../src/build-and-import/buildAndImport.ts"],"names":[],"mappings":"AAqCA,UAAU,OAAO;IACf,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CA4I5C"}

package/dist/build-and-import/buildAndImport.js

@@ -7,11 +7,12 @@ import replace from "@rollup/plugin-replace";
 import { rollup } from "rollup";
 import { swc } from "rollup-plugin-swc3";
 import unimportPlugin from "unimport/unplugin";
-import { getConfig, getPaths, projectIsEsm } from "@cedarjs/project-config";
+import { getConfig, getPaths } from "@cedarjs/project-config";
 import {
   getPathsFromTypeScriptConfig,
   parseTypeScriptConfigFiles
 } from "../internal.js";
+import { cedarRemoveDevFatalErrorPagePlugin } from "./rollupPlugins/rollup-plugin-cedar-remove-dev-fatal-error-page.js";
 import { cellTransformPlugin } from "./rollupPlugins/rollup-plugin-cedarjs-cell.js";
 import { cedarjsDirectoryNamedImportPlugin } from "./rollupPlugins/rollup-plugin-cedarjs-directory-named-imports.js";
 import { externalPlugin } from "./rollupPlugins/rollup-plugin-cedarjs-external.js";
@@ -41,7 +42,6 @@ async function buildAndImport(options) {
   if (!fs.existsSync(outDir)) {
     fs.mkdirSync(outDir, { recursive: true });
   }
-  const isEsm = projectIsEsm();
   const build = await rollup({
     input: [options.filepath],
     output: {
@@ -78,6 +78,25 @@ async function buildAndImport(options) {
           ...getPathsFromTypeScriptConfig(tsConfigs.web, webBase)
         ]
       }),
+      // Handle JSON imports (e.g. .cedar/gqlorm-schema.json)
+      {
+        name: "json",
+        transform(code, id) {
+          if (!id.endsWith(".json")) {
+            return null;
+          }
+          try {
+            const parsed = JSON.parse(code);
+            return {
+              code: `export default ${JSON.stringify(parsed)}`,
+              map: { mappings: "" }
+            };
+          } catch {
+            return null;
+          }
+        }
+      },
+      cedarRemoveDevFatalErrorPagePlugin(),
       ignoreHtmlAndCssImportsPlugin(),
       cellTransformPlugin(),
       cedarjsRoutesAutoLoaderPlugin(),
@@ -94,16 +113,10 @@ async function buildAndImport(options) {
             from: "react"
           },
           // import { gql } from 'graphql-tag'
-          !useTrustedDocumentsGqlTag && isEsm && {
+          !useTrustedDocumentsGqlTag && {
             name: "gql",
             from: "graphql-tag"
           },
-          // import gql from 'graphql-tag'
-          !useTrustedDocumentsGqlTag && !isEsm && {
-            name: "default",
-            as: "gql",
-            from: "graphql-tag"
-          },
           // import { gql } from 'src/graphql/gql'
           useTrustedDocumentsGqlTag && {
             name: "gql",

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedar-remove-dev-fatal-error-page.d.ts

@@ -0,0 +1,14 @@
+import type { Plugin as RollupPlugin } from 'rollup';
+/**
+ * Rollup plugin to remove the DevFatalErrorPage import during prerendering.
+ *
+ * Replaces:
+ *   import { DevFatalErrorPage } from '@cedarjs/web/dist/components/DevFatalErrorPage'
+ * with:
+ *   const DevFatalErrorPage = undefined
+ *
+ * Prerendering runs in a production context and should not include the
+ * dev-only error page component in the bundle.
+ */
+export declare const cedarRemoveDevFatalErrorPagePlugin: () => RollupPlugin;
+//# sourceMappingURL=rollup-plugin-cedar-remove-dev-fatal-error-page.d.ts.map

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedar-remove-dev-fatal-error-page.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rollup-plugin-cedar-remove-dev-fatal-error-page.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedar-remove-dev-fatal-error-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,QAAQ,CAAA;AAcpD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kCAAkC,QAAO,YAqBrD,CAAA"}

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedar-remove-dev-fatal-error-page.js

@@ -0,0 +1,29 @@
+const DEV_FATAL_ERROR_PAGE_MODULE = "@cedarjs/web/dist/components/DevFatalErrorPage";
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+const ESCAPED_MODULE = escapeRegExp(DEV_FATAL_ERROR_PAGE_MODULE);
+const IMPORT_PATTERN = new RegExp(
+  `import\\s*\\{[^}]*\\bDevFatalErrorPage\\b[^}]*\\}\\s*from\\s*['"]${ESCAPED_MODULE}['"]`
+);
+const cedarRemoveDevFatalErrorPagePlugin = () => {
+  return {
+    name: "cedar-remove-dev-fatal-error-page",
+    transform(code) {
+      if (!code.includes(DEV_FATAL_ERROR_PAGE_MODULE)) {
+        return null;
+      }
+      const newCode = code.replace(
+        IMPORT_PATTERN,
+        "const DevFatalErrorPage = undefined"
+      );
+      if (newCode === code) {
+        return null;
+      }
+      return { code: newCode, map: null };
+    }
+  };
+};
+export {
+  cedarRemoveDevFatalErrorPagePlugin
+};

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedarjs-cell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup-plugin-cedarjs-cell.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedarjs-cell.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAmBpC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAmK5C"}
+{"version":3,"file":"rollup-plugin-cedarjs-cell.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedarjs-cell.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAoBpC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAsK5C"}

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedarjs-cell.js

@@ -7,6 +7,7 @@ const generate = babelGenerator.default;
 const EXPECTED_EXPORTS_FROM_CELL = [
   "beforeQuery",
   "QUERY",
+  "FRAGMENT",
   "data",
   "isEmpty",
   "afterQuery",
@@ -64,7 +65,7 @@ function cellTransformPlugin() {
             }
           }
         });
-        const hasQueryOrDataExport = exportNames.includes("QUERY") || exportNames.includes("data");
+        const hasQueryOrDataExport = exportNames.includes("QUERY") || exportNames.includes("FRAGMENT") || exportNames.includes("data");
         if (hasDefaultExport || !hasQueryOrDataExport) {
           return null;
         }

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedarjs-ignore-html-and-css-imports.d.ts

@@ -1,8 +1,9 @@
 import type { Plugin as RollupPlugin } from 'rollup';
 /**
- * A Rollup plugin that ignores imports of HTML and CSS files by replacing them with empty modules.
- * This is useful when bundling code that imports these files for webpack or other bundlers,
- * but you want Rollup to ignore them during the build process.
+ * A Rollup plugin that ignores imports of HTML and CSS files by replacing them
+ * with empty modules. This is useful when bundling code that imports these
+ * files for the browser build (where Vite handles them), but you want Rollup to
+ * ignore them during the build process.
  *
  * @param options Configuration options
  * @returns Rollup plugin

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedarjs-ignore-html-and-css-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup-plugin-cedarjs-ignore-html-and-css-imports.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedarjs-ignore-html-and-css-imports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,QAAQ,CAAA;AAEpD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,6BAA6B,QAAO,YAyBhD,CAAA"}
+{"version":3,"file":"rollup-plugin-cedarjs-ignore-html-and-css-imports.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedarjs-ignore-html-and-css-imports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,QAAQ,CAAA;AAEpD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,6BAA6B,QAAO,YAyBhD,CAAA"}

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedarjs-prerender-media-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup-plugin-cedarjs-prerender-media-imports.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedarjs-prerender-media-imports.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AA6BpC,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kCAAkC,CAChD,OAAO,GAAE,4BAAiC,GACzC,MAAM,CA0ER"}
+{"version":3,"file":"rollup-plugin-cedarjs-prerender-media-imports.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedarjs-prerender-media-imports.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AA8BpC,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kCAAkC,CAChD,OAAO,GAAE,4BAAiC,GACzC,MAAM,CA0ER"}

package/dist/build-and-import/rollupPlugins/rollup-plugin-cedarjs-routes-auto-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup-plugin-cedarjs-routes-auto-loader.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedarjs-routes-auto-loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAYpC,MAAM,WAAW,aAAa;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAuBD,wBAAgB,6BAA6B,IAAI,MAAM,CAoJtD"}
+{"version":3,"file":"rollup-plugin-cedarjs-routes-auto-loader.d.ts","sourceRoot":"","sources":["../../../src/build-and-import/rollupPlugins/rollup-plugin-cedarjs-routes-auto-loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAYpC,MAAM,WAAW,aAAa;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAoBD,wBAAgB,6BAA6B,IAAI,MAAM,CAoJtD"}

package/dist/detection/detection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detection.d.ts","sourceRoot":"","sources":["../../src/detection/detection.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB;;;;;;;;;GAsBjC,CAAA"}
+{"version":3,"file":"detection.d.ts","sourceRoot":"","sources":["../../src/detection/detection.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB;;;;;;;;;GAqBjC,CAAA"}

package/dist/detection/detection.js

@@ -1,8 +1,6 @@
-import { getPaths } from "@cedarjs/project-config";
 import { getProject } from "@cedarjs/structure";
 const detectPrerenderRoutes = () => {
-  const rwProject = getProject(getPaths().base);
-  const routes = rwProject.getRouter().routes;
+  const routes = getProject().getRouter().routes;
   const prerenderRoutes = routes.filter((route) => route.prerender).map((route) => ({
     name: route.isNotFound ? "404" : route.name,
     // `path` will be updated/expanded later where route parameters will be

package/dist/graphql/graphql.d.ts

@@ -1,5 +1,19 @@
 import type { DocumentNode } from 'graphql';
 export type FileImporter = (path: string) => Promise<any>;
+/**
+ * The project's GraphQL API handler, wrapped so it can be called with a bare
+ * GraphQL operation. Resolves to the handler's response, whose `body` holds
+ * the JSON-encoded result.
+ */
+export type GqlHandler = (operation: GqlOperation) => Promise<{
+    body?: string;
+} | undefined>;
+interface GqlOperation {
+    operationName: string;
+    query: string | undefined;
+    variables?: Record<string, unknown>;
+    extensions?: Record<string, unknown>;
+}
 /**
  * Loads the graphql server, with all the user's settings
  * And execute the query against it
@@ -8,12 +22,13 @@ export type FileImporter = (path: string) => Promise<any>;
  * there is a GraphQL error. Instead, it returns the result with the graphql
  * error.
  */
-export declare function executeQuery(fileImporter: FileImporter, gqlHandler: (args: any) => Promise<any>, query: DocumentNode, variables?: Record<string, unknown>): Promise<any>;
+export declare function executeQuery(fileImporter: FileImporter, gqlHandler: GqlHandler, query: DocumentNode, variables?: Record<string, unknown>): Promise<string | undefined>;
 /**
  * Finds the graphql handler, returns a function
  * that can be used to execute queries against it
  *
  * Throws GqlHandlerImportError, so that we can warn the user (but not blow up)
  */
-export declare function getGqlHandler(fileImporter: FileImporter): Promise<(operation: Record<string, unknown>) => Promise<any>>;
+export declare function getGqlHandler(fileImporter: FileImporter): Promise<GqlHandler>;
+export {};
 //# sourceMappingURL=graphql.d.ts.map

package/dist/graphql/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/graphql/graphql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAS3C,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AASzD;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACvC,KAAK,EAAE,YAAY,EACnB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,gBAmCpC;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,YAAY,EAAE,YAAY,uBAMjC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,mBAUnD"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/graphql/graphql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAS3C,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAEzD;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,SAAS,EAAE,YAAY,KACpB,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAAA;AAE3C,UAAU,YAAY;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACrC;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,YAAY,EACnB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,+BAmCpC;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,UAAU,CAAC,CAgBrB"}

package/dist/graphql/node-runner.d.ts

@@ -1,7 +1,7 @@
 import type { UserConfig } from 'vite';
 export declare class NodeRunner {
     private viteServer?;
-    private runner?;
+    private env?;
     private readonly customViteConfig;
     constructor(customViteConfig?: UserConfig);
     init(): Promise<void>;

package/dist/graphql/node-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-runner.d.ts","sourceRoot":"","sources":["../../src/graphql/node-runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,UAAU,EAAE,MAAM,MAAM,CAAA;AAsDrD,qBAAa,UAAU;IACrB,OAAO,CAAC,UAAU,CAAC,CAA2B;IAC9C,OAAO,CAAC,MAAM,CAAC,CAA4B;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;gBAEjC,gBAAgB,GAAE,UAAe;IAIvC,IAAI;IA6BJ,UAAU,CAAC,QAAQ,EAAE,MAAM;IAQ3B,KAAK;CAGZ"}
+{"version":3,"file":"node-runner.d.ts","sourceRoot":"","sources":["../../src/graphql/node-runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAyC,UAAU,EAAE,MAAM,MAAM,CAAA;AAsD7E,qBAAa,UAAU;IACrB,OAAO,CAAC,UAAU,CAAC,CAA2B;IAC9C,OAAO,CAAC,GAAG,CAAC,CAAoC;IAChD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;gBAEjC,gBAAgB,GAAE,UAAe;IAIvC,IAAI;IAYJ,UAAU,CAAC,QAAQ,EAAE,MAAM;IAa3B,KAAK;CAGZ"}

package/dist/graphql/node-runner.js

@@ -1,24 +1,28 @@
-import { createServer, version as viteVersion, mergeConfig } from "vite";
-import { ViteNodeRunner } from "vite-node/client";
-import { ViteNodeServer } from "vite-node/server";
-import { installSourcemapsSupport } from "vite-node/source-map";
+import { createServer, isRunnableDevEnvironment, mergeConfig } from "vite";
 import { getPaths } from "@cedarjs/project-config";
 import {
   cedarCellTransform,
-  cedarjsDirectoryNamedImportPlugin,
+  cedarjsResolveCedarStyleImportsPlugin,
   cedarjsJobPathInjectorPlugin,
-  cedarSwapApolloProvider
+  cedarSwapApolloProvider,
+  cedarCjsCompatPlugin,
+  cedarImportDirPlugin
 } from "@cedarjs/vite";
 import { cedarAutoImportsPlugin } from "./vite-plugin-cedar-auto-import.js";
-import { cedarImportDirPlugin } from "./vite-plugin-cedar-import-dir.js";
 async function createViteServer(customConfig = {}) {
   const defaultConfig = {
     mode: "production",
     optimizeDeps: {
-      // This is recommended in the vite-node readme
       noDiscovery: true,
       include: void 0
     },
+    server: {
+      hmr: false,
+      watch: null
+    },
+    environments: {
+      nodeRunnerEnv: {}
+    },
     resolve: {
       alias: [
         {
@@ -28,9 +32,10 @@ async function createViteServer(customConfig = {}) {
       ]
     },
     plugins: [
+      cedarCjsCompatPlugin(),
       cedarImportDirPlugin(),
       cedarAutoImportsPlugin(),
-      cedarjsDirectoryNamedImportPlugin(),
+      cedarjsResolveCedarStyleImportsPlugin(),
       cedarCellTransform(),
       cedarjsJobPathInjectorPlugin(),
       cedarSwapApolloProvider()
@@ -38,48 +43,33 @@ async function createViteServer(customConfig = {}) {
   };
   const mergedConfig = mergeConfig(defaultConfig, customConfig);
   const server = await createServer(mergedConfig);
-  if (Number(viteVersion.split(".")[0]) < 6) {
-    await server.pluginContainer.buildStart({});
-  }
   return server;
 }
 class NodeRunner {
   viteServer = void 0;
-  runner = void 0;
+  env = void 0;
   customViteConfig;
   constructor(customViteConfig = {}) {
     this.customViteConfig = customViteConfig;
   }
   async init() {
     this.viteServer = await createViteServer(this.customViteConfig);
-    const nodeServer = new ViteNodeServer(this.viteServer, {
-      transformMode: {
-        ssr: [/.*/],
-        web: [/\/web\//]
-      },
-      deps: {
-        fallbackCJS: true
-      }
-    });
-    installSourcemapsSupport({
-      getSourceMap: (source) => nodeServer?.getSourceMap(source)
-    });
-    this.runner = new ViteNodeRunner({
-      root: this.viteServer.config.root,
-      base: this.viteServer.config.base,
-      fetchModule(id) {
-        return nodeServer.fetchModule(id);
-      },
-      resolveId(id, importer) {
-        return nodeServer.resolveId(id, importer);
-      }
-    });
+    const env = this.viteServer.environments.nodeRunnerEnv;
+    if (!env || !isRunnableDevEnvironment(env)) {
+      await this.viteServer.close();
+      throw new Error("Vite environment is not runnable.");
+    }
+    this.env = env;
   }
   async importFile(filePath) {
-    if (!this.runner) {
+    if (!this.env) {
       await this.init();
     }
-    return this.runner?.executeFile(filePath);
+    const env = this.env;
+    if (!env) {
+      throw new Error("NodeRunner failed to initialize");
+    }
+    return env.runner.import(filePath);
   }
   async close() {
     await this.viteServer?.close();

package/dist/{cjs/index.d.ts.map → index.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA"}

package/dist/index.js

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

package/dist/runPrerender.d.ts.map

@@ -0,0 +1 @@
+{"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"}

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

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import React from "react";
-import * as apolloClient from "@apollo/client";
+import { ApolloClient, ApolloLink, InMemoryCache } from "@apollo/client";
 import { load as loadHtml } from "cheerio";
 import ReactDOMServer from "react-dom/server";
 import {
@@ -10,6 +10,7 @@ import {
   importStatementPath
 } from "@cedarjs/project-config";
 import { matchPath } from "@cedarjs/router/dist/util";
+import { hasApolloState } from "./apolloState.js";
 import { buildAndImport } from "./build-and-import/buildAndImport.js";
 import { detectPrerenderRoutes } from "./detection/detection.js";
 import {
@@ -20,9 +21,21 @@ import {
 import { executeQuery, getGqlHandler } from "./graphql/graphql.js";
 import { NodeRunner } from "./graphql/node-runner.js";
 import { getRootHtmlPath, registerShims, writeToDist } from "./internal.js";
-const { ApolloClient, InMemoryCache } = apolloClient.default;
-const prerenderApolloClient = new ApolloClient({ cache: new InMemoryCache() });
-async function recursivelyRender(App, Routes, CellCacheContextProvider, LocationProvider, renderPath, fileImporter, gqlHandler, queryCache) {
+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 { getOperationName } = await import("@cedarjs/web");
   let shouldShowGraphqlHandlerNotFoundWarn = false;
   await Promise.all(
@@ -39,13 +52,13 @@ async function recursivelyRender(App, Routes, CellCacheContextProvider, Location
         );
         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 ?? ""
             });
           }
         }
@@ -89,16 +102,7 @@ async function recursivelyRender(App, Routes, CellCacheContextProvider, Location
     /* @__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(
-      App,
-      Routes,
-      CellCacheContextProvider,
-      LocationProvider,
-      renderPath,
-      fileImporter,
-      gqlHandler,
-      queryCache
-    );
+    return recursivelyRender(args);
   } else {
     if (shouldShowGraphqlHandlerNotFoundWarn) {
       console.warn(
@@ -130,7 +134,7 @@ function insertChunkLoadingScript(indexHtmlTree, renderPath) {
   );
   const chunkPaths = [];
   if (route?.filePath) {
-    const pagesIndex = route.filePath.indexOf(path.join("web", "src", "pages")) + 8;
+    const pagesIndex = route.filePath.indexOf(path.join("web", "src", "pages")) + 4;
     const pagePath = ensurePosixPath(route.filePath.slice(pagesIndex));
     const pageChunkPath = buildManifest[pagePath]?.file;
     if (pageChunkPath) {
@@ -180,48 +184,54 @@ const runPrerender = async ({
 }) => {
   registerShims(renderPath);
   const nodeRunner = new NodeRunner();
-  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
+  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
     });
-    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");
+  } finally {
+    await nodeRunner.close();
   }
-  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];
@@ -250,14 +260,17 @@ const runPrerender = async ({
       }
     }
   }
-  indexHtmlTree("head").append(
-    `<script> globalThis.__REDWOOD__APOLLO_STATE = ${JSON.stringify(
-      prerenderApolloClient.extract()
-    )}</script>`
-  );
+  const apolloState = prerenderApolloClient.extract();
+  if (hasApolloState(apolloState)) {
+    indexHtmlTree("head").append(
+      `<script> globalThis.__CEDAR__APOLLO_STATE = ${JSON.stringify(
+        apolloState
+      )}</script>`
+    );
+  }
   prerenderApolloClient.resetStore();
   insertChunkLoadingScript(indexHtmlTree, renderPath);
-  indexHtmlTree("#redwood-app").append(componentAsHtml);
+  indexHtmlTree("#cedar-app, #redwood-app").append(componentAsHtml);
   const renderOutput = indexHtmlTree.html();
   return renderOutput;
 };