@cedarjs/vite 5.0.0-canary.2602 → 5.0.0-canary.2604

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,
   cedarDataUriShim: () => import_vite_plugin_cedar_data_uri_shim2.cedarDataUriShim,
   cedarEntryInjectionPlugin: () => import_vite_plugin_cedar_entry_injection2.cedarEntryInjectionPlugin,
   cedarHtmlEnvPlugin: () => import_vite_plugin_cedar_html_env2.cedarHtmlEnvPlugin,
@@ -68,6 +70,8 @@ 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");
@@ -114,10 +118,12 @@ function cedar({ mode } = {}) {
 var index_default = cedar;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  applyContextWrapping,
   cedar,
   cedarAutoImportsPlugin,
   cedarCellTransform,
   cedarCjsCompatPlugin,
+  cedarContextWrappingPlugin,
   cedarDataUriShim,
   cedarEntryInjectionPlugin,
   cedarHtmlEnvPlugin,

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

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 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);
@@ -37,7 +38,6 @@ var import_project_config = require("@cedarjs/project-config");
 function cedarContextWrappingPlugin({
   projectIsEsm = false
 } = {}) {
-  const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   return {
     name: "cedar-context-wrapping",
     transform(code, id) {
@@ -51,20 +51,27 @@ function cedarContextWrappingPlugin({
       if (!(0, import_vite.normalizePath)(id).startsWith(functionsDir + "/")) {
         return null;
       }
-      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 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 = `
+  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()
@@ -79,14 +86,10 @@ export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) =>
   return __rw_handler(__rw_event, __rw__context)
 }
 `;
-      return {
-        code: before + importStatement + renamed + wrappedHandler,
-        map: null
-      };
-    }
-  };
+  return before + importStatement + renamed + wrappedHandler;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  applyContextWrapping,
   cedarContextWrappingPlugin
 });

package/dist/index.d.ts

@@ -2,6 +2,8 @@ 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';

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;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,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAC/E,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"}
+{"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,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAC/E,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

@@ -21,6 +21,8 @@ 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";
@@ -66,10 +68,12 @@ function cedar({ mode } = {}) {
 }
 var index_default = cedar;
 export {
+  applyContextWrapping,
   cedar,
   cedarAutoImportsPlugin,
   cedarCellTransform2 as cedarCellTransform,
   cedarCjsCompatPlugin,
+  cedarContextWrappingPlugin,
   cedarDataUriShim2 as cedarDataUriShim,
   cedarEntryInjectionPlugin2 as cedarEntryInjectionPlugin,
   cedarHtmlEnvPlugin2 as cedarHtmlEnvPlugin,

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

@@ -28,4 +28,17 @@ import type { Plugin } from 'vite';
 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

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

@@ -4,7 +4,6 @@ import { getPaths } from "@cedarjs/project-config";
 function cedarContextWrappingPlugin({
   projectIsEsm = false
 } = {}) {
-  const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   return {
     name: "cedar-context-wrapping",
     transform(code, id) {
@@ -18,20 +17,27 @@ function cedarContextWrappingPlugin({
       if (!normalizePath(id).startsWith(functionsDir + "/")) {
         return null;
       }
-      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 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 = `
+  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()
@@ -46,13 +52,9 @@ export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) =>
   return __rw_handler(__rw_event, __rw__context)
 }
 `;
-      return {
-        code: before + importStatement + renamed + wrappedHandler,
-        map: null
-      };
-    }
-  };
+  return before + importStatement + renamed + wrappedHandler;
 }
 export {
+  applyContextWrapping,
   cedarContextWrappingPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "5.0.0-canary.2602",
+  "version": "5.0.0-canary.2604",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -63,15 +63,15 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "5.0.0-canary.2602",
-    "@cedarjs/babel-config": "5.0.0-canary.2602",
-    "@cedarjs/context": "5.0.0-canary.2602",
-    "@cedarjs/cookie-jar": "5.0.0-canary.2602",
-    "@cedarjs/graphql-server": "5.0.0-canary.2602",
-    "@cedarjs/internal": "5.0.0-canary.2602",
-    "@cedarjs/project-config": "5.0.0-canary.2602",
-    "@cedarjs/server-store": "5.0.0-canary.2602",
-    "@cedarjs/testing": "5.0.0-canary.2602",
+    "@cedarjs/api": "5.0.0-canary.2604",
+    "@cedarjs/babel-config": "5.0.0-canary.2604",
+    "@cedarjs/context": "5.0.0-canary.2604",
+    "@cedarjs/cookie-jar": "5.0.0-canary.2604",
+    "@cedarjs/graphql-server": "5.0.0-canary.2604",
+    "@cedarjs/internal": "5.0.0-canary.2604",
+    "@cedarjs/project-config": "5.0.0-canary.2604",
+    "@cedarjs/server-store": "5.0.0-canary.2604",
+    "@cedarjs/testing": "5.0.0-canary.2604",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.41",
     "@universal-deploy/store": "^0.2.1",
@@ -103,9 +103,9 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.4",
-    "@cedarjs/auth": "5.0.0-canary.2602",
-    "@cedarjs/router": "5.0.0-canary.2602",
-    "@cedarjs/web": "5.0.0-canary.2602",
+    "@cedarjs/auth": "5.0.0-canary.2604",
+    "@cedarjs/router": "5.0.0-canary.2604",
+    "@cedarjs/web": "5.0.0-canary.2604",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
     "@types/aws-lambda": "8.10.162",