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

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,11 +11,11 @@ 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";
-import { prepareForRollback } from "../../../lib/rollback.js";
+import { addFileToRollback, prepareForRollback } from "../../../lib/rollback.js";
 import { files } from "./filesTask.js";
 function nameVariants(nameArg) {
   const base = path.basename(getPaths().base);
@@ -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",
@@ -246,6 +248,9 @@ function updateWorkspaceTsconfigReferences(task, folderName, targetWorkspaces) {
 async function installAndBuild(folderName) {
   const packagePath = path.join("packages", folderName);
   await installPackages({ stdio: "inherit", cwd: getPaths().base });
+  addFileToRollback(
+    path.join(getPaths().base, packagePath, "tsconfig.tsbuildinfo")
+  );
   await runScript("build", [], { stdio: "inherit", cwd: packagePath });
 }
 const handler = async ({
@@ -335,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/monitoring/sentry/sentryHandler.js

@@ -90,15 +90,20 @@ const handler = async ({ force }) => {
       title: "Replacing Redwood's Error boundary",
       task: async () => {
         const contentLines = fs.readFileSync(rwPaths.web.app).toString().split("\n");
+        const webImportRe = /^import \{ FatalErrorBoundary, ((?:Cedar|Redwood)Provider) \} from '@cedarjs\/web'$/;
         const webImportIndex = contentLines.findLastIndex(
-          (line) => /^import { FatalErrorBoundary, RedwoodProvider } from '@cedarjs\/web'$/.test(
-            line
-          )
+          (line) => webImportRe.test(line)
         );
+        if (webImportIndex === -1) {
+          throw new Error(
+            `Could not find "import { FatalErrorBoundary, CedarProvider } from '@cedarjs/web'" in web/src/App`
+          );
+        }
+        const providerName = contentLines[webImportIndex].match(webImportRe)?.[1];
         contentLines.splice(
           webImportIndex,
           1,
-          "import { RedwoodProvider } from '@cedarjs/web'"
+          `import { ${providerName} } from '@cedarjs/web'`
         );
         const boundaryOpenIndex = contentLines.findLastIndex(
           (line) => line.includes("<FatalErrorBoundary page={FatalErrorPage}>")

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";
@@ -9,7 +10,23 @@ import {
   checkProjectShape,
   getSqliteToPostgresTasks
 } from "../database/postgresHandler.js";
-async function handler({ force }) {
+function isPostgresConnectionString(rawValue) {
+  let value = rawValue.trim();
+  const quoted = value.match(/^(['"])(.*)\1$/);
+  if (quoted) {
+    value = quoted[2];
+  }
+  if (!value) {
+    return false;
+  }
+  try {
+    const url = new URL(value);
+    return (url.protocol === "postgres:" || url.protocol === "postgresql:") && !!url.hostname;
+  } catch {
+    return false;
+  }
+}
+async function handler({ force, migrations, verbose }) {
   const cedarPaths = getPaths();
   const shape = checkProjectShape(cedarPaths);
   if (!shape.ok) {
@@ -23,9 +40,8 @@ async function handler({ force }) {
   const envPath = path.join(cedarPaths.base, ".env");
   let hasExistingDatabaseUrl = false;
   if (fs.existsSync(envPath)) {
-    hasExistingDatabaseUrl = /^DATABASE_URL=/m.test(
-      fs.readFileSync(envPath, "utf-8")
-    );
+    const match = fs.readFileSync(envPath, "utf-8").match(/^DATABASE_URL=(.*)$/m);
+    hasExistingDatabaseUrl = !!match?.[1] && isPostgresConnectionString(match[1]);
   }
   const skipProvisioning = hasExistingDatabaseUrl && !force;
   const notes = [];
@@ -36,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 }),
@@ -109,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.`;
           }
@@ -119,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,
@@ -129,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"])}`
@@ -152,13 +195,11 @@ You can try running it manually:
           let envContent = "";
           if (fs.existsSync(envPath)) {
             envContent = fs.readFileSync(envPath, "utf-8");
-            if (force) {
-              const lines = envContent.split("\n");
-              const filtered = lines.filter(
-                (line) => !line.startsWith("DATABASE_URL=") && !line.startsWith("DIRECT_DATABASE_URL=")
-              );
-              envContent = filtered.join("\n").trimEnd();
-            }
+            const lines = envContent.split("\n");
+            const filtered = lines.filter(
+              (line) => !line.startsWith("DATABASE_URL=") && !line.startsWith("DIRECT_DATABASE_URL=")
+            );
+            envContent = filtered.join("\n").trimEnd();
             if (envContent && !envContent.endsWith("\n")) {
               envContent += "\n";
             }

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

@@ -54,7 +54,9 @@ async function handler({
           insertComponent: {
             name: "ChakraProvider",
             props: { theme: "extendedTheme" },
-            within: "RedwoodProvider",
+            // Older projects (created before CedarProvider replaced the
+            // deprecated RedwoodProvider) may still use RedwoodProvider.
+            within: "CedarProvider|RedwoodProvider",
             insertBefore: "<ColorModeScript />"
           },
           imports: [

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

@@ -77,7 +77,9 @@ async function handler({
           insertComponent: {
             name: "MantineProvider",
             props: { theme: "theme" },
-            within: "RedwoodProvider"
+            // Older projects (created before CedarProvider replaced the
+            // deprecated RedwoodProvider) may still use RedwoodProvider.
+            within: "CedarProvider|RedwoodProvider"
           },
           imports: [
             "import { MantineProvider } from '@mantine/core'",

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/lib/extendFile.js

@@ -56,7 +56,7 @@ function insertComponent(content, {
       "Exactly one of (around | within) must be defined. Choose one."
     );
   }
-  const target = around ?? within;
+  const target = `(?:${around ?? within})`;
   const findTagIndex = (regex) => content.findIndex((line) => regex.test(line));
   let open = findTagIndex(new RegExp(`([^\\S\r
 ]*)<${target}\\s*(.*)\\s*>`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-rc.241",
+  "version": "6.0.0-rc.312",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-rc.241",
-    "@cedarjs/babel-config": "6.0.0-rc.241",
-    "@cedarjs/cli-helpers": "6.0.0-rc.241",
-    "@cedarjs/internal": "6.0.0-rc.241",
-    "@cedarjs/prerender": "6.0.0-rc.241",
-    "@cedarjs/project-config": "6.0.0-rc.241",
-    "@cedarjs/structure": "6.0.0-rc.241",
-    "@cedarjs/telemetry": "6.0.0-rc.241",
-    "@cedarjs/utils": "6.0.0-rc.241",
-    "@cedarjs/vite": "6.0.0-rc.241",
-    "@cedarjs/web-server": "6.0.0-rc.241",
+    "@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",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -82,9 +82,9 @@
     "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",
     "termi-link": "1.1.0",
@@ -94,10 +94,10 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-rc.241",
+    "@cedarjs/framework-tools": "6.0.0-rc.312",
     "@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",