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

package/dist/cjs/lib/getMergedConfig.js

@@ -50,9 +50,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:
@@ -104,7 +109,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
@@ -137,9 +142,12 @@ function getMergedConfig(cedarConfig, cedarPaths) {
     return (0, import_vite.mergeConfig)(defaultCedarViteConfig, userConfig);
   };
 }
-function getRollupInput(ssr) {
+function getRollupInput(userConfig, ssr) {
   const cedarConfig = (0, import_project_config.getConfig)();
   const cedarPaths = (0, import_project_config.getPaths)();
+  if (userConfig.build?.rollupOptions?.input) {
+    return userConfig.build.rollupOptions.input;
+  }
   if (!cedarPaths.web.entryClient) {
     throw new Error("entryClient not defined");
   }

package/dist/cjs/lib/workspacePackageAliases.js

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(workspacePackageAliases_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_workspaces = require("@cedarjs/project-config/workspaces");
 function findSourceEntry(pkgDir, pkgJson) {
   let distEntry = null;
   if (typeof pkgJson.main === "string") {
@@ -71,14 +72,7 @@ function getWorkspacePackageAliases(cedarPaths, cedarConfig) {
     return {};
   }
   try {
-    const rootPkgPath = import_node_path.default.join(cedarPaths.base, "package.json");
-    const rootPkg = JSON.parse(import_node_fs.default.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 = (0, import_workspaces.getNonApiWebWorkspaces)(cedarPaths.base);
     if (nonApiWebWorkspaces.length === 0) {
       return {};
     }

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

@@ -36,21 +36,36 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_vite = require("vite");
 var import_project_config = require("@cedarjs/project-config");
 function cedarEntryInjectionPlugin() {
-  const rwPaths = (0, import_project_config.getPaths)();
-  const clientEntryPath = rwPaths.web.entryClient;
+  const cedarPaths = (0, import_project_config.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 = import_node_path.default.relative(rwPaths.web.src, clientEntryPath);
+  const relativeEntryPath = (0, import_vite.normalizePath)(
+    import_node_path.default.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 || (0, import_vite.normalizePath)(ctx.filename) !== (0, import_vite.normalizePath)(cedarPaths.web.html)) {
+          return html;
+        }
         if (import_node_fs.default.existsSync(clientEntryPath)) {
           return html.replace(
             "</head>",
@@ -67,7 +82,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 (import_node_fs.default.existsSync(clientEntryPath) && (0, import_vite.normalizePath)(id) === (0, import_vite.normalizePath)(rwPaths.web.html)) {
+      if (import_node_fs.default.existsSync(clientEntryPath) && (0, import_vite.normalizePath)(id) === (0, import_vite.normalizePath)(cedarPaths.web.html)) {
         return {
           code: code.replace(
             "</head>",

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

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

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

@@ -97,25 +97,39 @@ function toEntryMeta(route) {
   };
 }
 function cedarUniversalDeployPlugin(options = {}) {
-  const { apiRootPath } = options;
-  const routes = discoverCedarRoutes(apiRootPath ?? "/");
-  let entriesInjected = false;
+  const effectiveApiRootPath = process.env.CEDAR_API_ROOT_PATH ?? options.apiRootPath;
+  const routes = discoverCedarRoutes(effectiveApiRootPath ?? "/");
   return {
     name: "cedar-universal-deploy",
     apply: "build",
     config: {
       order: "pre",
       handler() {
-        if (entriesInjected) {
-          return;
-        }
-        entriesInjected = true;
         for (const route of routes) {
           (0, import_store.addEntry)(toEntryMeta(route));
         }
       }
     },
+    buildStart() {
+      if (this.environment.name !== "ssr") {
+        return;
+      }
+      for (const route of routes) {
+        const resolvedId = RESOLVED_CEDAR_FN_PREFIX + route.id;
+        const safeName = route.id.replace(/[/\\?%*:|"<>]/g, "_").replace(/^_+/, "");
+        this.emitFile({
+          type: "chunk",
+          id: resolvedId,
+          // Emit the functions into a sub-dir to "hide" them from Netlify
+          fileName: "chunks/" + safeName + "-handler.js"
+        });
+      }
+    },
     resolveId(id) {
+      const viteEnv = this.environment;
+      if (viteEnv.config.consumer === "client" || viteEnv.name === "api") {
+        return void 0;
+      }
       if (id.startsWith(RESOLVED_CEDAR_FN_PREFIX)) {
         return id;
       }
@@ -124,7 +138,11 @@ function cedarUniversalDeployPlugin(options = {}) {
       }
       return void 0;
     },
-    load(id) {
+    async load(id) {
+      const viteEnv = this.environment;
+      if (viteEnv.config.consumer === "client" || viteEnv.name === "api") {
+        return void 0;
+      }
       if (id.startsWith(RESOLVED_CEDAR_FN_PREFIX)) {
         const routeId = id.slice(RESOLVED_CEDAR_FN_PREFIX.length);
         const route = routes.find((r) => r.id === routeId);
@@ -140,16 +158,186 @@ function cedarUniversalDeployPlugin(options = {}) {
     }
   };
 }
-function generateGraphQLModule(distPath) {
+async function bundleDistFile(distPath, options = {}) {
+  const { build } = await import("esbuild");
+  const buildOptions = {
+    bundle: true,
+    write: false,
+    format: "esm",
+    platform: "node",
+    target: "node24",
+    plugins: [
+      {
+        name: "ud-external",
+        setup(build2) {
+          build2.onResolve({ filter: /^[^.]/ }, (args) => {
+            if (import_node_path.default.isAbsolute(args.path)) {
+              return;
+            }
+            if (args.path.startsWith("api/")) {
+              return;
+            }
+            return { external: true };
+          });
+        }
+      }
+    ],
+    logLevel: "silent"
+  };
+  if (options.include && options.include.length > 0) {
+    const resolveDir = import_node_path.default.dirname(distPath);
+    const relativeDistPath = "./" + import_node_path.default.basename(distPath);
+    const exportList = options.include.join(", ");
+    buildOptions.stdin = {
+      // Use stdin to define a synthetic entry point that exports only the
+      // requested named exports
+      contents: `export { ${exportList} } from ${JSON.stringify(relativeDistPath)}`,
+      resolveDir,
+      loader: "js"
+    };
+  } else {
+    buildOptions.entryPoints = [distPath];
+  }
+  const result = await build(buildOptions);
+  if (!result.outputFiles || result.outputFiles.length === 0) {
+    throw new Error("esbuild bundle produced no output files");
+  }
+  let text = result.outputFiles[0].text;
+  const exportBlock = text.match(/\nexport\s*\{([^}]*)\};\s*$/);
+  if (exportBlock) {
+    const defaultExportMatch = exportBlock[1].match(
+      /(?:^|,)\s*(\w+)\s+as\s+default\s*(?:,|$)/
+    );
+    if (defaultExportMatch) {
+      const defaultBinding = defaultExportMatch[1];
+      text = text.replace(/\nexport\s*\{[^}]*\};\s*$/, "") + `
+const __cedar_default = ${defaultBinding};`;
+    } else {
+      text = text.replace(/\nexport\s*\{[^}]*\};\s*$/, "");
+    }
+  }
+  return text;
+}
+async function generateGraphQLModule(distPath) {
+  const bundledCode = await bundleDistFile(distPath, {
+    include: ["__cedar_graphqlOptions"]
+  });
   return `
-    import { createGraphQLHandler } from '@cedarjs/vite/ud-handlers/graphql';
-    export default createGraphQLHandler({ distPath: ${JSON.stringify(distPath)} });
+    import { buildCedarContext, requestToLegacyEvent } from '@cedarjs/api/runtime';
+    import { createGraphQLYoga } from '@cedarjs/graphql-server';
+
+    // Inlined bundle of ${import_node_path.default.basename(distPath)} (node_modules kept external)
+    ${bundledCode}
+
+    let yogaInitPromise = null;
+
+    function getYoga() {
+      if (!yogaInitPromise) {
+        yogaInitPromise = createGraphQLYoga(__cedar_graphqlOptions).then(
+          ({ yoga }) => ({ yoga, graphqlOptions: __cedar_graphqlOptions })
+        );
+      }
+      return yogaInitPromise;
+    }
+
+    export default {
+      async fetch(request) {
+        const { yoga, graphqlOptions } = await getYoga();
+        const cedarContext = await buildCedarContext(request, {
+          authDecoder: graphqlOptions ? graphqlOptions.authDecoder : undefined,
+        });
+        const event = await requestToLegacyEvent(request, cedarContext);
+        // Wrap yoga.handle in an AsyncLocalStorage run so directive
+        // validators can read from the global @cedarjs/context. Without
+        // this, the auth plugin's setContext() call writes to a store
+        // that's only visible inside the plugin's own callback \u2014 not
+        // during directive validation.
+        const { getAsyncStoreInstance } = await import('@cedarjs/context/dist/store')
+        const store = getAsyncStoreInstance()
+
+        return store.run(new Map(), () => {
+          return yoga.handle(request, {
+            request,
+            cedarContext,
+            event,
+            requestContext: undefined,
+          })
+        }).then((response) => {
+          // GraphQL Yoga returns a PonyfillResponse from @whatwg-node/fetch
+          // which is not an instanceof the native Response class. Netlify's
+          // bootstrap checks instanceof Response, so we wrap it.
+          return new Response(response.body, {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+          })
+        }).catch((e) => {
+          if (e?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
+            // Client disconnected while the request was being processed (e.g.,
+            // page navigation, tab close). Return a 499 so the runtime doesn't
+            // treat this as a 500.
+            return new Response(null, { status: 499 })
+          }
+
+          throw e
+        })
+      }
+    };
   `;
 }
-function generateFunctionModule(distPath) {
+async function generateFunctionModule(distPath) {
+  const bundledCode = await bundleDistFile(distPath);
+  const notFoundMsg = JSON.stringify(
+    `Handler not found in ${import_node_path.default.basename(distPath)}. Expected \`export async function handleRequest(request, ctx)\`, \`export default async (request, ctx) => Response\`, \`export default { handleRequest }\`, or a legacy Lambda-shaped \`handler\`.`
+  );
   return `
-    import { createFunctionHandler } from '@cedarjs/vite/ud-handlers/function';
-    export default createFunctionHandler({ distPath: ${JSON.stringify(distPath)} });
+    import { wrapLegacyHandler, buildCedarContext } from '@cedarjs/api/runtime';
+
+    // Inlined bundle of ${import_node_path.default.basename(distPath)} (node_modules kept external)
+    ${bundledCode}
+
+    const nativeHandler = (() => {
+      // Prefer named handleRequest export
+      if (typeof handleRequest !== 'undefined') { return handleRequest; }
+      // Handle export default { handleRequest } pattern
+      if (typeof __cedar_default !== 'undefined' && __cedar_default && typeof __cedar_default.handleRequest === 'function') {
+        return __cedar_default.handleRequest;
+      }
+      // Handle plain default-exported async function: export default async (req) => Response
+      if (typeof __cedar_default !== 'undefined' && typeof __cedar_default === 'function') {
+        return __cedar_default;
+      }
+      return undefined;
+    })();
+
+    const legacyFn = (() => {
+      if (typeof handler !== 'undefined') { return handler; }
+      if (typeof __cedar_default !== 'undefined' && __cedar_default && typeof __cedar_default.handler === 'function') {
+        return __cedar_default.handler;
+      }
+      return undefined;
+    })();
+
+    if (!nativeHandler && !legacyFn) {
+      throw new Error(${notFoundMsg});
+    }
+
+    const _handler = nativeHandler ?? wrapLegacyHandler(legacyFn);
+
+    export default {
+      async fetch(request) {
+        const ctx = await buildCedarContext(request);
+        // 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));
+      }
+    };
   `;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/runFeServer.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -74,7 +75,7 @@ async function runFeServer() {
     import_node_path.default.join(rwPaths.web.distBrowser, "client-build-manifest.json")
   ).href;
   const clientBuildManifest = (await import(clientBuildManifestUrl, { with: { type: "json" } })).default;
-  const clientEntry = rscEnabled ? clientBuildManifest["entry.client.tsx"] || clientBuildManifest["entry.client.jsx"] : Object.values(clientBuildManifest).find(
+  const clientEntry = rscEnabled ? clientBuildManifest["src/entry.client.tsx"] || clientBuildManifest["src/entry.client.jsx"] : Object.values(clientBuildManifest).find(
     (manifestItem) => manifestItem.isEntry
   );
   if (!clientEntry) {