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

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-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,178 @@ 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);
+        return _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) {

package/dist/cjs/utils.js

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

package/dist/devFeServer.d.ts

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

package/dist/devFeServer.js

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

package/dist/index.d.ts

@@ -6,6 +6,7 @@ export { cedarEntryInjectionPlugin } from './plugins/vite-plugin-cedar-entry-inj
 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 { cedarRemoveFromBundle } from './plugins/vite-plugin-cedar-remove-from-bundle.js';
 export { cedarjsResolveCedarStyleImportsPlugin } from './plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js';
 export { cedarjsJobPathInjectorPlugin } from './plugins/vite-plugin-cedarjs-job-path-injector.js';

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -10,6 +10,7 @@ import { cedarCellTransform } from "./plugins/vite-plugin-cedar-cell.js";
 import { cedarEntryInjectionPlugin } from "./plugins/vite-plugin-cedar-entry-injection.js";
 import { cedarHtmlEnvPlugin } from "./plugins/vite-plugin-cedar-html-env.js";
 import { cedarNodePolyfills } from "./plugins/vite-plugin-cedar-node-polyfills.js";
+import { cedarRemoveDevFatalErrorPage } from "./plugins/vite-plugin-cedar-remove-dev-fatal-error-page.js";
 import { cedarRemoveFromBundle } from "./plugins/vite-plugin-cedar-remove-from-bundle.js";
 import { cedarWaitForApiServer } from "./plugins/vite-plugin-cedar-wait-for-api-server.js";
 import { cedarjsResolveCedarStyleImportsPlugin } from "./plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
@@ -23,6 +24,7 @@ import { cedarEntryInjectionPlugin as cedarEntryInjectionPlugin2 } from "./plugi
 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 { 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";
@@ -61,6 +63,7 @@ function cedar({ mode } = {}) {
     cedarCellTransform(),
     cedarTransformJsAsJsx(),
     cedarRemoveFromBundle(),
+    cedarRemoveDevFatalErrorPage(),
     react({ babel: babelConfig })
   ];
 }
@@ -75,6 +78,7 @@ export {
   cedarImportDirPlugin,
   cedarMergedConfig2 as cedarMergedConfig,
   cedarNodePolyfills2 as cedarNodePolyfills,
+  cedarRemoveDevFatalErrorPage2 as cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle2 as cedarRemoveFromBundle,
   cedarSwapApolloProvider2 as cedarSwapApolloProvider,
   cedarTransformJsAsJsx2 as cedarTransformJsAsJsx,

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

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

package/dist/lib/getMergedConfig.js

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

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

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

package/dist/lib/workspacePackageAliases.js

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,37 @@
+const DEV_FATAL_ERROR_PAGE_MODULE = "@cedarjs/web/dist/components/DevFatalErrorPage";
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+const ESCAPED_MODULE = escapeRegExp(DEV_FATAL_ERROR_PAGE_MODULE);
+const IMPORT_PATTERN = new RegExp(
+  `import\\s*\\{[^}]*\\bDevFatalErrorPage\\b[^}]*\\}\\s*from\\s*['"]${ESCAPED_MODULE}['"]`
+);
+function cedarRemoveDevFatalErrorPage() {
+  let config;
+  return {
+    name: "cedar-remove-dev-fatal-error-page",
+    apply: "build",
+    configResolved(resolvedConfig) {
+      config = resolvedConfig;
+    },
+    transform(code) {
+      if (config.command === "build" && config.mode === "development") {
+        return null;
+      }
+      if (!code.includes(DEV_FATAL_ERROR_PAGE_MODULE)) {
+        return null;
+      }
+      const newCode = code.replace(
+        IMPORT_PATTERN,
+        "const DevFatalErrorPage = undefined"
+      );
+      if (newCode === code) {
+        return null;
+      }
+      return { code: newCode, map: null };
+    }
+  };
+}
+export {
+  cedarRemoveDevFatalErrorPage
+};

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

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