@astrojs/upgrade 0.7.1 → 0.7.3

package/dist/index.js

@@ -211,38 +211,49 @@ import terminalLink from "terminal-link";
 // src/shell.ts
 import { spawn } from "node:child_process";
 import { text as textFromStream } from "node:stream/consumers";
+var WINDOWS_CMD_SHIMS = /* @__PURE__ */ new Set(["npm", "npx", "pnpm", "pnpx", "yarn", "yarnpkg"]);
+var WINDOWS_EXE_SHIMS = /* @__PURE__ */ new Set(["bun", "bunx"]);
 var text = (stream) => stream ? textFromStream(stream).then((t) => t.trimEnd()) : "";
-var signal;
+function resolveCommand(command, flags) {
+  if (process.platform !== "win32") return [command, flags];
+  if (command.includes("/") || command.includes("\\") || command.includes(".")) {
+    return [command, flags];
+  }
+  const cmd = command.toLowerCase();
+  if (WINDOWS_CMD_SHIMS.has(cmd)) {
+    return ["cmd.exe", ["/d", "/s", "/c", `${command}.cmd`, ...flags]];
+  }
+  if (WINDOWS_EXE_SHIMS.has(cmd)) {
+    return [`${command}.exe`, flags];
+  }
+  return [command, flags];
+}
 async function shell(command, flags, opts = {}) {
   let child;
   let stdout2 = "";
   let stderr = "";
-  if (!signal) {
-    const controller = new AbortController();
-    process.once("beforeexit", () => controller.abort());
-    process.once("exit", () => controller.abort());
-    signal = controller.signal;
-  }
   try {
-    child = spawn(`${command} ${flags.join(" ")}`, {
+    const [resolvedCommand, resolvedFlags] = resolveCommand(command, flags);
+    child = spawn(resolvedCommand, resolvedFlags, {
       cwd: opts.cwd,
-      shell: true,
       stdio: opts.stdio,
-      timeout: opts.timeout,
-      signal
+      timeout: opts.timeout
     });
-    const done2 = new Promise((resolve) => child.on("close", resolve));
-    [stdout2, stderr] = await Promise.all([text(child.stdout), text(child.stderr)]);
-    await done2;
-  } catch {
-    throw { stdout: stdout2, stderr, exitCode: 1 };
+    const done2 = new Promise((resolve, reject) => {
+      child.once("error", reject);
+      child.once("close", () => resolve());
+    });
+    [stdout2, stderr] = await Promise.all([text(child.stdout), text(child.stderr), done2]);
+  } catch (e) {
+    const message = e instanceof Error ? e.message : stderr || "Unknown error";
+    throw new Error(message);
   }
   const { exitCode } = child;
   if (exitCode === null) {
     throw new Error("Timeout");
   }
   if (exitCode !== 0) {
-    throw new Error(stderr);
+    throw new Error(stderr || stdout2 || `Process exited with code ${exitCode}`);
   }
   return { stdout: stdout2, stderr, exitCode };
 }
@@ -438,7 +449,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { color as color2, say } from "@astrojs/cli-kit";
 import { random, sleep } from "@astrojs/cli-kit/utils";
-import { resolveCommand } from "package-manager-detector";
+import { resolveCommand as resolveCommand2 } from "package-manager-detector";
 async function install(ctx, shellFn = shell) {
   await banner();
   newline();
@@ -516,7 +527,7 @@ function sortPackages(a, b) {
 async function runInstallCommand(ctx, dependencies, devDependencies, shellFn = shell) {
   const cwd = fileURLToPath(ctx.cwd);
   if (ctx.packageManager.name === "yarn") await ensureYarnLock({ cwd });
-  const installCommand = resolveCommand(ctx.packageManager.agent, "add", []);
+  const installCommand = resolveCommand2(ctx.packageManager.agent, "add", []);
   if (!installCommand) {
     error("error", `Unable to find install command for ${ctx.packageManager.name}.`);
     return ctx.exit(1);
@@ -562,11 +573,19 @@ async function runInstallCommand(ctx, dependencies, devDependencies, shellFn = s
         )
       ].join(" ");
       newline();
-      error(
-        "error",
-        `Dependencies failed to install, please run the following command manually:
+      if (errorMessage.includes("MINIMUM_RELEASE_AGE")) {
+        error(
+          "error",
+          `pnpm's ${color2.bold("minimumReleaseAge")} policy blocked the installation. Run the following command manually to confirm the update:
+${color2.bold(manualInstallCommand)}`
+        );
+      } else {
+        error(
+          "error",
+          `Dependencies failed to install, please run the following command manually:
 ${color2.bold(manualInstallCommand)}`
-      );
+        );
+      }
       return ctx.exit(1);
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -15,10 +15,10 @@
     ".": "./upgrade.mjs"
   },
   "main": "./upgrade.mjs",
-  "bin": "./upgrade.mjs",
   "files": [
-    "dist",
-    "upgrade.js"
+    "dist/**/*.js",
+    "dist/**/*.mjs",
+    "upgrade.mjs"
   ],
   "//a": "MOST PACKAGES SHOULD GO IN DEV_DEPENDENCIES! THEY WILL BE BUNDLED.",
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
@@ -37,9 +37,12 @@
     "node": ">=22.12.0"
   },
   "scripts": {
-    "build": "astro-scripts build \"src/index.ts\" --bundle && tsc",
+    "build": "astro-scripts build \"src/index.ts\" --bundle && tsc -b",
     "build:ci": "astro-scripts build \"src/index.ts\" --bundle",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "astro-scripts test \"test/**/*.test.js\""
+    "test": "astro-scripts test \"test/**/*.test.ts\""
+  },
+  "bin": {
+    "upgrade": "./upgrade.mjs"
   }
 }

package/upgrade.mjs

@@ -12,4 +12,4 @@ if (requiredMajorVersion < minimumMajorVersion) {
 	process.exit(1);
 }
 
-import('./dist/index.js').then(({ main }) => main());
+void import('./dist/index.js').then(({ main }) => main());