@cedarjs/vite 4.1.1-next.1 → 4.1.1-next.55

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

@@ -1,39 +1,124 @@
-import { addEntry, catchAllEntry } from "@universal-deploy/store";
-const VIRTUAL_CEDAR_API = "virtual:cedar-api";
-const RESOLVED_VIRTUAL_CEDAR_API = "\0virtual:cedar-api";
+import path from "node:path";
+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 GRAPHQL_METHODS = ["GET", "POST", "OPTIONS"];
+function normaliseApiPrefix(apiPrefix) {
+  apiPrefix = apiPrefix.trim();
+  while (apiPrefix.startsWith("/")) {
+    apiPrefix = apiPrefix.slice(1);
+  }
+  while (apiPrefix.endsWith("/")) {
+    apiPrefix = apiPrefix.slice(0, -1);
+  }
+  return apiPrefix ? "/" + apiPrefix : "";
+}
+function discoverCedarRoutes(apiRootPath) {
+  const srcFunctions = getPaths().api.functions;
+  const distFunctions = path.join(getPaths().api.base, "dist", "functions");
+  const sourceFiles = findApiServerFunctions(srcFunctions);
+  const routes = [];
+  for (const sourcePath of sourceFiles) {
+    const relative = path.relative(srcFunctions, sourcePath);
+    const { dir, name, ext: _ext } = path.parse(relative);
+    let routeName;
+    if (dir === name) {
+      routeName = dir;
+    } else if (dir === "") {
+      routeName = name;
+    } else if (dir.length && name === "index") {
+      routeName = dir;
+    } else {
+      continue;
+    }
+    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");
+    routes.push({
+      id: routePath,
+      path: routePath,
+      methods,
+      type,
+      entry: distPath
+    });
+  }
+  const gqlIndex = routes.findIndex((r) => r.type === "graphql");
+  if (gqlIndex > 0) {
+    const [gqlRoute] = routes.splice(gqlIndex, 1);
+    routes.unshift(gqlRoute);
+  }
+  return routes;
+}
+function toEntryMeta(route) {
+  const routePatterns = route.path === "/**" ? ["/**"] : [route.path, `${route.path}/**`];
+  return {
+    id: `${VIRTUAL_CEDAR_FN_PREFIX}${route.id}`,
+    route: routePatterns,
+    ...route.methods.length > 0 && {
+      method: route.methods
+    }
+  };
+}
 function cedarUniversalDeployPlugin(options = {}) {
   const { apiRootPath } = options;
+  const routes = discoverCedarRoutes(apiRootPath ?? "/");
+  let entriesInjected = false;
   return {
     name: "cedar-universal-deploy",
     apply: "build",
-    buildStart() {
-      addEntry({
-        id: VIRTUAL_CEDAR_API,
-        route: "/**"
-      });
+    config: {
+      order: "pre",
+      handler() {
+        if (entriesInjected) {
+          return;
+        }
+        entriesInjected = true;
+        for (const route of routes) {
+          addEntry(toEntryMeta(route));
+        }
+      }
     },
     resolveId(id) {
-      if (id === catchAllEntry) {
-        return RESOLVED_VIRTUAL_CEDAR_API;
+      if (id.startsWith(RESOLVED_CEDAR_FN_PREFIX)) {
+        return id;
       }
-      if (id === VIRTUAL_CEDAR_API) {
-        return RESOLVED_VIRTUAL_CEDAR_API;
+      if (id.startsWith(VIRTUAL_CEDAR_FN_PREFIX)) {
+        return "\0" + id;
       }
       return void 0;
     },
     load(id) {
-      if (id !== RESOLVED_VIRTUAL_CEDAR_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);
+        if (!route) {
+          return void 0;
+        }
+        if (route.type === "graphql") {
+          return generateGraphQLModule(route.entry);
+        }
+        return generateFunctionModule(route.entry);
       }
-      const apiRootPathArg = apiRootPath !== void 0 ? `{ apiRootPath: ${JSON.stringify(apiRootPath)} }` : "undefined";
-      return `
-import { buildCedarDispatcher } from '@cedarjs/api-server/udDispatcher';
-const { fetchable } = await buildCedarDispatcher(${apiRootPathArg});
-export default fetchable;
-`;
+      return void 0;
     }
   };
 }
+function generateGraphQLModule(distPath) {
+  return `
+    import { createGraphQLHandler } from '@cedarjs/vite/ud-handlers/graphql';
+    export default createGraphQLHandler({ distPath: ${JSON.stringify(distPath)} });
+  `;
+}
+function generateFunctionModule(distPath) {
+  return `
+    import { createFunctionHandler } from '@cedarjs/vite/ud-handlers/function';
+    export default createFunctionHandler({ distPath: ${JSON.stringify(distPath)} });
+  `;
+}
 export {
   cedarUniversalDeployPlugin
 };

package/dist/plugins/vite-plugin-cedar-wait-for-api-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-wait-for-api-server.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-wait-for-api-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAiB,MAAM,MAAM,CAAA;AAOvD,wBAAgB,qBAAqB,IAAI,YAAY,CA8FpD"}
+{"version":3,"file":"vite-plugin-cedar-wait-for-api-server.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-wait-for-api-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAiB,MAAM,MAAM,CAAA;AAOvD,wBAAgB,qBAAqB,IAAI,YAAY,CAkGpD"}

package/dist/plugins/vite-plugin-cedar-wait-for-api-server.js

@@ -6,6 +6,7 @@ function cedarWaitForApiServer() {
   const cedarConfig = getConfig();
   const apiPort = cedarConfig.api.port;
   const apiHost = cedarConfig.api.host || "localhost";
+  const isUnifiedDev = process.env.__CEDAR_UNIFIED_DEV === "true";
   return {
     name: "cedar-wait-for-api-server",
     apply: "serve",
@@ -18,7 +19,7 @@ function cedarWaitForApiServer() {
         // don't use startsWith here
         url === apiGqlUrl || // The two checks below are for when we support GraphQL-over-HTTP
         url.startsWith(apiGqlUrl + "/") || url.startsWith(apiGqlUrl + "?"));
-        if (!isApiRequest || serverHasBeenUp) {
+        if (!isApiRequest || serverHasBeenUp || isUnifiedDev) {
           return next();
         }
         try {

package/dist/ud-handlers/catch-all.d.ts

@@ -0,0 +1,15 @@
+export interface CatchAllRoute {
+    path: string;
+    methods: string[];
+    module: {
+        fetch: (request: Request) => Promise<Response> | Response;
+    };
+}
+export interface CatchAllHandlerOptions {
+    routes: CatchAllRoute[];
+    apiRootPath: string;
+}
+export declare function createCatchAllHandler(options: CatchAllHandlerOptions): {
+    fetch(request: Request): Promise<Response>;
+};
+//# sourceMappingURL=catch-all.d.ts.map

package/dist/ud-handlers/catch-all.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catch-all.d.ts","sourceRoot":"","sources":["../../src/ud-handlers/catch-all.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,EAAE;QAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;KAAE,CAAA;CACtE;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,aAAa,EAAE,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB;mBAiC5C,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;EAgBnD"}

package/dist/ud-handlers/catch-all.js

@@ -0,0 +1,41 @@
+import { createRouter, addRoute, findRoute } from "rou3";
+function createCatchAllHandler(options) {
+  const router = createRouter();
+  for (const route of options.routes) {
+    const methods = route.methods.length > 0 ? route.methods : ["GET", "HEAD", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
+    for (const method of methods) {
+      addRoute(router, method, route.path, route.module);
+      addRoute(router, method, `${route.path}/**`, route.module);
+    }
+  }
+  const apiRootPath = options.apiRootPath;
+  function normalizePathname(requestUrl) {
+    const url = new URL(requestUrl);
+    let pathname = url.pathname;
+    if (apiRootPath !== "/" && pathname.startsWith(apiRootPath)) {
+      pathname = pathname.slice(apiRootPath.length - 1);
+    }
+    if (!pathname.startsWith("/")) {
+      pathname = "/" + pathname;
+    }
+    return pathname;
+  }
+  return {
+    async fetch(request) {
+      const pathname = normalizePathname(request.url);
+      const match = findRoute(router, request.method, pathname);
+      if (!match) {
+        return new Response("Not Found", { status: 404 });
+      }
+      try {
+        return await match.data.fetch(request);
+      } catch (err) {
+        console.error("Unhandled error in fetch handler for", pathname, err);
+        return new Response("Internal Server Error", { status: 500 });
+      }
+    }
+  };
+}
+export {
+  createCatchAllHandler
+};

package/dist/ud-handlers/function.d.ts

@@ -0,0 +1,5 @@
+export interface FunctionHandlerOptions {
+    distPath: string;
+}
+export declare function createFunctionHandler(options: FunctionHandlerOptions): import("@cedarjs/api-server/udFetchable").Fetchable;
+//# sourceMappingURL=function.d.ts.map

package/dist/ud-handlers/function.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../src/ud-handlers/function.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,uDAyBpE"}

package/dist/ud-handlers/function.js

@@ -0,0 +1,23 @@
+import { pathToFileURL } from "node:url";
+import { wrapLegacyHandler } from "@cedarjs/api/runtime";
+import { createCedarFetchable } from "@cedarjs/api-server/udFetchable";
+function createFunctionHandler(options) {
+  const handleRequest = async (request, ctx) => {
+    const mod = await import(pathToFileURL(options.distPath).href);
+    const nativeHandler = mod.handleRequest || mod.default?.handleRequest;
+    if (nativeHandler) {
+      return nativeHandler(request, ctx);
+    }
+    const legacyHandler = mod.handler || mod.default?.handler;
+    if (legacyHandler) {
+      return wrapLegacyHandler(legacyHandler)(request, ctx);
+    }
+    throw new Error(
+      `Handler not found in ${options.distPath}. Expected \`export async function handleRequest(request, ctx)\`, \`export default { handleRequest }\`, or a legacy Lambda-shaped \`handler\`.`
+    );
+  };
+  return createCedarFetchable(handleRequest);
+}
+export {
+  createFunctionHandler
+};

package/dist/ud-handlers/graphql.d.ts

@@ -0,0 +1,7 @@
+export interface GraphQLHandlerOptions {
+    distPath: string;
+}
+export declare function createGraphQLHandler(options: GraphQLHandlerOptions): {
+    fetch(request: Request): Promise<Response>;
+};
+//# sourceMappingURL=graphql.d.ts.map

package/dist/ud-handlers/graphql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/ud-handlers/graphql.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB;mBAiB1C,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;EAenD"}

package/dist/ud-handlers/graphql.js

@@ -0,0 +1,35 @@
+import { pathToFileURL } from "node:url";
+import { buildCedarContext, requestToLegacyEvent } from "@cedarjs/api/runtime";
+import { createGraphQLYoga } from "@cedarjs/graphql-server";
+function createGraphQLHandler(options) {
+  let yogaInitPromise = null;
+  async function getYoga() {
+    if (!yogaInitPromise) {
+      yogaInitPromise = (async () => {
+        const mod = await import(pathToFileURL(options.distPath).href);
+        const opts = mod.__rw_graphqlOptions;
+        const { yoga } = await createGraphQLYoga(opts);
+        return { yoga, graphqlOptions: opts };
+      })();
+    }
+    return yogaInitPromise;
+  }
+  return {
+    async fetch(request) {
+      const { yoga, graphqlOptions } = await getYoga();
+      const cedarContext = await buildCedarContext(request, {
+        authDecoder: graphqlOptions?.authDecoder
+      });
+      const event = await requestToLegacyEvent(request, cedarContext);
+      return yoga.handle(request, {
+        request,
+        cedarContext,
+        event,
+        requestContext: void 0
+      });
+    }
+  };
+}
+export {
+  createGraphQLHandler
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "4.1.1-next.1+a867fc51b4",
+  "version": "4.1.1-next.55",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -25,12 +25,6 @@
       "types": "./dist/api/vite-plugin-cedar-vitest-api-preset.d.ts",
       "default": "./dist/api/vite-plugin-cedar-vitest-api-preset.js"
     },
-    "./apiDevServer": {
-      "import": {
-        "types": "./dist/apiDevServer.d.ts",
-        "default": "./dist/apiDevServer.js"
-      }
-    },
     "./client": {
       "require": "./dist/cjs/client.js",
       "import": "./dist/client.js"
@@ -46,7 +40,37 @@
       "import": "./dist/build/build.js",
       "default": "./dist/cjs/build/build.js"
     },
-    "./bins/cedar-vite-build.mjs": "./bins/cedar-vite-build.mjs"
+    "./bins/cedar-vite-build.mjs": "./bins/cedar-vite-build.mjs",
+    "./ud-handlers/graphql": {
+      "import": {
+        "types": "./dist/ud-handlers/graphql.d.ts",
+        "default": "./dist/ud-handlers/graphql.js"
+      },
+      "require": {
+        "types": "./dist/cjs/ud-handlers/graphql.d.ts",
+        "default": "./dist/cjs/ud-handlers/graphql.js"
+      }
+    },
+    "./ud-handlers/function": {
+      "import": {
+        "types": "./dist/ud-handlers/function.d.ts",
+        "default": "./dist/ud-handlers/function.js"
+      },
+      "require": {
+        "types": "./dist/cjs/ud-handlers/function.d.ts",
+        "default": "./dist/cjs/ud-handlers/function.js"
+      }
+    },
+    "./ud-handlers/catch-all": {
+      "import": {
+        "types": "./dist/ud-handlers/catch-all.d.ts",
+        "default": "./dist/ud-handlers/catch-all.js"
+      },
+      "require": {
+        "types": "./dist/cjs/ud-handlers/catch-all.d.ts",
+        "default": "./dist/cjs/ud-handlers/catch-all.js"
+      }
+    }
   },
   "bin": {
     "cedar-dev-fe": "./dist/devFeServer.js",
@@ -73,25 +97,29 @@
   "dependencies": {
     "@ast-grep/napi": "0.42.1",
     "@babel/generator": "7.29.1",
-    "@babel/parser": "7.29.2",
+    "@babel/parser": "7.29.3",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/api-server": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/auth": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/babel-config": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/context": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/cookie-jar": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/graphql-server": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/internal": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/project-config": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/server-store": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/testing": "4.1.1-next.1+a867fc51b4",
-    "@cedarjs/web": "4.1.1-next.1+a867fc51b4",
+    "@cedarjs/api": "4.1.0",
+    "@cedarjs/api-server": "4.1.0",
+    "@cedarjs/auth": "4.1.0",
+    "@cedarjs/babel-config": "4.1.0",
+    "@cedarjs/context": "4.1.0",
+    "@cedarjs/cookie-jar": "4.1.0",
+    "@cedarjs/graphql-server": "4.1.0",
+    "@cedarjs/internal": "4.1.0",
+    "@cedarjs/project-config": "4.1.0",
+    "@cedarjs/server-store": "4.1.0",
+    "@cedarjs/testing": "4.1.0",
+    "@cedarjs/web": "4.1.0",
     "@fastify/url-data": "6.0.3",
-    "@swc/core": "1.15.30",
+    "@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",
+    "acorn": "8.16.0",
     "acorn-loose": "8.5.2",
     "ansis": "4.2.0",
     "buffer": "6.0.3",
@@ -108,6 +136,7 @@
     "react": "18.3.1",
     "react-server-dom-webpack": "19.2.4",
     "rimraf": "6.1.3",
+    "rou3": "^0.8.1",
     "vite": "7.3.2",
     "vite-plugin-cjs-interop": "2.4.4",
     "vite-plugin-node-polyfills": "0.26.0",
@@ -126,7 +155,7 @@
     "concurrently": "9.2.1",
     "glob": "11.1.0",
     "memfs": "4.57.2",
-    "publint": "0.3.18",
+    "publint": "0.3.19",
     "rollup": "4.60.2",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
@@ -138,5 +167,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a867fc51b46741c77baddf329bc84e7339b75ddc"
+  "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 Cedar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/apiDevServer.d.ts

@@ -1,18 +0,0 @@
-import type { ViteDevServer } from 'vite';
-/**
- * Start the Cedar API dev server using Vite's SSR module runner for HMR.
- *
- * This replaces the previous system of:
- *   nodemon → api-server-watch (chokidar + esbuild + forked child process)
- *
- * With:
- *   Vite SSR dev server (module graph + HMR) + Fastify (same process)
- *
- * When API source files change, Vite invalidates the affected modules and
- * re-loads them on the next call – no process restart needed.
- */
-export declare function startApiDevServer(port: number): Promise<{
-    viteServer: ViteDevServer;
-    close: () => Promise<void>;
-}>;
-//# sourceMappingURL=apiDevServer.d.ts.map

package/dist/apiDevServer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"apiDevServer.d.ts","sourceRoot":"","sources":["../src/apiDevServer.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,MAAM,CAAA;AAsLrD;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC7D,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B,CAAC,CAiCD"}