@cedarjs/cli 2.4.2-next.0 → 2.5.0-rc.146

package/README.md

@@ -111,9 +111,13 @@ cd packages/cli
 yarn dev <command>
 ```
 
-> **Note:** If you are implementing a command and wish to run via `yarn dev <command>` be sure to `yarn build:clean-dist` beforehand to run the latest version.
+> **Note:** If you are implementing a command and wish to run via
+> `yarn dev <command>` be sure to `yarn build:clean-dist` beforehand to run the
+> latest version.
 
-> **Important:** If your command alters the `example-todo-main` project (adds a package, modifies redwood.toml, etc) be sure not to commit and push those changes as part of your PR.
+> **Important:** If your command alters the `example-todo-main` project (adds a
+> package, modifies cedar.toml, etc) be sure not to commit and push those changes
+> as part of your PR.
 
 ### Best Practices
 

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -297,18 +297,18 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
         title: `DB Migrations...`,
         task: async () => {
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
-            "rw",
+            "cedar",
             "prisma",
             "migrate",
             "deploy"
           ]);
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
-            "rw",
+            "cedar",
             "prisma",
             "generate"
           ]);
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
-            "rw",
+            "cedar",
             "dataMigrate",
             "up"
           ]);
@@ -326,7 +326,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
           title: `Building ${side}...`,
           task: async () => {
             await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
-              "rw",
+              "cedar",
               "build",
               side
             ]);

package/dist/commands/deploy/serverlessHandler.js

@@ -23,7 +23,7 @@ const buildCommands = ({ sides }) => {
   return [
     {
       title: `Building ${sides.join(" & ")}...`,
-      command: ["yarn", ["rw", "build", ...sides]]
+      command: ["yarn", ["cedar", "build", ...sides]]
     },
     {
       title: "Packing Functions...",

package/dist/commands/dev/devHandler.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { Writable } from "node:stream";
 import concurrently from "concurrently";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { shutdownPort } from "@cedarjs/internal/dist/dev";
@@ -66,7 +67,7 @@ const handler = async ({
     const message = [
       "The currently configured ports for the development server are",
       "unavailable. Suggested changes to your ports, which can be changed in",
-      "redwood.toml, are:\n",
+      "cedar.toml (or redwood.toml), are:\n",
       apiPortChangeNeeded && ` - API to use port ${apiAvailablePort} instead`,
       apiPortChangeNeeded && "of your currently configured",
       apiPortChangeNeeded && `${apiPreferredPort}
@@ -177,10 +178,38 @@ const handler = async ({
     }
   }
   const filteredJobs = jobs.filter((job) => !job.runWhen || job.runWhen());
+  class FilterEmptyLinesStream extends Writable {
+    buffer = "";
+    _write(chunk, _encoding, callback) {
+      this.buffer += chunk.toString();
+      const lines = this.buffer.split("\n");
+      this.buffer = lines.pop() || "";
+      for (const line of lines) {
+        const strippedLine = line.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "");
+        const isEmptyPrefixLine = /^[^|]+\|\s*$/.test(strippedLine);
+        if (!isEmptyPrefixLine) {
+          process.stdout.write(line + "\n");
+        }
+      }
+      callback();
+    }
+    _final(callback) {
+      if (this.buffer.length > 0) {
+        const strippedLine = this.buffer.replace(/\x1B\[[0-9;]*[a-zA-Z]/g, "");
+        const isEmptyPrefixLine = /^[^|]+\|\s*$/.test(strippedLine);
+        if (!isEmptyPrefixLine) {
+          process.stdout.write(this.buffer);
+        }
+      }
+      callback();
+    }
+  }
+  const outputStream = new FilterEmptyLinesStream();
   const { result } = concurrently(filteredJobs, {
     prefix: "{name} |",
     timestampFormat: "HH:mm:ss",
-    handleInput: true
+    handleInput: true,
+    outputStream
   });
   result.catch((e) => {
     if (e?.message) {

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -21,6 +21,9 @@ import {
 import { printTaskEpilogue } from "./util.js";
 const handler = async ({ force, verbose }) => {
   const ts = isTypeScriptProject();
+  const configTomlPath = getConfigPath();
+  const configFileName = path.basename(configTomlPath);
+  const configContent = fs.readFileSync(configTomlPath, "utf-8");
   const opentelemetryScriptPath = `${getPaths().api.src}/opentelemetry.${ts ? "ts" : "js"}`;
   const opentelemetryPackages = [
     "@opentelemetry/api",
@@ -54,13 +57,11 @@ const handler = async ({ force, verbose }) => {
       }
     },
     {
-      title: "Adding config to redwood.toml...",
+      title: `Adding config to ${configFileName}...`,
       task: (_ctx, task) => {
-        const redwoodTomlPath = getConfigPath();
-        const configContent = fs.readFileSync(redwoodTomlPath, "utf-8");
         if (!configContent.includes("[experimental.opentelemetry]")) {
           writeFile(
-            redwoodTomlPath,
+            configTomlPath,
             configContent.concat(
               `
 [experimental.opentelemetry]
@@ -69,12 +70,12 @@ const handler = async ({ force, verbose }) => {
             ),
             {
               overwriteExisting: true
-              // redwood.toml always exists
+              // cedar.toml or redwood.toml always exists
             }
           );
         } else {
           task.skip(
-            `The [experimental.opentelemetry] config block already exists in your 'redwood.toml' file.`
+            `The [experimental.opentelemetry] config block already exists in your ${configFileName} file.`
           );
         }
       }

package/dist/commands/experimental/setupReactCompilerHandler.js

@@ -15,8 +15,9 @@ import {
 import { printTaskEpilogue } from "./util.js";
 const handler = async ({ force, verbose }) => {
   const rwPaths = getPaths();
-  const redwoodTomlPath = getConfigPath();
-  const configContent = fs.readFileSync(redwoodTomlPath, "utf-8");
+  const configTomlPath = getConfigPath();
+  const configFileName = path.basename(configTomlPath);
+  const configContent = fs.readFileSync(configTomlPath, "utf-8");
   const tasks = new Listr(
     [
       {
@@ -44,24 +45,24 @@ const handler = async ({ force, verbose }) => {
         }
       },
       {
-        title: "Adding config to redwood.toml...",
+        title: `Adding config to ${configFileName}...`,
         task: (_ctx, task) => {
           if (!configContent.includes("[experimental.reactCompiler]")) {
             writeFile(
-              redwoodTomlPath,
+              configTomlPath,
               configContent.concat(
                 "\n[experimental.reactCompiler]\n  enabled = true\n  lintOnly = false\n"
               ),
               {
                 overwriteExisting: true
-                // redwood.toml always exists
+                // configuration file always exists
               }
             );
           } else {
             if (force) {
-              task.output = "Overwriting config in redwood.toml";
+              task.output = `Overwriting config in ${configFileName}`;
               writeFile(
-                redwoodTomlPath,
+                configTomlPath,
                 configContent.replace(
                   // Enable if it's currently disabled
                   "\n[experimental.reactCompiler]\n  enabled = false\n",
@@ -69,12 +70,12 @@ const handler = async ({ force, verbose }) => {
                 ),
                 {
                   overwriteExisting: true
-                  // redwood.toml always exists
+                  // configuration file always exists
                 }
               );
             } else {
               task.skip(
-                "The [experimental.reactCompiler] config block already exists in your `redwood.toml` file."
+                `The [experimental.reactCompiler] config block already exists in ${configFileName}.`
               );
             }
           }

package/dist/commands/experimental/setupRscHandler.js

@@ -12,8 +12,8 @@ import { command, description, EXPERIMENTAL_TOPIC_ID } from "./setupRsc.js";
 import { printTaskEpilogue } from "./util.js";
 const handler = async ({ force, verbose }) => {
   const rwPaths = getPaths();
-  const redwoodTomlPath = getConfigPath();
-  const configContent = fs.readFileSync(redwoodTomlPath, "utf-8");
+  const configTomlPath = getConfigPath();
+  const configContent = fs.readFileSync(configTomlPath, "utf-8");
   const ext = path.extname(rwPaths.web.entryClient || "");
   const tasks = new Listr(
     [
@@ -36,22 +36,22 @@ const handler = async ({ force, verbose }) => {
         }
       },
       {
-        title: "Adding config to redwood.toml...",
+        title: "Adding config to cedar.toml...",
         task: (_ctx, task) => {
           if (!configContent.includes("[experimental.rsc]")) {
             writeFile(
-              redwoodTomlPath,
+              configTomlPath,
               configContent.concat("\n[experimental.rsc]\n  enabled = true\n"),
               {
                 overwriteExisting: true
-                // redwood.toml always exists
+                // cedar.toml always exists
               }
             );
           } else {
             if (force) {
-              task.output = "Overwriting config in redwood.toml";
+              task.output = "Overwriting config in cedar.toml";
               writeFile(
-                redwoodTomlPath,
+                configTomlPath,
                 configContent.replace(
                   // Enable if it's currently disabled
                   "\n[experimental.rsc]\n  enabled = false\n",
@@ -59,12 +59,12 @@ const handler = async ({ force, verbose }) => {
                 ),
                 {
                   overwriteExisting: true
-                  // redwood.toml always exists
+                  // cedar.toml always exists
                 }
               );
             } else {
               task.skip(
-                "The [experimental.rsc] config block already exists in your `redwood.toml` file."
+                "The [experimental.rsc] config block already exists in your cedar.toml file."
               );
             }
           }

package/dist/commands/experimental/setupStreamingSsrHandler.js

@@ -16,8 +16,8 @@ import {
 import { printTaskEpilogue } from "./util.js";
 const handler = async ({ force, verbose }) => {
   const rwPaths = getPaths();
-  const redwoodTomlPath = getConfigPath();
-  const configContent = fs.readFileSync(redwoodTomlPath, "utf-8");
+  const configPath = getConfigPath();
+  const configContent = fs.readFileSync(configPath, "utf-8");
   const ts = isTypeScriptProject();
   const ext = path.extname(rwPaths.web.entryClient || "");
   const tasks = new Listr(
@@ -33,11 +33,11 @@ const handler = async ({ force, verbose }) => {
         }
       },
       {
-        title: "Adding config to redwood.toml...",
+        title: "Adding config to cedar.toml...",
         task: (_ctx, task) => {
           if (!configContent.includes("[experimental.streamingSsr]")) {
             writeFile(
-              redwoodTomlPath,
+              configPath,
               configContent.concat(
                 `
 [experimental.streamingSsr]
@@ -46,14 +46,14 @@ const handler = async ({ force, verbose }) => {
               ),
               {
                 overwriteExisting: true
-                // redwood.toml always exists
+                // cedar.toml always exists
               }
             );
           } else {
             if (force) {
-              task.output = "Overwriting config in redwood.toml";
+              task.output = "Overwriting config in cedar.toml";
               writeFile(
-                redwoodTomlPath,
+                configPath,
                 configContent.replace(
                   // Enable if it's currently disabled
                   `
@@ -67,12 +67,12 @@ const handler = async ({ force, verbose }) => {
                 ),
                 {
                   overwriteExisting: true
-                  // redwood.toml always exists
+                  // cedar.toml always exists
                 }
               );
             } else {
               task.skip(
-                `The [experimental.streamingSsr] config block already exists in your 'redwood.toml' file.`
+                "The [experimental.streamingSsr] config block already exists in your cedar.toml file."
               );
             }
           }

package/dist/commands/generate/package/package.js

@@ -1,9 +1,22 @@
-import { createHandler, createBuilder } from "../yargsCommandHelpers.js";
+import {
+  createHandler,
+  createBuilder,
+  getYargsDefaults
+} from "../yargsCommandHelpers.js";
 const command = "package <name>";
 const description = "Generate a workspace Package";
 const builder = createBuilder({
   componentName: "package",
-  addStories: false
+  addStories: false,
+  optionsObj: () => ({
+    ...getYargsDefaults(),
+    workspace: {
+      alias: "w",
+      description: "Which workspace(s) should use this package? One of: 'none', 'api', 'web', 'both'. If provided, the generator will skip the interactive prompt and apply the chosen workspace.",
+      type: "string",
+      choices: ["none", "api", "web", "both"]
+    }
+  })
 });
 const handler = createHandler("package");
 export {