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

package/dist/commands/dev/devHandler.js

@@ -48,7 +48,8 @@ const handler = async ({
   apiDebugPort,
   debugBrk,
   ud = false,
-  nodeArgs = ""
+  nodeArgs = "",
+  jobs: jobsOption
 }) => {
   recordTelemetryAttributes({
     command: "dev",
@@ -206,6 +207,11 @@ const handler = async ({
       `  --apiPort ${apiAvailablePort}`,
       getApiDebugFlag(apiDebugPort, apiAvailablePort),
       debugBrk ? "--debug-brk" : "",
+      // `cedar-unified-dev` starts its own in-process jobs worker pool (see
+      // `jobsDevMiddleware.ts`) rather than relying on the nodemon-wrapped
+      // worker pushed below, so `--no-jobs` has to be forwarded explicitly -
+      // it isn't part of `forward` unless the user passed it after `--`.
+      jobsOption === false ? "--no-jobs" : "",
       forward
     ].join(" ").replace(/\s+/g, " ").trim();
   };
@@ -280,6 +286,37 @@ const handler = async ({
       prefixColor: "green"
     });
   }
+  const jobsConfigured = jobsOption !== false && workspace.includes("api") && !!cedarPaths.api.jobsConfig && // `getPaths()` resolves `jobsConfig` once and caches it in-process, so
+  // if `api/src/lib/jobs.ts` is deleted mid-session the cached path would
+  // otherwise still look "configured". Guard against starting a worker
+  // that can't load a jobs config that no longer exists.
+  fs.existsSync(cedarPaths.api.jobsConfig) && fs.existsSync(cedarPaths.api.jobs) && // Job files always live in `api/src/jobs/<ComponentName>Job/`
+  // subdirectories (see `generate/job/jobHandler.ts`), so entries here are
+  // directories, not files — only the `.keep` placeholder (and any stray
+  // dotfiles, e.g. `.DS_Store`) should be excluded.
+  fs.readdirSync(cedarPaths.api.jobs).some((entry) => !entry.startsWith("."));
+  if (jobsConfigured && unifiedDevCommand) {
+  } else if (jobsConfigured) {
+    jobs.push({
+      name: "jobs",
+      // `cedar-jobs work` loads its config and job files from `api/dist`
+      // (compiled output), not `api/src`. That dist output is only written
+      // once the `api` watcher's initial build finishes, which happens
+      // asynchronously — so on a clean `cedar dev` start there's a window
+      // where `api/dist` doesn't exist yet and the worker would exit
+      // immediately. Wrapping it in nodemon (same tool the `api` job above
+      // uses) means it retries as soon as `api/dist` changes, instead of
+      // staying dead for the rest of the session. This also means the
+      // worker restarts automatically whenever job code is rebuilt, since
+      // Node's ESM cache would otherwise keep serving stale job code.
+      command: formatRunBinCommand("nodemon", [
+        "--quiet",
+        `--watch "${cedarPaths.api.dist}"`,
+        `--exec "${formatRunBinCommand("cedar-jobs", ["work"])}"`
+      ]),
+      prefixColor: "magenta"
+    });
+  }
   const packageWorkspaces = workspace.filter(
     (w) => w !== "api" && w !== "web" && w !== "gen"
   );

package/dist/commands/dev.js

@@ -31,6 +31,9 @@ const builder = (yargs) => {
   }).option("nodeArgs", {
     type: "string",
     description: 'CLI args to pass to the node process running the web dev server, for example: `--node-args="--inspect --max-old-space-size=8192"`.'
+  }).option("jobs", {
+    type: "boolean",
+    description: "Start the background jobs worker alongside the other dev servers when jobs are configured (`cedar setup jobs` + at least one `cedar g job`). Pass `--no-jobs` to opt out and run `cedar jobs work` yourself instead."
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {

package/dist/commands/execHandler.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { context } from "@opentelemetry/api";
 import { suppressTracing } from "@opentelemetry/core";
 import { Listr } from "listr2";
+import { Parser } from "yargs/helpers";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { findScripts } from "@cedarjs/internal/dist/files";
 import { runScriptFunction } from "../lib/exec.js";
@@ -50,6 +51,17 @@ const handler = async (args) => {
   delete scriptArgs.l;
   delete scriptArgs.s;
   delete scriptArgs.silent;
+  if (Array.isArray(scriptArgs._)) {
+    const dashBlockIndex = scriptArgs._.findIndex(
+      (arg) => typeof arg === "string" && arg.startsWith("-")
+    );
+    if (dashBlockIndex !== -1) {
+      const unparsedTail = scriptArgs._.splice(dashBlockIndex);
+      const { _: reparsedPositionals, ...reparsedFlags } = Parser(unparsedTail);
+      scriptArgs._.push(...reparsedPositionals);
+      Object.assign(scriptArgs, reparsedFlags);
+    }
+  }
   const scriptPath = resolveScriptPath(name);
   if (!scriptPath) {
     console.error(

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

@@ -8,6 +8,7 @@ const files = async ({
   fileName,
   typescript,
   tests: generateTests = true,
+  esm = false,
   ...rest
 }) => {
   const extension = typescript ? ".ts" : ".js";
@@ -58,6 +59,17 @@ const files = async ({
       outputPath: path.join(folderName, "src", `${fileName}.test${extension}`)
     });
     outputFiles.push(testFile);
+    if (esm) {
+      const vitestConfigFile = await templateForFile({
+        name,
+        side: "packages",
+        generator: "package",
+        templatePath: "vitest.config.ts.template",
+        templateVars: { folderName, ...rest },
+        outputPath: path.join(folderName, `vitest.config${extension}`)
+      });
+      outputFiles.push(vitestConfigFile);
+    }
   }
   return outputFiles.reduce(async (accP, [outputPath, content]) => {
     const acc = await accP;

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

@@ -11,7 +11,7 @@ import { workspacePackageSpecifier } from "@cedarjs/cli-helpers/packageManager";
 import { runScript, runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { addWorkspaceDir } from "@cedarjs/cli-helpers/packageManager/workspaces";
-import { getConfig } from "@cedarjs/project-config";
+import { getConfig, projectIsEsm } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
@@ -32,8 +32,10 @@ async function updateTsconfig(task) {
       path: path.join(getPaths().api.base, "tsconfig.json"),
       expectedModule: "node20",
       // While Cedar doesn't officially endorse NodeNext, it will still work
-      // here, so we'll keep it
-      acceptable: ["node20", "nodenext"]
+      // here, so we'll keep it. ESNext is also acceptable: it's the current
+      // create-cedar-app default, paired with `moduleResolution: bundler` so
+      // extensionless scaffold/generator imports resolve correctly.
+      acceptable: ["node20", "nodenext", "esnext"]
     },
     {
       name: "web",
@@ -338,7 +340,12 @@ const handler = async ({
       {
         title: "Generating package files...",
         task: async (ctx) => {
-          packageFiles = await files({ ...ctx.nameVariants, ...rest });
+          packageFiles = await files({
+            ...ctx.nameVariants,
+            // Only Vitest projects get a config generated for them
+            esm: projectIsEsm(),
+            ...rest
+          });
           return writeFilesTask(packageFiles, { overwriteExisting: force });
         }
       },

package/dist/commands/generate/package/templates/test.ts.template

@@ -1,7 +1,7 @@
 import { ${camelName} } from './index.js'
 
 describe('${camelName}', () => {
-  it('should not throw any errors', async () => {
-    expect(${camelName}()).not.toThrow()
+  it('should not throw any errors', () => {
+    expect(() => ${camelName}()).not.toThrow()
   })
 })

package/dist/commands/generate/package/templates/vitest.config.ts.template

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    name: '${folderName}',
+    // Enables global test APIs like describe, it, expect
+    globals: true,
+  },
+})

package/dist/commands/generate/scaffold/scaffoldHandler.js

@@ -6,6 +6,7 @@ import humanize from "humanize-string";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import {
   addWorkspacePackages,
   removeWorkspacePackages
@@ -38,10 +39,14 @@ import {
 import { builder as sdlBuilder } from "../sdl/sdl.js";
 import {
   files as sdlFiles,
+  stubFiles as sdlStubFiles,
   printRedactedFieldsNote,
   redactedSensitiveFields
 } from "../sdl/sdlHandler.js";
-import { writeFilesWithStubsTask } from "../sdl/stubFiles.js";
+import {
+  missingRelatedModels,
+  writeFilesWithStubsTask
+} from "../sdl/stubFiles.js";
 import { builder as serviceBuilder } from "../service/service.js";
 import { files as serviceFiles } from "../service/serviceHandler.js";
 import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
@@ -630,22 +635,26 @@ const tasks = ({
   tests,
   typescript,
   javascript: _javascript,
-  tailwind
+  tailwind,
+  missingModels
 }) => {
   return new Listr(
     [
       {
         title: "Generating scaffold files...",
         task: async () => {
-          const f = await files({
-            docs,
-            model,
-            path: path2,
-            tests,
-            typescript,
-            tailwind,
-            force
-          });
+          const f = {
+            ...await files({
+              docs,
+              model,
+              path: path2,
+              tests,
+              typescript,
+              tailwind,
+              force
+            }),
+            ...await sdlStubFiles(missingModels, model, { docs, typescript })
+          };
           return writeFilesWithStubsTask(f, { overwriteExisting: force });
         }
       },
@@ -711,6 +720,7 @@ const handler = async ({
   tailwind = shouldUseTailwindCSS(tailwind);
   try {
     const { name } = await verifyModelName({ name: model });
+    const missingModels = await missingRelatedModels(name);
     const t = tasks({
       docs,
       model: name,
@@ -718,13 +728,44 @@ const handler = async ({
       force,
       tests,
       typescript,
-      tailwind
+      tailwind,
+      missingModels
     });
     if (rollback && !force) {
       prepareForRollback(t);
     }
     await t.run();
-    printRedactedFieldsNote(await redactedSensitiveFields([name]));
+    if (missingModels.length > 0) {
+      console.log();
+      console.log(
+        c.info(
+          `${name} has relations to models that don't have SDL files of their own yet: ${missingModels.join(", ")}`
+        )
+      );
+      console.log(
+        c.info(
+          "Read-only SDL stubs were generated for them, since GraphQL type generation fails otherwise."
+        )
+      );
+      console.log(
+        c.info("To replace a stub, run one of the following for each model:")
+      );
+      for (const stubModel of missingModels) {
+        console.log(
+          c.info(
+            `  ${formatCedarCommand(["generate", "sdl", stubModel])} (SDL + service only)`
+          )
+        );
+        console.log(
+          c.info(
+            `  ${formatCedarCommand(["generate", "scaffold", stubModel])} (adds pages, cells, and forms too)`
+          )
+        );
+      }
+    }
+    printRedactedFieldsNote(
+      await redactedSensitiveFields([name, ...missingModels])
+    );
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     const exitCode = e instanceof Error && "exitCode" in e ? e.exitCode ?? 1 : 1;

package/dist/commands/generate/script/templates/script.ts.template

@@ -3,12 +3,17 @@
 // To access your database uncomment the line below
 // import { db } from 'api/src/lib/db'
 
-interface Args {
-  _: string[]
-  [key: string]: unknown
+interface ScriptArgs {
+  args: {
+    // positional args, e.g. `yarn cedar exec myScript foo 123` -> ['foo', 123]
+    // numeric-looking args are parsed as numbers, others as strings
+    _: Array<string | number>
+    // named flags, e.g. `--force` -> { force: true }
+    [flag: string]: unknown
+  }
 }
 
-export default async ({ args }: Args) => {
+export default async ({ args }: ScriptArgs) => {
   // Your script here...
   console.log(':: Executing script with args ::')
   console.log(args)

package/dist/commands/serve.js

@@ -107,7 +107,7 @@ const builder = async (yargs) => {
         const webHost = argv.webHost ?? getWebHost({ isPublicSide: true });
         const apiRootPath = argv.apiRootPath ?? "/";
         const apiTarget = `http://${apiHost.includes(":") ? `[${apiHost}]` : apiHost}:${apiPort}`;
-        const { serveStatic } = await import("srvx/static");
+        const { staticMiddleware } = await import("srvx/static");
         const apiUrl = getConfig().web.apiUrl;
         const webDist = getPaths().web.dist;
         const prerenderIndexPath = path.join(webDist, "200.html");
@@ -117,7 +117,7 @@ const builder = async (yargs) => {
           // Dummy fetch handler. All requests are handled by middleware
           fetch: async () => new Response("Not Found", { status: 404 }),
           middleware: [
-            serveStatic({ dir: webDist }),
+            staticMiddleware({ dir: webDist }),
             async (req, next) => {
               const url = new URL(req.url, "http://localhost");
               if (!url.pathname.startsWith(apiUrl)) {

package/dist/commands/setup/deploy/providers/renderHandler.js

@@ -1,12 +1,14 @@
 import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
+import prompts from "prompts";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";
 import { POSTGRES_YAML, RENDER_YAML, SQLITE_YAML } from "../templates/render.js";
 const { getConfig } = prismaInternals;
+const SQLITE_API_PLAN = "starter";
 const getRenderYamlContent = async (database) => {
   if (database === "none") {
     return {
@@ -27,7 +29,7 @@ const getRenderYamlContent = async (database) => {
       case "sqlite":
         return {
           path: path.join(getPaths().base, "render.yaml"),
-          content: RENDER_YAML(SQLITE_YAML)
+          content: RENDER_YAML(SQLITE_YAML, SQLITE_API_PLAN)
         };
       default:
         throw new Error(`
@@ -61,6 +63,26 @@ const handler = async ({
     force,
     database
   });
+  if (database === "sqlite") {
+    console.warn(
+      c.warning(
+        `Render's free plan doesn't support persistent disks, which the \`sqlite\` deploy option requires for its database file. The generated render.yaml will set the api service's plan to "${SQLITE_API_PLAN}" (a paid plan) instead of "free" so the disk can actually attach.
+
+If you want to stay on the free plan, rerun this command with \`--database postgresql\` (a managed database, not a disk) or \`--database none\`.`
+      )
+    );
+    console.log();
+    const { confirmed } = await prompts({
+      type: "confirm",
+      name: "confirmed",
+      message: `Generate render.yaml with the api service on the "${SQLITE_API_PLAN}" plan?`
+    });
+    if (!confirmed) {
+      console.log("Aborting render setup.");
+      return;
+    }
+    console.log();
+  }
   const tasks = new Listr(
     [
       {

package/dist/commands/setup/deploy/templates/render.js

@@ -2,7 +2,7 @@ import path from "path";
 import { getPaths } from "../../../../lib/index.js";
 import { getUserApiUrl } from "../helpers/index.js";
 const PROJECT_NAME = path.basename(getPaths().base);
-const RENDER_YAML = (database) => {
+const RENDER_YAML = (database, plan = "free") => {
   const apiUrl = getUserApiUrl().replace(/\/$/, "");
   return `# Quick links to the docs:
 # - Deploying Cedar: https://cedarjs.com/docs/deploy/render
@@ -41,7 +41,7 @@ services:
 
 - name: ${PROJECT_NAME}-api
   type: web
-  plan: free
+  plan: ${plan}
   runtime: node
   region: oregon
   buildCommand: npm install --global corepack && yarn install && yarn cedar build api
@@ -69,9 +69,12 @@ const POSTGRES_YAML = `  - key: DATABASE_URL
 
 databases:
   - name: ${PROJECT_NAME}-db
+    plan: free
     region: oregon`;
 const SQLITE_YAML = `  - key: DATABASE_URL
     value: file:./data/sqlite.db
+  # Persistent disks aren't available on Render's free plan, which is why
+  # the api service above is on a paid plan when SQLite is selected.
   disk:
     name: sqlite-data
     mountPath: /opt/render/project/src/api/db/data

package/dist/commands/setup/neon/neon.js

@@ -7,15 +7,25 @@ function builder(yargs) {
     default: false,
     description: "Overwrite existing DATABASE_URL in .env",
     type: "boolean"
+  }).option("migrations", {
+    description: "Run Prisma migrations after setup. Omit to be prompted. Use --no-migrations to skip.",
+    type: "boolean"
+  }).option("verbose", {
+    alias: "v",
+    default: false,
+    description: "Show full output from migration commands (stderr visible in terminal)",
+    type: "boolean"
   });
 }
-async function handler({ force }) {
+async function handler({ force, migrations, verbose }) {
   recordTelemetryAttributes({
     command: "setup neon",
-    force
+    force,
+    migrations,
+    verbose
   });
   const { handler: handler2 } = await import("./neonHandler.js");
-  return handler2({ force });
+  return handler2({ force, migrations, verbose });
 }
 export {
   builder,

package/dist/commands/setup/neon/neonHandler.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
+import prompts from "prompts";
 import { colors, getPaths, installPackages } from "@cedarjs/cli-helpers";
 import { prettyPrintCedarCommand } from "@cedarjs/cli-helpers/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
@@ -25,7 +26,7 @@ function isPostgresConnectionString(rawValue) {
     return false;
   }
 }
-async function handler({ force }) {
+async function handler({ force, migrations, verbose }) {
   const cedarPaths = getPaths();
   const shape = checkProjectShape(cedarPaths);
   if (!shape.ok) {
@@ -51,6 +52,29 @@ async function handler({ force }) {
       )
     );
   }
+  let runMigrations = migrations;
+  if (!skipProvisioning && runMigrations === void 0) {
+    if (!process.stdin.isTTY) {
+      const error = new Error(
+        "Cannot prompt for confirmation in a non-interactive terminal. Please pass --migrations or --no-migrations explicitly."
+      );
+      errorTelemetry(process.argv, error.message);
+      console.error(colors.error(error.message));
+      process.exit(1);
+    }
+    const response = await prompts({
+      type: "toggle",
+      name: "runMigrations",
+      message: "Run Prisma migrations now?",
+      initial: true,
+      active: "Yes",
+      inactive: "No"
+    });
+    if (response.runMigrations === void 0) {
+      process.exit(0);
+    }
+    runMigrations = response.runMigrations;
+  }
   const tasks = new Listr(
     [
       ...getSqliteToPostgresTasks({ dbPath: shape.dbPath }),
@@ -124,6 +148,9 @@ async function handler({ force }) {
           if (skipProvisioning) {
             return true;
           }
+          if (!runMigrations) {
+            return migrations === false ? "Skipped (--no-migrations)" : "Skipped";
+          }
           if (ctx.directDatabaseUrlNotSet) {
             return `Skipping migrations \u2014 could not confirm prisma.config is reading DIRECT_DATABASE_URL, so migrations could target the wrong database. Fix datasource.url, then run \`${prettyPrintCedarCommand(["prisma", "migrate", "dev"])}\` manually.`;
           }
@@ -134,7 +161,7 @@ async function handler({ force }) {
             "yarn cedar prisma migrate dev --name init-neon",
             {
               cwd: cedarPaths.base,
-              stdio: ["inherit", "inherit", "pipe"],
+              stdio: verbose ? "inherit" : ["inherit", "inherit", "pipe"],
               reject: false,
               env: {
                 ...process.env,
@@ -144,7 +171,8 @@ async function handler({ force }) {
           );
           if (result.exitCode !== 0) {
             throw new Error(
-              "Prisma migration failed:\n\n" + result.stderr + `
+              verbose ? `Prisma migration failed. You can try running it manually:
+  ${prettyPrintCedarCommand(["prisma", "migrate", "dev", "--name", "init-neon"])}` : "Prisma migration failed:\n\n" + result.stderr + `
 
 You can try running it manually:
   ${prettyPrintCedarCommand(["prisma", "migrate", "dev", "--name", "init-neon"])}`

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/test/testHandlerEsm.js

@@ -59,10 +59,10 @@ const handler = async ({
     vitestArgs.push("--run");
   }
   if (!others["config"]) {
+    sides.forEach((side) => vitestArgs.push("--project", side));
     if (!sides.length) {
       project.workspaces().forEach((side) => sides.push(side));
     }
-    sides.forEach((side) => vitestArgs.push("--project", side));
   }
   try {
     const cacheDirDb = `file:${ensurePosixPath(

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.260",
+  "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.260",
-    "@cedarjs/babel-config": "6.0.0-rc.260",
-    "@cedarjs/cli-helpers": "6.0.0-rc.260",
-    "@cedarjs/internal": "6.0.0-rc.260",
-    "@cedarjs/prerender": "6.0.0-rc.260",
-    "@cedarjs/project-config": "6.0.0-rc.260",
-    "@cedarjs/structure": "6.0.0-rc.260",
-    "@cedarjs/telemetry": "6.0.0-rc.260",
-    "@cedarjs/utils": "6.0.0-rc.260",
-    "@cedarjs/vite": "6.0.0-rc.260",
-    "@cedarjs/web-server": "6.0.0-rc.260",
+    "@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",
@@ -82,11 +82,11 @@
     "prettier": "3.8.4",
     "prisma": "7.8.0",
     "prompts": "2.4.2",
-    "semver": "7.7.4",
-    "smol-toml": "1.6.1",
-    "srvx": "0.11.16",
+    "semver": "7.8.5",
+    "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,10 +94,10 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-rc.260",
+    "@cedarjs/framework-tools": "6.0.0-rc.340",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
-    "memfs": "4.64.0",
+    "memfs": "4.68.1",
     "node-ssh": "13.2.1",
     "ts-dedent": "2.3.0",
     "typescript": "5.9.3",