@cedarjs/cli 6.0.0-rc.312 → 6.0.0-rc.340

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

@@ -83,7 +83,7 @@ const handler = async ({ force }) => {
           if (transformResult.error) {
             if (transformResult.error === "RW_CODEMOD_ERR_OLD_FORMAT") {
               throw new Error(
-                "It looks like your src/lib/db file is using the old format. Please update it as per the v8 upgrade guide: https://cedarjs.com/docs/upgrade-guides/v8#database-file-structure-change. And run again. \n\nYou can also manually modify your api/src/lib/db to include the prisma extension: https://cedarjs.com/docs/uploads/#attaching-the-prisma-extension"
+                "It looks like your src/lib/db file is using the old format. Please update it as per the v8 upgrade guide: https://cedarjs.com/docs/8.x/upgrade-guides/v8#database-file-structure-change. And run again. \n\nYou can also manually modify your api/src/lib/db to include the prisma extension: https://cedarjs.com/docs/uploads/#attaching-the-prisma-extension"
               );
             }
             throw new Error(

package/dist/commands/upgrade/preUpgradeScripts.js

@@ -4,6 +4,7 @@ import os from "node:os";
 import path from "node:path";
 import execa from "execa";
 import semver from "semver";
+const MAIN_BRANCH_PRERELEASE_TAGS = ["canary"];
 function isExecaError(e) {
   return e instanceof Error && ("stdout" in e || "stderr" in e || "exitCode" in e);
 }
@@ -33,8 +34,15 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
   if (!Array.isArray(manifest) || manifest.length === 0) {
     return;
   }
+  const prereleaseTag = parsed?.prerelease[0];
+  const isMainBranchPrerelease = typeof prereleaseTag === "string" && MAIN_BRANCH_PRERELEASE_TAGS.includes(prereleaseTag);
   const checkLevels = [];
-  if (parsed && !parsed.prerelease.length) {
+  if (parsed && isMainBranchPrerelease) {
+    checkLevels.push({
+      id: "tag",
+      candidates: [`${prereleaseTag}.ts`, `${prereleaseTag}/index.ts`]
+    });
+  } else if (parsed) {
     checkLevels.push({
       id: "exact",
       candidates: [`${version}.ts`, `${version}/index.ts`]
@@ -50,14 +58,6 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
       id: "minor",
       candidates: [`${parsed.major}.x.ts`, `${parsed.major}.x/index.ts`]
     });
-  } else if (parsed && parsed.prerelease.length > 0) {
-    checkLevels.push({
-      id: "tag",
-      candidates: [
-        `${parsed.prerelease[0]}.ts`,
-        `${parsed.prerelease[0]}/index.ts`
-      ]
-    });
   }
   const scriptsToRun = [];
   for (const level of checkLevels) {

package/dist/commands/upgrade/upgradeHandler.js

@@ -33,6 +33,7 @@ const handler = async (upgradeOptions) => {
   });
   let preUpgradeMessage = "";
   let preUpgradeError = "";
+  const notBlockedByPreUpgradeChecks = (ctx) => force || !ctx.preUpgradeError;
   const tasks = new Listr(
     [
       {
@@ -87,39 +88,46 @@ const handler = async (upgradeOptions) => {
       {
         title: "Updating your CedarJS version",
         task: (ctx) => updateCedarJSDepsForAllSides(ctx, { dryRun, verbose }),
-        enabled: (ctx) => !!ctx.versionToUpgradeTo && !ctx.preUpgradeError
+        enabled: (ctx) => !!ctx.versionToUpgradeTo && notBlockedByPreUpgradeChecks(ctx)
       },
       {
         title: "Updating other packages in your package.json(s)",
         task: (ctx) => updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }),
-        enabled: (ctx) => String(ctx.versionToUpgradeTo).includes("canary") && !ctx.preUpgradeError
+        // Canary only. This forces the template's dependency versions onto the
+        // project and adds back any the project is missing, which resurrects
+        // packages people have deliberately removed — a project that moved off
+        // SQLite gets better-sqlite3 back, for example. That's too blunt for
+        // regular upgrades, but people running canary are already signed up
+        // for rougher edges.
+        // https://github.com/redwoodjs/redwood/pull/8855
+        enabled: (ctx) => String(ctx.versionToUpgradeTo).includes("canary") && notBlockedByPreUpgradeChecks(ctx)
       },
       {
         title: "Downloading yarn patches",
         task: (ctx) => downloadYarnPatches(ctx, { dryRun, verbose }),
-        enabled: (ctx) => String(ctx.versionToUpgradeTo).includes("canary") && !ctx.preUpgradeError
+        enabled: (ctx) => String(ctx.versionToUpgradeTo).includes("canary") && notBlockedByPreUpgradeChecks(ctx)
       },
       {
         title: "Removing CLI cache",
         task: () => removeCliCache({ dryRun, verbose }),
-        enabled: (ctx) => !ctx.preUpgradeError
+        enabled: (ctx) => notBlockedByPreUpgradeChecks(ctx)
       },
       {
         title: `Running ${getPackageManager()} ${install()}`,
         task: () => packageManagerInstall({ verbose }),
-        enabled: (ctx) => !ctx.preUpgradeError,
+        enabled: (ctx) => notBlockedByPreUpgradeChecks(ctx),
         skip: () => !!dryRun
       },
       {
         title: "Refreshing the Prisma client",
         task: (_ctx, task) => refreshPrismaClient(task, { verbose }),
-        enabled: (ctx) => !ctx.preUpgradeError,
+        enabled: (ctx) => notBlockedByPreUpgradeChecks(ctx),
         skip: () => !!dryRun
       },
       {
         title: "De-duplicating dependencies",
         skip: () => !!dryRun || !dedupe2,
-        enabled: (ctx) => dedupeIsSupported() && !ctx.preUpgradeError,
+        enabled: (ctx) => dedupeIsSupported() && notBlockedByPreUpgradeChecks(ctx),
         task: (_ctx, task) => dedupeDeps(task, { verbose })
       },
       {
@@ -303,6 +311,22 @@ function updateCedarJSDepsForAllSides(ctx, options) {
     })
   );
 }
+function mergeTemplateDependencies(field, templatePackageJson, localPackageJson, messages, { dryRun, verbose } = {}) {
+  const templateDeps = templatePackageJson[field];
+  if (!templateDeps) {
+    return;
+  }
+  for (const [depName, depVersion] of Object.entries(templateDeps)) {
+    if (depName.startsWith("@cedarjs/")) {
+      continue;
+    }
+    const localDeps = localPackageJson[field] ??= {};
+    if (verbose || dryRun) {
+      messages.push(` - ${depName}: ${localDeps[depName]} => ${depVersion}`);
+    }
+    localDeps[depName] = depVersion;
+  }
+}
 async function updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }) {
   if (!ctx.versionToUpgradeTo) {
     throw new Error("Failed to upgrade");
@@ -338,30 +362,15 @@ async function updatePackageVersionsFromTemplate(ctx, { dryRun, verbose }) {
           const localPackageJsonText = fs.readFileSync(pkgJsonPath, "utf-8");
           const localPackageJson = JSON.parse(localPackageJsonText);
           const messages = [];
-          Object.entries(templatePackageJson.dependencies || {}).forEach(
-            ([depName, depVersion]) => {
-              if (!depName.startsWith("@cedarjs/")) {
-                if (verbose || dryRun) {
-                  messages.push(
-                    ` - ${depName}: ${localPackageJson.dependencies[depName]} => ${depVersion}`
-                  );
-                }
-                localPackageJson.dependencies[depName] = depVersion;
-              }
-            }
-          );
-          Object.entries(templatePackageJson.devDependencies || {}).forEach(
-            ([depName, depVersion]) => {
-              if (!depName.startsWith("@cedarjs/")) {
-                if (verbose || dryRun) {
-                  messages.push(
-                    ` - ${depName}: ${localPackageJson.devDependencies[depName]} => ${depVersion}`
-                  );
-                }
-                localPackageJson.devDependencies[depName] = depVersion;
-              }
-            }
-          );
+          for (const field of ["dependencies", "devDependencies"]) {
+            mergeTemplateDependencies(
+              field,
+              templatePackageJson,
+              localPackageJson,
+              messages,
+              { dryRun, verbose }
+            );
+          }
           if (messages.length > 0) {
             task.title = task.title + "\n" + messages.join("\n");
           }
@@ -469,5 +478,6 @@ async function dedupeDeps(_task, { verbose }) {
   await packageManagerInstall({ verbose });
 }
 export {
-  handler
+  handler,
+  mergeTemplateDependencies
 };

package/dist/lib/background.js

@@ -3,6 +3,23 @@ import fs from "node:fs";
 import os from "os";
 import path from "path";
 import { getPaths } from "@cedarjs/project-config";
+function quoteForWindowsShell(arg) {
+  let quoted = '"';
+  let backslashes = 0;
+  for (const char of arg) {
+    if (char === "\\") {
+      backslashes += 1;
+      continue;
+    }
+    if (char === '"') {
+      quoted += "\\".repeat(backslashes * 2 + 1) + '"';
+    } else {
+      quoted += "\\".repeat(backslashes) + char;
+    }
+    backslashes = 0;
+  }
+  return quoted + "\\".repeat(backslashes * 2) + '"';
+}
 function spawnBackgroundProcess(name, cmd, args) {
   const logDirectory = path.join(getPaths().generated.base, "logs");
   fs.mkdirSync(logDirectory, { recursive: true });
@@ -37,7 +54,8 @@ function spawnBackgroundProcess(name, cmd, args) {
       shell: true,
       stdio: ["ignore", stdout, stderr]
     };
-    const child = spawn(cmd + " " + args.join(" "), spawnOptions);
+    const command = [cmd, ...args].map(quoteForWindowsShell).join(" ");
+    const child = spawn(command, spawnOptions);
     child.unref();
   } else {
     const spawnOptions = {
@@ -51,5 +69,6 @@ function spawnBackgroundProcess(name, cmd, args) {
   fs.closeSync(stderr);
 }
 export {
+  quoteForWindowsShell,
   spawnBackgroundProcess
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-rc.312",
+  "version": "6.0.0-rc.340",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -32,21 +32,21 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
-    "@babel/parser": "7.29.7",
+    "@babel/parser": "7.29.8",
     "@babel/preset-typescript": "7.29.7",
-    "@babel/traverse": "7.29.7",
-    "@babel/types": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-rc.312",
-    "@cedarjs/babel-config": "6.0.0-rc.312",
-    "@cedarjs/cli-helpers": "6.0.0-rc.312",
-    "@cedarjs/internal": "6.0.0-rc.312",
-    "@cedarjs/prerender": "6.0.0-rc.312",
-    "@cedarjs/project-config": "6.0.0-rc.312",
-    "@cedarjs/structure": "6.0.0-rc.312",
-    "@cedarjs/telemetry": "6.0.0-rc.312",
-    "@cedarjs/utils": "6.0.0-rc.312",
-    "@cedarjs/vite": "6.0.0-rc.312",
-    "@cedarjs/web-server": "6.0.0-rc.312",
+    "@babel/traverse": "7.29.8",
+    "@babel/types": "7.29.8",
+    "@cedarjs/api-server": "6.0.0-rc.340",
+    "@cedarjs/babel-config": "6.0.0-rc.340",
+    "@cedarjs/cli-helpers": "6.0.0-rc.340",
+    "@cedarjs/internal": "6.0.0-rc.340",
+    "@cedarjs/prerender": "6.0.0-rc.340",
+    "@cedarjs/project-config": "6.0.0-rc.340",
+    "@cedarjs/structure": "6.0.0-rc.340",
+    "@cedarjs/telemetry": "6.0.0-rc.340",
+    "@cedarjs/utils": "6.0.0-rc.340",
+    "@cedarjs/vite": "6.0.0-rc.340",
+    "@cedarjs/web-server": "6.0.0-rc.340",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -86,7 +86,7 @@
     "smol-toml": "1.8.0",
     "srvx": "0.12.5",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.31.7",
+    "systeminformation": "5.33.1",
     "termi-link": "1.1.0",
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-rc.312",
+    "@cedarjs/framework-tools": "6.0.0-rc.340",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.1",