pkg-pr-new 0.0.19 → 0.0.21

package/index.ts

@@ -6,7 +6,7 @@ import { createHash } from "node:crypto";
 import { hash } from "ohash";
 import fsSync from "fs";
 import fs from "fs/promises";
-import { detect } from "detect-package-manager";
+import { detect } from "package-manager-detector";
 import { getPackageManifest, type PackageManifest } from "query-registry";
 import type { Comment } from "@pkg-pr-new/utils";
 import {
@@ -14,7 +14,7 @@ import {
   extractOwnerAndRepo,
   extractRepository,
 } from "@pkg-pr-new/utils";
-import fg from "fast-glob";
+import { glob, globSync } from "tinyglobby";
 import ignore from "ignore";
 import "./environments";
 import pkg from "./package.json" with { type: "json" };
@@ -26,6 +26,18 @@ declare global {
   var API_URL: string;
 }
 
+type OutputMetadata = {
+  packages: {
+    name: string;
+    url: string;
+    shasum: string;
+  }[];
+  templates: {
+    name: string;
+    url: string;
+  }[];
+};
+
 const apiUrl = process.env.API_URL ?? API_URL;
 const publishUrl = new URL("/publish", apiUrl);
 
@@ -64,10 +76,19 @@ const main = defineCommand({
             description: `"off" for no comments (silent mode). "create" for comment on each publish. "update" for one comment across the pull request with edits on each publish (default)`,
             default: "update",
           },
+          "only-templates": {
+            type: "boolean",
+            description: `generate only stackblitz templates`,
+            default: false,
+          },
+          json: {
+            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.`,
+          },
         },
         run: async ({ args }) => {
           const paths = (args._.length ? args._ : ["."])
-            .flatMap((p) => fg.sync(p, { onlyDirectories: true }))
+            .flatMap((p) => globSync([p], { expandDirectories: false, onlyDirectories: true }))
             .map((p) => path.resolve(p.trim()));
 
           const templates = (
@@ -75,7 +96,7 @@ const main = defineCommand({
               ? [args.template]
               : ([...(args.template || [])] as string[])
           )
-            .flatMap((p) => fg.sync(p, { onlyDirectories: true }))
+            .flatMap((p) => globSync([p], { expandDirectories: false, onlyDirectories: true }))
             .map((p) => path.resolve(p.trim()));
 
           const formData = new FormData();
@@ -83,6 +104,7 @@ const main = defineCommand({
           const isCompact = !!args.compact;
           const isPnpm = !!args.pnpm;
           const isPeerDepsEnabled = !!args.peerDeps
+          const isOnlyTemplates = !!args['only-templates']
 
           const comment: Comment = args.comment as Comment;
 
@@ -122,7 +144,7 @@ const main = defineCommand({
           });
 
           if (!checkResponse.ok) {
-            console.log(await checkResponse.text());
+            console.error(await checkResponse.text());
             process.exit(1);
           }
 
@@ -132,6 +154,14 @@ const main = defineCommand({
           const deps: Map<string, string> = new Map(); // pkg.pr.new versions of the package
           const realDeps: Map<string, string> | null = isPeerDepsEnabled ? new Map() : null // real versions of the package, useful for peerDependencies
 
+          const printJson = typeof args.json === 'boolean';
+          const saveJson = typeof args.json === 'string';
+          const jsonFilePath = saveJson ? args.json : '';
+          const outputMetadata: OutputMetadata = {
+            packages: [],
+            templates: [],
+          };
+
           for (const p of paths) {
             if (!(await hasPackageJson(p))) {
               continue;
@@ -151,9 +181,9 @@ const main = defineCommand({
             }
 
             const depUrl = new URL(
-                `/${owner}/${repo}/${pJson.name}@${abbreviatedSha}`,
-                apiUrl,
-              ).href
+              `/${owner}/${repo}/${pJson.name}@${abbreviatedSha}`,
+              apiUrl,
+            ).href
             deps.set(
               pJson.name,
               depUrl,
@@ -164,11 +194,18 @@ const main = defineCommand({
             if (resource.ok) {
               console.warn(`${pJson.name}@${abbreviatedSha} was already published on ${depUrl}`)
             }
+
+            // Collect package metadata
+            outputMetadata.packages.push({
+              name: pJson.name,
+              url: depUrl,
+              shasum: "", // will be filled later
+            });
           }
 
           for (const templateDir of templates) {
             if (!(await hasPackageJson(templateDir))) {
-              console.log(
+              console.warn(
                 `skipping ${templateDir} because there's no package.json file`,
               );
               continue;
@@ -180,7 +217,7 @@ const main = defineCommand({
               throw new Error(`"name" field in ${pJsonPath} should be defined`);
             }
 
-            console.log("preparing template:", pJson.name);
+            console.warn("preparing template:", pJson.name);
 
             const restore = await writeDeps(templateDir, deps, realDeps);
 
@@ -194,11 +231,11 @@ const main = defineCommand({
               ig.add(gitignoreContent);
             }
 
-            const files = await fg(["**/*"], {
+            const files = await glob(["**/*"], {
               cwd: templateDir,
               dot: true,
               onlyFiles: true,
-              ignore: ['node_modules', '.git'], // always ignore node_modules and .git
+              ignore: ['**/node_modules', '.git'], // always ignore node_modules and .git
             });
 
             const filteredFiles = files.filter((file) => !ig.ignores(file));
@@ -215,6 +252,16 @@ const main = defineCommand({
               );
             }
             await restore();
+
+            // Collect template metadata
+            const templateUrl = new URL(
+              `/${owner}/${repo}/template/${pJson.name}`,
+              apiUrl,
+            ).href;
+            outputMetadata.templates.push({
+              name: pJson.name,
+              url: templateUrl,
+            });
           }
 
           const noDefaultTemplate = args.template === false;
@@ -253,7 +300,7 @@ const main = defineCommand({
           const shasums: Record<string, string> = {};
           for (const p of paths) {
             if (!(await hasPackageJson(p))) {
-              console.log(`skipping ${p} because there's no package.json file`);
+              console.warn(`skipping ${p} because there's no package.json file`);
               continue;
             }
             const pJsonPath = path.resolve(p, "package.json");
@@ -266,7 +313,7 @@ const main = defineCommand({
                 );
               }
               if (pJson.private) {
-                console.log(`skipping ${p} because the package is private`);
+                console.warn(`skipping ${p} because the package is private`);
                 continue;
               }
 
@@ -276,7 +323,10 @@ const main = defineCommand({
               );
 
               shasums[pJson.name] = shasum;
-              console.log(`shasum for ${pJson.name}(${filename}): ${shasum}`);
+              console.warn(`shasum for ${pJson.name}(${filename}): ${shasum}`);
+
+              const outputPkg = outputMetadata.packages.find(p => p.name === pJson.name)!;
+              outputPkg.shasum = shasum;
 
               const file = await fs.readFile(path.resolve(p, filename));
 
@@ -298,7 +348,8 @@ const main = defineCommand({
               "sb-key": key,
               "sb-shasums": JSON.stringify(shasums),
               "sb-run-id": GITHUB_RUN_ID,
-              "sb-package-manager": packageManager,
+              "sb-package-manager": packageManager.agent ?? "npm",
+              "sb-only-templates": `${isOnlyTemplates}`
             },
             body: formData,
           });
@@ -309,8 +360,8 @@ const main = defineCommand({
             `publishing failed: ${await res.text()}`,
           );
 
-          console.log("\n");
-          console.log(
+          console.warn("\n");
+          console.warn(
             `⚡️ Your npm packages are published.\n${[...formData.keys()]
               .filter((k) => k.startsWith("package:"))
               .map(
@@ -319,19 +370,28 @@ const main = defineCommand({
               )
               .join("\n")}`,
           );
+
+          const output = JSON.stringify(outputMetadata, null, 2);
+          if (printJson) {
+            console.log(output); // Log output for piping
+          }
+          if (saveJson) {
+            await fs.writeFile(jsonFilePath, output);
+            console.warn(`metadata written to ${jsonFilePath}`);
+          }
         },
       };
     },
     link: () => {
       return {
         meta: {},
-        run: () => {},
+        run: () => { },
       };
     },
   },
 });
 
-runMain(main);
+runMain(main).then(() => process.exit(0)).catch(() => process.exit(1));
 
 // TODO: we'll add support for yarn if users hit issues with npm
 async function resolveTarball(pm: "npm" | "pnpm", p: string) {
@@ -357,6 +417,7 @@ async function writeDeps(p: string, deps: Map<string, string>, realDeps: Map<str
 
   hijackDeps(deps, pJson.dependencies);
   hijackDeps(deps, pJson.devDependencies);
+  hijackDeps(deps, pJson.optionalDependencies);
 
   if (realDeps) {
     hijackDeps(realDeps, pJson.peerDependencies);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pkg-pr-new",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -23,12 +23,12 @@
   "dependencies": {
     "@jsdevtools/ez-spawn": "^3.0.4",
     "@octokit/action": "^6.1.0",
-    "detect-package-manager": "^3.0.2",
-    "fast-glob": "^3.3.2",
     "ignore": "^5.3.1",
     "isbinaryfile": "^5.0.2",
+    "package-manager-detector": "^0.1.2",
     "pkg-types": "^1.1.1",
-    "query-registry": "^3.0.1"
+    "query-registry": "^3.0.1",
+    "tinyglobby": "^0.2.2"
   },
   "devDependencies": {
     "@pkg-pr-new/utils": "workspace:^",