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

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

@@ -15,7 +15,7 @@ import { getConfig } 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);
@@ -246,6 +246,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 ({

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/neonHandler.js

@@ -9,6 +9,22 @@ import {
   checkProjectShape,
   getSqliteToPostgresTasks
 } from "../database/postgresHandler.js";
+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 }) {
   const cedarPaths = getPaths();
   const shape = checkProjectShape(cedarPaths);
@@ -23,9 +39,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 = [];
@@ -152,13 +167,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/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.260",
   "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.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",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-rc.241",
+    "@cedarjs/framework-tools": "6.0.0-rc.260",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.64.0",