@cedarjs/prerender 1.0.0-canary.12482 → 1.0.0-canary.12485

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":"AAiCA,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,CAgIlD"}
+{"version":3,"file":"buildAndImport.d.ts","sourceRoot":"","sources":["../../src/build-and-import/buildAndImport.ts"],"names":[],"mappings":"AAiCA,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,CAyHlD"}

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

@@ -59,12 +59,7 @@ async function buildAndImport(options) {
   if (!(0, import_utils.isValidJsFile)(options.filepath)) {
     throw new Error(`${options.filepath} is not a valid JS file`);
   }
-  console.log("options", options);
   const tsConfigs = (0, import_internal.parseTypeScriptConfigFiles)();
-  console.log(
-    "tsConfigs.web?.data.compilerOptions",
-    tsConfigs.web?.compilerOptions
-  );
   const resolvePaths = tsconfigPathsToRegExp(
     tsConfigs.web?.compilerOptions?.paths || {}
   );

package/dist/runPrerender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runPrerender.d.ts","sourceRoot":"","sources":["../src/runPrerender.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAuP7C,UAAU,eAAe;IACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACrC,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,YAAY,gCAGtB,eAAe,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CA4GzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,mBACnB,MAAM,WACb,MAAM,SAchB,CAAA"}
+{"version":3,"file":"runPrerender.d.ts","sourceRoot":"","sources":["../src/runPrerender.tsx"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AA4P7C,UAAU,eAAe;IACvB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IACrC,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,eAAO,MAAM,YAAY,gCAGtB,eAAe,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAmHzC,CAAA;AAGD,eAAO,MAAM,wBAAwB,mBACnB,MAAM,WACb,MAAM,SAchB,CAAA"}

package/dist/runPrerender.js

@@ -39,7 +39,6 @@ var import_client = require("@apollo/client");
 var import_cheerio = require("cheerio");
 var import_server = __toESM(require("react-dom/server"));
 var import_project_config = require("@cedarjs/project-config");
-var import_router = require("@cedarjs/router");
 var import_util = require("@cedarjs/router/dist/util");
 var import_buildAndImport = require("./build-and-import/buildAndImport");
 var import_detection = require("./detection");
@@ -47,7 +46,7 @@ var import_errors = require("./errors");
 var import_graphql = require("./graphql/graphql");
 var import_internal = require("./internal");
 const prerenderApolloClient = new import_client.ApolloClient({ cache: new import_client.InMemoryCache() });
-async function recursivelyRender(App, Routes, CellCacheContextProvider, renderPath, gqlHandler, queryCache) {
+async function recursivelyRender(App, Routes, CellCacheContextProvider, LocationProvider, renderPath, gqlHandler, queryCache) {
   const { getOperationName } = await import("@cedarjs/web");
   let shouldShowGraphqlHandlerNotFoundWarn = false;
   await Promise.all(
@@ -110,13 +109,14 @@ async function recursivelyRender(App, Routes, CellCacheContextProvider, renderPa
   );
   const prerenderUrl = process.env.RWJS_PRERENDER_ORIGIN || "http://localhost" + renderPath;
   const componentAsHtml = import_server.default.renderToString(
-    /* @__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))))
+    /* @__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))))
   );
   if (Object.values(queryCache).some((value) => !value.hasProcessed)) {
     return recursivelyRender(
       App,
       Routes,
       CellCacheContextProvider,
+      LocationProvider,
       renderPath,
       gqlHandler,
       queryCache
@@ -183,11 +183,13 @@ globalThis.__REDWOOD__PRERENDER_PAGES.${route?.pageIdentifier}=${varNameMatch?.[
 }
 async function createCombinedEntry({ appPath, routesPath, outDir }) {
   const combinedContent = `
+    import { LocationProvider } from '@cedarjs/router'
+    import { CellCacheContextProvider } from '@cedarjs/web'
+
     import App from "${(0, import_project_config.importStatementPath)(appPath.replace(".tsx", ""))}";
     import Routes from "${(0, import_project_config.importStatementPath)(routesPath.replace(".tsx", ""))}";
-    import { CellCacheContextProvider } from '@cedarjs/web'
 
-    export { App, Routes, CellCacheContextProvider };
+    export { LocationProvider, CellCacheContextProvider, App, Routes };
   `;
   const tempFilePath = import_node_path.default.join(outDir, "__prerender-temp-entry.tsx");
   await import_node_fs.default.promises.writeFile(tempFilePath, combinedContent, "utf8");
@@ -215,8 +217,9 @@ const runPrerender = async ({
     renderCache.App = required.App;
     renderCache.Routes = required.Routes;
     renderCache.CellCacheContextProvider = required.CellCacheContextProvider;
+    renderCache.LocationProvider = required.LocationProvider;
   }
-  const { App, Routes, CellCacheContextProvider } = renderCache;
+  const { LocationProvider, App, Routes, CellCacheContextProvider } = renderCache;
   if (!App) {
     throw new Error("App not found");
   }
@@ -226,10 +229,14 @@ const runPrerender = async ({
   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,
     gqlHandler,
     queryCache

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/prerender",
-  "version": "1.0.0-canary.12482+40591ba6a",
+  "version": "1.0.0-canary.12485+9eca35b85",
   "description": "RedwoodJS prerender",
   "repository": {
     "type": "git",
@@ -40,11 +40,11 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/babel-config": "1.0.0-canary.12482",
-    "@cedarjs/project-config": "1.0.0-canary.12482",
-    "@cedarjs/router": "1.0.0-canary.12482",
-    "@cedarjs/structure": "1.0.0-canary.12482",
-    "@cedarjs/web": "1.0.0-canary.12482",
+    "@cedarjs/babel-config": "1.0.0-canary.12485",
+    "@cedarjs/project-config": "1.0.0-canary.12485",
+    "@cedarjs/router": "1.0.0-canary.12485",
+    "@cedarjs/structure": "1.0.0-canary.12485",
+    "@cedarjs/web": "1.0.0-canary.12485",
     "@rollup/plugin-alias": "5.1.1",
     "@rollup/plugin-commonjs": "28.0.6",
     "@rollup/plugin-node-resolve": "16.0.1",
@@ -61,7 +61,7 @@
     "unimport": "5.0.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "1.0.0-canary.12482",
+    "@cedarjs/framework-tools": "1.0.0-canary.12485",
     "@types/mime-types": "2.1.4",
     "babel-plugin-tester": "11.0.4",
     "concurrently": "8.2.2",
@@ -78,5 +78,5 @@
     "react": "react",
     "react-dom": "react-dom"
   },
-  "gitHead": "40591ba6a0c25bb8870ade6f350b0b778e37c7db"
+  "gitHead": "9eca35b85097a6799b8a8568267bc06629b2c14a"
 }