@cedarjs/cli 0.5.1-next.0 → 0.6.0

package/README.md

@@ -659,7 +659,7 @@ We also use methods that we want to affect all commands here, like `demandComman
 
 #### lib/colors.js
 
-[colors.js](https://github.com/redwoodjs/redwood/blob/main/packages/cli/src/lib/colors.js) provides a declarative way of coloring output to the console using [chalk](https://github.com/chalk/chalk#styles). You'll see it imported like:
+[colors.js](https://github.com/redwoodjs/redwood/blob/main/packages/cli/src/lib/colors.js) provides a declarative way of coloring output to the console using [ansis](https://github.com/webdiscus/ansis#styles). You'll see it imported like:
 
 ```javascript
 import c from '../lib/colors'
@@ -685,10 +685,10 @@ Adding a new color is as simple as adding a new property to the default export:
 // ./src/lib/colors.js
 
 export default {
-  error: chalk.bold.red,
-  warning: chalk.keyword('orange'),
-  green: chalk.green,
-  info: chalk.grey,
+  error: ansis.bold.red,
+  warning: ansis.hex('#ffa500'),
+  green: ansis.green,
+  info: ansis.gray,
 }
 ```
 

package/dist/commands/deploy/serverlessHandler.js

@@ -1,6 +1,6 @@
 import path from "path";
+import ansis from "ansis";
 import boxen from "boxen";
-import chalk from "chalk";
 import { config } from "dotenv-defaults";
 import execa from "execa";
 import fs from "fs-extra";
@@ -91,7 +91,7 @@ const handler = async (yargs) => {
   try {
     await tasks.run();
     if (yargs.firstRun) {
-      const SETUP_MARKER = chalk.bgBlue(chalk.black("First Setup "));
+      const SETUP_MARKER = ansis.bgBlue.black("First Setup ");
       console.log();
       console.log(SETUP_MARKER, c.success("Starting first setup wizard..."));
       const { stdout: slsInfo } = await execa(

package/dist/commands/deploy.js

@@ -1,5 +1,3 @@
-const command = "deploy <target>";
-const description = "Deploy your Redwood project";
 import { terminalLink } from "termi-link";
 import * as deployBaremetal from "./deploy/baremetal.js";
 import * as deployFlightcontrol from "./deploy/flightcontrol.js";
@@ -7,6 +5,8 @@ import * as deployNetlify from "./deploy/netlify.js";
 import * as deployRender from "./deploy/render.js";
 import * as deployServerless from "./deploy/serverless.js";
 import * as deployVercel from "./deploy/vercel.js";
+const command = "deploy <target>";
+const description = "Deploy your Redwood project";
 const builder = (yargs) => yargs.command(deployBaremetal).command(deployFlightcontrol).command(deployNetlify).command(deployRender).command(deployServerless).command(deployVercel).demandCommand().epilogue(
   `Also see the ${terminalLink(
     "Redwood CLI Reference",

package/dist/commands/destroy/cell/cell.js

@@ -1,7 +1,6 @@
-import { files as cellFiles } from "../../generate/cell/cellHandler.js";
 import { createYargsForComponentDestroy, createHandler } from "../helpers.js";
 const { command, description, builder } = createYargsForComponentDestroy(
-  { componentName: "cell", filesFn: cellFiles }
+  { componentName: "cell" }
 );
 const handler = createHandler("cell");
 export {

package/dist/commands/destroy/cell/cellHandler.js

@@ -1,4 +1,4 @@
-import { files as cellFiles } from "../../generate/cell/cell.js";
+import { files as cellFiles } from "../../generate/cell/cellHandler.js";
 import { createHandler } from "../handlerHelpers.js";
 const { handler, tasks } = createHandler({
   componentName: "cell",

package/dist/commands/destroy/component/component.js

@@ -1,9 +1,7 @@
-import { files as componentFiles } from "../../generate/component/componentHandler.js";
 import { createHandler, createYargsForComponentDestroy } from "../helpers.js";
 const description = "Destroy a component";
 const { command, builder, tasks } = createYargsForComponentDestroy({
-  componentName: "component",
-  filesFn: componentFiles
+  componentName: "component"
 });
 const handler = createHandler("component");
 export {

package/dist/commands/destroy.js

@@ -1,6 +1,3 @@
-const command = "destroy <type>";
-const aliases = ["d"];
-const description = "Rollback changes made by the generate command";
 import { terminalLink } from "termi-link";
 import * as destroyCell from "./destroy/cell/cell.js";
 import * as destroyComponent from "./destroy/component/component.js";
@@ -11,6 +8,9 @@ import * as destroyPage from "./destroy/page/page.js";
 import * as destroyScaffold from "./destroy/scaffold/scaffold.js";
 import * as destroySdl from "./destroy/sdl/sdl.js";
 import * as destroyService from "./destroy/service/service.js";
+const command = "destroy <type>";
+const aliases = ["d"];
+const description = "Rollback changes made by the generate command";
 const builder = (yargs) => yargs.command(destroyCell).command(destroyComponent).command(destroyDirective).command(destroyFunction).command(destroyLayout).command(destroyPage).command(destroyScaffold).command(destroySdl).command(destroyService).demandCommand().epilogue(
   `Also see the ${terminalLink(
     "Redwood CLI Reference",

package/dist/commands/experimental/util.js

@@ -1,5 +1,5 @@
 import path from "path";
-import chalk from "chalk";
+import ansis from "ansis";
 import fs from "fs-extra";
 import { terminalLink } from "termi-link";
 import { getPaths } from "../../lib/index.js";
@@ -21,9 +21,9 @@ Please find documentation and links to provide feedback for ${command} at:
 )}`;
 const printTaskEpilogue = (command, description, topicId) => {
   console.log(
-    `${chalk.hex("#ff845e")(
+    `${ansis.hex("#ff845e")(
       `------------------------------------------------------------------
- \u{1F9EA} ${chalk.green(
+ \u{1F9EA} ${ansis.green(
         "Experimental Feature"
       )} \u{1F9EA}
 ------------------------------------------------------------------`
@@ -31,7 +31,7 @@ const printTaskEpilogue = (command, description, topicId) => {
   );
   console.log(getEpilogue(command, description, topicId, false));
   console.log(
-    `${chalk.hex("#ff845e")(
+    `${ansis.hex("#ff845e")(
       "------------------------------------------------------------------"
     )}
 `

package/dist/commands/generate/sdl/sdlHandler.js

@@ -1,7 +1,7 @@
 import path from "path";
+import ansis from "ansis";
 import boxen from "boxen";
 import camelcase from "camelcase";
-import chalk from "chalk";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
@@ -29,11 +29,11 @@ import { files as serviceFiles } from "../service/serviceHandler.js";
 import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
 const DEFAULT_IGNORE_FIELDS_FOR_INPUT = ["createdAt", "updatedAt"];
 const missingIdConsoleMessage = () => {
-  const line1 = chalk.bold.yellow("WARNING") + ": Cannot generate CRUD SDL without an `@id` database column.";
+  const line1 = ansis.bold.yellow("WARNING") + ": Cannot generate CRUD SDL without an `@id` database column.";
   const line2 = "If you are trying to generate for a many-to-many join table ";
   const line3 = "you'll need to update your schema definition to include";
   const line4 = "an `@id` column. Read more here: ";
-  const line5 = chalk.underline.blue(
+  const line5 = ansis.underline.blue(
     "https://redwoodjs.com/docs/schema-relations"
   );
   console.error(

package/dist/commands/setup/middleware/ogImage/__codemod_tests__/middleware.js

@@ -1,15 +1,18 @@
 import { describe, it } from "vitest";
-describe("Middleware codemod", () => {
-  it("Handles the default TSX case", async () => {
-    await matchTransformSnapshot("codemodMiddleware", "defaultTsx");
-  });
-  it("Handles when OgImageMiddleware is already imported", async () => {
-    await matchTransformSnapshot("codemodMiddleware", "alreadyContainsImport");
-  });
-  it("Handles when registerMiddleware function is already defined", async () => {
-    await matchTransformSnapshot(
-      "codemodMiddleware",
-      "registerFunctionAlreadyDefined"
-    );
-  });
-});
+describe.skipIf(process.env.CI && process.platform === "win32")(
+  "Middleware codemod",
+  () => {
+    it("Handles the default TSX case", async () => {
+      await matchTransformSnapshot("codemodMiddleware", "defaultTsx");
+    });
+    it("Handles when OgImageMiddleware is already imported", async () => {
+      await matchTransformSnapshot("codemodMiddleware", "alreadyContainsImport");
+    });
+    it("Handles when registerMiddleware function is already defined", async () => {
+      await matchTransformSnapshot(
+        "codemodMiddleware",
+        "registerFunctionAlreadyDefined"
+      );
+    });
+  }
+);

package/dist/commands/setup/middleware/ogImage/__codemod_tests__/vitePlugin.js

@@ -1,6 +1,9 @@
 import { describe, it } from "vitest";
-describe("Vite plugin codemod", () => {
-  it("Handles the default vite config case", async () => {
-    await matchTransformSnapshot("codemodVitePlugin", "defaultViteConfig");
-  });
-});
+describe.skipIf(process.env.CI && process.platform === "win32")(
+  "Vite plugin codemod",
+  () => {
+    it("Handles the default vite config case", async () => {
+      await matchTransformSnapshot("codemodVitePlugin", "defaultViteConfig");
+    });
+  }
+);

package/dist/commands/upgrade.js

@@ -37,8 +37,8 @@ const builder = (yargs) => {
     default: true
   }).epilogue(
     `Also see the ${terminalLink(
-      "Cedar CLI Reference for the upgrade command",
-      "https://redwoodjs.com/docs/cli-commands#upgrade"
+      "CedarJS CLI Reference for the upgrade command",
+      "https://cedarjs.com/docs/cli-commands#upgrade"
     )}.
 And the ${terminalLink(
       "GitHub releases page",
@@ -50,11 +50,11 @@ const SEMVER_REGEX = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*
 const isValidSemver = (string) => {
   return SEMVER_REGEX.test(string);
 };
-const isValidCedarTag = (tag) => {
+const isValidCedarJSTag = (tag) => {
   return ["rc", "canary", "latest", "next", "experimental"].includes(tag);
 };
 const validateTag = (tag) => {
-  const isTagValid = isValidSemver(tag) || isValidCedarTag(tag);
+  const isTagValid = isValidSemver(tag) || isValidCedarJSTag(tag);
   if (!isTagValid) {
     throw new Error(
       c.error(
@@ -80,7 +80,7 @@ const handler = async ({ dryRun, tag, verbose, dedupe }) => {
       },
       {
         title: "Updating your CedarJS version",
-        task: (ctx) => updateCedarDepsForAllSides(ctx, { dryRun, verbose }),
+        task: (ctx) => updateCedarJSDepsForAllSides(ctx, { dryRun, verbose }),
         enabled: (ctx) => !!ctx.versionToUpgradeTo
       },
       {
@@ -126,24 +126,26 @@ const handler = async ({ dryRun, tag, verbose, dedupe }) => {
 `
           ];
           if ([void 0, "latest", "rc"].includes(tag)) {
+            const ghReleasesLink = terminalLink(
+              `GitHub Release notes`,
+              `https://github.com/cedarjs/cedar/releases`
+              // intentionally not linking to specific version
+            );
+            const discordLink = terminalLink(
+              `Discord`,
+              `https://cedarjs.com/discord`
+            );
             messageSections.push(
-              `   Please review the release notes for any manual steps: 
-   \u2756 ${terminalLink(
-                `Redwood community discussion`,
-                `https://community.redwoodjs.com/c/announcements/releases-and-upgrade-guides/`
-              )}
-   \u2756 ${terminalLink(
-                `GitHub Release notes`,
-                `https://github.com/cedarjs/cedar/releases`
-                // intentionally not linking to specific version
-              )} 
-
+              `   Please review the release notes for any manual steps:
+   \u2756 ${ghReleasesLink}
+   Join our Discord community if you have any questions or need support:
+   \u2756 ${discordLink}
 `
             );
           }
           if (tag) {
             const additionalMessages = [];
-            if (!getConfig().notifications.versionUpdates.includes(tag) && isValidCedarTag(tag)) {
+            if (!getConfig().notifications.versionUpdates.includes(tag) && isValidCedarJSTag(tag)) {
               additionalMessages.push(
                 `   \u2756 You may want to update your redwood.toml config so that \`notifications.versionUpdates\` includes "${tag}"
 `
@@ -246,7 +248,7 @@ function updatePackageJsonVersion(pkgPath, version, { dryRun, verbose }) {
     );
   }
 }
-function updateCedarDepsForAllSides(ctx, options) {
+function updateCedarJSDepsForAllSides(ctx, options) {
   if (!ctx.versionToUpgradeTo) {
     throw new Error("Failed to upgrade");
   }

package/dist/lib/colors.js

@@ -1,17 +1,17 @@
-import chalk from "chalk";
+import ansis from "ansis";
 var colors_default = {
-  error: chalk.bold.red,
-  warning: chalk.hex("#ffa500"),
-  highlight: chalk.hex("#ffa500"),
-  success: chalk.green,
-  info: chalk.grey,
-  bold: chalk.bold,
-  underline: chalk.underline,
-  note: chalk.blue,
-  tip: chalk.green,
-  important: chalk.magenta,
-  caution: chalk.red,
-  link: chalk.underline
+  error: ansis.bold.red,
+  warning: ansis.hex("#ffa500"),
+  highlight: ansis.hex("#ffa500"),
+  success: ansis.green,
+  info: ansis.gray,
+  bold: ansis.bold,
+  underline: ansis.underline,
+  note: ansis.blue,
+  tip: ansis.green,
+  important: ansis.magenta,
+  caution: ansis.red,
+  link: ansis.underline
 };
 export {
   colors_default as default

package/dist/lib/execBabel.js

@@ -1,25 +1,8 @@
-import { createRequire } from "node:module";
-import path from "node:path";
 import {
   getWebSideDefaultBabelConfig,
   registerApiSideBabelHook
 } from "@cedarjs/babel-config";
 import { getPaths } from "@cedarjs/project-config";
-async function runScriptFunction({
-  path: scriptPath,
-  functionName,
-  args
-}) {
-  const createdRequire = createRequire(import.meta.url);
-  const script = createdRequire(scriptPath);
-  const returnValue = await script[functionName](args);
-  try {
-    const { db } = createdRequire(path.join(getPaths().api.lib, "db"));
-    db.$disconnect();
-  } catch (e) {
-  }
-  return returnValue;
-}
 function configureBabel() {
   const {
     overrides: _overrides,
@@ -80,6 +63,5 @@ function configureBabel() {
   });
 }
 export {
-  configureBabel,
-  runScriptFunction
+  configureBabel
 };

package/dist/lib/exit.js

@@ -1,4 +1,4 @@
-import chalk from "chalk";
+import ansis from "ansis";
 import { terminalLink } from "termi-link";
 import { v4 as uuidv4 } from "uuid";
 import {
@@ -23,7 +23,7 @@ function exitWithError(error, { exitCode, message, epilogue, includeEpilogue, in
   includeReferenceCode ??= true;
   message ??= error.stack ?? (error.toString() || "Unknown error");
   const errorReferenceCode = uuidv4();
-  const line = chalk.red("-".repeat(process.stderr.columns));
+  const line = ansis.red("-".repeat(process.stderr.columns));
   const content = !includeEpilogue ? message : [
     "",
     line,

package/dist/lib/plugin.js

@@ -1,5 +1,5 @@
 import path from "path";
-import chalk from "chalk";
+import ansis from "ansis";
 import enquirer from "enquirer";
 import fs from "fs-extra";
 import { getCompatibilityData } from "@cedarjs/cli-helpers";
@@ -100,14 +100,14 @@ function checkPluginListAndWarn(plugins) {
   for (const plugin of plugins) {
     if (!plugin.package) {
       console.warn(
-        chalk.yellow(`\u26A0\uFE0F  A plugin is missing a package, it cannot be loaded.`)
+        ansis.yellow(`\u26A0\uFE0F  A plugin is missing a package, it cannot be loaded.`)
       );
     }
   }
   const pluginPackages = plugins.map((p) => p.package).filter((p) => p !== void 0);
   if (pluginPackages.length !== new Set(pluginPackages).size) {
     console.warn(
-      chalk.yellow(
+      ansis.yellow(
         "\u26A0\uFE0F  Duplicate plugin packages found in redwood.toml, duplicates will be ignored."
       )
     );
@@ -116,7 +116,7 @@ function checkPluginListAndWarn(plugins) {
   namespaces.forEach((ns) => {
     if (ns !== void 0 && !ns.startsWith("@")) {
       console.warn(
-        chalk.yellow(
+        ansis.yellow(
           `\u26A0\uFE0F  Plugin "${ns}" is missing a scope/namespace, it will not be loaded.`
         )
       );
@@ -129,13 +129,13 @@ async function loadPluginPackage(packageName, packageVersion, autoInstall) {
   }
   if (!autoInstall) {
     console.warn(
-      chalk.yellow(
+      ansis.yellow(
         `\u26A0\uFE0F  Plugin "${packageName}" cannot be loaded because it is not installed and "autoInstall" is disabled.`
       )
     );
     return null;
   }
-  console.log(chalk.green(`Installing plugin "${packageName}"...`));
+  console.log(ansis.green(`Installing plugin "${packageName}"...`));
   const installed = await installPluginPackage(packageName, packageVersion);
   if (installed) {
     return await import(packageName);
@@ -154,7 +154,7 @@ async function installPluginPackage(packageName, packageVersion) {
       );
       versionToInstall = compatibilityData.compatible.version;
       console.log(
-        chalk.green(
+        ansis.green(
           `Installing the latest compatible version: ${versionToInstall}`
         )
       );

package/dist/lib/updateCheck.js

@@ -1,6 +1,6 @@
 import path from "path";
+import ansis from "ansis";
 import boxen from "boxen";
-import chalk from "chalk";
 import fs from "fs-extra";
 import latestVersion from "latest-version";
 import semver from "semver";
@@ -95,7 +95,7 @@ function getUpdateMessage() {
       if (tag === localTag) {
         message += `
 
- \u2756  ${chalk.underline(chalk.bold(tag))}:
+ \u2756  ${ansis.underline.bold(tag)}:
      v${data.localVersion} -> v${version} `;
       } else {
         message += `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "0.5.1-next.0+9c48e99f3",
+  "version": "0.6.0",
   "description": "The Redwood Command Line",
   "repository": {
     "type": "git",
@@ -31,15 +31,15 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/api-server": "0.5.1-next.0+9c48e99f3",
-    "@cedarjs/cli-helpers": "0.5.1-next.0+9c48e99f3",
-    "@cedarjs/fastify-web": "0.5.1-next.0+9c48e99f3",
-    "@cedarjs/internal": "0.5.1-next.0+9c48e99f3",
-    "@cedarjs/prerender": "0.5.1-next.0+9c48e99f3",
-    "@cedarjs/project-config": "0.5.1-next.0+9c48e99f3",
-    "@cedarjs/structure": "0.5.1-next.0+9c48e99f3",
-    "@cedarjs/telemetry": "0.5.1-next.0+9c48e99f3",
-    "@cedarjs/web-server": "0.5.1-next.0+9c48e99f3",
+    "@cedarjs/api-server": "0.6.0",
+    "@cedarjs/cli-helpers": "0.6.0",
+    "@cedarjs/fastify-web": "0.6.0",
+    "@cedarjs/internal": "0.6.0",
+    "@cedarjs/prerender": "0.6.0",
+    "@cedarjs/project-config": "0.6.0",
+    "@cedarjs/structure": "0.6.0",
+    "@cedarjs/telemetry": "0.6.0",
+    "@cedarjs/web-server": "0.6.0",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -48,10 +48,10 @@
     "@opentelemetry/sdk-trace-node": "1.22.0",
     "@opentelemetry/semantic-conventions": "1.22.0",
     "@prisma/internals": "5.20.0",
+    "ansis": "4.1.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
     "camelcase": "6.3.0",
-    "chalk": "4.1.2",
     "change-case": "4.1.2",
     "ci-info": "4.0.0",
     "concurrently": "8.2.2",
@@ -101,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9c48e99f37468ae011bc39c5d405044ccef0e77c"
+  "gitHead": "dbb79eb24110276fc52803bb3874acd62b76f7c8"
 }