pkg-pr-new 0.0.59 → 0.0.61

package/index.ts

@@ -13,6 +13,7 @@ import {
   abbreviateCommitHash,
   extractOwnerAndRepo,
   extractRepository,
+  installCommands,
 } from "@pkg-pr-new/utils";
 import { glob } from "tinyglobby";
 import ignore from "ignore";
@@ -74,6 +75,10 @@ const main = defineCommand({
             type: "boolean",
             description: "use `yarn pack` instead of `npm pack --json`",
           },
+          bun: {
+            type: "boolean",
+            description: "use `bun pm pack` instead of `npm pack --json`",
+          },
           template: {
             type: "string",
             description:
@@ -131,26 +136,33 @@ const main = defineCommand({
             packMethod = "pnpm";
           } else if (args.yarn) {
             packMethod = "yarn";
+          } else if (args.bun) {
+            packMethod = "bun";
           }
 
           const isPeerDepsEnabled = !!args.peerDeps;
           const isOnlyTemplates = !!args["only-templates"];
           const isBinaryApplication = !!args.bin;
           const comment: Comment = args.comment as Comment;
-          const selectedPackageManager = args.packageManager as
-            | "npm"
-            | "bun"
-            | "pnpm"
-            | "yarn";
-
-          if (
-            !["npm", "bun", "pnpm", "yarn"].includes(selectedPackageManager)
-          ) {
+          const selectedPackageManager = (args.packageManager as string)
+            .split(",")
+            .filter((s) => s.trim()) as Array<"npm" | "bun" | "pnpm" | "yarn">;
+          const packageManagers = ["npm", "bun", "pnpm", "yarn"];
+
+          if (!selectedPackageManager.length) {
             console.error(
-              `Unsupported package manager: ${selectedPackageManager}. Supported managers are npm, bun, pnpm, yarn.`,
+              `Unsupported package manager: ${args.packageManager}. Supported managers are npm, bun, pnpm, yarn.`,
             );
             process.exit(1);
           }
+          for (let i = 0; i < packageManagers.length; i++) {
+            if (!packageManagers.includes(packageManagers[i])) {
+              console.error(
+                `Unsupported package manager: ${packageManagers[i]}. Supported managers are npm, bun, pnpm, yarn.`,
+              );
+              process.exit(1);
+            }
+          }
 
           if (!process.env.TEST && process.env.GITHUB_ACTIONS !== "true") {
             console.error(
@@ -505,7 +517,7 @@ const main = defineCommand({
               "sb-shasums": JSON.stringify(shasums),
               "sb-run-id": GITHUB_RUN_ID,
               "sb-bin": `${isBinaryApplication}`,
-              "sb-package-manager": selectedPackageManager,
+              "sb-package-manager": selectedPackageManager[0],
               "sb-only-templates": `${isOnlyTemplates}`,
             },
             body: formData,
@@ -538,7 +550,7 @@ const main = defineCommand({
               return `${packageName}:
 - sha: ${shasums[packageName]}
 - publint: ${publintUrl}
-- npm: npm i ${url}`;
+- ${packMethod}: ${installCommands[packMethod]} ${url}`;
             })
             .join("\n\n");
 
@@ -582,13 +594,15 @@ runMain(main)
   .then(() => process.exit(0))
   .catch(() => process.exit(1));
 
-type PackMethod = "npm" | "pnpm" | "yarn";
+type PackMethod = "npm" | "pnpm" | "yarn" | "bun";
 
 async function resolveTarball(pm: PackMethod, p: string, pJson: PackageJson) {
   let cmd = `${pm} pack`;
   let filename = `${pJson.name!.replace("/", "-")}-${pJson.version}.tgz`;
   if (pm === "yarn") {
     cmd += ` --filename ${filename}`;
+  } else if (pm === "bun") {
+    cmd = `bun pm pack --filename ${filename}`;
   }
   const { stdout } = await ezSpawn.async(cmd, {
     stdio: "overlapped",
@@ -596,7 +610,7 @@ async function resolveTarball(pm: PackMethod, p: string, pJson: PackageJson) {
   });
   const lines = stdout.split("\n").filter(Boolean);
 
-  if (pm !== "yarn") {
+  if (pm !== "yarn" && pm !== "bun") {
     filename = lines[lines.length - 1].trim();
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pkg-pr-new",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "description": "",
   "main": "index.js",
   "type": "module",