@cedarjs/vite 5.0.0-canary.2318 → 5.0.0-canary.2319

package/dist/buildUDApiServer.d.ts

@@ -3,14 +3,15 @@ export interface BuildUDApiServerOptions {
     apiRootPath?: string;
 }
 /**
- * Builds the API server Universal Deploy Node entry using Vite.
+ * Builds the API server Universal Deploy entry using Vite.
  *
  * Runs a Vite server build that:
  *   1. Installs `cedarUniversalDeployPlugin()` to register per-route API
- *      entries (GraphQL, auth, functions) with UD's store and resolve
- *      `virtual:ud:catch-all` → Cedar's multi-route rou3 dispatcher.
- *   2. Installs `node()` from `@universal-deploy/node/vite` to emit a
- *      self-contained Node server entry at `api/dist/ud/index.js`
+ *      entries (GraphQL, auth, functions) with UD's store.
+ *   2. Installs `universalDeploy()` from `@universal-deploy/vite` which
+ *      provides `catchAll()` (rou3-based route dispatch), `devServer()`, and
+ *      auto-detection of deployment targets (Node by default, or Netlify/
+ *      Vercel/Cloudflare if the user has added the corresponding Vite plugin).
  *
  * The emitted entry can be launched directly:  node api/dist/ud/index.js
  * That is what `cedar serve api` does.

package/dist/buildUDApiServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildUDApiServer.d.ts","sourceRoot":"","sources":["../src/buildUDApiServer.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,gBAAgB,GAAU,4BAGpC,uBAA4B,kBA+D9B,CAAA"}
+{"version":3,"file":"buildUDApiServer.d.ts","sourceRoot":"","sources":["../src/buildUDApiServer.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,gBAAgB,GAAU,4BAGpC,uBAA4B,kBA6C9B,CAAA"}

package/dist/buildUDApiServer.js

@@ -6,23 +6,19 @@ const buildUDApiServer = async ({
 } = {}) => {
   const { build } = await import("vite");
   const { cedarUniversalDeployPlugin } = await import("./plugins/vite-plugin-cedar-universal-deploy.js");
-  const { node } = await import("@universal-deploy/node/vite");
+  const { default: universalDeploy } = await import("@universal-deploy/vite");
   const rwPaths = getPaths();
   const outDir = path.join(rwPaths.api.dist, "ud");
   await build({
-    // No configFile — we configure everything inline so this build is
-    // self-contained and does not require a vite.config.ts in api/.
-    configFile: false,
-    envFile: false,
     logLevel: verbose ? "info" : "warn",
     plugins: [
-      // Registers per-route API entries with @universal-deploy/store and
-      // resolves virtual:ud:catch-all → Cedar's multi-route rou3 dispatcher.
+      // Registers per-route API entries with @universal-deploy/store.
       cedarUniversalDeployPlugin({ apiRootPath }),
-      // Emits a self-contained Node server entry (api/dist/ud/index.js) that
-      // imports virtual:ud:catch-all and starts an srvx HTTP server.
-      // This is a Vite server-build concern, not Cedar HTML SSR.
-      ...node()
+      // Includes catchAll(), devServer(), and auto-detection of
+      // deployment targets. Enables @universal-deploy/node by default
+      // when no other target (Netlify, Vercel, Cloudflare) is detected
+      // in the user's Vite config.
+      universalDeploy()
     ],
     // The ssr environment is the Vite mechanism for server-side builds.
     // Reminder: "ssr" here means "server-side module execution", NOT
@@ -30,21 +26,7 @@ const buildUDApiServer = async ({
     environments: {
       ssr: {
         build: {
-          outDir,
-          // Ensure @universal-deploy/node is bundled into the output so the
-          // emitted entry is self-contained.
-          rollupOptions: {
-            output: {
-              // Produce a single-file entry where possible; srvx chunks are
-              // split by the node() plugin automatically.
-              entryFileNames: "[name].js"
-            }
-          }
-        },
-        resolve: {
-          // Do not externalise @universal-deploy/node — the node() plugin
-          // requires it to be bundled into the server entry.
-          noExternal: ["@universal-deploy/node"]
+          outDir
         }
       }
     },

package/dist/cjs/buildUDApiServer.js

@@ -39,23 +39,19 @@ const buildUDApiServer = async ({
 } = {}) => {
   const { build } = await import("vite");
   const { cedarUniversalDeployPlugin } = await import("./plugins/vite-plugin-cedar-universal-deploy.js");
-  const { node } = await import("@universal-deploy/node/vite");
+  const { default: universalDeploy } = await import("@universal-deploy/vite");
   const rwPaths = (0, import_project_config.getPaths)();
   const outDir = import_node_path.default.join(rwPaths.api.dist, "ud");
   await build({
-    // No configFile — we configure everything inline so this build is
-    // self-contained and does not require a vite.config.ts in api/.
-    configFile: false,
-    envFile: false,
     logLevel: verbose ? "info" : "warn",
     plugins: [
-      // Registers per-route API entries with @universal-deploy/store and
-      // resolves virtual:ud:catch-all → Cedar's multi-route rou3 dispatcher.
+      // Registers per-route API entries with @universal-deploy/store.
       cedarUniversalDeployPlugin({ apiRootPath }),
-      // Emits a self-contained Node server entry (api/dist/ud/index.js) that
-      // imports virtual:ud:catch-all and starts an srvx HTTP server.
-      // This is a Vite server-build concern, not Cedar HTML SSR.
-      ...node()
+      // Includes catchAll(), devServer(), and auto-detection of
+      // deployment targets. Enables @universal-deploy/node by default
+      // when no other target (Netlify, Vercel, Cloudflare) is detected
+      // in the user's Vite config.
+      universalDeploy()
     ],
     // The ssr environment is the Vite mechanism for server-side builds.
     // Reminder: "ssr" here means "server-side module execution", NOT
@@ -63,21 +59,7 @@ const buildUDApiServer = async ({
     environments: {
       ssr: {
         build: {
-          outDir,
-          // Ensure @universal-deploy/node is bundled into the output so the
-          // emitted entry is self-contained.
-          rollupOptions: {
-            output: {
-              // Produce a single-file entry where possible; srvx chunks are
-              // split by the node() plugin automatically.
-              entryFileNames: "[name].js"
-            }
-          }
-        },
-        resolve: {
-          // Do not externalise @universal-deploy/node — the node() plugin
-          // requires it to be bundled into the server entry.
-          noExternal: ["@universal-deploy/node"]
+          outDir
         }
       }
     },

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

@@ -37,19 +37,18 @@ var import_files = require("@cedarjs/internal/dist/files.js");
 var import_project_config = require("@cedarjs/project-config");
 const VIRTUAL_CEDAR_FN_PREFIX = "virtual:cedar-api:fn:";
 const RESOLVED_CEDAR_FN_PREFIX = "\0virtual:cedar-api:fn:";
-const RESOLVED_VIRTUAL_UD_CATCH_ALL = "\0virtual:ud:catch-all";
 const GRAPHQL_METHODS = ["GET", "POST", "OPTIONS"];
-function normalizeApiRootPath(rootPath) {
-  let normalized = rootPath;
-  if (!normalized.startsWith("/")) {
-    normalized = "/" + normalized;
+function normaliseApiPrefix(apiPrefix) {
+  apiPrefix = apiPrefix.trim();
+  while (apiPrefix.startsWith("/")) {
+    apiPrefix = apiPrefix.slice(1);
   }
-  if (!normalized.endsWith("/")) {
-    normalized = normalized + "/";
+  while (apiPrefix.endsWith("/")) {
+    apiPrefix = apiPrefix.slice(0, -1);
   }
-  return normalized;
+  return apiPrefix ? "/" + apiPrefix : "";
 }
-function discoverCedarRoutes() {
+function discoverCedarRoutes(apiRootPath) {
   const srcFunctions = (0, import_project_config.getPaths)().api.functions;
   const distFunctions = import_node_path.default.join((0, import_project_config.getPaths)().api.base, "dist", "functions");
   const sourceFiles = (0, import_files.findApiServerFunctions)(srcFunctions);
@@ -67,7 +66,8 @@ function discoverCedarRoutes() {
     } else {
       continue;
     }
-    const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
+    const apiPrefix = normaliseApiPrefix(apiRootPath);
+    const routePath = routeName === "graphql" ? `${apiPrefix}/graphql` : `${apiPrefix}/${routeName}`;
     const methods = routeName === "graphql" ? [...GRAPHQL_METHODS] : [];
     const type = routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function";
     const distPath = import_node_path.default.join(distFunctions, dir, name + ".js");
@@ -98,8 +98,7 @@ function toEntryMeta(route) {
 }
 function cedarUniversalDeployPlugin(options = {}) {
   const { apiRootPath } = options;
-  const normalizedApiRootPath = normalizeApiRootPath(apiRootPath ?? "/");
-  const routes = discoverCedarRoutes();
+  const routes = discoverCedarRoutes(apiRootPath ?? "/");
   let entriesInjected = false;
   return {
     name: "cedar-universal-deploy",
@@ -114,15 +113,11 @@ function cedarUniversalDeployPlugin(options = {}) {
         for (const route of routes) {
           (0, import_store.addEntry)(toEntryMeta(route));
         }
-        (0, import_store.addEntry)({
-          id: import_store.catchAllEntry,
-          route: "/**"
-        });
       }
     },
     resolveId(id) {
-      if (id === import_store.catchAllEntry) {
-        return RESOLVED_VIRTUAL_UD_CATCH_ALL;
+      if (id.startsWith(RESOLVED_CEDAR_FN_PREFIX)) {
+        return id;
       }
       if (id.startsWith(VIRTUAL_CEDAR_FN_PREFIX)) {
         return "\0" + id;
@@ -141,9 +136,6 @@ function cedarUniversalDeployPlugin(options = {}) {
         }
         return generateFunctionModule(route.entry);
       }
-      if (id === RESOLVED_VIRTUAL_UD_CATCH_ALL) {
-        return generateCatchAllModule(routes, normalizedApiRootPath);
-      }
       return void 0;
     }
   };
@@ -160,27 +152,6 @@ function generateFunctionModule(distPath) {
     export default createFunctionHandler({ distPath: ${JSON.stringify(distPath)} });
   `;
 }
-function generateCatchAllModule(routes, normalizedApiRootPath) {
-  const imports = routes.map(
-    (route, i) => `import mod${i} from '${VIRTUAL_CEDAR_FN_PREFIX}${route.id}';`
-  ).join("\n");
-  const routesArray = routes.map(
-    (route, i) => `{
-           path: ${JSON.stringify(route.path)},
-           methods: ${JSON.stringify(route.methods)},
-           module: mod${i}
-        }`
-  ).join(", ");
-  return `
-    import { createCatchAllHandler } from '@cedarjs/vite/ud-handlers/catch-all';
-    ${imports}
-
-    export default createCatchAllHandler({
-      routes: [${routesArray}],
-      apiRootPath: ${JSON.stringify(normalizedApiRootPath)}
-    });
-  `;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cedarUniversalDeployPlugin

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;AAyGD,wBAAgB,0BAA0B,CACxC,OAAO,GAAE,iCAAsC,GAC9C,MAAM,CAsER"}
+{"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"}

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

@@ -1,22 +1,21 @@
 import path from "node:path";
-import { addEntry, catchAllEntry } from "@universal-deploy/store";
+import { addEntry } from "@universal-deploy/store";
 import { findApiServerFunctions } from "@cedarjs/internal/dist/files.js";
 import { getPaths } from "@cedarjs/project-config";
 const VIRTUAL_CEDAR_FN_PREFIX = "virtual:cedar-api:fn:";
 const RESOLVED_CEDAR_FN_PREFIX = "\0virtual:cedar-api:fn:";
-const RESOLVED_VIRTUAL_UD_CATCH_ALL = "\0virtual:ud:catch-all";
 const GRAPHQL_METHODS = ["GET", "POST", "OPTIONS"];
-function normalizeApiRootPath(rootPath) {
-  let normalized = rootPath;
-  if (!normalized.startsWith("/")) {
-    normalized = "/" + normalized;
+function normaliseApiPrefix(apiPrefix) {
+  apiPrefix = apiPrefix.trim();
+  while (apiPrefix.startsWith("/")) {
+    apiPrefix = apiPrefix.slice(1);
   }
-  if (!normalized.endsWith("/")) {
-    normalized = normalized + "/";
+  while (apiPrefix.endsWith("/")) {
+    apiPrefix = apiPrefix.slice(0, -1);
   }
-  return normalized;
+  return apiPrefix ? "/" + apiPrefix : "";
 }
-function discoverCedarRoutes() {
+function discoverCedarRoutes(apiRootPath) {
   const srcFunctions = getPaths().api.functions;
   const distFunctions = path.join(getPaths().api.base, "dist", "functions");
   const sourceFiles = findApiServerFunctions(srcFunctions);
@@ -34,7 +33,8 @@ function discoverCedarRoutes() {
     } else {
       continue;
     }
-    const routePath = routeName === "graphql" ? "/graphql" : `/${routeName}`;
+    const apiPrefix = normaliseApiPrefix(apiRootPath);
+    const routePath = routeName === "graphql" ? `${apiPrefix}/graphql` : `${apiPrefix}/${routeName}`;
     const methods = routeName === "graphql" ? [...GRAPHQL_METHODS] : [];
     const type = routeName === "graphql" ? "graphql" : routeName === "health" ? "health" : routeName.toLowerCase().includes("auth") ? "auth" : "function";
     const distPath = path.join(distFunctions, dir, name + ".js");
@@ -65,8 +65,7 @@ function toEntryMeta(route) {
 }
 function cedarUniversalDeployPlugin(options = {}) {
   const { apiRootPath } = options;
-  const normalizedApiRootPath = normalizeApiRootPath(apiRootPath ?? "/");
-  const routes = discoverCedarRoutes();
+  const routes = discoverCedarRoutes(apiRootPath ?? "/");
   let entriesInjected = false;
   return {
     name: "cedar-universal-deploy",
@@ -81,15 +80,11 @@ function cedarUniversalDeployPlugin(options = {}) {
         for (const route of routes) {
           addEntry(toEntryMeta(route));
         }
-        addEntry({
-          id: catchAllEntry,
-          route: "/**"
-        });
       }
     },
     resolveId(id) {
-      if (id === catchAllEntry) {
-        return RESOLVED_VIRTUAL_UD_CATCH_ALL;
+      if (id.startsWith(RESOLVED_CEDAR_FN_PREFIX)) {
+        return id;
       }
       if (id.startsWith(VIRTUAL_CEDAR_FN_PREFIX)) {
         return "\0" + id;
@@ -108,9 +103,6 @@ function cedarUniversalDeployPlugin(options = {}) {
         }
         return generateFunctionModule(route.entry);
       }
-      if (id === RESOLVED_VIRTUAL_UD_CATCH_ALL) {
-        return generateCatchAllModule(routes, normalizedApiRootPath);
-      }
       return void 0;
     }
   };
@@ -127,27 +119,6 @@ function generateFunctionModule(distPath) {
     export default createFunctionHandler({ distPath: ${JSON.stringify(distPath)} });
   `;
 }
-function generateCatchAllModule(routes, normalizedApiRootPath) {
-  const imports = routes.map(
-    (route, i) => `import mod${i} from '${VIRTUAL_CEDAR_FN_PREFIX}${route.id}';`
-  ).join("\n");
-  const routesArray = routes.map(
-    (route, i) => `{
-           path: ${JSON.stringify(route.path)},
-           methods: ${JSON.stringify(route.methods)},
-           module: mod${i}
-        }`
-  ).join(", ");
-  return `
-    import { createCatchAllHandler } from '@cedarjs/vite/ud-handlers/catch-all';
-    ${imports}
-
-    export default createCatchAllHandler({
-      routes: [${routesArray}],
-      apiRootPath: ${JSON.stringify(normalizedApiRootPath)}
-    });
-  `;
-}
 export {
   cedarUniversalDeployPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "5.0.0-canary.2318",
+  "version": "5.0.0-canary.2319",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -99,22 +99,23 @@
     "@babel/generator": "7.29.1",
     "@babel/parser": "7.29.3",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/api": "5.0.0-canary.2318",
-    "@cedarjs/api-server": "5.0.0-canary.2318",
-    "@cedarjs/auth": "5.0.0-canary.2318",
-    "@cedarjs/babel-config": "5.0.0-canary.2318",
-    "@cedarjs/context": "5.0.0-canary.2318",
-    "@cedarjs/cookie-jar": "5.0.0-canary.2318",
-    "@cedarjs/graphql-server": "5.0.0-canary.2318",
-    "@cedarjs/internal": "5.0.0-canary.2318",
-    "@cedarjs/project-config": "5.0.0-canary.2318",
-    "@cedarjs/server-store": "5.0.0-canary.2318",
-    "@cedarjs/testing": "5.0.0-canary.2318",
-    "@cedarjs/web": "5.0.0-canary.2318",
+    "@cedarjs/api": "5.0.0-canary.2319",
+    "@cedarjs/api-server": "5.0.0-canary.2319",
+    "@cedarjs/auth": "5.0.0-canary.2319",
+    "@cedarjs/babel-config": "5.0.0-canary.2319",
+    "@cedarjs/context": "5.0.0-canary.2319",
+    "@cedarjs/cookie-jar": "5.0.0-canary.2319",
+    "@cedarjs/graphql-server": "5.0.0-canary.2319",
+    "@cedarjs/internal": "5.0.0-canary.2319",
+    "@cedarjs/project-config": "5.0.0-canary.2319",
+    "@cedarjs/server-store": "5.0.0-canary.2319",
+    "@cedarjs/testing": "5.0.0-canary.2319",
+    "@cedarjs/web": "5.0.0-canary.2319",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.32",
     "@universal-deploy/node": "^0.1.6",
     "@universal-deploy/store": "^0.2.1",
+    "@universal-deploy/vite": "^0.1.9",
     "@vitejs/plugin-react": "4.7.0",
     "@whatwg-node/fetch": "0.10.13",
     "@whatwg-node/server": "0.10.18",