@cedarjs/cli 3.1.1 → 3.1.2-next.126

package/dist/commands/setup/tsconfig/tsconfigHandler.js

@@ -1,7 +1,8 @@
 import path from "path";
 import { Listr } from "listr2";
+import { terminalLink } from "termi-link";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../lib/colors.js";
 import {
   getInstalledCedarVersion,
   getPaths,
@@ -39,7 +40,7 @@ const handler = async ({ force }) => {
           task.title = `One more thing...
 
           ${c.tip("Quick link to the docs on configuring TypeScript")}
-          ${c.link("https://cedarjs.com/docs/typescript")}
+          ${terminalLink("", "https://cedarjs.com/docs/typescript")}
         `;
         }
       }

package/dist/commands/setup/ui/libraries/chakra-uiHandler.js

@@ -1,8 +1,7 @@
 import path from "path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../../../../lib/colors.js";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import extendStorybookConfiguration from "../../../../lib/configureStorybook.js";
 import { extendJSXFile, fileIncludes } from "../../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../../lib/index.js";

package/dist/commands/setup/ui/libraries/mantineHandler.js

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../../../../lib/colors.js";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import extendStorybookConfiguration from "../../../../lib/configureStorybook.js";
 import { extendJSXFile, fileIncludes } from "../../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../../lib/index.js";

package/dist/commands/setup/ui/libraries/tailwindcssHandler.js

@@ -4,9 +4,8 @@ import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../../lib/colors.js";
 import { getPaths, usingVSCode } from "../../../../lib/index.js";
 const tailwindDirectives = [
   "@tailwind base;",

package/dist/commands/setup/uploads/uploadsHandler.js

@@ -2,9 +2,13 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { addApiPackages, getPrettierOptions } from "@cedarjs/cli-helpers";
+import { terminalLink } from "termi-link";
+import {
+  addApiPackages,
+  getPrettierOptions,
+  colors as c
+} from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
 import { runTransform } from "../../../lib/runTransform.js";
@@ -122,9 +126,8 @@ const handler = async ({ force }) => {
 
           Remember to add UPLOADS_SECRET to your .env file. You can generate one with ${c.highlight("yarn cedar generate secret")}
 
-
           Check out the docs for more info:
-          ${c.link("https://cedarjs.com/docs/uploads")}
+          ${terminalLink("", "https://cedarjs.com/docs/uploads")}
 
         `;
         }

package/dist/commands/setup/vite/viteHandler.js

@@ -1,9 +1,8 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { addWebPackages } from "@cedarjs/cli-helpers";
+import { addWebPackages, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
 const { version } = JSON.parse(

package/dist/commands/setup.js

@@ -8,7 +8,6 @@ import * as setupGenerator from "./setup/generator/generator.js";
 import * as setupGraphql from "./setup/graphql/graphql.js";
 import * as setupI18n from "./setup/i18n/i18n.js";
 import * as setupJobs from "./setup/jobs/jobs.js";
-import * as setupLiveQueries from "./setup/live-queries/liveQueries.js";
 import * as setupMailer from "./setup/mailer/mailer.js";
 import * as setupMiddleware from "./setup/middleware/middleware.js";
 import * as setupMonitoring from "./setup/monitoring/monitoring.js";
@@ -21,7 +20,7 @@ import * as setupUploads from "./setup/uploads/uploads.js";
 import * as setupVite from "./setup/vite/vite.js";
 const command = "setup <command>";
 const description = "Initialize project config and install packages";
-const builder = (yargs) => yargs.command(setupAuth).command(setupCache).command(setupDeploy).command(setupDocker).command(setupGenerator).command(setupGraphql).command(setupI18n).command(setupJobs).command(setupLiveQueries).command(setupMailer).command(setupMiddleware).command(setupMonitoring).command(setupPackage).command(setupRealtime).command(setupServerFile).command(setupTsconfig).command(setupUi).command(setupUploads).command(setupVite).demandCommand().middleware(detectCedarVersion).epilogue(
+const builder = (yargs) => yargs.command(setupAuth).command(setupCache).command(setupDeploy).command(setupDocker).command(setupGenerator).command(setupGraphql).command(setupI18n).command(setupJobs).command(setupMailer).command(setupMiddleware).command(setupMonitoring).command(setupPackage).command(setupRealtime).command(setupServerFile).command(setupTsconfig).command(setupUi).command(setupUploads).command(setupVite).demandCommand().middleware(detectCedarVersion).epilogue(
   `Also see the ${terminalLink(
     "CedarJS CLI Reference",
     "https://cedarjs.com/docs/cli-commands#setup"

package/dist/commands/test/testHandler.js

@@ -1,10 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
-import c from "../../lib/colors.js";
 import { getPaths } from "../../lib/index.js";
 import * as project from "../../lib/project.js";
 import { warnIfNonStandardDatasourceUrl } from "./datasourceWarning.js";

package/dist/commands/test.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import c from "../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { workspaces } from "../lib/project.js";
 const command = "test [filter..]";
 const description = "Run Jest tests. Defaults to watch mode";

package/dist/commands/testEsm.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import c from "../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { workspaces } from "../lib/project.js";
 const command = "test [filter..]";
 const description = "Run Vitest tests. Defaults to watch mode";

package/dist/commands/type-checkHandler.js

@@ -55,7 +55,7 @@ const handler = async ({
       [
         {
           title: "Generating types",
-          task: () => execa("yarn rw-gen", {
+          task: () => execa("yarn cedar-gen", {
             shell: true,
             stdio: verbose ? "inherit" : "ignore"
           })

package/dist/commands/upgrade/upgrade.js

@@ -1,6 +1,6 @@
 import { terminalLink } from "termi-link";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { dedupeIsSupported } from "@cedarjs/cli-helpers/packageManager";
-import c from "../../lib/colors.js";
 import { isValidCedarJSTag } from "./tags.js";
 const SEMVER_REGEX = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/i;
 const isValidSemver = (string) => {

package/dist/commands/upgrade/upgradeHandler.js

@@ -5,7 +5,7 @@ import execa from "execa";
 import latestVersion from "latest-version";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   dedupe,
   dedupeIsSupported,
@@ -15,7 +15,6 @@ import {
 } from "@cedarjs/cli-helpers/packageManager";
 import { getConfig } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
-import c from "../../lib/colors.js";
 import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
 import { getPaths } from "../../lib/index.js";
 import { PLUGIN_CACHE_FILENAME } from "../../lib/plugin.js";

package/dist/index.js

@@ -4,7 +4,11 @@ import path from "path";
 import { trace, SpanStatusCode } from "@opentelemetry/api";
 import { hideBin, Parser } from "yargs/helpers";
 import yargs from "yargs/yargs";
-import { loadEnvFiles, recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import {
+  loadEnvFiles,
+  recordTelemetryAttributes,
+  colors as c
+} from "@cedarjs/cli-helpers";
 import { findUp, projectIsEsm, getConfigPath } from "@cedarjs/project-config";
 import { telemetryMiddleware } from "@cedarjs/telemetry";
 import * as buildCommand from "./commands/build.js";
@@ -30,7 +34,6 @@ import * as testCommandEsm from "./commands/testEsm.js";
 import * as tstojsCommand from "./commands/ts-to-js.js";
 import * as typeCheckCommand from "./commands/type-check.js";
 import * as upgradeCommand from "./commands/upgrade/upgrade.js";
-import c from "./lib/colors.js";
 import { exitWithError } from "./lib/exit.js";
 import * as updateCheck from "./lib/updateCheck.js";
 import { loadPlugins } from "./plugin.js";

package/dist/lib/exec.js

@@ -6,7 +6,7 @@ import { installSourcemapsSupport } from "vite-node/source-map";
 import { getPaths, importStatementPath } from "@cedarjs/project-config";
 import {
   cedarCellTransform,
-  cedarjsDirectoryNamedImportPlugin,
+  cedarjsResolveCedarStyleImportsPlugin,
   cedarjsJobPathInjectorPlugin,
   cedarSwapApolloProvider,
   cedarImportDirPlugin,
@@ -71,7 +71,7 @@ async function runScriptFunction({
       ]
     },
     plugins: [
-      cedarjsDirectoryNamedImportPlugin(),
+      cedarjsResolveCedarStyleImportsPlugin(),
       cedarCellTransform(),
       cedarjsJobPathInjectorPlugin(),
       cedarSwapApolloProvider(),
@@ -105,11 +105,12 @@ async function runScriptFunction({
     }
   });
   let returnValue;
+  let scriptError = null;
   try {
     const script = await runner.executeFile(scriptPath);
-    returnValue = script[functionName](args);
+    returnValue = await script[functionName](args);
   } catch (error) {
-    console.error(error);
+    scriptError = error;
   }
   try {
     const { db } = await runner.executeFile(path.join(getPaths().api.lib, "db"));
@@ -118,6 +119,9 @@ async function runScriptFunction({
   }
   await server.close();
   process.env.NODE_ENV = NODE_ENV;
+  if (scriptError) {
+    throw scriptError;
+  }
   return returnValue;
 }
 export {

package/dist/lib/index.js

@@ -12,6 +12,7 @@ import memoize from "lodash/memoize.js";
 import template from "lodash/template.js";
 import pascalcase from "pascalcase";
 import { format } from "prettier";
+import { colors as c } from "@cedarjs/cli-helpers";
 import {
   getConfig as getRedwoodConfig,
   getPaths as getRedwoodPaths,
@@ -19,7 +20,6 @@ import {
   findUp
 } from "@cedarjs/project-config";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
-import c from "./colors.js";
 import { addFileToRollback } from "./rollback.js";
 const nameVariants = (name) => {
   const normalizedName = pascalcase(paramCase(singularize(name)));

package/dist/lib/merge/index.js

@@ -80,11 +80,13 @@ function insertAfterLastImport(expression, program) {
 }
 function prune(path) {
   switch (path.parentPath.type) {
+    // If pruning 'path' would yield an ill-formed parent (e.g, '{foo:}' or 'const x;'), prune it.
     case "ObjectProperty":
     case "VariableDeclarator":
       return path.parentPath.remove();
     default:
       console.log(`Warning: default prune strategy for ${path.parentPath.type}`);
+    // eslint-disable-next-line no-fallthrough
     case "Program":
     case "ArrayExpression":
       return path.remove();

package/dist/lib/test.js

@@ -49,11 +49,11 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
         packages: path.join(BASE_PATH, "packages"),
         generatorTemplates: path.join(BASE_PATH, "generatorTemplates"),
         generated: {
-          base: path.join(BASE_PATH, ".redwood"),
-          schema: path.join(BASE_PATH, ".redwood/schema.graphql"),
+          base: path.join(BASE_PATH, ".cedar"),
+          schema: path.join(BASE_PATH, ".cedar/schema.graphql"),
           types: {
-            includes: path.join(BASE_PATH, ".redwood/types/includes"),
-            mirror: path.join(BASE_PATH, ".redwood/types/mirror")
+            includes: path.join(BASE_PATH, ".cedar/types/includes"),
+            mirror: path.join(BASE_PATH, ".cedar/types/mirror")
           }
         }
       };

package/dist/middleware/checkNodeVersion.js

@@ -1,5 +1,5 @@
 import semver from "semver";
-import c from "../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers";
 function checkNodeVersion() {
   const checks = { ok: true };
   const pVersion = process.version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.1.1",
+  "version": "3.1.2-next.126+e7fa625a39",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,16 +33,16 @@
   "dependencies": {
     "@babel/parser": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "3.1.1",
-    "@cedarjs/cli-helpers": "3.1.1",
-    "@cedarjs/fastify-web": "3.1.1",
-    "@cedarjs/internal": "3.1.1",
-    "@cedarjs/prerender": "3.1.1",
-    "@cedarjs/project-config": "3.1.1",
-    "@cedarjs/structure": "3.1.1",
-    "@cedarjs/telemetry": "3.1.1",
-    "@cedarjs/utils": "3.1.1",
-    "@cedarjs/web-server": "3.1.1",
+    "@cedarjs/api-server": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/cli-helpers": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/fastify-web": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/internal": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/prerender": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/project-config": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/structure": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/telemetry": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/utils": "3.1.2-next.126+e7fa625a39",
+    "@cedarjs/web-server": "3.1.2-next.126+e7fa625a39",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -50,7 +50,7 @@
     "@opentelemetry/resources": "1.30.1",
     "@opentelemetry/sdk-trace-node": "1.30.1",
     "@opentelemetry/semantic-conventions": "1.38.0",
-    "@prisma/internals": "7.5.0",
+    "@prisma/internals": "7.7.0",
     "ansis": "4.2.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
@@ -71,17 +71,17 @@
     "jsonc-parser": "3.3.1",
     "latest-version": "9.0.0",
     "listr2": "10.2.1",
-    "lodash": "4.17.23",
+    "lodash": "4.18.1",
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "portfinder": "1.0.38",
     "prettier": "3.8.1",
-    "prisma": "7.5.0",
+    "prisma": "7.7.0",
     "prompts": "2.4.2",
     "recast": "0.23.11",
     "rimraf": "6.1.3",
     "semver": "7.7.4",
-    "smol-toml": "1.6.0",
+    "smol-toml": "1.6.1",
     "string-env-interpolation": "1.0.1",
     "systeminformation": "5.31.5",
     "termi-link": "1.1.0",
@@ -108,5 +108,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "daccdd356942396c8037bd53c8e945255e4c8fdb"
+  "gitHead": "e7fa625a39d829a9078bd5b8237e93ec1a8745be"
 }

package/dist/lib/colors.js

@@ -1,18 +0,0 @@
-import ansis from "ansis";
-var colors_default = {
-  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
-};