@astrojs/upgrade 0.2.0 → 0.2.2

package/dist/index.js

@@ -513,6 +513,7 @@ 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";
   await spinner({
     start: `Installing dependencies with ${ctx.packageManager}...`,
     end: `Installed dependencies!`,
@@ -522,7 +523,7 @@ async function runInstallCommand(ctx, dependencies, devDependencies) {
           await shell(
             ctx.packageManager,
             [
-              "install",
+              installCmd,
               ...dependencies.map(
                 ({ name, targetVersion }) => `${name}@${targetVersion.replace(/^\^/, "")}`
               )
@@ -534,7 +535,7 @@ async function runInstallCommand(ctx, dependencies, devDependencies) {
           await shell(
             ctx.packageManager,
             [
-              "install",
+              installCmd,
               "--save-dev",
               ...devDependencies.map(
                 ({ name, targetVersion }) => `${name}@${targetVersion.replace(/^\^/, "")}`
@@ -550,7 +551,7 @@ async function runInstallCommand(ctx, dependencies, devDependencies) {
           "error",
           `Dependencies failed to install, please run the following command manually:
 ${color2.bold(
-            `${ctx.packageManager} install ${packages}`
+            `${ctx.packageManager} ${installCmd} ${packages}`
           )}`
         );
         return ctx.exit(1);
@@ -622,12 +623,25 @@ async function verifyAstroProject(ctx) {
   collectPackageInfo(ctx, dependencies, devDependencies);
   return true;
 }
-function isAstroPackage(name) {
+function isAstroPackage(name, _version) {
   return name === "astro" || name.startsWith("@astrojs/");
 }
-function collectPackageInfo(ctx, dependencies, devDependencies) {
+function isAllowedPackage(name, _version) {
+  return name !== "@astrojs/upgrade";
+}
+function isValidVersion(_name, version) {
+  return semverCoerce(version, { loose: true }) !== null;
+}
+function isSupportedPackage(name, version) {
+  for (const validator of [isAstroPackage, isAllowedPackage, isValidVersion]) {
+    if (!validator(name, version))
+      return false;
+  }
+  return true;
+}
+function collectPackageInfo(ctx, dependencies = {}, devDependencies = {}) {
   for (const [name, currentVersion] of Object.entries(dependencies)) {
-    if (!isAstroPackage(name))
+    if (!isSupportedPackage(name, currentVersion))
       continue;
     ctx.packages.push({
       name,
@@ -636,7 +650,7 @@ function collectPackageInfo(ctx, dependencies, devDependencies) {
     });
   }
   for (const [name, currentVersion] of Object.entries(devDependencies)) {
-    if (!isAstroPackage(name))
+    if (!isSupportedPackage(name, currentVersion))
       continue;
     ctx.packages.push({
       name,
@@ -732,6 +746,7 @@ async function main() {
   process.exit(0);
 }
 export {
+  collectPackageInfo,
   getContext,
   install,
   main,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",