@cedarjs/cli 1.0.0-canary.13129 → 1.0.0-canary.13130

package/dist/commands/build.js

@@ -7,7 +7,7 @@ const command = "build [workspace..]";
 const description = "Build for production";
 const builder = (yargs) => {
   yargs.positional("workspace", {
-    default: ["web", "api", "packages/*"],
+    default: ["api", "web", "packages/*"],
     description: "What workspace(s) to build. Valid values are: web, api, packages/*, <package-name>",
     type: "array"
   }).option("verbose", {

package/dist/commands/{devHandler.js → dev/devHandler.js}

@@ -6,25 +6,25 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { shutdownPort } from "@cedarjs/internal/dist/dev";
 import { getConfig, getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../lib/colors.js";
-import { exitWithError } from "../lib/exit.js";
-import { generatePrismaClient } from "../lib/generatePrismaClient.js";
-import { getPaths } from "../lib/index.js";
-import { getFreePort } from "../lib/ports.js";
-import { serverFileExists } from "../lib/project.js";
+import c from "../../lib/colors.js";
+import { exitWithError } from "../../lib/exit.js";
+import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
+import { getPaths } from "../../lib/index.js";
+import { getFreePort } from "../../lib/ports.js";
+import { serverFileExists } from "../../lib/project.js";
 const defaultApiDebugPort = 18911;
 const handler = async ({
-  side = ["api", "web"],
+  workspace = ["api", "web"],
   forward = "",
   generate = true,
   apiDebugPort
 }) => {
   recordTelemetryAttributes({
     command: "dev",
-    side: JSON.stringify(side),
+    workspace: JSON.stringify(workspace),
     generate
   });
-  const rwjsPaths = getPaths();
+  const cedarPaths = getPaths();
   const serverFile = serverFileExists();
   const apiPreferredPort = parseInt(String(getConfig().api.port));
   let webPreferredPort = parseInt(
@@ -34,7 +34,7 @@ const handler = async ({
   let apiPortChangeNeeded = false;
   let webAvailablePort = webPreferredPort;
   let webPortChangeNeeded = false;
-  if (side.includes("api") && !serverFile) {
+  if (workspace.includes("api") && !serverFile) {
     apiAvailablePort = await getFreePort(apiPreferredPort);
     if (apiAvailablePort === -1) {
       exitWithError(void 0, {
@@ -43,7 +43,7 @@ const handler = async ({
     }
     apiPortChangeNeeded = apiAvailablePort !== apiPreferredPort;
   }
-  if (side.includes("web")) {
+  if (workspace.includes("web")) {
     const forwardedPortMatches = [
       ...forward.matchAll(/\-\-port(\=|\s)(?<port>[^\s]*)/g)
     ];
@@ -80,14 +80,14 @@ const handler = async ({
     ].filter(Boolean).join(" ");
     exitWithError(void 0, { message });
   }
-  if (side.includes("api")) {
+  if (workspace.includes("api")) {
     try {
       await generatePrismaClient({
         verbose: false,
         force: false
       });
     } catch (e) {
-      const message = e instanceof Object && "message" in e ? e.message : String(e);
+      const message = getErrorMessage(e);
       errorTelemetry(process.argv, `Error generating prisma client: ${message}`);
       console.error(c.error(message));
     }
@@ -95,7 +95,7 @@ const handler = async ({
       try {
         await shutdownPort(apiAvailablePort);
       } catch (e) {
-        const message = e instanceof Object && "message" in e ? e.message : String(e);
+        const message = getErrorMessage(e);
         errorTelemetry(process.argv, `Error shutting down "api": ${message}`);
         console.error(
           `Error whilst shutting down "api" port: ${c.error(message)}`
@@ -103,11 +103,11 @@ const handler = async ({
       }
     }
   }
-  if (side.includes("web")) {
+  if (workspace.includes("web")) {
     try {
       await shutdownPort(webAvailablePort);
     } catch (e) {
-      const message = e instanceof Object && "message" in e ? e.message : String(e);
+      const message = getErrorMessage(e);
       errorTelemetry(process.argv, `Error shutting down "web": ${message}`);
       console.error(
         `Error whilst shutting down "web" port: ${c.error(message)}`
@@ -126,7 +126,7 @@ const handler = async ({
     }
     return "";
   };
-  const redwoodConfigPath = getConfigPath();
+  const cedarConfigPath = getConfigPath();
   const streamingSsrEnabled = getConfig().experimental?.streamingSsr?.enabled;
   process.env.VITE_CJS_IGNORE_WARNING = "true";
   let webCommand = `yarn cross-env NODE_ENV=development rw-vite-dev ${forward}`;
@@ -134,7 +134,7 @@ const handler = async ({
     webCommand = `yarn cross-env NODE_ENV=development rw-dev-fe ${forward}`;
   }
   const rootPackageJson = JSON.parse(
-    fs.readFileSync(path.join(rwjsPaths.base, "package.json"), "utf8")
+    fs.readFileSync(path.join(cedarPaths.base, "package.json"), "utf8")
   );
   const isEsm = rootPackageJson.type === "module";
   const serverWatchCommand = isEsm ? `cedarjs-api-server-watch` : `rw-api-server-watch`;
@@ -144,7 +144,7 @@ const handler = async ({
       command: [
         "yarn nodemon",
         "  --quiet",
-        `  --watch "${redwoodConfigPath}"`,
+        `  --watch "${cedarConfigPath}"`,
         `  --exec "yarn ${serverWatchCommand}`,
         `    --port ${apiAvailablePort}`,
         `    ${getApiDebugFlag()}`,
@@ -155,14 +155,14 @@ const handler = async ({
         NODE_OPTIONS: getDevNodeOptions()
       },
       prefixColor: "cyan",
-      runWhen: () => fs.existsSync(rwjsPaths.api.src)
+      runWhen: () => fs.existsSync(cedarPaths.api.src)
     },
     web: {
       name: "web",
       command: webCommand,
       prefixColor: "blue",
-      cwd: rwjsPaths.web.base,
-      runWhen: () => fs.existsSync(rwjsPaths.web.src)
+      cwd: cedarPaths.web.base,
+      runWhen: () => fs.existsSync(cedarPaths.web.src)
     },
     gen: {
       name: "gen",
@@ -172,7 +172,7 @@ const handler = async ({
     }
   };
   const mappedJobs = Object.keys(jobs).map((job) => {
-    if (side.includes(job) || job === "gen") {
+    if (workspace.includes(job) || job === "gen") {
       return jobs[job];
     }
     return {
@@ -193,7 +193,7 @@ const handler = async ({
     if (e?.message) {
       errorTelemetry(
         process.argv,
-        `Error concurrently starting sides: ${e.message}`
+        `Error concurrently starting workspaces: ${e.message}`
       );
       exitWithError(e);
     }
@@ -210,6 +210,9 @@ function getDevNodeOptions() {
   }
   return `${NODE_OPTIONS} ${enableSourceMapsOption}`;
 }
+function getErrorMessage(error) {
+  return error instanceof Object && "message" in error ? error.message : String(error);
+}
 export {
   getDevNodeOptions,
   handler

package/dist/commands/dev.js

@@ -1,10 +1,10 @@
 import { terminalLink } from "termi-link";
 import c from "../lib/colors.js";
 import { checkNodeVersion } from "../middleware/checkNodeVersion.js";
-const command = "dev [side..]";
+const command = "dev [workspace..]";
 const description = "Start development servers for api, and web";
 const builder = (yargs) => {
-  yargs.positional("side", {
+  yargs.positional("workspace", {
     choices: ["api", "web"],
     default: ["api", "web"],
     description: "Which dev server(s) to start",
@@ -14,6 +14,8 @@ const builder = (yargs) => {
     alias: "fwd",
     description: 'String of one or more vite dev server config options, for example: `--fwd="--port=1234 --open=false"`',
     type: "string",
+    // The reason `forward` is hidden is that it's been broken with Vite and
+    // it's not clear how to fix it.
     hidden: true
   }).option("generate", {
     type: "boolean",
@@ -37,7 +39,7 @@ const builder = (yargs) => {
   );
 };
 const handler = async (options) => {
-  const { handler: handler2 } = await import("./devHandler.js");
+  const { handler: handler2 } = await import("./dev/devHandler.js");
   return handler2(options);
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13129+295e52f86",
+  "version": "1.0.0-canary.13130+38895e6ea",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -32,15 +32,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "1.0.0-canary.13129",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13129",
-    "@cedarjs/fastify-web": "1.0.0-canary.13129",
-    "@cedarjs/internal": "1.0.0-canary.13129",
-    "@cedarjs/prerender": "1.0.0-canary.13129",
-    "@cedarjs/project-config": "1.0.0-canary.13129",
-    "@cedarjs/structure": "1.0.0-canary.13129",
-    "@cedarjs/telemetry": "1.0.0-canary.13129",
-    "@cedarjs/web-server": "1.0.0-canary.13129",
+    "@cedarjs/api-server": "1.0.0-canary.13130",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13130",
+    "@cedarjs/fastify-web": "1.0.0-canary.13130",
+    "@cedarjs/internal": "1.0.0-canary.13130",
+    "@cedarjs/prerender": "1.0.0-canary.13130",
+    "@cedarjs/project-config": "1.0.0-canary.13130",
+    "@cedarjs/structure": "1.0.0-canary.13130",
+    "@cedarjs/telemetry": "1.0.0-canary.13130",
+    "@cedarjs/web-server": "1.0.0-canary.13130",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -102,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "295e52f869e62a82335aa0de7471e6a3a0186c7a"
+  "gitHead": "38895e6ea5228295d67e5dfcf31956265b18dae0"
 }