pkg-pr-new 0.0.30 → 0.0.31

package/index.ts

@@ -6,7 +6,6 @@ import { createHash } from "node:crypto";
 import { hash } from "ohash";
 import fsSync from "fs";
 import fs from "fs/promises";
-import { detect } from "package-manager-detector";
 import { getPackageManifest, type PackageManifest } from "query-registry";
 import type { Comment } from "@pkg-pr-new/utils";
 import {
@@ -88,15 +87,22 @@ const main = defineCommand({
             type: "mixed",
             description: `Save metadata to a JSON file. If true, log the output for piping. If a string, save the output to the specified file path.`,
           },
+          packageManager: {
+            type: "string",
+            description: "Specify the package manager to use (npm, bun, pnpm, yarn)",
+            enum: ["npm", "bun", "pnpm", "yarn"],
+            default: "npm",
+          },
         },
         run: async ({ args }) => {
-          const paths = args._.length > 0
-            ? await glob(args._, {
-                expandDirectories: false,
-                onlyDirectories: true,
-                absolute: true,
-              })
-            : [process.cwd()];
+          const paths =
+            args._.length > 0
+              ? await glob(args._, {
+                  expandDirectories: false,
+                  onlyDirectories: true,
+                  absolute: true,
+                })
+              : [process.cwd()];
 
           const templates = await glob(args.template ?? [], {
             expandDirectories: false,
@@ -112,6 +118,14 @@ const main = defineCommand({
           const isOnlyTemplates = !!args["only-templates"];
 
           const comment: Comment = args.comment as Comment;
+          const selectedPackageManager = args.packageManager as "npm" | "bun" | "pnpm" | "yarn";
+
+          if (!["npm", "bun", "pnpm", "yarn"].includes(selectedPackageManager)) {
+            console.error(
+              `Unsupported package manager: ${selectedPackageManager}. Supported managers are npm, bun, pnpm, yarn.`
+            );
+            process.exit(1);
+          }
 
           if (!process.env.TEST && process.env.GITHUB_ACTIONS !== "true") {
             console.error(
@@ -154,7 +168,6 @@ const main = defineCommand({
           }
 
           const { sha } = await checkResponse.json();
-          const abbreviatedSha = abbreviateCommitHash(sha);
 
           const deps: Map<string, string> = new Map(); // pkg.pr.new versions of the package
           const realDeps: Map<string, string> | null = isPeerDepsEnabled
@@ -188,7 +201,7 @@ const main = defineCommand({
             }
 
             const depUrl = new URL(
-              `/${owner}/${repo}/${pJson.name}@${abbreviatedSha}`,
+              `/${owner}/${repo}/${pJson.name}@${sha}`,
               apiUrl,
             ).href;
             deps.set(pJson.name, depUrl);
@@ -197,7 +210,7 @@ const main = defineCommand({
             const resource = await fetch(depUrl);
             if (resource.ok) {
               console.warn(
-                `${pJson.name}@${abbreviatedSha} was already published on ${depUrl}`,
+                `${pJson.name}@${abbreviateCommitHash(sha)} was already published on ${depUrl}`,
               );
             }
 
@@ -329,14 +342,13 @@ const main = defineCommand({
               );
 
               shasums[pJson.name] = shasum;
-              console.warn(`shasum for ${pJson.name}(${filename}): ${shasum}`);
 
               const outputPkg = outputMetadata.packages.find(
                 (p) => p.name === pJson.name,
               )!;
               outputPkg.shasum = shasum;
 
-              const filePath = path.resolve(p, filename)
+              const filePath = path.resolve(p, filename);
               const buffer = await fs.readFile(filePath);
 
               const blob = new Blob([buffer], {
@@ -344,7 +356,7 @@ const main = defineCommand({
               });
               formData.append(`package:${pJson.name}`, blob, filename);
 
-              await fs.rm(filePath)
+              await fs.rm(filePath);
             } finally {
               await restoreMap.get(p)?.();
             }
@@ -376,8 +388,11 @@ const main = defineCommand({
                   console.error(await createMultipartRes.text());
                   continue;
                 }
-                const { key: uploadKey, id: uploadId, ...data } =
-                  await createMultipartRes.json();
+                const {
+                  key: uploadKey,
+                  id: uploadId,
+                  ...data
+                } = await createMultipartRes.json();
 
                 interface R2UploadedPart {
                   partNumber: number;
@@ -431,8 +446,6 @@ const main = defineCommand({
             }
           }
 
-          const packageManager = await detect();
-          const agent = packageManager.agent.includes('@') ? packageManager.agent.split('@')[0] : packageManager.agent;
           const res = await fetch(publishUrl, {
             method: "POST",
             headers: {
@@ -441,7 +454,7 @@ const main = defineCommand({
               "sb-key": key,
               "sb-shasums": JSON.stringify(shasums),
               "sb-run-id": GITHUB_RUN_ID,
-              "sb-package-manager": agent ?? "npm",
+              "sb-package-manager": selectedPackageManager,
               "sb-only-templates": `${isOnlyTemplates}`,
             },
             body: formData,
@@ -454,15 +467,22 @@ const main = defineCommand({
           );
 
           console.warn("\n");
-          console.warn(
-            `⚡️ Your npm packages are published.\n${[...formData.keys()]
-              .filter((k) => k.startsWith("package:"))
-              .map(
-                (name, i) =>
-                  `${name.slice("package:".length)}: npm i ${laterRes.urls[i]}`,
-              )
-              .join("\n")}`,
-          );
+          console.warn("⚡️ Your npm packages are published.\n");
+
+          const packageLogs = [...formData.keys()]
+            .filter((k) => k.startsWith("package:"))
+            .map((name, i) => {
+              const packageName = name.slice("package:".length);
+              const url = new URL(laterRes.urls[i])
+              const publintUrl = new URL(`/pkg.pr.new${url.pathname}`, "https://publint.dev")
+              return `${packageName}:
+- sha: ${shasums[packageName]}
+- publint: ${publintUrl}
+- npm: npm i ${url}`;
+            })
+            .join("\n\n");
+
+          console.warn(packageLogs);
 
           const output = JSON.stringify(outputMetadata, null, 2);
           if (printJson) {
@@ -542,7 +562,7 @@ function hijackDeps(
 }
 
 function getFormEntrySize(entry: FormDataEntryValue) {
-  if (typeof entry === 'string') {
+  if (typeof entry === "string") {
     return entry.length;
   }
   return entry.size;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pkg-pr-new",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -25,7 +25,6 @@
     "@octokit/action": "^6.1.0",
     "ignore": "^5.3.1",
     "isbinaryfile": "^5.0.2",
-    "package-manager-detector": "^0.1.2",
     "pkg-types": "^1.1.1",
     "query-registry": "^3.0.1",
     "tinyglobby": "^0.2.9"