@cedarjs/cli 5.0.0-canary.13889 → 5.0.0-canary.13892

package/dist/commands/build/buildHandler.js

@@ -20,6 +20,7 @@ import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
 import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
 import {} from "@cedarjs/project-config";
 import { timedTelemetry } from "@cedarjs/telemetry";
+import { buildCedarApp } from "@cedarjs/vite/build";
 import { buildUDApiServer } from "@cedarjs/vite/buildUDApiServer";
 import { generatePrismaCommand } from "../../lib/generatePrismaClient.js";
 import { getPaths, getConfig } from "../../lib/index.js";
@@ -163,25 +164,23 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
       title: "Verifying graphql schema...",
       task: loadAndValidateSdls
     },
-    // The API build has two sequential steps:
-    // 1. esbuild compiles api/src/** → api/dist/ (functions, services, etc.)
-    // 2. Vite wraps api/dist/functions/ into a self-contained UD Node server
-    //    entry at api/dist/ud/index.js for `cedar serve api`
-    // Step 2 depends on step 1 having completed.
-    workspace.includes("api") && {
-      title: "Building API...",
-      task: async () => {
-        await cleanApiBuild();
-        await buildApiWithVite();
-      }
-    },
     ud && workspace.includes("api") && {
       title: "Bundling API server entry (Universal Deploy)...",
       task: async () => {
         await buildUDApiServer({ verbose });
       }
     },
-    workspace.includes("web") && {
+    // When streaming SSR is enabled, fall back to the legacy separate build
+    // paths because streaming SSR has its own complex build orchestration.
+    // Phase 7 (SSR/RSC rebuild) will address unifying this path.
+    workspace.includes("api") && getConfig().experimental?.streamingSsr?.enabled && {
+      title: "Building API...",
+      task: async () => {
+        await cleanApiBuild();
+        await buildApiWithVite();
+      }
+    },
+    workspace.includes("web") && getConfig().experimental?.streamingSsr?.enabled && {
       title: "Building Web...",
       task: async () => {
         process.env.VITE_CJS_IGNORE_WARNING = "true";
@@ -194,9 +193,6 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           {
             stdio: verbose ? "inherit" : "pipe",
             shell: true,
-            // `cwd` is needed for yarn to find the cedar-vite-build binary
-            // It won't change process.cwd for anything else here, in this
-            // process
             cwd: cedarPaths.web.base
           }
         );
@@ -209,6 +205,31 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           );
         }
       }
+    },
+    // Unified build path (default, non-streaming-SSR)
+    (workspace.includes("api") || workspace.includes("web")) && !getConfig().experimental?.streamingSsr?.enabled && {
+      title: workspace.includes("api") && workspace.includes("web") ? "Building App..." : workspace.includes("api") ? "Building API..." : "Building Web...",
+      task: async () => {
+        process.env.VITE_CJS_IGNORE_WARNING = "true";
+        if (workspace.includes("api")) {
+          await cleanApiBuild();
+        }
+        const originalCwd = process.cwd();
+        process.chdir(cedarPaths.web.base);
+        try {
+          await buildCedarApp({ verbose, workspace });
+        } finally {
+          process.chdir(originalCwd);
+        }
+        if (workspace.includes("web")) {
+          console.log("Creating 200.html...");
+          const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
+          fs.copyFileSync(
+            indexHtmlPath,
+            path.join(getPaths().web.dist, "200.html")
+          );
+        }
+      }
     }
   ].filter((t) => Boolean(t));
   const triggerPrerender = async () => {

package/dist/lib/exec.js

@@ -1,8 +1,6 @@
+import { existsSync } from "node:fs";
 import path from "node:path";
-import { createServer, version as viteVersion } from "vite";
-import { ViteNodeRunner } from "vite-node/client";
-import { ViteNodeServer } from "vite-node/server";
-import { installSourcemapsSupport } from "vite-node/source-map";
+import { createServer, isRunnableDevEnvironment } from "vite";
 import { getPaths, importStatementPath } from "@cedarjs/project-config";
 import {
   cedarCellTransform,
@@ -10,8 +8,21 @@ import {
   cedarjsJobPathInjectorPlugin,
   cedarSwapApolloProvider,
   cedarImportDirPlugin,
-  cedarAutoImportsPlugin
+  cedarAutoImportsPlugin,
+  cedarCjsCompatPlugin
 } from "@cedarjs/vite";
+function resolveExtension(id) {
+  if (existsSync(id)) {
+    return id;
+  }
+  const withoutExt = /\.jsx?$/.test(id) ? id.replace(/\.jsx?$/, "") : id;
+  for (const ext of [".ts", ".tsx", ".js", ".jsx"]) {
+    if (existsSync(withoutExt + ext)) {
+      return withoutExt + ext;
+    }
+  }
+  return id;
+}
 async function runScriptFunction({
   path: scriptPath,
   functionName,
@@ -22,10 +33,16 @@ async function runScriptFunction({
   const server = await createServer({
     mode: "production",
     optimizeDeps: {
-      // This is recommended in the vite-node readme
       noDiscovery: true,
       include: void 0
     },
+    server: {
+      hmr: false,
+      watch: null
+    },
+    environments: {
+      nodeRunnerEnv: {}
+    },
     resolve: {
       alias: [
         {
@@ -52,18 +69,12 @@ async function runScriptFunction({
             const webImportBase = importStatementPath(getPaths().web.base);
             if (importer.startsWith(apiImportBase)) {
               const apiImportSrc = importStatementPath(getPaths().api.src);
-              let resolvedId = id.replace("src", apiImportSrc);
-              if (importer.endsWith(".ts") || importer.endsWith(".tsx")) {
-                resolvedId = resolvedId.replace(/\.jsx?$/, "");
-              }
-              return { id: resolvedId };
+              const resolvedId = id.replace("src", apiImportSrc);
+              return { id: resolveExtension(resolvedId) };
             } else if (importer.startsWith(webImportBase)) {
               const webImportSrc = importStatementPath(getPaths().web.src);
-              let resolvedId = id.replace("src", webImportSrc);
-              if (importer.endsWith(".ts") || importer.endsWith(".tsx")) {
-                resolvedId = resolvedId.replace(/\.jsx?$/, "");
-              }
-              return { id: resolvedId };
+              const resolvedId = id.replace("src", webImportSrc);
+              return { id: resolveExtension(resolvedId) };
             }
             return null;
           }
@@ -71,6 +82,7 @@ async function runScriptFunction({
       ]
     },
     plugins: [
+      cedarCjsCompatPlugin(),
       cedarjsResolveCedarStyleImportsPlugin(),
       cedarCellTransform(),
       cedarjsJobPathInjectorPlugin(),
@@ -79,41 +91,21 @@ async function runScriptFunction({
       cedarAutoImportsPlugin()
     ]
   });
-  if (Number(viteVersion.split(".")[0]) < 6) {
-    await server.pluginContainer.buildStart({});
+  const env = server.environments.nodeRunnerEnv;
+  if (!env || !isRunnableDevEnvironment(env)) {
+    await server.close();
+    throw new Error("Vite environment is not runnable.");
   }
-  const node = new ViteNodeServer(server, {
-    transformMode: {
-      ssr: [/.*/],
-      web: [/\/web\//]
-    },
-    deps: {
-      fallbackCJS: true
-    }
-  });
-  installSourcemapsSupport({
-    getSourceMap: (source) => node.getSourceMap(source)
-  });
-  const runner = new ViteNodeRunner({
-    root: server.config.root,
-    base: server.config.base,
-    fetchModule(id) {
-      return node.fetchModule(id);
-    },
-    resolveId(id, importer) {
-      return node.resolveId(id, importer);
-    }
-  });
   let returnValue;
   let scriptError = null;
   try {
-    const script = await runner.executeFile(scriptPath);
+    const script = await env.runner.import(scriptPath);
     returnValue = await script[functionName](args);
   } catch (error) {
     scriptError = error;
   }
   try {
-    const { db } = await runner.executeFile(path.join(getPaths().api.lib, "db"));
+    const { db } = await env.runner.import(path.join(getPaths().api.lib, "db"));
     db.$disconnect();
   } catch (e) {
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.13889+d7d8c21e39",
+  "version": "5.0.0-canary.13892+1388c33071",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,16 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.13889",
-    "@cedarjs/cli-helpers": "5.0.0-canary.13889",
-    "@cedarjs/fastify-web": "5.0.0-canary.13889",
-    "@cedarjs/internal": "5.0.0-canary.13889",
-    "@cedarjs/prerender": "5.0.0-canary.13889",
-    "@cedarjs/project-config": "5.0.0-canary.13889",
-    "@cedarjs/structure": "5.0.0-canary.13889",
-    "@cedarjs/telemetry": "5.0.0-canary.13889",
-    "@cedarjs/utils": "5.0.0-canary.13889",
-    "@cedarjs/web-server": "5.0.0-canary.13889",
+    "@cedarjs/api-server": "5.0.0-canary.13892",
+    "@cedarjs/cli-helpers": "5.0.0-canary.13892",
+    "@cedarjs/fastify-web": "5.0.0-canary.13892",
+    "@cedarjs/internal": "5.0.0-canary.13892",
+    "@cedarjs/prerender": "5.0.0-canary.13892",
+    "@cedarjs/project-config": "5.0.0-canary.13892",
+    "@cedarjs/structure": "5.0.0-canary.13892",
+    "@cedarjs/telemetry": "5.0.0-canary.13892",
+    "@cedarjs/utils": "5.0.0-canary.13892",
+    "@cedarjs/vite": "5.0.0-canary.13892",
+    "@cedarjs/web-server": "5.0.0-canary.13892",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -88,7 +89,6 @@
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
     "uuid": "11.1.0",
-    "vite-node": "3.2.4",
     "yargs": "17.7.2"
   },
   "devDependencies": {
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d7d8c21e39d2bf02ec27a79854571fe8c2376fbc"
+  "gitHead": "1388c330712767faa318d1af805d49e5151470f5"
 }