@astrojs/upgrade 0.5.0 → 0.5.2

package/dist/index.js

@@ -172,7 +172,7 @@ var require_arg = __commonJS({
 var import_arg = __toESM(require_arg(), 1);
 import { pathToFileURL } from "node:url";
 import { prompt } from "@astrojs/cli-kit";
-import detectPackageManager from "preferred-pm";
+import { detect } from "package-manager-detector";
 async function getContext(argv) {
   const flags = (0, import_arg.default)(
     {
@@ -182,7 +182,11 @@ async function getContext(argv) {
     },
     { argv, permissive: true }
   );
-  const packageManager = (await detectPackageManager(process.cwd()))?.name ?? "npm";
+  const packageManager = await detect({
+    // Include the `install-metadata` strategy to have the package manager that's
+    // used for installation take precedence
+    strategies: ["install-metadata", "lockfile", "packageManager-field"]
+  }) ?? { agent: "npm", name: "npm" };
   const {
     _: [version = "latest"] = [],
     "--help": help2 = false,
@@ -205,7 +209,7 @@ async function getContext(argv) {
 // src/messages.ts
 import { color, label, spinner as load } from "@astrojs/cli-kit";
 import { align } from "@astrojs/cli-kit/utils";
-import detectPackageManager2 from "preferred-pm";
+import { detect as detect2 } from "package-manager-detector";
 import terminalLink from "terminal-link";
 
 // src/shell.ts
@@ -252,7 +256,7 @@ var _registry;
 async function getRegistry() {
   if (_registry) return _registry;
   const fallback = "https://registry.npmjs.org";
-  const packageManager = (await detectPackageManager2(process.cwd()))?.name || "npm";
+  const packageManager = (await detect2())?.name || "npm";
   try {
     const { stdout: stdout2 } = await shell(packageManager, ["config", "get", "registry"]);
     _registry = stdout2?.trim()?.replace(/\/$/, "") || fallback;
@@ -438,6 +442,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";
 async function install(ctx) {
   await banner();
   newline();
@@ -514,18 +519,22 @@ function sortPackages(a, b) {
 }
 async function runInstallCommand(ctx, dependencies, devDependencies) {
   const cwd = fileURLToPath(ctx.cwd);
-  if (ctx.packageManager === "yarn") await ensureYarnLock({ cwd });
-  const installCmd = ctx.packageManager === "yarn" || ctx.packageManager === "pnpm" ? "add" : "install";
+  if (ctx.packageManager.name === "yarn") await ensureYarnLock({ cwd });
+  const installCommand = resolveCommand(ctx.packageManager.agent, "add", []);
+  if (!installCommand) {
+    error("error", `Unable to find install command for ${ctx.packageManager.name}.`);
+    return ctx.exit(1);
+  }
   await spinner({
-    start: `Installing dependencies with ${ctx.packageManager}...`,
+    start: `Installing dependencies with ${ctx.packageManager.name}...`,
     end: `Installed dependencies!`,
     while: async () => {
       try {
         if (dependencies.length > 0) {
           await shell(
-            ctx.packageManager,
+            installCommand.command,
             [
-              installCmd,
+              ...installCommand.args,
               ...dependencies.map(
                 ({ name, targetVersion }) => `${name}@${targetVersion.replace(/^\^/, "")}`
               )
@@ -535,10 +544,9 @@ async function runInstallCommand(ctx, dependencies, devDependencies) {
         }
         if (devDependencies.length > 0) {
           await shell(
-            ctx.packageManager,
+            installCommand.command,
             [
-              installCmd,
-              "--save-dev",
+              ...installCommand.args,
               ...devDependencies.map(
                 ({ name, targetVersion }) => `${name}@${targetVersion.replace(/^\^/, "")}`
               )
@@ -547,14 +555,18 @@ async function runInstallCommand(ctx, dependencies, devDependencies) {
           );
         }
       } catch {
-        const packages = [...dependencies, ...devDependencies].map(({ name, targetVersion }) => `${name}@${targetVersion}`).join(" ");
+        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(
-            `${ctx.packageManager} ${installCmd} ${packages}`
-          )}`
+${color2.bold(manualInstallCommand)}`
         );
         return ctx.exit(1);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -24,12 +24,12 @@
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
   "dependencies": {
     "@astrojs/cli-kit": "^0.4.1",
-    "preferred-pm": "^4.1.1",
+    "package-manager-detector": "^1.1.0",
     "semver": "^7.7.1",
     "terminal-link": "^3.0.0"
   },
   "devDependencies": {
-    "@types/semver": "^7.5.8",
+    "@types/semver": "^7.7.0",
     "arg": "^5.0.2",
     "astro-scripts": "0.0.14"
   },