pkg-pr-new 0.0.16 → 0.0.18

package/index.ts

@@ -44,6 +44,12 @@ const main = defineCommand({
             description:
               "compact urls. The shortest form of urls like pkg.pr.new/tinybench@a832a55)",
           },
+          peerDeps: {
+            type: "boolean",
+            description:
+              "handle peerDependencies by setting the workspace version instead of what has been set in the peerDeps itself. --peerDeps not being true would leave peerDependencies to the package manager itself (npm, pnpm)",
+            default: false,
+          },
           pnpm: {
             type: "boolean",
             description: "use `pnpm pack` instead of `npm pack --json`",
@@ -76,6 +82,7 @@ const main = defineCommand({
 
           const isCompact = !!args.compact;
           const isPnpm = !!args.pnpm;
+          const isPeerDepsEnabled = !!args.peerDeps
 
           const comment: Comment = args.comment as Comment;
 
@@ -122,7 +129,8 @@ const main = defineCommand({
           const { sha } = await checkResponse.json();
           const abbreviatedSha = abbreviateCommitHash(sha);
 
-          const deps: Map<string, string> = new Map();
+          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
 
           for (const p of paths) {
             if (!(await hasPackageJson(p))) {
@@ -142,13 +150,20 @@ const main = defineCommand({
               await verifyCompactMode(pJson.name);
             }
 
-            deps.set(
-              pJson.name,
-              new URL(
+            const depUrl = new URL(
                 `/${owner}/${repo}/${pJson.name}@${abbreviatedSha}`,
                 apiUrl,
-              ).href,
+              ).href
+            deps.set(
+              pJson.name,
+              depUrl,
             );
+            realDeps?.set(pJson.name, pJson.version ?? depUrl)
+
+            const resource = await fetch(depUrl)
+            if (resource.ok) {
+              console.warn(`${pJson.name}@${abbreviatedSha} was already published on ${depUrl}`)
+            }
           }
 
           for (const templateDir of templates) {
@@ -167,7 +182,7 @@ const main = defineCommand({
 
             console.log("preparing template:", pJson.name);
 
-            const restore = await writeDeps(templateDir, deps);
+            const restore = await writeDeps(templateDir, deps, realDeps);
 
             const gitignorePath = path.join(templateDir, ".gitignore");
             const ig = ignore()
@@ -204,7 +219,7 @@ const main = defineCommand({
 
           const noDefaultTemplate = args.template === false;
 
-          if (!templates.length && !noDefaultTemplate) {
+          if (!noDefaultTemplate) {
             const project = createDefaultTemplate(
               Object.fromEntries(deps.entries()),
             );
@@ -232,7 +247,7 @@ const main = defineCommand({
               continue;
             }
 
-            restoreMap.set(p, await writeDeps(p, deps));
+            restoreMap.set(p, await writeDeps(p, deps, realDeps));
           }
 
           const shasums: Record<string, string> = {};
@@ -334,7 +349,7 @@ async function resolveTarball(pm: "npm" | "pnpm", p: string) {
   return { filename, shasum };
 }
 
-async function writeDeps(p: string, deps: Map<string, string>) {
+async function writeDeps(p: string, deps: Map<string, string>, realDeps: Map<string, string> | null) {
   const pJsonPath = path.resolve(p, "package.json");
   const content = await fs.readFile(pJsonPath, "utf-8");
 
@@ -343,6 +358,10 @@ async function writeDeps(p: string, deps: Map<string, string>) {
   hijackDeps(deps, pJson.dependencies);
   hijackDeps(deps, pJson.devDependencies);
 
+  if (realDeps) {
+    hijackDeps(realDeps, pJson.peerDependencies);
+  }
+
   await writePackageJSON(pJsonPath, pJson);
 
   return () => fs.writeFile(pJsonPath, content);

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "pkg-pr-new",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "",
   "main": "index.js",
   "type": "module",
   "bin": {
     "pkg-pr-new": "bin/cli.js"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/stackblitz-labs/pkg.pr.new",
+    "directory": "packages/cli"
+  },
   "scripts": {
     "dev": "tsup --watch",
     "build": "tsup",