@cedarjs/cli 6.0.0-canary.2873 → 6.0.0-canary.2875

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/uploads/uploadsHandler.js

@@ -15,9 +15,10 @@ import { isTypeScriptProject } from "../../../lib/project.js";
 import { runTransform } from "../../../lib/runTransform.js";
 const handler = async ({ force }) => {
   const projectIsTypescript = isTypeScriptProject();
-  const redwoodVersion = await import(path.join(getPaths().base, "package.json"), {
-    with: { type: "json " }
-  }).default.devDependencies["@cedarjs/core"] ?? "latest";
+  const packageJson = await import(path.join(getPaths().base, "package.json"), {
+    with: { type: "json" }
+  });
+  const cedarVersion = packageJson.default.devDependencies["@cedarjs/core"] ?? "latest";
   const tasks = new Listr(
     [
       {
@@ -65,7 +66,7 @@ const handler = async ({ force }) => {
         }
       },
       {
-        ...addApiPackages([`@cedarjs/storage@${redwoodVersion}`]),
+        ...addApiPackages([`@cedarjs/storage@${cedarVersion}`]),
         title: "Adding dependencies to your api side..."
       },
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2873",
+  "version": "6.0.0-canary.2875",
   "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-canary.2873",
-    "@cedarjs/babel-config": "6.0.0-canary.2873",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2873",
-    "@cedarjs/internal": "6.0.0-canary.2873",
-    "@cedarjs/prerender": "6.0.0-canary.2873",
-    "@cedarjs/project-config": "6.0.0-canary.2873",
-    "@cedarjs/structure": "6.0.0-canary.2873",
-    "@cedarjs/telemetry": "6.0.0-canary.2873",
-    "@cedarjs/utils": "6.0.0-canary.2873",
-    "@cedarjs/vite": "6.0.0-canary.2873",
-    "@cedarjs/web-server": "6.0.0-canary.2873",
+    "@cedarjs/api-server": "6.0.0-canary.2875",
+    "@cedarjs/babel-config": "6.0.0-canary.2875",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2875",
+    "@cedarjs/internal": "6.0.0-canary.2875",
+    "@cedarjs/prerender": "6.0.0-canary.2875",
+    "@cedarjs/project-config": "6.0.0-canary.2875",
+    "@cedarjs/structure": "6.0.0-canary.2875",
+    "@cedarjs/telemetry": "6.0.0-canary.2875",
+    "@cedarjs/utils": "6.0.0-canary.2875",
+    "@cedarjs/vite": "6.0.0-canary.2875",
+    "@cedarjs/web-server": "6.0.0-canary.2875",
     "@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-canary.2873",
+    "@cedarjs/framework-tools": "6.0.0-canary.2875",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.64.0",