@cedarjs/cli 2.2.0-rc.34 → 2.2.0

package/dist/commands/upgrade.js

@@ -1,9 +1,12 @@
-import path from "path";
+import { builtinModules } from "node:module";
+import os from "node:os";
+import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import fs from "fs-extra";
 import latestVersion from "latest-version";
 import { Listr } from "listr2";
+import semver from "semver";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getConfig } from "@cedarjs/project-config";
@@ -41,6 +44,11 @@ const builder = (yargs) => {
     describe: "Skip prompts and use defaults",
     default: false,
     type: "boolean"
+  }).option("force", {
+    alias: "f",
+    describe: "Force upgrade even if pre-upgrade checks fail",
+    default: false,
+    type: "boolean"
   }).epilogue(
     `Also see the ${terminalLink(
       "CedarJS CLI Reference for the upgrade command",
@@ -70,20 +78,23 @@ const validateTag = (tag) => {
   }
   return tag;
 };
-const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
+const handler = async ({ dryRun, tag, verbose, dedupe, yes, force }) => {
   recordTelemetryAttributes({
     command: "upgrade",
     dryRun,
     tag,
     verbose,
     dedupe,
-    yes
+    yes,
+    force
   });
+  let preUpgradeMessage = "";
+  let preUpgradeError = "";
   const tasks = new Listr(
     [
       {
         title: "Confirm upgrade",
-        task: async (ctx, task) => {
+        task: async (_ctx, task) => {
           if (yes) {
             task.skip("Skipping confirmation prompt because of --yes flag.");
             return;
@@ -117,38 +128,55 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
         title: "Checking latest version",
         task: async (ctx) => setLatestVersionToContext(ctx, tag)
       },
+      {
+        title: "Running pre-upgrade scripts",
+        task: async (ctx, task) => {
+          await runPreUpgradeScripts(ctx, task, { verbose, force });
+          if (ctx.preUpgradeMessage) {
+            preUpgradeMessage = ctx.preUpgradeMessage;
+          }
+          if (ctx.preUpgradeError) {
+            preUpgradeError = ctx.preUpgradeError;
+          }
+        },
+        enabled: (ctx) => !!ctx.versionToUpgradeTo
+      },
       {
         title: "Updating your CedarJS version",
         task: (ctx) => updateCedarJSDepsForAllSides(ctx, { dryRun, verbose }),
-        enabled: (ctx) => !!ctx.versionToUpgradeTo
+        enabled: (ctx) => !!ctx.versionToUpgradeTo && !ctx.preUpgradeError
       },
       {
         title: "Updating other packages in your package.json(s)",
         task: (ctx) => updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }),
-        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary")
+        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary") && !ctx.preUpgradeError
       },
       {
         title: "Downloading yarn patches",
         task: (ctx) => downloadYarnPatches(ctx, { dryRun, verbose }),
-        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary")
+        enabled: (ctx) => ctx.versionToUpgradeTo?.includes("canary") && !ctx.preUpgradeError
       },
       {
         title: "Removing CLI cache",
-        task: (ctx) => removeCliCache(ctx, { dryRun, verbose })
+        task: (ctx) => removeCliCache(ctx, { dryRun, verbose }),
+        enabled: (ctx) => !ctx.preUpgradeError
       },
       {
         title: "Running yarn install",
         task: (ctx) => yarnInstall(ctx, { dryRun, verbose }),
+        enabled: (ctx) => !ctx.preUpgradeError,
         skip: () => dryRun
       },
       {
         title: "Refreshing the Prisma client",
         task: (_ctx, task) => refreshPrismaClient(task, { verbose }),
+        enabled: (ctx) => !ctx.preUpgradeError,
         skip: () => dryRun
       },
       {
         title: "De-duplicating dependencies",
         skip: () => dryRun || !dedupe,
+        enabled: (ctx) => !ctx.preUpgradeError,
         task: (_ctx, task) => dedupeDeps(task, { verbose })
       },
       {
@@ -208,6 +236,21 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
     }
   );
   await tasks.run();
+  if (preUpgradeError) {
+    console.error("");
+    console.error(`   \u274C ${c.error("Pre-upgrade Error:")}
+`);
+    console.error("  " + preUpgradeError.replace(/\n/g, "\n   "));
+    if (!force) {
+      process.exit(1);
+    }
+  }
+  if (preUpgradeMessage) {
+    console.log("");
+    console.log(`   \u{1F4E3} ${c.info("Pre-upgrade Message:")}
+`);
+    console.log("  " + preUpgradeMessage.replace(/\n/g, "\n   "));
+  }
 };
 async function yarnInstall({ verbose }) {
   try {
@@ -249,16 +292,19 @@ async function setLatestVersionToContext(ctx, tag) {
     throw new Error("Could not find the latest version");
   }
 }
-function updatePackageJsonVersion(pkgPath, version, { dryRun, verbose }) {
+function updatePackageJsonVersion(pkgPath, version, task, { dryRun, verbose }) {
   const pkg = JSON.parse(
     fs.readFileSync(path.join(pkgPath, "package.json"), "utf-8")
   );
+  const messages = [];
   if (pkg.dependencies) {
     for (const depName of Object.keys(pkg.dependencies).filter(
       (x) => x.startsWith("@cedarjs/") && x !== "@cedarjs/studio"
     )) {
       if (verbose || dryRun) {
-        console.log(` - ${depName}: ${pkg.dependencies[depName]} => ${version}`);
+        messages.push(
+          ` - ${depName}: ${pkg.dependencies[depName]} => ${version}`
+        );
       }
       pkg.dependencies[depName] = `${version}`;
     }
@@ -268,13 +314,16 @@ function updatePackageJsonVersion(pkgPath, version, { dryRun, verbose }) {
       (x) => x.startsWith("@cedarjs/") && x !== "@cedarjs/studio"
     )) {
       if (verbose || dryRun) {
-        console.log(
+        messages.push(
           ` - ${depName}: ${pkg.devDependencies[depName]} => ${version}`
         );
       }
       pkg.devDependencies[depName] = `${version}`;
     }
   }
+  if (messages.length > 0) {
+    task.title = task.title + "\n" + messages.join("\n");
+  }
   if (!dryRun) {
     fs.writeFileSync(
       path.join(pkgPath, "package.json"),
@@ -296,7 +345,12 @@ function updateCedarJSDepsForAllSides(ctx, options) {
       const pkgJsonPath = path.join(basePath, "package.json");
       return {
         title: `Updating ${pkgJsonPath}`,
-        task: () => updatePackageJsonVersion(basePath, ctx.versionToUpgradeTo, options),
+        task: (_ctx, task) => updatePackageJsonVersion(
+          basePath,
+          ctx.versionToUpgradeTo,
+          task,
+          options
+        ),
         skip: () => !fs.existsSync(pkgJsonPath)
       };
     })
@@ -433,7 +487,7 @@ async function refreshPrismaClient(task, { verbose }) {
     console.log(c.error(e.message));
   }
 }
-const dedupeDeps = async (task, { verbose }) => {
+const dedupeDeps = async (_task, { verbose }) => {
   try {
     await execa("yarn dedupe", {
       shell: true,
@@ -448,10 +502,212 @@ const dedupeDeps = async (task, { verbose }) => {
   }
   await yarnInstall({ verbose });
 };
+async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
+  if (!ctx.versionToUpgradeTo) {
+    return;
+  }
+  const version = ctx.versionToUpgradeTo;
+  const parsed = semver.parse(version);
+  const baseUrl = "https://raw.githubusercontent.com/cedarjs/cedar/main/upgrade-scripts/";
+  const manifestUrl = `${baseUrl}manifest.json`;
+  let manifest = [];
+  try {
+    const res = await fetch(manifestUrl);
+    if (res.status === 200) {
+      manifest = await res.json();
+    } else {
+      if (verbose) {
+        console.log("No upgrade script manifest found.");
+      }
+    }
+  } catch (e) {
+    if (verbose) {
+      console.log("Failed to fetch upgrade script manifest", e);
+    }
+  }
+  if (!Array.isArray(manifest) || manifest.length === 0) {
+    return;
+  }
+  const checkLevels = [];
+  if (parsed) {
+    checkLevels.push({
+      id: "exact",
+      candidates: [`${version}.ts`, `${version}/index.ts`]
+    });
+    checkLevels.push({
+      id: "patch",
+      candidates: [
+        `${parsed.major}.${parsed.minor}.x.ts`,
+        `${parsed.major}.${parsed.minor}.x/index.ts`
+      ]
+    });
+    checkLevels.push({
+      id: "minor",
+      candidates: [`${parsed.major}.x.ts`, `${parsed.major}.x/index.ts`]
+    });
+  } else {
+    checkLevels.push({
+      id: "tag",
+      candidates: [`${version}.ts`, `${version}/index.ts`]
+    });
+  }
+  const scriptsToRun = [];
+  for (const level of checkLevels) {
+    for (const candidate of level.candidates) {
+      if (manifest.includes(candidate)) {
+        scriptsToRun.push(candidate);
+        break;
+      }
+    }
+  }
+  if (scriptsToRun.length === 0) {
+    if (verbose) {
+      console.log(`No upgrade scripts found for ${version}`);
+    }
+    return;
+  }
+  ctx.preUpgradeMessage = "";
+  ctx.preUpgradeError = "";
+  for (const scriptName of scriptsToRun) {
+    task.output = `Found upgrade check script: ${scriptName}. Downloading...`;
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "cedar-upgrade-"));
+    const scriptPath = path.join(tempDir, "script.ts");
+    const isDirectoryScript = scriptName.includes("/");
+    if (isDirectoryScript) {
+      const dirName = scriptName.split("/")[0];
+      const githubApiUrl = `https://api.github.com/repos/cedarjs/cedar/contents/upgrade-scripts/${dirName}`;
+      try {
+        const dirRes = await fetch(githubApiUrl, {
+          headers: {
+            Accept: "application/vnd.github.v3+json"
+          }
+        });
+        if (dirRes.status !== 200) {
+          throw new Error(
+            `Failed to fetch directory contents: ${dirRes.statusText}`
+          );
+        }
+        const files = await dirRes.json();
+        for (const file of files) {
+          if (file.type === "file") {
+            task.output = `Downloading ${file.name}...`;
+            const fileRes = await fetch(file.download_url);
+            if (fileRes.status !== 200) {
+              throw new Error(`Failed to download ${file.name}`);
+            }
+            const fileContent = await fileRes.text();
+            const filePath = path.join(tempDir, file.name);
+            await fs.writeFile(filePath, fileContent);
+            if (file.name === "index.ts") {
+              await fs.rename(filePath, scriptPath);
+            }
+          }
+        }
+      } catch (e) {
+        if (verbose) {
+          console.error(e);
+        }
+        throw new Error(
+          `Failed to download upgrade script directory from ${githubApiUrl}`
+        );
+      }
+    } else {
+      const scriptUrl = `${baseUrl}${scriptName}`;
+      try {
+        const res = await fetch(scriptUrl);
+        if (res.status !== 200) {
+          throw new Error(`Failed to download script: ${res.statusText}`);
+        }
+        const scriptContent2 = await res.text();
+        await fs.writeFile(scriptPath, scriptContent2);
+      } catch (e) {
+        if (verbose) {
+          console.error(e);
+        }
+        throw new Error(`Failed to download upgrade script from ${scriptUrl}`);
+      }
+    }
+    const scriptContent = await fs.readFile(scriptPath, "utf8");
+    const deps = extractDependencies(scriptContent);
+    if (deps.length > 0) {
+      const depList = deps.join(", ");
+      task.output = `Installing dependencies for ${scriptName}: ${depList}...`;
+      await fs.writeJson(path.join(tempDir, "package.json"), {
+        name: "pre-upgrade-script",
+        version: "0.0.0",
+        dependencies: {}
+      });
+      await execa("yarn", ["add", ...deps], { cwd: tempDir });
+    }
+    task.output = `Running pre-upgrade script: ${scriptName}...`;
+    let shouldCleanup = true;
+    try {
+      const { stdout } = await execa(
+        "node",
+        ["script.ts", "--verbose", verbose, "--force", force],
+        { cwd: tempDir }
+      );
+      if (stdout) {
+        if (ctx.preUpgradeMessage) {
+          ctx.preUpgradeMessage += "\n\n";
+        }
+        ctx.preUpgradeMessage += `
+${stdout}`;
+      }
+    } catch (e) {
+      const errorOutput = e.stdout || e.stderr || e.message || "";
+      const errorMessage = `Pre-upgrade check ${scriptName} failed:
+${errorOutput}`;
+      if (ctx.preUpgradeError) {
+        ctx.preUpgradeError += "\n\n";
+      }
+      ctx.preUpgradeError += errorMessage;
+      if (!force) {
+        await fs.remove(tempDir);
+        shouldCleanup = false;
+        return;
+      }
+    } finally {
+      if (shouldCleanup) {
+        await fs.remove(tempDir);
+      }
+    }
+  }
+}
+const extractDependencies = (content) => {
+  const deps = /* @__PURE__ */ new Map();
+  const commentRegex = /\/\/\s*@dependency:\s*(\S+)/g;
+  let match;
+  while ((match = commentRegex.exec(content)) !== null) {
+    const spec = match[1];
+    const nameMatch = spec.match(/^(@?[^@\s]+)(?:@.+)?$/);
+    if (nameMatch) {
+      deps.set(nameMatch[1], spec);
+    }
+  }
+  const importRegex = /(?:import|from)\s*\(?['"]([^'"]+)['"]\)?/g;
+  while ((match = importRegex.exec(content)) !== null) {
+    let name = match[1];
+    if (name.startsWith(".") || name.startsWith("/") || name.startsWith("node:") || builtinModules.includes(name)) {
+      continue;
+    }
+    const parts = name.split("/");
+    if (name.startsWith("@") && parts.length >= 2) {
+      name = parts.slice(0, 2).join("/");
+    } else if (parts.length >= 1) {
+      name = parts[0];
+    }
+    if (!deps.has(name)) {
+      deps.set(name, name);
+    }
+  }
+  return Array.from(deps.values());
+};
 export {
   builder,
   command,
   description,
   handler,
+  runPreUpgradeScripts,
   validateTag
 };

package/dist/lib/exit.js

@@ -5,16 +5,12 @@ import {
   recordTelemetryAttributes,
   recordTelemetryError
 } from "@cedarjs/cli-helpers";
+const discordLink = terminalLink("Discord", "https://cedarjs.com/discord");
+const githubLink = terminalLink("GitHub", "https://github.com/cedarjs/cedar");
 const DEFAULT_ERROR_EPILOGUE = [
   "Need help?",
-  ` - Not sure about something or need advice? Reach out on our ${terminalLink(
-    "Forum",
-    "https://community.redwoodjs.com/"
-  )}`,
-  ` - Think you've found a bug? Open an issue on our ${terminalLink(
-    "GitHub",
-    "https://github.com/cedarjs/cedar"
-  )}`
+  ` - Not sure about something or need advice? Reach out on our ${discordLink}`,
+  ` - Think you've found a bug? Open an issue on our ${githubLink}`
 ].join("\n");
 function exitWithError(error, { exitCode, message, epilogue, includeEpilogue, includeReferenceCode } = {}) {
   exitCode ??= error?.exitCode ?? 1;
@@ -23,7 +19,7 @@ function exitWithError(error, { exitCode, message, epilogue, includeEpilogue, in
   includeReferenceCode ??= true;
   message ??= error.stack ?? (error.toString() || "Unknown error");
   const errorReferenceCode = uuidv4();
-  const line = ansis.red("-".repeat(process.stderr.columns));
+  const line = ansis.red("-".repeat(process.stderr.columns - 4));
   const content = !includeEpilogue ? message : [
     "",
     line,

package/dist/lib/index.js

@@ -17,9 +17,9 @@ import {
   resolveFile as internalResolveFile,
   findUp
 } from "@cedarjs/project-config";
+import { pluralize, singularize } from "./cedarPluralize.js";
 import c from "./colors.js";
 import { addFileToRollback } from "./rollback.js";
-import { pluralize, singularize } from "./rwPluralize.js";
 const { memoize, template } = lodash;
 const nameVariants = (name) => {
   const normalizedName = pascalcase(paramCase(singularize(name)));

package/dist/lib/pluralHelpers.js

@@ -1,5 +1,5 @@
 import prompts from "prompts";
-import { isSingular, isPlural, addSingularPlural } from "./rwPluralize.js";
+import { isSingular, isPlural, addSingularPlural } from "./cedarPluralize.js";
 const isWordPluralizable = (word) => {
   return isPlural(word) !== isSingular(word);
 };

package/dist/lib/schemaHelpers.js

@@ -1,7 +1,7 @@
 import prismaInternals from "@prisma/internals";
 import { getSchemaPath } from "@cedarjs/project-config";
+import { singularize, isPlural } from "./cedarPluralize.js";
 import { ensureUniquePlural } from "./pluralHelpers.js";
-import { singularize, isPlural } from "./rwPluralize.js";
 import { getPaths } from "./index.js";
 const { getConfig, getDMMF, getSchemaWithPath } = prismaInternals;
 const schemaMemo = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "2.2.0-rc.34",
+  "version": "2.2.0",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -11,9 +11,9 @@
   "type": "module",
   "bin": {
     "cedarjs": "./dist/index.js",
+    "cfw": "./dist/cfw.js",
     "redwood": "./dist/index.js",
-    "rw": "./dist/index.js",
-    "rwfw": "./dist/rwfw.js"
+    "rw": "./dist/index.js"
   },
   "files": [
     "dist"
@@ -23,7 +23,7 @@
     "build:pack": "yarn pack -o cedarjs-cli.tgz",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx,template\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
     "dev": "RWJS_CWD=../../__fixtures__/example-todo-main node dist/index.js",
-    "fix:permissions": "chmod +x dist/index.js dist/rwfw.js",
+    "fix:permissions": "chmod +x dist/index.js dist/cfw.js",
     "prepublishOnly": "yarn build",
     "test": "vitest run",
     "test:watch": "vitest watch"
@@ -31,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "2.2.0-rc.34",
-    "@cedarjs/cli-helpers": "2.2.0-rc.34",
-    "@cedarjs/fastify-web": "2.2.0-rc.34",
-    "@cedarjs/internal": "2.2.0-rc.34",
-    "@cedarjs/prerender": "2.2.0-rc.34",
-    "@cedarjs/project-config": "2.2.0-rc.34",
-    "@cedarjs/structure": "2.2.0-rc.34",
-    "@cedarjs/telemetry": "2.2.0-rc.34",
-    "@cedarjs/web-server": "2.2.0-rc.34",
+    "@cedarjs/api-server": "2.2.0",
+    "@cedarjs/cli-helpers": "2.2.0",
+    "@cedarjs/fastify-web": "2.2.0",
+    "@cedarjs/internal": "2.2.0",
+    "@cedarjs/prerender": "2.2.0",
+    "@cedarjs/project-config": "2.2.0",
+    "@cedarjs/structure": "2.2.0",
+    "@cedarjs/telemetry": "2.2.0",
+    "@cedarjs/web-server": "2.2.0",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -48,23 +48,23 @@
     "@opentelemetry/sdk-trace-node": "1.22.0",
     "@opentelemetry/semantic-conventions": "1.22.0",
     "@prisma/internals": "6.19.1",
-    "ansis": "4.1.0",
+    "ansis": "4.2.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
     "camelcase": "6.3.0",
     "change-case": "4.1.2",
-    "ci-info": "4.0.0",
+    "ci-info": "4.3.1",
     "concurrently": "8.2.2",
-    "configstore": "7.0.0",
-    "core-js": "3.42.0",
+    "configstore": "7.1.0",
+    "core-js": "3.47.0",
     "cross-env": "7.0.3",
     "decamelize": "6.0.1",
     "dotenv-defaults": "5.0.2",
     "enquirer": "2.4.1",
-    "envinfo": "7.14.0",
+    "envinfo": "7.21.0",
     "execa": "5.1.1",
     "fast-glob": "3.3.3",
-    "fs-extra": "11.2.0",
+    "fs-extra": "11.3.3",
     "humanize-string": "2.1.0",
     "jscodeshift": "17.0.0",
     "latest-version": "9.0.0",
@@ -76,14 +76,14 @@
     "prettier": "3.6.2",
     "prisma": "6.19.1",
     "prompts": "2.4.2",
-    "rimraf": "6.0.1",
-    "semver": "7.6.3",
-    "smol-toml": "1.3.4",
+    "rimraf": "6.1.2",
+    "semver": "7.7.3",
+    "smol-toml": "1.6.0",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.27.14",
+    "systeminformation": "5.27.17",
     "termi-link": "1.1.0",
     "title-case": "3.0.3",
-    "unionfs": "4.5.4",
+    "unionfs": "4.6.0",
     "uuid": "10.0.0",
     "vite-node": "3.2.4",
     "yargs": "17.7.2"
@@ -94,6 +94,7 @@
     "@types/archiver": "^6",
     "memfs": "4.51.1",
     "node-ssh": "13.2.1",
+    "ts-dedent": "2.2.0",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "vitest": "3.2.4"
@@ -101,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "406fc59c483c865428ad7ba0b5166364973f2377"
+  "gitHead": "9a8306e575225c25573303a8c80c57b2ab09fbd5"
 }