@cedarjs/cli 6.0.0-canary.2968 → 6.0.0-canary.2973

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/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-canary.2968",
+  "version": "6.0.0-canary.2973",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "6.0.0-canary.2968",
-    "@cedarjs/babel-config": "6.0.0-canary.2968",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2968",
-    "@cedarjs/internal": "6.0.0-canary.2968",
-    "@cedarjs/prerender": "6.0.0-canary.2968",
-    "@cedarjs/project-config": "6.0.0-canary.2968",
-    "@cedarjs/structure": "6.0.0-canary.2968",
-    "@cedarjs/telemetry": "6.0.0-canary.2968",
-    "@cedarjs/utils": "6.0.0-canary.2968",
-    "@cedarjs/vite": "6.0.0-canary.2968",
-    "@cedarjs/web-server": "6.0.0-canary.2968",
+    "@cedarjs/api-server": "6.0.0-canary.2973",
+    "@cedarjs/babel-config": "6.0.0-canary.2973",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2973",
+    "@cedarjs/internal": "6.0.0-canary.2973",
+    "@cedarjs/prerender": "6.0.0-canary.2973",
+    "@cedarjs/project-config": "6.0.0-canary.2973",
+    "@cedarjs/structure": "6.0.0-canary.2973",
+    "@cedarjs/telemetry": "6.0.0-canary.2973",
+    "@cedarjs/utils": "6.0.0-canary.2973",
+    "@cedarjs/vite": "6.0.0-canary.2973",
+    "@cedarjs/web-server": "6.0.0-canary.2973",
     "@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.2968",
+    "@cedarjs/framework-tools": "6.0.0-canary.2973",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.1",