@cedarjs/prerender 5.0.7-next.338 → 5.0.7-rc.3

package/dist/babelPlugins/babel-plugin-redwood-cell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babel-plugin-redwood-cell.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/babel-plugin-redwood-cell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAgCnD,wBAAgB,sBAAsB,CAAC,EACrC,KAAK,EAAE,CAAC,GACT,EAAE;IACD,KAAK,EAAE,OAAO,KAAK,CAAA;CACpB,GAAG,SAAS,CAmHZ"}
+{"version":3,"file":"babel-plugin-redwood-cell.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/babel-plugin-redwood-cell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AA+BnD,wBAAgB,sBAAsB,CAAC,EACrC,KAAK,EAAE,CAAC,GACT,EAAE;IACD,KAAK,EAAE,OAAO,KAAK,CAAA;CACpB,GAAG,SAAS,CAgHZ"}

package/dist/babelPlugins/babel-plugin-redwood-cell.js

@@ -2,7 +2,6 @@ import { parse } from "path";
 const EXPECTED_EXPORTS_FROM_CELL = [
   "beforeQuery",
   "QUERY",
-  "FRAGMENT",
   "data",
   "isEmpty",
   "afterQuery",
@@ -45,7 +44,7 @@ function babelPluginRedwoodCell({
           hasDefaultExport = false;
         },
         exit(path) {
-          const hasQueryOrDataExport = exportNames.includes("QUERY") || exportNames.includes("FRAGMENT") || exportNames.includes("data");
+          const hasQueryOrDataExport = exportNames.includes("QUERY") || exportNames.includes("data");
           if (hasDefaultExport || !hasQueryOrDataExport) {
             return;
           }

package/dist/babelPlugins/babel-plugin-redwood-prerender-media-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babel-plugin-redwood-prerender-media-imports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/babel-plugin-redwood-prerender-media-imports.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAY,MAAM,aAAa,CAAA;AAuC7D,wBAAgB,uCAAuC,CAAC,EACtD,KAAK,EAAE,CAAC,GACT,EAAE;IACD,KAAK,EAAE,OAAO,KAAK,CAAA;CACpB,GAAG,SAAS,CAqDZ"}
+{"version":3,"file":"babel-plugin-redwood-prerender-media-imports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/babel-plugin-redwood-prerender-media-imports.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAY,MAAM,aAAa,CAAA;AAyC7D,wBAAgB,uCAAuC,CAAC,EACtD,KAAK,EAAE,CAAC,GACT,EAAE;IACD,KAAK,EAAE,OAAO,KAAK,CAAA;CACpB,GAAG,SAAS,CAqDZ"}

package/dist/babelPlugins/babel-plugin-redwood-prerender-media-imports.js

@@ -2,8 +2,7 @@ import { extname, join, relative, dirname } from "path";
 import { ensurePosixPath, getPaths } from "@cedarjs/project-config";
 import { convertToDataUrl } from "./utils.js";
 const defaultOptions = {
-  // Media file extensions that Vite emits as assets, and that we therefore
-  // have to resolve to their built asset path (or a data URL) when prerendering
+  // This list of extensions matches config for file-loader in
   extensions: [
     ".ico",
     ".jpg",

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;AAoBpC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAsK5C"}
+{"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"}

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

@@ -7,7 +7,6 @@ const generate = babelGenerator.default;
 const EXPECTED_EXPORTS_FROM_CELL = [
   "beforeQuery",
   "QUERY",
-  "FRAGMENT",
   "data",
   "isEmpty",
   "afterQuery",
@@ -65,7 +64,7 @@ function cellTransformPlugin() {
             }
           }
         });
-        const hasQueryOrDataExport = exportNames.includes("QUERY") || exportNames.includes("FRAGMENT") || exportNames.includes("data");
+        const hasQueryOrDataExport = exportNames.includes("QUERY") || 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,9 +1,8 @@
 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 the browser build (where Vite handles them), 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 webpack or other bundlers,
+ * 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;;;;;;;;;;;;;;;;;;;;;GAqBG;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;;;;;;;;;;;;;;;;;;;;GAoBG;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;AA8BpC,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;AA6BpC,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/cjs/babelPlugins/babel-plugin-redwood-cell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babel-plugin-redwood-cell.d.ts","sourceRoot":"","sources":["../../../src/babelPlugins/babel-plugin-redwood-cell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAgCnD,wBAAgB,sBAAsB,CAAC,EACrC,KAAK,EAAE,CAAC,GACT,EAAE;IACD,KAAK,EAAE,OAAO,KAAK,CAAA;CACpB,GAAG,SAAS,CAmHZ"}
+{"version":3,"file":"babel-plugin-redwood-cell.d.ts","sourceRoot":"","sources":["../../../src/babelPlugins/babel-plugin-redwood-cell.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AA+BnD,wBAAgB,sBAAsB,CAAC,EACrC,KAAK,EAAE,CAAC,GACT,EAAE;IACD,KAAK,EAAE,OAAO,KAAK,CAAA;CACpB,GAAG,SAAS,CAgHZ"}

package/dist/cjs/babelPlugins/babel-plugin-redwood-cell.js

@@ -25,7 +25,6 @@ var import_path = require("path");
 const EXPECTED_EXPORTS_FROM_CELL = [
   "beforeQuery",
   "QUERY",
-  "FRAGMENT",
   "data",
   "isEmpty",
   "afterQuery",
@@ -68,7 +67,7 @@ function babelPluginRedwoodCell({
           hasDefaultExport = false;
         },
         exit(path) {
-          const hasQueryOrDataExport = exportNames.includes("QUERY") || exportNames.includes("FRAGMENT") || exportNames.includes("data");
+          const hasQueryOrDataExport = exportNames.includes("QUERY") || exportNames.includes("data");
           if (hasDefaultExport || !hasQueryOrDataExport) {
             return;
           }

package/dist/cjs/babelPlugins/babel-plugin-redwood-prerender-media-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babel-plugin-redwood-prerender-media-imports.d.ts","sourceRoot":"","sources":["../../../src/babelPlugins/babel-plugin-redwood-prerender-media-imports.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAY,MAAM,aAAa,CAAA;AAuC7D,wBAAgB,uCAAuC,CAAC,EACtD,KAAK,EAAE,CAAC,GACT,EAAE;IACD,KAAK,EAAE,OAAO,KAAK,CAAA;CACpB,GAAG,SAAS,CAqDZ"}
+{"version":3,"file":"babel-plugin-redwood-prerender-media-imports.d.ts","sourceRoot":"","sources":["../../../src/babelPlugins/babel-plugin-redwood-prerender-media-imports.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAY,MAAM,aAAa,CAAA;AAyC7D,wBAAgB,uCAAuC,CAAC,EACtD,KAAK,EAAE,CAAC,GACT,EAAE;IACD,KAAK,EAAE,OAAO,KAAK,CAAA;CACpB,GAAG,SAAS,CAqDZ"}

package/dist/cjs/babelPlugins/babel-plugin-redwood-prerender-media-imports.js

@@ -25,8 +25,7 @@ var import_path = require("path");
 var import_project_config = require("@cedarjs/project-config");
 var import_utils = require("./utils.js");
 const defaultOptions = {
-  // Media file extensions that Vite emits as assets, and that we therefore
-  // have to resolve to their built asset path (or a data URL) when prerendering
+  // This list of extensions matches config for file-loader in
   extensions: [
     ".ico",
     ".jpg",

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

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

package/dist/cjs/graphql/node-runner.js

@@ -25,6 +25,7 @@ var import_vite = require("vite");
 var import_project_config = require("@cedarjs/project-config");
 var import_vite2 = require("@cedarjs/vite");
 var import_vite_plugin_cedar_auto_import = require("./vite-plugin-cedar-auto-import.js");
+var import_vite_plugin_cedar_import_dir = require("./vite-plugin-cedar-import-dir.js");
 async function createViteServer(customConfig = {}) {
   const defaultConfig = {
     mode: "production",
@@ -49,7 +50,7 @@ async function createViteServer(customConfig = {}) {
     },
     plugins: [
       (0, import_vite2.cedarCjsCompatPlugin)(),
-      (0, import_vite2.cedarImportDirPlugin)(),
+      (0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)(),
       (0, import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin)(),
       (0, import_vite2.cedarjsResolveCedarStyleImportsPlugin)(),
       (0, import_vite2.cedarCellTransform)(),

package/dist/cjs/graphql/vite-plugin-cedar-import-dir.js

@@ -0,0 +1,118 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vite_plugin_cedar_import_dir_exports = {};
+__export(vite_plugin_cedar_import_dir_exports, {
+  cedarImportDirPlugin: () => cedarImportDirPlugin
+});
+module.exports = __toCommonJS(vite_plugin_cedar_import_dir_exports);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_napi = require("@ast-grep/napi");
+var import_fast_glob = __toESM(require("fast-glob"), 1);
+var import_project_config = require("@cedarjs/project-config");
+function cedarImportDirPlugin() {
+  return {
+    name: "vite-plugin-cedar-import-dir",
+    enforce: "pre",
+    async transform(code, id) {
+      if (!code.includes("/**/")) {
+        return null;
+      }
+      const ext = import_node_path.default.extname(id);
+      const language = ext === ".ts" || ext === ".tsx" ? import_napi.Lang.TypeScript : import_napi.Lang.JavaScript;
+      let ast;
+      try {
+        ast = (0, import_napi.parse)(language, code);
+      } catch (error) {
+        console.warn("Failed to parse file:", id);
+        console.warn(error);
+        return null;
+      }
+      const root = ast.root();
+      let hasTransformations = false;
+      const edits = [];
+      const globImports = root.findAll({
+        rule: {
+          pattern: "import $DEFAULT_IMPORT from $SOURCE"
+        }
+      });
+      for (const importNode of globImports) {
+        const sourceNode = importNode.getMatch("SOURCE");
+        const defaultImportNode = importNode.getMatch("DEFAULT_IMPORT");
+        if (!sourceNode || !defaultImportNode) {
+          continue;
+        }
+        const sourceValue = sourceNode.text().slice(1, -1);
+        if (!sourceValue.includes("/**/")) {
+          continue;
+        }
+        hasTransformations = true;
+        const importName = defaultImportNode.text();
+        const importGlob = (0, import_project_config.importStatementPath)(sourceValue);
+        const cwd = importGlob.startsWith("src/") ? (0, import_project_config.getPaths)().api.base : import_node_path.default.dirname(id);
+        try {
+          const dirFiles = import_fast_glob.default.sync(importGlob, { cwd }).filter(
+            (n) => !n.includes(".test.") && !n.includes(".scenarios.") && !n.includes(".d.ts")
+          );
+          const staticGlob = importGlob.split("*")[0];
+          const filePathToVarName = (filePath) => {
+            return filePath.replace(staticGlob, "").replace(/\.(js|ts)$/, "").replace(/[^a-zA-Z0-9]/g, "_");
+          };
+          let replacement = `let ${importName} = {};
+`;
+          for (const filePath of dirFiles) {
+            const { dir: fileDir, name: fileName } = import_node_path.default.parse(filePath);
+            const fileImportPath = fileDir + "/" + fileName;
+            const filePathVarName = filePathToVarName(filePath);
+            const namespaceImportName = `${importName}_${filePathVarName}`;
+            replacement += `import * as ${namespaceImportName} from '${fileImportPath}';
+`;
+            replacement += `${importName}.${filePathVarName} = ${namespaceImportName};
+`;
+          }
+          edits.push(importNode.replace(replacement.trim()));
+        } catch (error) {
+          console.warn(`Failed to process glob import: ${sourceValue}`, error);
+        }
+      }
+      if (hasTransformations && edits.length > 0) {
+        const transformedCode = root.commitEdits(edits);
+        return {
+          code: transformedCode,
+          map: null
+          // For simplicity, not generating source maps
+        };
+      }
+      return null;
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cedarImportDirPlugin
+});

package/dist/cjs/runPrerender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runPrerender.d.ts","sourceRoot":"","sources":["../../src/runPrerender.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AA2O7C,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,CAuIzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,GACnC,gBAAgB,MAAM,EACtB,SAAS,MAAM,SAchB,CAAA"}
+{"version":3,"file":"runPrerender.d.ts","sourceRoot":"","sources":["../../src/runPrerender.tsx"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAsO7C,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,CAkIzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,GACnC,gBAAgB,MAAM,EACtB,SAAS,MAAM,SAchB,CAAA"}

package/dist/cjs/runPrerender.js

@@ -40,7 +40,8 @@ var import_cheerio = require("cheerio");
 var import_server = __toESM(require("react-dom/server"), 1);
 var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
-var import_apolloState = require("./apolloState.js");
+var import_router = require("@cedarjs/router");
+var import_util = require("@cedarjs/router/dist/util");
 var import_babel_plugin_redwood_cell = require("./babelPlugins/babel-plugin-redwood-cell.js");
 var import_babel_plugin_redwood_prerender_media_imports = require("./babelPlugins/babel-plugin-redwood-prerender-media-imports.js");
 var import_detection = require("./detection/detection.js");
@@ -51,7 +52,6 @@ const { ApolloClient, InMemoryCache } = apolloClient.default || apolloClient;
 const prerenderApolloClient = new ApolloClient({ cache: new InMemoryCache() });
 async function recursivelyRender(App, Routes, renderPath, fileImporter, gqlHandler, queryCache) {
   const { CellCacheContextProvider, getOperationName } = require("@cedarjs/web");
-  const { LocationProvider } = require("@cedarjs/router");
   let shouldShowGraphqlHandlerNotFoundWarn = false;
   await Promise.all(
     Object.entries(queryCache).map(async ([cacheKey, value]) => {
@@ -114,7 +114,7 @@ async function recursivelyRender(App, Routes, renderPath, fileImporter, gqlHandl
   );
   const prerenderUrl = process.env.RWJS_PRERENDER_ORIGIN || "http://localhost" + renderPath;
   const componentAsHtml = import_server.default.renderToString(
-    /* @__PURE__ */ import_react.default.createElement(LocationProvider, { location: new URL(prerenderUrl) }, /* @__PURE__ */ import_react.default.createElement(CellCacheContextProvider, { queryCache }, /* @__PURE__ */ import_react.default.createElement(App, null, /* @__PURE__ */ import_react.default.createElement(Routes, null))))
+    /* @__PURE__ */ import_react.default.createElement(import_router.LocationProvider, { location: new URL(prerenderUrl) }, /* @__PURE__ */ import_react.default.createElement(CellCacheContextProvider, { queryCache }, /* @__PURE__ */ import_react.default.createElement(App, null, /* @__PURE__ */ import_react.default.createElement(Routes, null))))
   );
   if (Object.values(queryCache).some((value) => !value.hasProcessed)) {
     return recursivelyRender(
@@ -135,13 +135,12 @@ async function recursivelyRender(App, Routes, renderPath, fileImporter, gqlHandl
   }
 }
 function insertChunkLoadingScript(indexHtmlTree, renderPath) {
-  const { matchPath } = require("@cedarjs/router/dist/util");
   const prerenderRoutes = (0, import_detection.detectPrerenderRoutes)();
   const route = prerenderRoutes.find((route2) => {
     if (!route2.routePath) {
       return false;
     }
-    return matchPath(route2.routePath, renderPath).match;
+    return (0, import_util.matchPath)(route2.routePath, renderPath).match;
   });
   if (!route) {
     throw new Error("Could not find a Route matching " + renderPath);
@@ -228,8 +227,8 @@ const runPrerender = async ({
     overrides: [
       {
         plugins: [
-          // Vite handles CSS imports for the browser build
           ["ignore-html-and-css-imports"],
+          // webpack/postcss handles CSS imports
           [import_babel_plugin_redwood_prerender_media_imports.babelPluginRedwoodPrerenderMediaImports]
         ]
       },
@@ -280,14 +279,11 @@ const runPrerender = async ({
       }
     }
   }
-  const apolloState = prerenderApolloClient.extract();
-  if ((0, import_apolloState.hasApolloState)(apolloState)) {
-    indexHtmlTree("head").append(
-      `<script> globalThis.__CEDAR__APOLLO_STATE = ${JSON.stringify(
-        apolloState
-      )}</script>`
-    );
-  }
+  indexHtmlTree("head").append(
+    `<script> globalThis.__REDWOOD__APOLLO_STATE = ${JSON.stringify(
+      prerenderApolloClient.extract()
+    )}</script>`
+  );
   prerenderApolloClient.resetStore();
   insertChunkLoadingScript(indexHtmlTree, renderPath);
   indexHtmlTree("#cedar-app, #redwood-app").append(componentAsHtml);

package/dist/cjs/runPrerenderEsm.js

@@ -40,7 +40,6 @@ var import_cheerio = require("cheerio");
 var import_server = __toESM(require("react-dom/server"), 1);
 var import_project_config = require("@cedarjs/project-config");
 var import_util = require("@cedarjs/router/dist/util");
-var import_apolloState = require("./apolloState.js");
 var import_buildAndImport = require("./build-and-import/buildAndImport.js");
 var import_detection = require("./detection/detection.js");
 var import_errors = require("./errors.js");
@@ -277,14 +276,11 @@ const runPrerender = async ({
       }
     }
   }
-  const apolloState = prerenderApolloClient.extract();
-  if ((0, import_apolloState.hasApolloState)(apolloState)) {
-    indexHtmlTree("head").append(
-      `<script> globalThis.__CEDAR__APOLLO_STATE = ${JSON.stringify(
-        apolloState
-      )}</script>`
-    );
-  }
+  indexHtmlTree("head").append(
+    `<script> globalThis.__REDWOOD__APOLLO_STATE = ${JSON.stringify(
+      prerenderApolloClient.extract()
+    )}</script>`
+  );
   prerenderApolloClient.resetStore();
   insertChunkLoadingScript(indexHtmlTree, renderPath);
   indexHtmlTree("#cedar-app, #redwood-app").append(componentAsHtml);

package/dist/graphql/node-runner.js

@@ -5,10 +5,10 @@ import {
   cedarjsResolveCedarStyleImportsPlugin,
   cedarjsJobPathInjectorPlugin,
   cedarSwapApolloProvider,
-  cedarCjsCompatPlugin,
-  cedarImportDirPlugin
+  cedarCjsCompatPlugin
 } 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",

package/dist/graphql/vite-plugin-cedar-import-dir.d.ts

@@ -0,0 +1,19 @@
+import type { Plugin } from 'vite';
+/**
+ * This Vite plugin will search for import statements that include a glob double
+ * star `**` in the source part of the statement. The files that are matched are
+ * imported and appended to an object.
+ *
+ * @example
+ * Given a directory "src/services" that contains "a.js", "b.ts" and
+ * "nested/c.js" will produce the following results:
+ * ```js
+ * import services from 'src/services/**\/*.{js,ts}'
+ * console.log(services)
+ * // services.a = import('src/services/a')
+ * // services.b = import('src/services/b')
+ * // services.nested_c = import('src/services/nested/c')
+ * ```
+ */
+export declare function cedarImportDirPlugin(): Plugin;
+//# sourceMappingURL=vite-plugin-cedar-import-dir.d.ts.map

package/dist/graphql/vite-plugin-cedar-import-dir.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-import-dir.d.ts","sourceRoot":"","sources":["../../src/graphql/vite-plugin-cedar-import-dir.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAgH7C"}

package/dist/graphql/vite-plugin-cedar-import-dir.js

@@ -0,0 +1,84 @@
+import path from "node:path";
+import { parse, Lang } from "@ast-grep/napi";
+import fg from "fast-glob";
+import { importStatementPath, getPaths } from "@cedarjs/project-config";
+function cedarImportDirPlugin() {
+  return {
+    name: "vite-plugin-cedar-import-dir",
+    enforce: "pre",
+    async transform(code, id) {
+      if (!code.includes("/**/")) {
+        return null;
+      }
+      const ext = path.extname(id);
+      const language = ext === ".ts" || ext === ".tsx" ? Lang.TypeScript : Lang.JavaScript;
+      let ast;
+      try {
+        ast = parse(language, code);
+      } catch (error) {
+        console.warn("Failed to parse file:", id);
+        console.warn(error);
+        return null;
+      }
+      const root = ast.root();
+      let hasTransformations = false;
+      const edits = [];
+      const globImports = root.findAll({
+        rule: {
+          pattern: "import $DEFAULT_IMPORT from $SOURCE"
+        }
+      });
+      for (const importNode of globImports) {
+        const sourceNode = importNode.getMatch("SOURCE");
+        const defaultImportNode = importNode.getMatch("DEFAULT_IMPORT");
+        if (!sourceNode || !defaultImportNode) {
+          continue;
+        }
+        const sourceValue = sourceNode.text().slice(1, -1);
+        if (!sourceValue.includes("/**/")) {
+          continue;
+        }
+        hasTransformations = true;
+        const importName = defaultImportNode.text();
+        const importGlob = importStatementPath(sourceValue);
+        const cwd = importGlob.startsWith("src/") ? getPaths().api.base : path.dirname(id);
+        try {
+          const dirFiles = fg.sync(importGlob, { cwd }).filter(
+            (n) => !n.includes(".test.") && !n.includes(".scenarios.") && !n.includes(".d.ts")
+          );
+          const staticGlob = importGlob.split("*")[0];
+          const filePathToVarName = (filePath) => {
+            return filePath.replace(staticGlob, "").replace(/\.(js|ts)$/, "").replace(/[^a-zA-Z0-9]/g, "_");
+          };
+          let replacement = `let ${importName} = {};
+`;
+          for (const filePath of dirFiles) {
+            const { dir: fileDir, name: fileName } = path.parse(filePath);
+            const fileImportPath = fileDir + "/" + fileName;
+            const filePathVarName = filePathToVarName(filePath);
+            const namespaceImportName = `${importName}_${filePathVarName}`;
+            replacement += `import * as ${namespaceImportName} from '${fileImportPath}';
+`;
+            replacement += `${importName}.${filePathVarName} = ${namespaceImportName};
+`;
+          }
+          edits.push(importNode.replace(replacement.trim()));
+        } catch (error) {
+          console.warn(`Failed to process glob import: ${sourceValue}`, error);
+        }
+      }
+      if (hasTransformations && edits.length > 0) {
+        const transformedCode = root.commitEdits(edits);
+        return {
+          code: transformedCode,
+          map: null
+          // For simplicity, not generating source maps
+        };
+      }
+      return null;
+    }
+  };
+}
+export {
+  cedarImportDirPlugin
+};

package/dist/runPrerenderEsm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runPrerenderEsm.d.ts","sourceRoot":"","sources":["../src/runPrerenderEsm.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAqQ7C,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,CA4HzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,GACnC,gBAAgB,MAAM,EACtB,SAAS,MAAM,SAchB,CAAA"}
+{"version":3,"file":"runPrerenderEsm.d.ts","sourceRoot":"","sources":["../src/runPrerenderEsm.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAoQ7C,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,CAwHzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,GACnC,gBAAgB,MAAM,EACtB,SAAS,MAAM,SAchB,CAAA"}

package/dist/runPrerenderEsm.js

@@ -10,7 +10,6 @@ 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 {
@@ -251,14 +250,11 @@ const runPrerender = async ({
       }
     }
   }
-  const apolloState = prerenderApolloClient.extract();
-  if (hasApolloState(apolloState)) {
-    indexHtmlTree("head").append(
-      `<script> globalThis.__CEDAR__APOLLO_STATE = ${JSON.stringify(
-        apolloState
-      )}</script>`
-    );
-  }
+  indexHtmlTree("head").append(
+    `<script> globalThis.__REDWOOD__APOLLO_STATE = ${JSON.stringify(
+      prerenderApolloClient.extract()
+    )}</script>`
+  );
   prerenderApolloClient.resetStore();
   insertChunkLoadingScript(indexHtmlTree, renderPath);
   indexHtmlTree("#cedar-app, #redwood-app").append(componentAsHtml);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/prerender",
-  "version": "5.0.7-next.338",
+  "version": "5.0.7-rc.3",
   "description": "CedarJS prerender",
   "repository": {
     "type": "git",
@@ -67,18 +67,19 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@babel/generator": "7.29.8",
-    "@babel/parser": "7.29.8",
-    "@babel/traverse": "7.29.8",
-    "@cedarjs/babel-config": "5.0.7-next.338",
-    "@cedarjs/project-config": "5.0.7-next.338",
-    "@cedarjs/structure": "5.0.7-next.338",
-    "@cedarjs/vite": "5.0.7-next.338",
+    "@ast-grep/napi": "0.43.0",
+    "@babel/generator": "7.29.7",
+    "@babel/parser": "7.29.7",
+    "@babel/traverse": "7.29.7",
+    "@cedarjs/babel-config": "5.0.7-rc.3",
+    "@cedarjs/project-config": "5.0.7-rc.3",
+    "@cedarjs/structure": "5.0.7-rc.3",
+    "@cedarjs/vite": "5.0.7-rc.3",
     "@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.0",
+    "@swc/core": "1.15.41",
     "@whatwg-node/fetch": "0.10.13",
     "babel-plugin-ignore-html-and-css-imports": "0.1.0",
     "cheerio": "1.2.0",
@@ -88,23 +89,23 @@
     "rollup-plugin-swc3": "0.12.1",
     "unimport": "5.7.0",
     "unplugin-auto-import": "19.3.0",
-    "vite": "7.3.6"
+    "vite": "7.3.5"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "5.0.7-next.338",
-    "@cedarjs/router": "5.0.7-next.338",
-    "@cedarjs/web": "5.0.7-next.338",
+    "@cedarjs/framework-tools": "5.0.7-rc.3",
+    "@cedarjs/router": "5.0.7-rc.3",
+    "@cedarjs/web": "5.0.7-rc.3",
     "@types/mime-types": "2.1.4",
     "@types/react": "^18.2.55",
     "babel-plugin-tester": "11.0.4",
     "concurrently": "9.2.4",
-    "publint": "0.3.23",
+    "publint": "0.3.21",
     "typescript": "5.9.3",
-    "vitest": "4.1.10"
+    "vitest": "3.2.6"
   },
   "peerDependencies": {
-    "@cedarjs/router": "5.0.7-next.338",
-    "@cedarjs/web": "5.0.7-next.338",
+    "@cedarjs/router": "5.0.7-rc.3",
+    "@cedarjs/web": "5.0.7-rc.3",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },

package/dist/apolloState.d.ts

@@ -1,13 +0,0 @@
-/**
- * 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

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

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

package/dist/cjs/apolloState.d.ts

@@ -1,13 +0,0 @@
-/**
- * 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/cjs/apolloState.d.ts.map

@@ -1 +0,0 @@
-{"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/cjs/apolloState.js

@@ -1,30 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var apolloState_exports = {};
-__export(apolloState_exports, {
-  hasApolloState: () => hasApolloState
-});
-module.exports = __toCommonJS(apolloState_exports);
-function hasApolloState(state) {
-  return typeof state === "object" && state !== null && Object.keys(state).length > 0;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  hasApolloState
-});