@astrojs/upgrade 0.3.0 → 0.3.1

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 "which-pm-runs";
+import detectPackageManager from "preferred-pm";
 async function getContext(argv) {
   const flags = (0, import_arg.default)(
     {
@@ -182,8 +182,12 @@ async function getContext(argv) {
     },
     { argv, permissive: true }
   );
-  const packageManager = detectPackageManager()?.name ?? "npm";
-  const { _: [version = "latest"] = [], "--help": help2 = false, "--dry-run": dryRun } = flags;
+  const packageManager = (await detectPackageManager(process.cwd()))?.name ?? "npm";
+  const {
+    _: [version = "latest"] = [],
+    "--help": help2 = false,
+    "--dry-run": dryRun
+  } = flags;
   return {
     help: help2,
     prompt,
@@ -201,8 +205,8 @@ 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 terminalLink from "terminal-link";
-import detectPackageManager2 from "which-pm-runs";
 
 // src/shell.ts
 import { spawn } from "node:child_process";
@@ -246,15 +250,13 @@ async function shell(command, flags, opts = {}) {
 // src/messages.ts
 var _registry;
 async function getRegistry() {
-  if (_registry)
-    return _registry;
+  if (_registry) return _registry;
   const fallback = "https://registry.npmjs.org";
-  const packageManager = detectPackageManager2()?.name || "npm";
+  const packageManager = (await detectPackageManager2(process.cwd()))?.name || "npm";
   try {
     const { stdout: stdout2 } = await shell(packageManager, ["config", "get", "registry"]);
     _registry = stdout2?.trim()?.replace(/\/$/, "") || fallback;
-    if (!new URL(_registry).host)
-      _registry = fallback;
+    if (!new URL(_registry).host) _registry = fallback;
   } catch (e) {
     _registry = fallback;
   }
@@ -269,8 +271,7 @@ async function spinner(args) {
 }
 function pluralize(word, n) {
   const [singular, plural] = Array.isArray(word) ? word : [word, word + "s"];
-  if (n === 1)
-    return singular;
+  if (n === 1) return singular;
   return plural;
 }
 var celebrations = [
@@ -502,24 +503,17 @@ function filterPackages(ctx) {
   return { current, dependencies, devDependencies };
 }
 function sortPackages(a, b) {
-  if (a.isMajor && !b.isMajor)
-    return 1;
-  if (b.isMajor && !a.isMajor)
-    return -1;
-  if (a.name === "astro")
-    return -1;
-  if (b.name === "astro")
-    return 1;
-  if (a.name.startsWith("@astrojs") && !b.name.startsWith("@astrojs"))
-    return -1;
-  if (b.name.startsWith("@astrojs") && !a.name.startsWith("@astrojs"))
-    return 1;
+  if (a.isMajor && !b.isMajor) return 1;
+  if (b.isMajor && !a.isMajor) return -1;
+  if (a.name === "astro") return -1;
+  if (b.name === "astro") return 1;
+  if (a.name.startsWith("@astrojs") && !b.name.startsWith("@astrojs")) return -1;
+  if (b.name.startsWith("@astrojs") && !a.name.startsWith("@astrojs")) return 1;
   return a.name.localeCompare(b.name);
 }
 async function runInstallCommand(ctx, dependencies, devDependencies) {
   const cwd = fileURLToPath(ctx.cwd);
-  if (ctx.packageManager === "yarn")
-    await ensureYarnLock({ cwd });
+  if (ctx.packageManager === "yarn") await ensureYarnLock({ cwd });
   const installCmd = ctx.packageManager === "yarn" || ctx.packageManager === "pnpm" ? "add" : "install";
   await spinner({
     start: `Installing dependencies with ${ctx.packageManager}...`,
@@ -569,8 +563,7 @@ ${color2.bold(
 }
 async function ensureYarnLock({ cwd }) {
   const yarnLock = path.join(cwd, "yarn.lock");
-  if (fs.existsSync(yarnLock))
-    return;
+  if (fs.existsSync(yarnLock)) return;
   return fs.promises.writeFile(yarnLock, "", { encoding: "utf-8" });
 }
 
@@ -619,14 +612,11 @@ function safeJSONParse(value) {
 }
 async function verifyAstroProject(ctx) {
   const packageJson = new URL("./package.json", ctx.cwd);
-  if (!existsSync(packageJson))
-    return false;
+  if (!existsSync(packageJson)) return false;
   const contents = await readFile(packageJson, { encoding: "utf-8" });
-  if (!contents.includes("astro"))
-    return false;
+  if (!contents.includes("astro")) return false;
   const { dependencies = {}, devDependencies = {} } = safeJSONParse(contents);
-  if (dependencies["astro"] === void 0 && devDependencies["astro"] === void 0)
-    return false;
+  if (dependencies["astro"] === void 0 && devDependencies["astro"] === void 0) return false;
   collectPackageInfo(ctx, dependencies, devDependencies);
   return true;
 }
@@ -641,15 +631,13 @@ function isValidVersion(_name, version) {
 }
 function isSupportedPackage(name, version) {
   for (const validator of [isAstroPackage, isAllowedPackage, isValidVersion]) {
-    if (!validator(name, version))
-      return false;
+    if (!validator(name, version)) return false;
   }
   return true;
 }
 function collectPackageInfo(ctx, dependencies = {}, devDependencies = {}) {
   for (const [name, currentVersion] of Object.entries(dependencies)) {
-    if (!isSupportedPackage(name, currentVersion))
-      continue;
+    if (!isSupportedPackage(name, currentVersion)) continue;
     ctx.packages.push({
       name,
       currentVersion,
@@ -657,8 +645,7 @@ function collectPackageInfo(ctx, dependencies = {}, devDependencies = {}) {
     });
   }
   for (const [name, currentVersion] of Object.entries(devDependencies)) {
-    if (!isSupportedPackage(name, currentVersion))
-      continue;
+    if (!isSupportedPackage(name, currentVersion)) continue;
     ctx.packages.push({
       name,
       currentVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -23,14 +23,14 @@
   "//a": "MOST PACKAGES SHOULD GO IN DEV_DEPENDENCIES! THEY WILL BE BUNDLED.",
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
   "dependencies": {
-    "@astrojs/cli-kit": "^0.2.3",
-    "semver": "^7.5.4",
-    "which-pm-runs": "^1.1.0",
+    "@astrojs/cli-kit": "^0.4.1",
+    "semver": "^7.6.2",
+    "preferred-pm": "^3.1.3",
     "terminal-link": "^3.0.0"
   },
   "devDependencies": {
-    "@types/semver": "^7.5.2",
-    "@types/which-pm-runs": "^1.0.0",
+    "@types/semver": "^7.5.8",
+    "@types/preferred-pm": "^3.0.0",
     "arg": "^5.0.2",
     "strip-ansi": "^7.1.0",
     "astro-scripts": "0.0.14"