@cedarjs/vite 4.2.1-next.0 → 4.2.1-next.269

package/dist/cjs/utils.js

@@ -28,6 +28,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_node_url = require("node:url");
 var import_project_config = require("@cedarjs/project-config");
+var import_packageManager = require("@cedarjs/project-config/packageManager");
 function stripQueryStringAndHashFromPath(url) {
   return url.split("?")[0].split("#")[0];
 }
@@ -36,7 +37,7 @@ function ensureProcessDirWeb(webDir = (0, import_project_config.getPaths)().web.
     console.error("\u26A0\uFE0F  Warning: CWD is ", process.cwd());
     console.warn("~".repeat(50));
     console.warn(
-      "The cwd must be web/. Please use `yarn cedar <command>` or run the command from the web/ directory."
+      `The cwd must be web/. Please use \`${(0, import_packageManager.prettyPrintCedarCommand)(["<command>"])}\` or run the command from the web/ directory.`
     );
     console.log(`Changing cwd to ${webDir}....`);
     console.log();

package/dist/devFeServer.d.ts

@@ -1,2 +1,3 @@
+#!/usr/bin/env node
 export {};
 //# sourceMappingURL=devFeServer.d.ts.map

package/dist/devFeServer.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import { createServerAdapter } from "@whatwg-node/server";
 import express from "express";
 import { createServer as createViteServer } from "vite";
@@ -40,7 +41,7 @@ async function createServer() {
   }
   if (!rwPaths.web.viteConfig) {
     throw new Error(
-      "Vite config not found. You need to setup your project with Vite using `yarn cedar setup vite`"
+      "Vite config not found. Please set up Vite before running the dev server."
     );
   }
   const vite = await createViteServer({

package/dist/index.d.ts

@@ -2,10 +2,14 @@ import type { PluginOption } from 'vite';
 export { cedarAutoImportsPlugin } from './plugins/vite-plugin-cedar-auto-import.js';
 export { cedarCjsCompatPlugin } from './plugins/vite-plugin-cedar-cjs-compat.js';
 export { cedarCellTransform } from './plugins/vite-plugin-cedar-cell.js';
+export { cedarContextWrappingPlugin } from './plugins/vite-plugin-cedar-context-wrapping.js';
+export { applyContextWrapping } from './plugins/vite-plugin-cedar-context-wrapping.js';
 export { cedarEntryInjectionPlugin } from './plugins/vite-plugin-cedar-entry-injection.js';
 export { cedarHtmlEnvPlugin } from './plugins/vite-plugin-cedar-html-env.js';
 export { cedarImportDirPlugin } from './plugins/vite-plugin-cedar-import-dir.js';
 export { cedarNodePolyfills } from './plugins/vite-plugin-cedar-node-polyfills.js';
+export { cedarRemoveDevFatalErrorPage } from './plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js';
+export { cedarRoutesAutoLoaderPlugin } from './plugins/vite-plugin-cedar-routes-auto-loader.js';
 export { cedarRemoveFromBundle } from './plugins/vite-plugin-cedar-remove-from-bundle.js';
 export { cedarjsResolveCedarStyleImportsPlugin } from './plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js';
 export { cedarjsJobPathInjectorPlugin } from './plugins/vite-plugin-cedarjs-job-path-injector.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAqBxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAA;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAA;AAE1F,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAyClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAuBxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAA;AACtF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAA;AAClF,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAA;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAA;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAA;AAE1F,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAgClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}

package/dist/index.js

@@ -10,7 +10,9 @@ import { cedarCellTransform } from "./plugins/vite-plugin-cedar-cell.js";
 import { cedarEntryInjectionPlugin } from "./plugins/vite-plugin-cedar-entry-injection.js";
 import { cedarHtmlEnvPlugin } from "./plugins/vite-plugin-cedar-html-env.js";
 import { cedarNodePolyfills } from "./plugins/vite-plugin-cedar-node-polyfills.js";
+import { cedarRemoveDevFatalErrorPage } from "./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js";
 import { cedarRemoveFromBundle } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
+import { cedarRoutesAutoLoaderPlugin } from "./plugins/vite-plugin-cedar-routes-auto-loader.js";
 import { cedarWaitForApiServer } from "./plugins/vite-plugin-cedar-wait-for-api-server.js";
 import { cedarjsResolveCedarStyleImportsPlugin } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 import { cedarTransformJsAsJsx } from "./plugins/vite-plugin-jsx-loader.js";
@@ -19,10 +21,14 @@ import { cedarSwapApolloProvider } from "./plugins/vite-plugin-swap-apollo-provi
 import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { cedarCjsCompatPlugin } from "./plugins/vite-plugin-cedar-cjs-compat.js";
 import { cedarCellTransform as cedarCellTransform2 } from "./plugins/vite-plugin-cedar-cell.js";
+import { cedarContextWrappingPlugin } from "./plugins/vite-plugin-cedar-context-wrapping.js";
+import { applyContextWrapping } from "./plugins/vite-plugin-cedar-context-wrapping.js";
 import { cedarEntryInjectionPlugin as cedarEntryInjectionPlugin2 } from "./plugins/vite-plugin-cedar-entry-injection.js";
 import { cedarHtmlEnvPlugin as cedarHtmlEnvPlugin2 } from "./plugins/vite-plugin-cedar-html-env.js";
 import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
 import { cedarNodePolyfills as cedarNodePolyfills2 } from "./plugins/vite-plugin-cedar-node-polyfills.js";
+import { cedarRemoveDevFatalErrorPage as cedarRemoveDevFatalErrorPage2 } from "./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js";
+import { cedarRoutesAutoLoaderPlugin as cedarRoutesAutoLoaderPlugin2 } from "./plugins/vite-plugin-cedar-routes-auto-loader.js";
 import { cedarRemoveFromBundle as cedarRemoveFromBundle2 } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
 import { cedarjsResolveCedarStyleImportsPlugin as cedarjsResolveCedarStyleImportsPlugin2 } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
@@ -38,14 +44,7 @@ function cedar({ mode } = {}) {
     forVite: true
   });
   const babelConfig = {
-    ...webSideDefaultBabelConfig,
-    // For RSC we don't want to include the routes auto-loader plugin as we
-    // handle that differently in each specific RSC build stage
-    overrides: rscEnabled ? webSideDefaultBabelConfig.overrides.filter((override) => {
-      return !override.plugins?.some((plugin) => {
-        return Array.isArray(plugin) && plugin[2] === "babel-plugin-redwood-routes-auto-loader";
-      });
-    }) : webSideDefaultBabelConfig.overrides
+    ...webSideDefaultBabelConfig
   };
   return [
     mode === "test" && cedarJsRouterImportTransformPlugin(),
@@ -61,21 +60,28 @@ function cedar({ mode } = {}) {
     cedarCellTransform(),
     cedarTransformJsAsJsx(),
     cedarRemoveFromBundle(),
+    cedarRemoveDevFatalErrorPage(),
+    // RSC handles route auto-loading differently in each build stage
+    !rscEnabled && cedarRoutesAutoLoaderPlugin(),
     react({ babel: babelConfig })
   ];
 }
 var index_default = cedar;
 export {
+  applyContextWrapping,
   cedar,
   cedarAutoImportsPlugin,
   cedarCellTransform2 as cedarCellTransform,
   cedarCjsCompatPlugin,
+  cedarContextWrappingPlugin,
   cedarEntryInjectionPlugin2 as cedarEntryInjectionPlugin,
   cedarHtmlEnvPlugin2 as cedarHtmlEnvPlugin,
   cedarImportDirPlugin,
   cedarMergedConfig2 as cedarMergedConfig,
   cedarNodePolyfills2 as cedarNodePolyfills,
+  cedarRemoveDevFatalErrorPage2 as cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle2 as cedarRemoveFromBundle,
+  cedarRoutesAutoLoaderPlugin2 as cedarRoutesAutoLoaderPlugin,
   cedarSwapApolloProvider2 as cedarSwapApolloProvider,
   cedarTransformJsAsJsx2 as cedarTransformJsAsJsx,
   cedarUniversalDeployPlugin,

package/dist/lib/getMergedConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMergedConfig.d.ts","sourceRoot":"","sources":["../../src/lib/getMergedConfig.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAS5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,IAC5D,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CAqHpE"}
+{"version":3,"file":"getMergedConfig.d.ts","sourceRoot":"","sources":["../../src/lib/getMergedConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAS5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,IAC5D,YAAY,cAAc,EAAE,KAAK,SAAS,KAAG,cAAc,CA4HpE"}

package/dist/lib/getMergedConfig.js

@@ -21,9 +21,14 @@ function getMergedConfig(cedarConfig, cedarPaths) {
       apiPort = cedarConfig.api.port;
     }
     const defaultCedarViteConfig = {
-      root: cedarPaths.web.src,
+      root: cedarPaths.web.base,
       resolve: {
-        alias: workspaceAliases
+        alias: {
+          ...workspaceAliases,
+          // In test mode, register the virtual module alias so that
+          // MockProviders can resolve the user's Routes file
+          ...env.mode === "test" ? { "~__CEDAR__USER_ROUTES_FOR_MOCK": cedarPaths.web.routes } : {}
+        }
       },
       // @MARK: when we have these aliases, the warnings from the FE server go
       // away BUT, if you have imports like this:
@@ -75,7 +80,7 @@ function getMergedConfig(cedarConfig, cedarPaths) {
         // Note that sourcemap can be boolean or 'inline'
         sourcemap: !env.isSsrBuild && cedarConfig.web.sourceMap,
         rollupOptions: {
-          input: getRollupInput(!!env.isSsrBuild)
+          input: getRollupInput(userConfig, !!env.isSsrBuild)
         }
       },
       // @MARK: do not set buildSsrCjsExternalHeuristics here
@@ -108,9 +113,12 @@ function getMergedConfig(cedarConfig, cedarPaths) {
     return mergeConfig(defaultCedarViteConfig, userConfig);
   };
 }
-function getRollupInput(ssr) {
+function getRollupInput(userConfig, ssr) {
   const cedarConfig = getConfig();
   const cedarPaths = getPaths();
+  if (userConfig.build?.rollupOptions?.input) {
+    return userConfig.build.rollupOptions.input;
+  }
   if (!cedarPaths.web.entryClient) {
     throw new Error("entryClient not defined");
   }

package/dist/lib/workspacePackageAliases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspacePackageAliases.d.ts","sourceRoot":"","sources":["../../src/lib/workspacePackageAliases.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AA2D5D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,KAAK,EACjB,WAAW,EAAE,MAAM,GAClB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiExB"}
+{"version":3,"file":"workspacePackageAliases.d.ts","sourceRoot":"","sources":["../../src/lib/workspacePackageAliases.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AA4D5D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,KAAK,EACjB,WAAW,EAAE,MAAM,GAClB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAoDxB"}

package/dist/lib/workspacePackageAliases.js

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { normalizePath } from "vite";
+import { getNonApiWebWorkspaces } from "@cedarjs/project-config/workspaces";
 function findSourceEntry(pkgDir, pkgJson) {
   let distEntry = null;
   if (typeof pkgJson.main === "string") {
@@ -38,14 +39,7 @@ function getWorkspacePackageAliases(cedarPaths, cedarConfig) {
     return {};
   }
   try {
-    const rootPkgPath = path.join(cedarPaths.base, "package.json");
-    const rootPkg = JSON.parse(fs.readFileSync(rootPkgPath, "utf-8"));
-    if (!Array.isArray(rootPkg.workspaces) || rootPkg.workspaces.length <= 2) {
-      return {};
-    }
-    const nonApiWebWorkspaces = rootPkg.workspaces.filter(
-      (w) => w !== "api" && w !== "web"
-    );
+    const nonApiWebWorkspaces = getNonApiWebWorkspaces(cedarPaths.base);
     if (nonApiWebWorkspaces.length === 0) {
       return {};
     }

package/dist/plugins/vite-plugin-cedar-context-wrapping.d.ts

@@ -0,0 +1,44 @@
+import type { Plugin } from 'vite';
+/**
+ * Vite plugin that wraps user API functions to ensure context isolation has
+ * been performed. This should already be done at the request level but in
+ * serverless environments like Netlify we need to do this at the function
+ * level as a safeguard.
+ *
+ * For each file in `api/src/functions/` that exports a `handler`, this plugin:
+ *
+ * 1. Adds an import at the top of the file:
+ *      import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '@cedarjs/context/dist/store'
+ *
+ * 2. Renames the original handler:
+ *      const __rw_handler = <original handler value>
+ *
+ * 3. Replaces the handler export with a wrapper that checks context isolation:
+ *      export const handler = (__rw_event, __rw__context) => {
+ *        const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
+ *        if (__rw_contextStore === undefined) {
+ *          return __rw_getAsyncStoreInstance().run(new Map(), __rw_handler, __rw_event, __rw__context)
+ *        }
+ *        return __rw_handler(__rw_event, __rw__context)
+ *      }
+ *
+ * This replaces `babel-plugin-redwood-context-wrapping` for Vite builds.
+ * The babel plugin is still used for Jest and prerender.
+ */
+export declare function cedarContextWrappingPlugin({ projectIsEsm, }?: {
+    projectIsEsm?: boolean;
+}): Plugin;
+/**
+ * Wraps the `handler` export of an API function file with an async context
+ * store guard. Returns the transformed code, or `null` if the file does not
+ * export a `handler`.
+ *
+ * This is the context-isolation safeguard that used to be performed by
+ * `babel-plugin-redwood-context-wrapping`. It is exported as a standalone
+ * function so it can be applied from build pipelines that don't go through
+ * Vite's plugin pipeline (e.g. the legacy esbuild API build).
+ */
+export declare function applyContextWrapping(code: string, { projectIsEsm }?: {
+    projectIsEsm?: boolean;
+}): string | null;
+//# sourceMappingURL=vite-plugin-cedar-context-wrapping.d.ts.map

package/dist/plugins/vite-plugin-cedar-context-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-context-wrapping.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-context-wrapping.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,0BAA0B,CAAC,EACzC,YAAoB,GACrB,GAAE;IACD,YAAY,CAAC,EAAE,OAAO,CAAA;CAClB,GAAG,MAAM,CAuBd;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,EAAE,YAAoB,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACxD,MAAM,GAAG,IAAI,CAsDf"}

package/dist/plugins/vite-plugin-cedar-context-wrapping.js

@@ -0,0 +1,60 @@
+import path from "node:path";
+import { normalizePath } from "vite";
+import { getPaths } from "@cedarjs/project-config";
+function cedarContextWrappingPlugin({
+  projectIsEsm = false
+} = {}) {
+  return {
+    name: "cedar-context-wrapping",
+    transform(code, id) {
+      let paths;
+      try {
+        paths = getPaths();
+      } catch {
+        return null;
+      }
+      const functionsDir = normalizePath(path.join(paths.api.src, "functions"));
+      if (!normalizePath(id).startsWith(functionsDir + "/")) {
+        return null;
+      }
+      const wrapped = applyContextWrapping(code, { projectIsEsm });
+      return wrapped ? { code: wrapped, map: null } : null;
+    }
+  };
+}
+function applyContextWrapping(code, { projectIsEsm = false } = {}) {
+  const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
+  const handlerMatch = handlerRe.exec(code);
+  if (!handlerMatch) {
+    return null;
+  }
+  const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
+  const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
+  const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
+  const importStatement = `import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '${storePath}'
+`;
+  const handlerStart = handlerMatch.index;
+  const before = code.slice(0, handlerStart);
+  const after = code.slice(handlerStart);
+  const renamed = after.replace(handlerRe, "const __rw_handler =");
+  const wrappedHandler = `
+export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) => {
+  // The store will be undefined if no context isolation has been performed yet
+  const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
+  if (__rw_contextStore === undefined) {
+    return __rw_getAsyncStoreInstance().run(
+      new Map(),
+      __rw_handler,
+      __rw_event,
+      __rw__context
+    )
+  }
+  return __rw_handler(__rw_event, __rw__context)
+}
+`;
+  return before + importStatement + renamed + wrappedHandler;
+}
+export {
+  applyContextWrapping,
+  cedarContextWrappingPlugin
+};

package/dist/plugins/vite-plugin-cedar-entry-injection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-entry-injection.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-entry-injection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,wBAAgB,yBAAyB,IAAI,MAAM,CA6DlD"}
+{"version":3,"file":"vite-plugin-cedar-entry-injection.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-entry-injection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC,wBAAgB,yBAAyB,IAAI,MAAM,CAqFlD"}

package/dist/plugins/vite-plugin-cedar-entry-injection.js

@@ -3,21 +3,36 @@ import path from "node:path";
 import { normalizePath } from "vite";
 import { getPaths } from "@cedarjs/project-config";
 function cedarEntryInjectionPlugin() {
-  const rwPaths = getPaths();
-  const clientEntryPath = rwPaths.web.entryClient;
+  const cedarPaths = getPaths();
+  const clientEntryPath = cedarPaths.web.entryClient;
   if (!clientEntryPath) {
     throw new Error(
       "Vite client entry point not found. Please check that your project has an entry.client.{jsx,tsx} file in the web/src directory."
     );
   }
-  const relativeEntryPath = path.relative(rwPaths.web.src, clientEntryPath);
+  const relativeEntryPath = normalizePath(
+    path.relative(cedarPaths.web.base, clientEntryPath)
+  );
   return {
     name: "cedar-entry-injection",
+    // Vite's dependency optimizer and dev server resolve the script tag
+    // src="/src/entry.client.{tsx,jsx}" as an absolute filesystem path
+    // (/src/entry.client.tsx) instead of relative to the Vite root.
+    // This hook maps it to the real file path so Vite can find it.
+    resolveId(id) {
+      if (id === "/" + relativeEntryPath) {
+        return clientEntryPath;
+      }
+      return null;
+    },
     // ---------- Bundle injection ----------
     // Used by Vite during dev, to inject the entrypoint.
     transformIndexHtml: {
       order: "pre",
-      handler: (html) => {
+      handler: (html, ctx) => {
+        if (!ctx.filename || normalizePath(ctx.filename) !== normalizePath(cedarPaths.web.html)) {
+          return html;
+        }
         if (fs.existsSync(clientEntryPath)) {
           return html.replace(
             "</head>",
@@ -34,7 +49,7 @@ function cedarEntryInjectionPlugin() {
     // Used by rollup during build to inject the entrypoint
     // but note index.html does not come through as an id during dev
     transform: (code, id) => {
-      if (fs.existsSync(clientEntryPath) && normalizePath(id) === normalizePath(rwPaths.web.html)) {
+      if (fs.existsSync(clientEntryPath) && normalizePath(id) === normalizePath(cedarPaths.web.html)) {
         return {
           code: code.replace(
             "</head>",

package/dist/plugins/vite-plugin-cedar-remove-dev-fatal-error-page.d.ts

@@ -0,0 +1,15 @@
+import type { Plugin } from 'vite';
+/**
+ * Vite plugin to remove the DevFatalErrorPage import in production builds.
+ *
+ * Replaces:
+ *   import { DevFatalErrorPage } from '@cedarjs/web/dist/components/DevFatalErrorPage'
+ * with:
+ *   const DevFatalErrorPage = undefined
+ *
+ * This ensures the DevFatalErrorPage component is not shipped in the
+ * production bundle. In development, the import is kept so the page
+ * renders when an unhandled error bubbles to the top of the app.
+ */
+export declare function cedarRemoveDevFatalErrorPage(): Plugin;
+//# sourceMappingURL=vite-plugin-cedar-remove-dev-fatal-error-page.d.ts.map

package/dist/plugins/vite-plugin-cedar-remove-dev-fatal-error-page.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-remove-dev-fatal-error-page.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-remove-dev-fatal-error-page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,MAAM,CAAA;AAclD;;;;;;;;;;;GAWG;AACH,wBAAgB,4BAA4B,IAAI,MAAM,CAgCrD"}

package/dist/plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js

@@ -0,0 +1,37 @@
+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}['"]`
+);
+function cedarRemoveDevFatalErrorPage() {
+  let config;
+  return {
+    name: "cedar-remove-dev-fatal-error-page",
+    apply: "build",
+    configResolved(resolvedConfig) {
+      config = resolvedConfig;
+    },
+    transform(code) {
+      if (config.command === "build" && config.mode === "development") {
+        return null;
+      }
+      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 {
+  cedarRemoveDevFatalErrorPage
+};

package/dist/plugins/vite-plugin-cedar-routes-auto-loader.d.ts

@@ -0,0 +1,24 @@
+import type { Plugin } from 'vite';
+/**
+ * Vite plugin to auto-load page components into the Routes file.
+ *
+ * For each page found in `web/src/pages` that is not already explicitly
+ * imported in Routes.tsx, this plugin prepends a lazy-loaded declaration:
+ *
+ * ```js
+ * const PageName = {
+ *   name: "PageName",
+ *   prerenderLoader: (name) => ({ default: globalThis.__REDWOOD__PRERENDER_PAGES[name] }),
+ *   LazyComponent: lazy(() => import("./pages/PageName/PageName")),
+ * }
+ * ```
+ *
+ * Pages already imported by App.tsx are also excluded to avoid Vite's
+ * "dynamically imported by Routes.tsx but also statically imported by App.tsx"
+ * warning.
+ *
+ * This replaces `babel-plugin-redwood-routes-auto-loader` for Vite builds.
+ * The babel plugin is still used for Jest and prerender.
+ */
+export declare function cedarRoutesAutoLoaderPlugin(): Plugin;
+//# sourceMappingURL=vite-plugin-cedar-routes-auto-loader.d.ts.map

package/dist/plugins/vite-plugin-cedar-routes-auto-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-routes-auto-loader.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-routes-auto-loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAqDlC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,2BAA2B,IAAI,MAAM,CAsFpD"}

package/dist/plugins/vite-plugin-cedar-routes-auto-loader.js

@@ -0,0 +1,98 @@
+import fs from "node:fs";
+import path from "node:path";
+import { normalizePath } from "vite";
+import {
+  ensurePosixPath,
+  getPaths,
+  importStatementPath,
+  processPagesDir,
+  resolveFile
+} from "@cedarjs/project-config";
+function getPathRelativeToSrc(maybeAbsolutePath) {
+  const withoutExt = maybeAbsolutePath.replace(/\.[^/.]+$/, "");
+  if (withoutExt.startsWith("src/")) {
+    const basePath = path.join(getPaths().web.base, withoutExt);
+    const resolved = resolveFile(basePath) || resolveFile(path.join(basePath, "index")) || resolveFile(path.join(basePath, path.basename(basePath)));
+    if (resolved) {
+      const resolvedWithoutExt = resolved.replace(/\.[^/.]+$/, "");
+      return "./" + path.relative(getPaths().web.src, resolvedWithoutExt);
+    }
+    return "./" + withoutExt.slice("src/".length);
+  }
+  if (!path.isAbsolute(withoutExt)) {
+    return withoutExt;
+  }
+  return `./${path.relative(getPaths().web.src, withoutExt)}`;
+}
+function withRelativeImports(page) {
+  return {
+    ...page,
+    relativeImport: ensurePosixPath(getPathRelativeToSrc(page.importPath))
+  };
+}
+function cedarRoutesAutoLoaderPlugin() {
+  const routesFileId = normalizePath(getPaths().web.routes);
+  const initialPages = processPagesDir().map(withRelativeImports);
+  const duplicatePageImportNames = /* @__PURE__ */ new Set();
+  const sortedPageImportNames = initialPages.map((page) => page.importName).sort();
+  for (let i = 0; i < sortedPageImportNames.length - 1; i++) {
+    if (sortedPageImportNames[i + 1] === sortedPageImportNames[i]) {
+      duplicatePageImportNames.add(sortedPageImportNames[i]);
+    }
+  }
+  if (duplicatePageImportNames.size > 0) {
+    const pageNames = Array.from(duplicatePageImportNames).map((name) => `'${name}'`).join(", ");
+    throw new Error(
+      `Unable to find only a single file ending in 'Page.{js,jsx,ts,tsx}' in the following page directories: ${pageNames}`
+    );
+  }
+  return {
+    name: "cedar-routes-auto-loader",
+    transform(code, id) {
+      if (normalizePath(id) !== routesFileId) {
+        return null;
+      }
+      let pages = processPagesDir().map(withRelativeImports);
+      const importRe = /^import\s+\w+\s+from\s+['"]([^'"]+)['"]/gm;
+      const appPath = resolveFile(path.join(getPaths().web.src, "App"));
+      if (appPath) {
+        const appSource = fs.readFileSync(appPath, "utf8");
+        let appMatch;
+        while ((appMatch = importRe.exec(appSource)) !== null) {
+          const rel = ensurePosixPath(
+            getPathRelativeToSrc(importStatementPath(appMatch[1]))
+          );
+          pages = pages.filter((page) => page.relativeImport !== rel);
+        }
+      }
+      importRe.lastIndex = 0;
+      let routesMatch;
+      while ((routesMatch = importRe.exec(code)) !== null) {
+        const rel = ensurePosixPath(
+          getPathRelativeToSrc(importStatementPath(routesMatch[1]))
+        );
+        pages = pages.filter((page) => page.relativeImport !== rel);
+      }
+      if (pages.length === 0) {
+        return null;
+      }
+      const lines = [`import { lazy } from 'react'`];
+      for (const { importName, relativeImport } of pages) {
+        lines.push(
+          `const ${importName} = {`,
+          `  name: "${importName}",`,
+          `  prerenderLoader: (name) => ({ default: globalThis.__REDWOOD__PRERENDER_PAGES[name] }),`,
+          `  LazyComponent: lazy(() => import("${relativeImport}")),`,
+          `}`
+        );
+      }
+      return {
+        code: lines.join("\n") + "\n\n" + code,
+        map: null
+      };
+    }
+  };
+}
+export {
+  cedarRoutesAutoLoaderPlugin
+};

package/dist/plugins/vite-plugin-cedar-universal-deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-universal-deploy.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-universal-deploy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC,MAAM,WAAW,iCAAiC;IAChD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AA6GD,wBAAgB,0BAA0B,CACxC,OAAO,GAAE,iCAAsC,GAC9C,MAAM,CA4DR"}
+{"version":3,"file":"vite-plugin-cedar-universal-deploy.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-universal-deploy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC,MAAM,WAAW,iCAAiC;IAChD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AA6GD,wBAAgB,0BAA0B,CACxC,OAAO,GAAE,iCAAsC,GAC9C,MAAM,CA0GR"}