@cedarjs/cli 3.0.0-canary.13414 → 3.0.0-canary.13417

package/dist/commands/info.js

@@ -28,7 +28,7 @@ const handler = async () => {
   const tomlContent = fs.readFileSync(configTomlPath, "utf8");
   console.log(
     output + `  ${path.basename(configTomlPath)}:
-` + tomlContent.split("\n").filter((line) => line.trim().length > 0).filter((line) => !/^#/.test(line)).map((line) => `    ${line}`).join("\n")
+` + tomlContent.split("\n").filter((line) => line.trim().length > 0).filter((line) => !line.startsWith("#")).map((line) => `    ${line}`).join("\n")
   );
 };
 export {

package/dist/commands/lint.js

@@ -29,7 +29,7 @@ function detectLegacyEslintConfig() {
       if (packageJson.eslint) {
         foundLegacyFiles.push("package.json (eslint field)");
       }
-    } catch (error) {
+    } catch {
     }
   }
   return foundLegacyFiles;
@@ -63,7 +63,8 @@ const description = "Lint your files";
 const builder = (yargs) => {
   yargs.positional("paths", {
     description: "Specify file(s) or directory(ies) to lint relative to project root",
-    type: "array"
+    type: "string",
+    array: true
   }).option("fix", {
     default: false,
     description: "Try to fix errors",
@@ -79,7 +80,11 @@ const builder = (yargs) => {
     )}`
   );
 };
-const handler = async ({ paths, fix, format }) => {
+const handler = async ({
+  paths = [],
+  fix = false,
+  format = "stylish"
+}) => {
   recordTelemetryAttributes({ command: "lint", fix, format });
   const config = getConfig();
   const legacyConfigFiles = detectLegacyEslintConfig();
@@ -98,13 +103,18 @@ const handler = async ({ paths, fix, format }) => {
         fs.existsSync(getPaths().api.src) && "api/src"
       );
     }
-    const result = await execa("yarn", args.filter(Boolean), {
+    const filteredArgs = args.filter((arg) => Boolean(arg));
+    const result = await execa("yarn", filteredArgs, {
       cwd: getPaths().base,
       stdio: "inherit"
     });
     process.exitCode = result.exitCode;
   } catch (error) {
-    process.exitCode = error.exitCode ?? 1;
+    if (error && typeof error === "object" && "exitCode" in error) {
+      process.exitCode = error.exitCode ?? 1;
+      return;
+    }
+    process.exitCode = 1;
   }
 };
 export {

package/dist/commands/record.js

@@ -1,7 +1,8 @@
+import { terminalLink } from "termi-link";
 const command = "record <command>";
 const description = "Setup RedwoodRecord for your project. Caches a JSON version of your data model and adds api/src/models/index.js with some config.";
-import { terminalLink } from "termi-link";
-const builder = (yargs) => yargs.command({ command, description, handler }).demandCommand().epilogue(
+const builder = (yargs) => yargs.command(command, description, () => {
+}, handler).demandCommand().epilogue(
   `Also see the ${terminalLink(
     "RedwoodRecord Docs",
     "https://cedarjs.com/docs/redwoodrecord"

package/dist/commands/serve.js

@@ -27,11 +27,11 @@ const builder = async (yargs) => {
         socket: argv.socket
       });
       if (serverFileExists()) {
-        const { bothServerFileHandler } = await import("./serveBothHandler.js");
-        await bothServerFileHandler(argv);
+        const serveBothHandlers = await import("./serveBothHandler.js");
+        await serveBothHandlers.bothServerFileHandler(argv);
       } else if (rscEnabled || streamingEnabled) {
-        const { bothSsrRscServerHandler } = await import("./serveBothHandler.js");
-        await bothSsrRscServerHandler(argv, rscEnabled);
+        const serveBothHandlers = await import("./serveBothHandler.js");
+        await serveBothHandlers.bothSsrRscServerHandler(argv, rscEnabled);
       } else {
         if (!projectIsEsm()) {
           const { handler } = await import("@cedarjs/api-server/cjs/bothCliConfigHandler");
@@ -88,7 +88,7 @@ const builder = async (yargs) => {
       command: "serve"
     });
     const positionalArgs = argv._;
-    if (positionalArgs.includes("web") && !fs.existsSync(path.join(getPaths().web.dist), "index.html")) {
+    if (positionalArgs.includes("web") && !webSideIsBuilt(streamingEnabled || rscEnabled)) {
       console.error(
         c.error(
           "\n Please run `yarn cedar build web` before trying to serve web. \n"
@@ -119,15 +119,16 @@ const builder = async (yargs) => {
       if (!apiSideExists && !rscEnabled) {
         console.error(
           c.error(
-            "\n Unable to serve the both sides as no `api` folder exists. Please use `yarn cedar serve web` instead. \n"
+            "\nUnable to serve web and api as no `api` folder exists. Please use `yarn cedar serve web` instead. \n"
           )
         );
         process.exit(1);
       }
-      if (fs.existsSync(path.join(getPaths().api.base)) && !fs.existsSync(path.join(getPaths().api.dist)) || !fs.existsSync(path.join(getPaths().web.dist), "index.html")) {
+      const apiExistsButIsNotBuilt = apiSideExists && !fs.existsSync(getPaths().api.dist);
+      if (apiExistsButIsNotBuilt || !webSideIsBuilt(streamingEnabled || rscEnabled)) {
         console.error(
           c.error(
-            "\n Please run `yarn cedar build` before trying to serve your redwood app. \n"
+            "\nPlease run `yarn cedar build` before trying to serve your Cedar app.\n"
           )
         );
         process.exit(1);
@@ -143,6 +144,15 @@ const builder = async (yargs) => {
     )}`
   );
 };
+function webSideIsBuilt(isStreamingOrRSC) {
+  if (isStreamingOrRSC) {
+    return fs.existsSync(
+      path.join(getPaths().web.distBrowser, "client-build-manifest.json")
+    );
+  } else {
+    return fs.existsSync(path.join(getPaths().web.dist, "index.html"));
+  }
+}
 export {
   builder,
   command,

package/dist/commands/setup/monitoring/sentry/sentryHandler.js

@@ -121,7 +121,7 @@ const handler = async ({ force }) => {
     },
     {
       title: "One more thing...",
-      task: (ctx) => {
+      task: (ctx, task) => {
         notes.push(
           colors.important(
             task.output = `You will need to add \`SENTRY_DSN\` to \`includeEnvironmentVariables\` in ${configFileName}.`

package/dist/commands/test.js

@@ -7,7 +7,8 @@ const builder = (yargs) => {
   yargs.strict(false).positional("filter", {
     default: workspaces(),
     description: "Which side(s) to test, and/or a regular expression to match against your test files to filter by",
-    type: "array"
+    type: "string",
+    array: true
   }).option("watch", {
     describe: "Run tests related to changed files based on hg/git. Specify the name or path to a file to focus on a specific set of tests",
     type: "boolean",

package/dist/commands/testEsm.js

@@ -12,7 +12,8 @@ const builder = (yargs) => {
   yargs.strict(false).positional("filter", {
     default: workspaces(),
     description: "Which side(s) to test, and/or a regular expression to match against your test files to filter by",
-    type: "array"
+    type: "string",
+    array: true
   }).option("db-push", {
     describe: "Syncs the test database with your Prisma schema without requiring a migration. It creates a test database if it doesn't already exist.",
     type: "boolean",

package/dist/commands/type-check.js

@@ -7,7 +7,8 @@ const builder = (yargs) => {
   yargs.strict(false).positional("sides", {
     default: workspaces(),
     description: "Which side(s) to run a typecheck on",
-    type: "array"
+    type: "string",
+    array: true
   }).option("prisma", {
     type: "boolean",
     default: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13414+7c6fed072",
+  "version": "3.0.0-canary.13417+a3ddd36d4",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -34,15 +34,15 @@
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "3.0.0-canary.13414",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13414",
-    "@cedarjs/fastify-web": "3.0.0-canary.13414",
-    "@cedarjs/internal": "3.0.0-canary.13414",
-    "@cedarjs/prerender": "3.0.0-canary.13414",
-    "@cedarjs/project-config": "3.0.0-canary.13414",
-    "@cedarjs/structure": "3.0.0-canary.13414",
-    "@cedarjs/telemetry": "3.0.0-canary.13414",
-    "@cedarjs/web-server": "3.0.0-canary.13414",
+    "@cedarjs/api-server": "3.0.0-canary.13417",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13417",
+    "@cedarjs/fastify-web": "3.0.0-canary.13417",
+    "@cedarjs/internal": "3.0.0-canary.13417",
+    "@cedarjs/prerender": "3.0.0-canary.13417",
+    "@cedarjs/project-config": "3.0.0-canary.13417",
+    "@cedarjs/structure": "3.0.0-canary.13417",
+    "@cedarjs/telemetry": "3.0.0-canary.13417",
+    "@cedarjs/web-server": "3.0.0-canary.13417",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -106,5 +106,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7c6fed0720f1213e0cb7bf0741e0f767b8e8e633"
+  "gitHead": "a3ddd36d46942deb1eec0cd1f42694bcb43b6cdb"
 }