@astrojs/upgrade 0.3.0 → 0.3.2

package/dist/index.js

@@ -1,189 +1,22 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// ../../node_modules/.pnpm/arg@5.0.2/node_modules/arg/index.js
-var require_arg = __commonJS({
-  "../../node_modules/.pnpm/arg@5.0.2/node_modules/arg/index.js"(exports, module) {
-    var flagSymbol = Symbol("arg flag");
-    var ArgError = class _ArgError extends Error {
-      constructor(msg, code) {
-        super(msg);
-        this.name = "ArgError";
-        this.code = code;
-        Object.setPrototypeOf(this, _ArgError.prototype);
-      }
-    };
-    function arg2(opts, {
-      argv = process.argv.slice(2),
-      permissive = false,
-      stopAtPositional = false
-    } = {}) {
-      if (!opts) {
-        throw new ArgError(
-          "argument specification object is required",
-          "ARG_CONFIG_NO_SPEC"
-        );
-      }
-      const result = { _: [] };
-      const aliases = {};
-      const handlers = {};
-      for (const key of Object.keys(opts)) {
-        if (!key) {
-          throw new ArgError(
-            "argument key cannot be an empty string",
-            "ARG_CONFIG_EMPTY_KEY"
-          );
-        }
-        if (key[0] !== "-") {
-          throw new ArgError(
-            `argument key must start with '-' but found: '${key}'`,
-            "ARG_CONFIG_NONOPT_KEY"
-          );
-        }
-        if (key.length === 1) {
-          throw new ArgError(
-            `argument key must have a name; singular '-' keys are not allowed: ${key}`,
-            "ARG_CONFIG_NONAME_KEY"
-          );
-        }
-        if (typeof opts[key] === "string") {
-          aliases[key] = opts[key];
-          continue;
-        }
-        let type = opts[key];
-        let isFlag = false;
-        if (Array.isArray(type) && type.length === 1 && typeof type[0] === "function") {
-          const [fn] = type;
-          type = (value, name, prev = []) => {
-            prev.push(fn(value, name, prev[prev.length - 1]));
-            return prev;
-          };
-          isFlag = fn === Boolean || fn[flagSymbol] === true;
-        } else if (typeof type === "function") {
-          isFlag = type === Boolean || type[flagSymbol] === true;
-        } else {
-          throw new ArgError(
-            `type missing or not a function or valid array type: ${key}`,
-            "ARG_CONFIG_VAD_TYPE"
-          );
-        }
-        if (key[1] !== "-" && key.length > 2) {
-          throw new ArgError(
-            `short argument keys (with a single hyphen) must have only one character: ${key}`,
-            "ARG_CONFIG_SHORTOPT_TOOLONG"
-          );
-        }
-        handlers[key] = [type, isFlag];
-      }
-      for (let i = 0, len = argv.length; i < len; i++) {
-        const wholeArg = argv[i];
-        if (stopAtPositional && result._.length > 0) {
-          result._ = result._.concat(argv.slice(i));
-          break;
-        }
-        if (wholeArg === "--") {
-          result._ = result._.concat(argv.slice(i + 1));
-          break;
-        }
-        if (wholeArg.length > 1 && wholeArg[0] === "-") {
-          const separatedArguments = wholeArg[1] === "-" || wholeArg.length === 2 ? [wholeArg] : wholeArg.slice(1).split("").map((a) => `-${a}`);
-          for (let j = 0; j < separatedArguments.length; j++) {
-            const arg3 = separatedArguments[j];
-            const [originalArgName, argStr] = arg3[1] === "-" ? arg3.split(/=(.*)/, 2) : [arg3, void 0];
-            let argName = originalArgName;
-            while (argName in aliases) {
-              argName = aliases[argName];
-            }
-            if (!(argName in handlers)) {
-              if (permissive) {
-                result._.push(arg3);
-                continue;
-              } else {
-                throw new ArgError(
-                  `unknown or unexpected option: ${originalArgName}`,
-                  "ARG_UNKNOWN_OPTION"
-                );
-              }
-            }
-            const [type, isFlag] = handlers[argName];
-            if (!isFlag && j + 1 < separatedArguments.length) {
-              throw new ArgError(
-                `option requires argument (but was followed by another short argument): ${originalArgName}`,
-                "ARG_MISSING_REQUIRED_SHORTARG"
-              );
-            }
-            if (isFlag) {
-              result[argName] = type(true, argName, result[argName]);
-            } else if (argStr === void 0) {
-              if (argv.length < i + 2 || argv[i + 1].length > 1 && argv[i + 1][0] === "-" && !(argv[i + 1].match(/^-?\d*(\.(?=\d))?\d*$/) && (type === Number || // eslint-disable-next-line no-undef
-              typeof BigInt !== "undefined" && type === BigInt))) {
-                const extended = originalArgName === argName ? "" : ` (alias for ${argName})`;
-                throw new ArgError(
-                  `option requires argument: ${originalArgName}${extended}`,
-                  "ARG_MISSING_REQUIRED_LONGARG"
-                );
-              }
-              result[argName] = type(argv[i + 1], argName, result[argName]);
-              ++i;
-            } else {
-              result[argName] = type(argStr, argName, result[argName]);
-            }
-          }
-        } else {
-          result._.push(wholeArg);
-        }
-      }
-      return result;
-    }
-    arg2.flag = (fn) => {
-      fn[flagSymbol] = true;
-      return fn;
-    };
-    arg2.COUNT = arg2.flag((v, name, existingCount) => (existingCount || 0) + 1);
-    arg2.ArgError = ArgError;
-    module.exports = arg2;
-  }
-});
-
 // src/actions/context.ts
-var import_arg = __toESM(require_arg(), 1);
 import { pathToFileURL } from "node:url";
+import { parseArgs } from "node:util";
 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)(
-    {
-      "--dry-run": Boolean,
-      "--help": Boolean,
-      "-h": "--help"
-    },
-    { argv, permissive: true }
-  );
-  const packageManager = detectPackageManager()?.name ?? "npm";
-  const { _: [version = "latest"] = [], "--help": help2 = false, "--dry-run": dryRun } = flags;
+  const args = parseArgs({
+    args: argv,
+    allowPositionals: true,
+    strict: false,
+    options: {
+      "dry-run": { type: "boolean" },
+      help: { type: "boolean", short: "h" }
+    }
+  });
+  const packageManager = (await detectPackageManager(process.cwd()))?.name ?? "npm";
+  const version = args.positionals[0] ?? "latest";
+  const help2 = !!args.values.help;
+  const dryRun = !!args.values["dry-run"];
   return {
     help: help2,
     prompt,
@@ -201,8 +34,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";
@@ -230,7 +63,7 @@ async function shell(command, flags, opts = {}) {
     const done2 = new Promise((resolve) => child.on("close", resolve));
     [stdout2, stderr] = await Promise.all([text(child.stdout), text(child.stderr)]);
     await done2;
-  } catch (e) {
+  } catch {
     throw { stdout: stdout2, stderr, exitCode: 1 };
   }
   const { exitCode } = child;
@@ -246,16 +79,14 @@ 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;
-  } catch (e) {
+    if (!new URL(_registry).host) _registry = fallback;
+  } catch {
     _registry = fallback;
   }
   return _registry;
@@ -269,8 +100,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 +332,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 +392,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 +441,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 +460,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 +474,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,
@@ -740,7 +556,7 @@ var exit = () => process.exit(0);
 process.on("SIGINT", exit);
 process.on("SIGTERM", exit);
 async function main() {
-  const cleanArgv = process.argv.slice(2).filter((arg2) => arg2 !== "--");
+  const cleanArgv = process.argv.slice(2).filter((arg) => arg !== "--");
   const ctx = await getContext(cleanArgv);
   if (ctx.help) {
     help();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -23,14 +23,13 @@
   "//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.3",
+    "preferred-pm": "^4.0.0",
     "terminal-link": "^3.0.0"
   },
   "devDependencies": {
-    "@types/semver": "^7.5.2",
-    "@types/which-pm-runs": "^1.0.0",
+    "@types/semver": "^7.5.8",
     "arg": "^5.0.2",
     "strip-ansi": "^7.1.0",
     "astro-scripts": "0.0.14"