@cedarjs/cli 5.0.0-canary.13893 → 5.0.0-canary.13895

package/dist/commands/build/buildHandler.js

@@ -11,6 +11,7 @@ import {
 } from "@cedarjs/cli-helpers/packageManager/display";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import {
+  buildApi,
   buildApiWithVite,
   cleanApiBuild
 } from "@cedarjs/internal/dist/build/api";
@@ -206,8 +207,51 @@ 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 && {
+    // Legacy separate build path (default when not --ud, non-streaming-SSR)
+    workspace.includes("api") && !ud && !getConfig().experimental?.streamingSsr?.enabled && {
+      title: "Building API...",
+      task: async () => {
+        await cleanApiBuild();
+        const { errors, warnings } = await buildApi();
+        if (warnings.length) {
+          console.warn(warnings);
+        }
+        if (errors.length) {
+          throw new Error(
+            `API build failed with ${errors.length} error(s). See output above for details.`
+          );
+        }
+      }
+    },
+    workspace.includes("web") && !ud && !getConfig().experimental?.streamingSsr?.enabled && {
+      title: "Building Web...",
+      task: async () => {
+        process.env.VITE_CJS_IGNORE_WARNING = "true";
+        const createdRequire = createRequire(import.meta.url);
+        const buildBinPath = createdRequire.resolve(
+          "@cedarjs/vite/bins/cedar-vite-build.mjs"
+        );
+        await execa(
+          `node ${buildBinPath} --webDir="${cedarPaths.web.base}" --verbose=${verbose}`,
+          {
+            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
+          }
+        );
+        console.log("Creating 200.html...");
+        const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
+        fs.copyFileSync(
+          indexHtmlPath,
+          path.join(getPaths().web.dist, "200.html")
+        );
+      }
+    },
+    // Unified build path (experimental, non-streaming-SSR, --ud)
+    (workspace.includes("api") || workspace.includes("web")) && ud && !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";

package/dist/commands/dev/devHandler.js

@@ -68,19 +68,40 @@ const handler = async ({
     }
     webPortChangeNeeded = webAvailablePort !== webPreferredPort;
   }
-  if (webPortChangeNeeded) {
-    const message = [
-      "The currently configured port for the development server is",
-      "unavailable. Suggested change to your port, which can be changed in",
-      "cedar.toml (or redwood.toml):\n",
-      ` - Web to use port ${webAvailablePort} instead`,
-      "of your currently configured",
-      `${webPreferredPort}
+  if (ud) {
+    if (webPortChangeNeeded) {
+      const message = [
+        "The currently configured port for the development server is",
+        "unavailable. Suggested change to your port, which can be changed in",
+        "cedar.toml (or redwood.toml):\n",
+        ` - Web to use port ${webAvailablePort} instead`,
+        "of your currently configured",
+        `${webPreferredPort}
 `,
-      "\nCannot run the development server until your configured port is",
-      "changed or becomes available."
-    ].filter(Boolean).join(" ");
-    exitWithError(void 0, { message });
+        "\nCannot run the development server until your configured port is",
+        "changed or becomes available."
+      ].filter(Boolean).join(" ");
+      exitWithError(void 0, { message });
+    }
+  } else {
+    if (apiPortChangeNeeded || webPortChangeNeeded) {
+      const message = [
+        "The currently configured ports for the development server are",
+        "unavailable. Suggested changes to your ports, which can be changed in",
+        "cedar.toml (or redwood.toml), are:\n",
+        apiPortChangeNeeded && ` - API to use port ${apiAvailablePort} instead`,
+        apiPortChangeNeeded && "of your currently configured",
+        apiPortChangeNeeded && `${apiPreferredPort}
+`,
+        webPortChangeNeeded && ` - Web to use port ${webAvailablePort} instead`,
+        webPortChangeNeeded && "of your currently configured",
+        webPortChangeNeeded && `${webPreferredPort}
+`,
+        "\nCannot run the development server until your configured ports are",
+        "changed or become available."
+      ].filter(Boolean).join(" ");
+      exitWithError(void 0, { message });
+    }
   }
   if (workspace.includes("api")) {
     try {
@@ -90,6 +111,17 @@ const handler = async ({
       errorTelemetry(process.argv, `Error generating prisma client: ${message}`);
       console.error(c.error(message));
     }
+    if (!ud && !serverFile) {
+      try {
+        await shutdownPort(apiAvailablePort);
+      } catch (e) {
+        const message = getErrorMessage(e);
+        errorTelemetry(process.argv, `Error shutting down "api": ${message}`);
+        console.error(
+          `Error whilst shutting down "api" port: ${c.error(message)}`
+        );
+      }
+    }
   }
   if (workspace.includes("web") && webAvailablePort !== void 0) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.13893+8801f7260c",
+  "version": "5.0.0-canary.13895+1afe7de6ad",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.13893",
-    "@cedarjs/cli-helpers": "5.0.0-canary.13893",
-    "@cedarjs/fastify-web": "5.0.0-canary.13893",
-    "@cedarjs/internal": "5.0.0-canary.13893",
-    "@cedarjs/prerender": "5.0.0-canary.13893",
-    "@cedarjs/project-config": "5.0.0-canary.13893",
-    "@cedarjs/structure": "5.0.0-canary.13893",
-    "@cedarjs/telemetry": "5.0.0-canary.13893",
-    "@cedarjs/utils": "5.0.0-canary.13893",
-    "@cedarjs/vite": "5.0.0-canary.13893",
-    "@cedarjs/web-server": "5.0.0-canary.13893",
+    "@cedarjs/api-server": "5.0.0-canary.13895",
+    "@cedarjs/cli-helpers": "5.0.0-canary.13895",
+    "@cedarjs/fastify-web": "5.0.0-canary.13895",
+    "@cedarjs/internal": "5.0.0-canary.13895",
+    "@cedarjs/prerender": "5.0.0-canary.13895",
+    "@cedarjs/project-config": "5.0.0-canary.13895",
+    "@cedarjs/structure": "5.0.0-canary.13895",
+    "@cedarjs/telemetry": "5.0.0-canary.13895",
+    "@cedarjs/utils": "5.0.0-canary.13895",
+    "@cedarjs/vite": "5.0.0-canary.13895",
+    "@cedarjs/web-server": "5.0.0-canary.13895",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8801f7260cc1702114b09ff8a2aa35334b109b2f"
+  "gitHead": "1afe7de6ad2bec0d50331b5c9b4fbc8a0a57cc25"
 }