@astrojs/upgrade 0.6.0 → 0.6.2

package/dist/index.js

@@ -187,11 +187,7 @@ async function getContext(argv) {
     // used for installation take precedence
     strategies: ["install-metadata", "lockfile", "packageManager-field"]
   }) ?? { agent: "npm", name: "npm" };
-  const {
-    _: [version = "latest"] = [],
-    "--help": help2 = false,
-    "--dry-run": dryRun
-  } = flags;
+  const { _: [version = "latest"] = [], "--help": help2 = false, "--dry-run": dryRun } = flags;
   return {
     help: help2,
     prompt,
@@ -228,7 +224,7 @@ async function shell(command, flags, opts = {}) {
     signal = controller.signal;
   }
   try {
-    child = spawn(command, flags, {
+    child = spawn(`${command} ${flags.join(" ")}`, {
       cwd: opts.cwd,
       shell: true,
       stdio: opts.stdio,
@@ -443,7 +439,7 @@ 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";
-async function install(ctx) {
+async function install(ctx, shellFn = shell) {
   await banner();
   newline();
   const { current, dependencies, devDependencies } = filterPackages(ctx);
@@ -490,7 +486,7 @@ async function install(ctx) {
   if (ctx.dryRun) {
     await info("--dry-run", `Skipping dependency installation`);
   } else {
-    await runInstallCommand(ctx, dependencies, devDependencies);
+    await runInstallCommand(ctx, dependencies, devDependencies, shellFn);
   }
 }
 function filterPackages(ctx) {
@@ -517,7 +513,7 @@ function sortPackages(a, b) {
   if (b.name.startsWith("@astrojs") && !a.name.startsWith("@astrojs")) return 1;
   return a.name.localeCompare(b.name);
 }
-async function runInstallCommand(ctx, dependencies, devDependencies) {
+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", []);
@@ -525,52 +521,59 @@ async function runInstallCommand(ctx, dependencies, devDependencies) {
     error("error", `Unable to find install command for ${ctx.packageManager.name}.`);
     return ctx.exit(1);
   }
-  await spinner({
-    start: `Installing dependencies with ${ctx.packageManager.name}...`,
-    end: `Installed dependencies!`,
-    while: async () => {
-      try {
-        if (dependencies.length > 0) {
-          await shell(
-            installCommand.command,
-            [
-              ...installCommand.args,
-              ...dependencies.map(
-                ({ name, targetVersion }) => `${name}@${targetVersion.replace(/^\^/, "")}`
-              )
-            ],
-            { cwd, timeout: 9e4, stdio: "ignore" }
-          );
-        }
-        if (devDependencies.length > 0) {
-          await shell(
-            installCommand.command,
-            [
-              ...installCommand.args,
-              ...devDependencies.map(
-                ({ name, targetVersion }) => `${name}@${targetVersion.replace(/^\^/, "")}`
-              )
-            ],
-            { cwd, timeout: 9e4, stdio: "ignore" }
-          );
-        }
-      } catch {
-        const manualInstallCommand = [
+  const doInstall = async (legacyPeerDeps = false) => {
+    try {
+      if (dependencies.length > 0) {
+        await shellFn(
           installCommand.command,
-          ...installCommand.args,
-          ...[...dependencies, ...devDependencies].map(
-            ({ name, targetVersion }) => `${name}@${targetVersion}`
-          )
-        ].join(" ");
-        newline();
-        error(
-          "error",
-          `Dependencies failed to install, please run the following command manually:
-${color2.bold(manualInstallCommand)}`
+          [
+            ...installCommand.args,
+            ...legacyPeerDeps ? ["--legacy-peer-deps"] : [],
+            ...dependencies.map(
+              ({ name, targetVersion }) => `${name}@${targetVersion.replace(/^\^/, "")}`
+            )
+          ],
+          { cwd, timeout: 9e4 }
+        );
+      }
+      if (devDependencies.length > 0) {
+        await shellFn(
+          installCommand.command,
+          [
+            ...installCommand.args,
+            ...legacyPeerDeps ? ["--legacy-peer-deps"] : [],
+            ...devDependencies.map(
+              ({ name, targetVersion }) => `${name}@${targetVersion.replace(/^\^/, "")}`
+            )
+          ],
+          { cwd, timeout: 9e4 }
         );
-        return ctx.exit(1);
       }
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      if (ctx.packageManager.name === "npm" && !legacyPeerDeps && errorMessage.includes("peer dependenc")) {
+        return doInstall(true);
+      }
+      const manualInstallCommand = [
+        installCommand.command,
+        ...installCommand.args,
+        ...[...dependencies, ...devDependencies].map(
+          ({ name, targetVersion }) => `${name}@${targetVersion}`
+        )
+      ].join(" ");
+      newline();
+      error(
+        "error",
+        `Dependencies failed to install, please run the following command manually:
+${color2.bold(manualInstallCommand)}`
+      );
+      return ctx.exit(1);
     }
+  };
+  await spinner({
+    start: `Installing dependencies with ${ctx.packageManager.name}...`,
+    end: `Installed dependencies!`,
+    while: doInstall
   });
   await say([`${random(celebrations)} ${random(done)}`, random(bye)], { clear: false });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "@astrojs/cli-kit": "^0.4.1",
     "package-manager-detector": "^1.1.0",
     "semver": "^7.7.1",
-    "terminal-link": "^3.0.0"
+    "terminal-link": "^4.0.0"
   },
   "devDependencies": {
     "@types/semver": "^7.7.0",