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

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBA0U3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA+BA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBA8U3B"}

package/dist/buildApp.js

@@ -10,6 +10,7 @@ import {
 import { findApiFiles } from "@cedarjs/internal/dist/files.js";
 import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
+import { cedarContextWrappingPlugin } from "./plugins/vite-plugin-cedar-context-wrapping.js";
 function resolveWithExtensions(id) {
   if (fs.existsSync(id)) {
     return id;
@@ -221,36 +222,41 @@ async function buildCedarApp({
         return null;
       }
     });
-    if (babelPlugins) {
-      plugins.push({
-        name: "cedar-vite-api-babel-transform",
-        enforce: "pre",
-        async transform(code, id) {
-          if (!/\.(js|ts|tsx|jsx)$/.test(id)) {
-            return null;
-          }
-          if (id.includes("node_modules")) {
-            return null;
-          }
-          if (!normalizePath(id).startsWith(normalizePath(cedarPaths.api.base))) {
-            return null;
-          }
-          const transformedCode = await transformWithBabel(
-            code,
-            id,
-            babelPlugins,
-            true
-          );
-          if (transformedCode?.code) {
-            return {
-              code: transformedCode.code,
-              map: transformedCode.map ?? null
-            };
-          }
+  }
+  if (workspace.includes("api")) {
+    plugins.push(
+      cedarContextWrappingPlugin({ projectIsEsm: projectSideIsEsm("api") })
+    );
+  }
+  if (babelPlugins) {
+    plugins.push({
+      name: "cedar-vite-api-babel-transform",
+      enforce: "pre",
+      async transform(code, id) {
+        if (!/\.(js|ts|tsx|jsx)$/.test(id)) {
           return null;
         }
-      });
-    }
+        if (id.includes("node_modules")) {
+          return null;
+        }
+        if (!normalizePath(id).startsWith(normalizePath(cedarPaths.api.base))) {
+          return null;
+        }
+        const transformedCode = await transformWithBabel(
+          code,
+          id,
+          babelPlugins,
+          true
+        );
+        if (transformedCode?.code) {
+          return {
+            code: transformedCode.code,
+            map: transformedCode.map ?? null
+          };
+        }
+        return null;
+      }
+    });
   }
   const builder = await createBuilder({
     configFile: cedarPaths.web.viteConfig,

package/dist/cjs/buildApp.js

@@ -40,6 +40,7 @@ var import_babel_config = require("@cedarjs/babel-config");
 var import_files = require("@cedarjs/internal/dist/files.js");
 var import_project_config = require("@cedarjs/project-config");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
+var import_vite_plugin_cedar_context_wrapping = require("./plugins/vite-plugin-cedar-context-wrapping.js");
 function resolveWithExtensions(id) {
   if (import_node_fs.default.existsSync(id)) {
     return id;
@@ -251,36 +252,41 @@ async function buildCedarApp({
         return null;
       }
     });
-    if (babelPlugins) {
-      plugins.push({
-        name: "cedar-vite-api-babel-transform",
-        enforce: "pre",
-        async transform(code, id) {
-          if (!/\.(js|ts|tsx|jsx)$/.test(id)) {
-            return null;
-          }
-          if (id.includes("node_modules")) {
-            return null;
-          }
-          if (!(0, import_vite2.normalizePath)(id).startsWith((0, import_vite2.normalizePath)(cedarPaths.api.base))) {
-            return null;
-          }
-          const transformedCode = await (0, import_babel_config.transformWithBabel)(
-            code,
-            id,
-            babelPlugins,
-            true
-          );
-          if (transformedCode?.code) {
-            return {
-              code: transformedCode.code,
-              map: transformedCode.map ?? null
-            };
-          }
+  }
+  if (workspace.includes("api")) {
+    plugins.push(
+      (0, import_vite_plugin_cedar_context_wrapping.cedarContextWrappingPlugin)({ projectIsEsm: (0, import_project_config.projectSideIsEsm)("api") })
+    );
+  }
+  if (babelPlugins) {
+    plugins.push({
+      name: "cedar-vite-api-babel-transform",
+      enforce: "pre",
+      async transform(code, id) {
+        if (!/\.(js|ts|tsx|jsx)$/.test(id)) {
           return null;
         }
-      });
-    }
+        if (id.includes("node_modules")) {
+          return null;
+        }
+        if (!(0, import_vite2.normalizePath)(id).startsWith((0, import_vite2.normalizePath)(cedarPaths.api.base))) {
+          return null;
+        }
+        const transformedCode = await (0, import_babel_config.transformWithBabel)(
+          code,
+          id,
+          babelPlugins,
+          true
+        );
+        if (transformedCode?.code) {
+          return {
+            code: transformedCode.code,
+            map: transformedCode.map ?? null
+          };
+        }
+        return null;
+      }
+    });
   }
   const builder = await (0, import_vite2.createBuilder)({
     configFile: cedarPaths.web.viteConfig,

package/dist/cjs/index.js

@@ -28,10 +28,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 __export(index_exports, {
+  applyContextWrapping: () => import_vite_plugin_cedar_context_wrapping2.applyContextWrapping,
   cedar: () => cedar,
   cedarAutoImportsPlugin: () => import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin,
   cedarCellTransform: () => import_vite_plugin_cedar_cell2.cedarCellTransform,
   cedarCjsCompatPlugin: () => import_vite_plugin_cedar_cjs_compat.cedarCjsCompatPlugin,
+  cedarContextWrappingPlugin: () => import_vite_plugin_cedar_context_wrapping.cedarContextWrappingPlugin,
   cedarEntryInjectionPlugin: () => import_vite_plugin_cedar_entry_injection2.cedarEntryInjectionPlugin,
   cedarHtmlEnvPlugin: () => import_vite_plugin_cedar_html_env2.cedarHtmlEnvPlugin,
   cedarImportDirPlugin: () => import_vite_plugin_cedar_import_dir.cedarImportDirPlugin,
@@ -39,6 +41,7 @@ __export(index_exports, {
   cedarNodePolyfills: () => import_vite_plugin_cedar_node_polyfills2.cedarNodePolyfills,
   cedarRemoveDevFatalErrorPage: () => import_vite_plugin_cedar_remove_dev_fatal_error_page2.cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle: () => import_vite_plugin_cedar_remove_from_bundle2.cedarRemoveFromBundle,
+  cedarRoutesAutoLoaderPlugin: () => import_vite_plugin_cedar_routes_auto_loader2.cedarRoutesAutoLoaderPlugin,
   cedarSwapApolloProvider: () => import_vite_plugin_swap_apollo_provider2.cedarSwapApolloProvider,
   cedarTransformJsAsJsx: () => import_vite_plugin_jsx_loader2.cedarTransformJsAsJsx,
   cedarUniversalDeployPlugin: () => import_vite_plugin_cedar_universal_deploy.cedarUniversalDeployPlugin,
@@ -58,6 +61,7 @@ var import_vite_plugin_cedar_html_env = require("./plugins/vite-plugin-cedar-htm
 var import_vite_plugin_cedar_node_polyfills = require("./plugins/vite-plugin-cedar-node-polyfills.js");
 var import_vite_plugin_cedar_remove_dev_fatal_error_page = require("./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js");
 var import_vite_plugin_cedar_remove_from_bundle = require("./plugins/vite-plugin-cedar-remove-from-bundle.js");
+var import_vite_plugin_cedar_routes_auto_loader = require("./plugins/vite-plugin-cedar-routes-auto-loader.js");
 var import_vite_plugin_cedar_wait_for_api_server = require("./plugins/vite-plugin-cedar-wait-for-api-server.js");
 var import_vite_plugin_cedarjs_resolve_cedar_style_imports = require("./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js");
 var import_vite_plugin_jsx_loader = require("./plugins/vite-plugin-jsx-loader.js");
@@ -66,11 +70,14 @@ var import_vite_plugin_swap_apollo_provider = require("./plugins/vite-plugin-swa
 var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
 var import_vite_plugin_cedar_cjs_compat = require("./plugins/vite-plugin-cedar-cjs-compat.js");
 var import_vite_plugin_cedar_cell2 = require("./plugins/vite-plugin-cedar-cell.js");
+var import_vite_plugin_cedar_context_wrapping = require("./plugins/vite-plugin-cedar-context-wrapping.js");
+var import_vite_plugin_cedar_context_wrapping2 = require("./plugins/vite-plugin-cedar-context-wrapping.js");
 var import_vite_plugin_cedar_entry_injection2 = require("./plugins/vite-plugin-cedar-entry-injection.js");
 var import_vite_plugin_cedar_html_env2 = require("./plugins/vite-plugin-cedar-html-env.js");
 var import_vite_plugin_cedar_import_dir = require("./plugins/vite-plugin-cedar-import-dir.js");
 var import_vite_plugin_cedar_node_polyfills2 = require("./plugins/vite-plugin-cedar-node-polyfills.js");
 var import_vite_plugin_cedar_remove_dev_fatal_error_page2 = require("./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js");
+var import_vite_plugin_cedar_routes_auto_loader2 = require("./plugins/vite-plugin-cedar-routes-auto-loader.js");
 var import_vite_plugin_cedar_remove_from_bundle2 = require("./plugins/vite-plugin-cedar-remove-from-bundle.js");
 var import_vite_plugin_cedarjs_resolve_cedar_style_imports2 = require("./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js");
 var import_vite_plugin_cedarjs_job_path_injector = require("./plugins/vite-plugin-cedarjs-job-path-injector.js");
@@ -86,14 +93,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" && (0, import_vitest.cedarJsRouterImportTransformPlugin)(),
@@ -110,16 +110,20 @@ function cedar({ mode } = {}) {
     (0, import_vite_plugin_jsx_loader.cedarTransformJsAsJsx)(),
     (0, import_vite_plugin_cedar_remove_from_bundle.cedarRemoveFromBundle)(),
     (0, import_vite_plugin_cedar_remove_dev_fatal_error_page.cedarRemoveDevFatalErrorPage)(),
+    // RSC handles route auto-loading differently in each build stage
+    !rscEnabled && (0, import_vite_plugin_cedar_routes_auto_loader.cedarRoutesAutoLoaderPlugin)(),
     (0, import_plugin_react.default)({ babel: babelConfig })
   ];
 }
 var index_default = cedar;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  applyContextWrapping,
   cedar,
   cedarAutoImportsPlugin,
   cedarCellTransform,
   cedarCjsCompatPlugin,
+  cedarContextWrappingPlugin,
   cedarEntryInjectionPlugin,
   cedarHtmlEnvPlugin,
   cedarImportDirPlugin,
@@ -127,6 +131,7 @@ var index_default = cedar;
   cedarNodePolyfills,
   cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle,
+  cedarRoutesAutoLoaderPlugin,
   cedarSwapApolloProvider,
   cedarTransformJsAsJsx,
   cedarUniversalDeployPlugin,

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

@@ -0,0 +1,95 @@
+"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_context_wrapping_exports = {};
+__export(vite_plugin_cedar_context_wrapping_exports, {
+  applyContextWrapping: () => applyContextWrapping,
+  cedarContextWrappingPlugin: () => cedarContextWrappingPlugin
+});
+module.exports = __toCommonJS(vite_plugin_cedar_context_wrapping_exports);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_vite = require("vite");
+var import_project_config = require("@cedarjs/project-config");
+function cedarContextWrappingPlugin({
+  projectIsEsm = false
+} = {}) {
+  return {
+    name: "cedar-context-wrapping",
+    transform(code, id) {
+      let paths;
+      try {
+        paths = (0, import_project_config.getPaths)();
+      } catch {
+        return null;
+      }
+      const functionsDir = (0, import_vite.normalizePath)(import_node_path.default.join(paths.api.src, "functions"));
+      if (!(0, import_vite.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;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyContextWrapping,
+  cedarContextWrappingPlugin
+});

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

@@ -0,0 +1,126 @@
+"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_routes_auto_loader_exports = {};
+__export(vite_plugin_cedar_routes_auto_loader_exports, {
+  cedarRoutesAutoLoaderPlugin: () => cedarRoutesAutoLoaderPlugin
+});
+module.exports = __toCommonJS(vite_plugin_cedar_routes_auto_loader_exports);
+var import_node_fs = __toESM(require("node:fs"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_vite = require("vite");
+var import_project_config = require("@cedarjs/project-config");
+function getPathRelativeToSrc(maybeAbsolutePath) {
+  const withoutExt = maybeAbsolutePath.replace(/\.[^/.]+$/, "");
+  if (withoutExt.startsWith("src/")) {
+    const basePath = import_node_path.default.join((0, import_project_config.getPaths)().web.base, withoutExt);
+    const resolved = (0, import_project_config.resolveFile)(basePath) || (0, import_project_config.resolveFile)(import_node_path.default.join(basePath, "index")) || (0, import_project_config.resolveFile)(import_node_path.default.join(basePath, import_node_path.default.basename(basePath)));
+    if (resolved) {
+      const resolvedWithoutExt = resolved.replace(/\.[^/.]+$/, "");
+      return "./" + import_node_path.default.relative((0, import_project_config.getPaths)().web.src, resolvedWithoutExt);
+    }
+    return "./" + withoutExt.slice("src/".length);
+  }
+  if (!import_node_path.default.isAbsolute(withoutExt)) {
+    return withoutExt;
+  }
+  return `./${import_node_path.default.relative((0, import_project_config.getPaths)().web.src, withoutExt)}`;
+}
+function withRelativeImports(page) {
+  return {
+    ...page,
+    relativeImport: (0, import_project_config.ensurePosixPath)(getPathRelativeToSrc(page.importPath))
+  };
+}
+function cedarRoutesAutoLoaderPlugin() {
+  const routesFileId = (0, import_vite.normalizePath)((0, import_project_config.getPaths)().web.routes);
+  const initialPages = (0, import_project_config.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 ((0, import_vite.normalizePath)(id) !== routesFileId) {
+        return null;
+      }
+      let pages = (0, import_project_config.processPagesDir)().map(withRelativeImports);
+      const importRe = /^import\s+\w+\s+from\s+['"]([^'"]+)['"]/gm;
+      const appPath = (0, import_project_config.resolveFile)(import_node_path.default.join((0, import_project_config.getPaths)().web.src, "App"));
+      if (appPath) {
+        const appSource = import_node_fs.default.readFileSync(appPath, "utf8");
+        let appMatch;
+        while ((appMatch = importRe.exec(appSource)) !== null) {
+          const rel = (0, import_project_config.ensurePosixPath)(
+            getPathRelativeToSrc((0, import_project_config.importStatementPath)(appMatch[1]))
+          );
+          pages = pages.filter((page) => page.relativeImport !== rel);
+        }
+      }
+      importRe.lastIndex = 0;
+      let routesMatch;
+      while ((routesMatch = importRe.exec(code)) !== null) {
+        const rel = (0, import_project_config.ensurePosixPath)(
+          getPathRelativeToSrc((0, import_project_config.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
+      };
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cedarRoutesAutoLoaderPlugin
+});

package/dist/cjs/plugins/vite-plugin-cedar-universal-deploy.js

@@ -327,7 +327,15 @@ async function generateFunctionModule(distPath) {
     export default {
       async fetch(request) {
         const ctx = await buildCedarContext(request);
-        return _handler(request, ctx);
+        // Wrap the handler in an AsyncLocalStorage run so the global
+        // @cedarjs/context is available inside it (and isolated per request).
+        // Mirrors the GraphQL module above and the cedarContextWrappingPlugin
+        // used for non-UD builds.
+        const { getAsyncStoreInstance } = await import(
+          '@cedarjs/context/dist/store'
+        );
+        const store = getAsyncStoreInstance();
+        return store.run(new Map(), () => _handler(request, ctx));
       }
     };
   `;

package/dist/index.d.ts

@@ -2,11 +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;AAsBxC,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,4BAA4B,EAAE,MAAM,4DAA4D,CAAA;AACzG,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,CA0ClE;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

@@ -12,6 +12,7 @@ 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";
@@ -20,11 +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";
@@ -40,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(),
@@ -64,15 +61,19 @@ function cedar({ mode } = {}) {
     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,
@@ -80,6 +81,7 @@ export {
   cedarNodePolyfills2 as cedarNodePolyfills,
   cedarRemoveDevFatalErrorPage2 as cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle2 as cedarRemoveFromBundle,
+  cedarRoutesAutoLoaderPlugin2 as cedarRoutesAutoLoaderPlugin,
   cedarSwapApolloProvider2 as cedarSwapApolloProvider,
   cedarTransformJsAsJsx2 as cedarTransformJsAsJsx,
   cedarUniversalDeployPlugin,

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-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.js

@@ -294,7 +294,15 @@ async function generateFunctionModule(distPath) {
     export default {
       async fetch(request) {
         const ctx = await buildCedarContext(request);
-        return _handler(request, ctx);
+        // Wrap the handler in an AsyncLocalStorage run so the global
+        // @cedarjs/context is available inside it (and isolated per request).
+        // Mirrors the GraphQL module above and the cedarContextWrappingPlugin
+        // used for non-UD builds.
+        const { getAsyncStoreInstance } = await import(
+          '@cedarjs/context/dist/store'
+        );
+        const store = getAsyncStoreInstance();
+        return store.run(new Map(), () => _handler(request, ctx));
       }
     };
   `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "4.2.1-next.258",
+  "version": "4.2.1-next.269",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
     "inject"
   ],
   "scripts": {
-    "build": "tsx build.ts && yarn build:types",
+    "build": "node ./build.ts && yarn build:types",
     "build:pack": "yarn pack -o cedarjs-vite.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "check:attw": "tsx ./attw.ts",