pkg-pr-new 0.0.2 → 0.0.4

package/environments.ts

@@ -12,13 +12,13 @@ declare global {
       // The head ref or source branch of the pull request in a workflow run. This property is only set when the event that triggers a workflow run is either pull_request or pull_request_target. For example, feature-branch-1.
       GITHUB_HEAD_REF: string;
       // The URL of the GitHub server. For example: https://github.com.
-      GITHUB_SERVER_URL: string
+      GITHUB_SERVER_URL: string;
       // The owner and repository name. For example, octocat/Hello-World.
       GITHUB_REPOSITORY: string;
       // The commit SHA that triggered the workflow. The value of this commit SHA depends on the event that triggered the workflow. For more information, see "Events that trigger workflows." For example, ffac537e6cbbf934b08745a378932722df287a53.
       GITHUB_SHA: string;
       // The account ID of the person or app that triggered the initial workflow run. For example, 1234567. Note that this is different from the actor username.
-      GITHUB_ACTOR_ID: string
+      GITHUB_ACTOR_ID: string;
       // The name of the person or app that initiated the workflow. For example, octocat.
       GITHUB_ACTOR: string;
       // The path to the file on the runner that contains the full event webhook payload. For example, /github/workflow/event.json.
@@ -26,7 +26,7 @@ declare global {
       // A unique number for each workflow run within a repository. This number does not change if you re-run the workflow run. For example, 1658821493.
       GITHUB_RUN_ID: string;
       // A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. For example, 3.
-      GITHUB_RUN_ATTEMPT: string
+      GITHUB_RUN_ATTEMPT: string;
     }
   }
 }

package/index.ts

@@ -1,4 +1,4 @@
-import { defineCommand, runMain } from "citty";
+import { defineCommand, runMain, parseArgs } from "citty";
 import assert from "node:assert";
 import path from "path";
 import ezSpawn from "@jsdevtools/ez-spawn";
@@ -7,14 +7,10 @@ import { hash } from "ohash";
 import fs from "fs/promises";
 import { Octokit } from "@octokit/action";
 import { pathToFileURL } from "node:url";
+import { getPackageManifest } from "query-registry";
+import { extractOwnerAndRepo, extractRepository } from "@pkg-pr-new/utils";
 import "./environments";
-
-const {
-  default: { name, version },
-} = await import(
-  pathToFileURL(path.resolve(process.cwd(), "package.json")).href,
-  { with: { type: "json" } }
-);
+import pkg from "./package.json" with { type: "json" };
 
 declare global {
   var API_URL: string;
@@ -34,17 +30,9 @@ const {
   GITHUB_RUN_ID,
   GITHUB_RUN_ATTEMPT,
   GITHUB_ACTOR_ID,
-  GITHUB_REF_NAME,
   GITHUB_SHA,
 } = process.env;
 
-let ref = GITHUB_REF_NAME.split("/merge")[0];
-const isPullRequest = GITHUB_REF_NAME.endsWith("/merge");
-
-if (isPullRequest) {
-  ref = "pr-" + ref;
-}
-
 const [owner, repo] = GITHUB_REPOSITORY.split("/");
 
 const commit = await octokit.git.getCommit({
@@ -68,38 +56,84 @@ const key = hash(metadata);
 
 const main = defineCommand({
   meta: {
-    version,
+    version: pkg.version,
     name: "stackblitz",
     description: "A CLI for pkg.pr.new (Continuous Releases)",
   },
   subCommands: {
     publish: () => {
       return {
-        meta: {},
-        run: async () => {
-          await ezSpawn.async("npm pack", { stdio: "inherit" });
+        args: {
+          compact: {
+            type: "boolean",
+            description:
+              "compact urls. The shortest form of urls like pkg.pr.new/tinybench@a832a55)",
+          },
+        },
+        run: async ({ args }) => {
+          const compact = !!args.compact;
 
-          const file = await fs.readFile(`${name}-${version}.tgz`);
-          console.log('headers', {
-            headers: {
-              "sb-key": key,
-              "sb-package-name": name,
-              "sb-package-version": version,
-              "sb-commit-timestamp": commitTimestamp.toString(),
-            },
-          })
+          const paths = (args._.length ? args._ : ["."]).map((p) =>
+            path.resolve(p),
+          );
+
+          const deps: Map<string, string> = new Map();
+          const pJsonContent: Map<string, string> = new Map();
+          for (const p of paths) {
+            const pJsonPath = path.resolve(p, "package.json");
+            const { name } = await importPackageJson(pJsonPath);
+
+            if (compact) {
+              await verifyCompactMode(name);
+            }
+
+            deps.set(
+              name,
+              new URL(
+                `/${owner}/${repo}/${name}@${GITHUB_SHA.substring(0, 7)}`,
+                API_URL,
+              ).href,
+            );
+          }
+          for (const p of paths) {
+            const pJsonPath = path.resolve(p, "package.json");
+            const content = await fs.readFile(pJsonPath, "utf-8");
+            pJsonContent.set(pJsonPath, content);
+
+            const pJson = await importPackageJson(pJsonPath);
+            hijackDeps(deps, pJson.dependencies);
+            hijackDeps(deps, pJson.devDependencies);
+            await fs.writeFile(pJsonPath, JSON.stringify(pJson));
+          }
+          const formData = new FormData();
+          for (const p of paths) {
+            const pJsonPath = path.resolve(p, "package.json");
+            try {
+              const { name, version } = await importPackageJson(pJsonPath);
+              await ezSpawn.async("npm pack", { stdio: "inherit", cwd: p });
+
+              const fileName = `${name}-${version}.tgz`;
+              const file = await fs.readFile(path.resolve(p, fileName));
+
+              const blob = new Blob([file], {
+                type: "application/octet-stream",
+              });
+              formData.append(name, blob, fileName);
+            } finally {
+              await fs.writeFile(pJsonPath, pJsonContent.get(pJsonPath)!);
+            }
+          }
 
           const res = await fetch(publishUrl, {
             method: "POST",
             headers: {
+              "sb-compact": `${compact}`,
               "sb-key": key,
-              "sb-package-name": name,
-              "sb-package-version": version,
               "sb-commit-timestamp": commitTimestamp.toString(),
             },
-            body: file,
+            body: formData,
           });
-          const laterRes = res.clone();
+          const laterRes = await res.clone().json();
           assert.equal(
             res.status,
             200,
@@ -107,7 +141,8 @@ const main = defineCommand({
           );
 
           console.log(
-            `⚡️ Your npm package is published: \`npm i ${(await laterRes.json()).url}\``,
+            `⚡️ Your npm packages are published.
+            ${[...formData.keys()].map((name, i) => `${name}: \`npm i ${laterRes.urls[i]}\``).join("\n")}`,
           );
         },
       };
@@ -122,3 +157,47 @@ const main = defineCommand({
 });
 
 runMain(main);
+
+async function importPackageJson(p: string): Promise<Record<string, any>> {
+  const { default: obj } = await import(pathToFileURL(p).href, {
+    with: { type: "json" },
+  });
+
+  return obj;
+}
+
+function hijackDeps(
+  newDeps: Map<string, string>,
+  oldDeps?: Record<string, string>,
+) {
+  if (!oldDeps) {
+    return;
+  }
+  for (const [newDep, url] of newDeps) {
+    if (newDep in oldDeps) {
+      oldDeps[newDep] = url;
+    }
+  }
+}
+
+async function verifyCompactMode(packageName: string) {
+  const error = new Error(
+    `pkg-pr-new cannot resolve ${packageName} from npm. --compact flag depends on the package being available in npm.
+Make sure to have your package on npm first or configure the 'repository' field in your package.json properly.`,
+  );
+  try {
+    const manifest = await getPackageManifest(packageName);
+
+    const repository = extractRepository(manifest);
+    if (!repository) {
+      throw error;
+    }
+
+    const match = extractOwnerAndRepo(repository);
+    if (!match) {
+      throw error;
+    }
+  } catch {
+    throw error;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pkg-pr-new",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -20,7 +20,9 @@
     "@octokit/action": "^6.0.7"
   },
   "devDependencies": {
+    "@pkg-pr-new/utils": "workspace:^",
     "citty": "^0.1.6",
+    "query-registry": "^3.0.0",
     "tsup": "^8.0.2"
   }
 }

package/tsup.config.ts

@@ -7,7 +7,7 @@ export default defineConfig({
   splitting: false,
   sourcemap: "inline",
   define: {
-    API_URL: JSON.stringify(process.env.API_URL ?? 'https://localhost:3000')
+    API_URL: JSON.stringify(process.env.API_URL ?? "https://localhost:3000"),
   },
   clean: true,
   bundle: true,