pnpm 8.3.0-0 → 8.3.1

package/README.md

@@ -105,6 +105,17 @@ To quote the [Rush](https://rushjs.io/) team:
         </a>
       </td>
     </tr>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://www.thinkmill.com.au/?utm_source=pnpm&utm_medium=readme" target="_blank">
+          <picture>
+            <source media="(prefers-color-scheme: light)" srcset="https://pnpm.io/img/users/thinkmill.svg" />
+            <source media="(prefers-color-scheme: dark)" srcset="https://pnpm.io/img/users/thinkmill_light.svg" />
+            <img src="https://pnpm.io/img/users/thinkmill.svg" width="200" />
+          </picture>
+        </a>
+      </td>
+    </tr>
   </tbody>
 </table>
 

package/dist/node_modules/.modules.yaml

@@ -204,7 +204,7 @@ packageManager: pnpm@8.0.0-beta.0
 pendingBuilds:
   - /node-gyp/9.3.1
   - /encoding/0.1.13
-prunedAt: Sun, 16 Apr 2023 21:22:34 GMT
+prunedAt: Wed, 19 Apr 2023 12:22:54 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3249,7 +3249,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault3(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "8.3.0-0" : "0.0.0"
+      version: true ? "8.3.1" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -45178,11 +45178,14 @@ var require_reportSummary = __commonJS({
     function reportSummary(log$, opts) {
       const pkgsDiff$ = (0, pkgsDiff_1.getPkgsDiff)(log$, { prefix: opts.cwd });
       const summaryLog$ = log$.summary.pipe((0, operators_1.take)(1));
-      const _printDiffs = printDiffs.bind(null, { prefix: opts.cwd, filterPkgsDiff: opts.filterPkgsDiff });
+      const _printDiffs = printDiffs.bind(null, { prefix: opts.cwd });
       return Rx.combineLatest(pkgsDiff$, summaryLog$).pipe((0, operators_1.take)(1), (0, operators_1.map)(([pkgsDiff]) => {
         let msg = "";
         for (const depType of ["prod", "optional", "peer", "dev", "nodeModulesOnly"]) {
-          const diffs = Object.values(pkgsDiff[depType]);
+          let diffs = Object.values(pkgsDiff[depType]);
+          if (opts.filterPkgsDiff) {
+            diffs = diffs.filter((pkgDiff) => opts.filterPkgsDiff(pkgDiff));
+          }
           if (diffs.length > 0) {
             msg += constants_1.EOL;
             if (opts.pnpmConfig?.global) {
@@ -45207,9 +45210,6 @@ var require_reportSummary = __commonJS({
     }
     exports2.reportSummary = reportSummary;
     function printDiffs(opts, pkgsDiff) {
-      if (opts.filterPkgsDiff) {
-        pkgsDiff = pkgsDiff.filter((pkgDiff) => opts.filterPkgsDiff(pkgDiff));
-      }
       pkgsDiff.sort((a, b) => a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)));
       const msg = pkgsDiff.map((pkg) => {
         let result2 = pkg.added ? outputConstants_1.ADDED_CHAR : outputConstants_1.REMOVED_CHAR;
@@ -60266,9 +60266,9 @@ var require_fetch_blob = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/node-fetch@3.0.0-beta.9/node_modules/node-fetch/dist/index.cjs
+// ../node_modules/.pnpm/@pnpm+node-fetch@1.0.0/node_modules/@pnpm/node-fetch/dist/index.cjs
 var require_dist6 = __commonJS({
-  "../node_modules/.pnpm/node-fetch@3.0.0-beta.9/node_modules/node-fetch/dist/index.cjs"(exports2, module2) {
+  "../node_modules/.pnpm/@pnpm+node-fetch@1.0.0/node_modules/@pnpm/node-fetch/dist/index.cjs"(exports2, module2) {
     "use strict";
     exports2 = module2.exports = fetch;
     var http = require("http");
@@ -60361,7 +60361,7 @@ var require_dist6 = __commonJS({
       length += Buffer.byteLength(getFooter(boundary));
       return length;
     }
-    var INTERNALS = Symbol("Body internals");
+    var INTERNALS$2 = Symbol("Body internals");
     var Body = class {
       constructor(body, {
         size = 0
@@ -60387,7 +60387,7 @@ var require_dist6 = __commonJS({
         } else {
           body = Buffer.from(String(body));
         }
-        this[INTERNALS] = {
+        this[INTERNALS$2] = {
           body,
           boundary,
           disturbed: false,
@@ -60397,15 +60397,15 @@ var require_dist6 = __commonJS({
         if (body instanceof Stream) {
           body.on("error", (err) => {
             const error = err instanceof FetchBaseError ? err : new FetchError(`Invalid response body while trying to fetch ${this.url}: ${err.message}`, "system", err);
-            this[INTERNALS].error = error;
+            this[INTERNALS$2].error = error;
           });
         }
       }
       get body() {
-        return this[INTERNALS].body;
+        return this[INTERNALS$2].body;
       }
       get bodyUsed() {
-        return this[INTERNALS].disturbed;
+        return this[INTERNALS$2].disturbed;
       }
       /**
        * Decode response as ArrayBuffer
@@ -60422,7 +60422,7 @@ var require_dist6 = __commonJS({
        * @return Promise
        */
       async blob() {
-        const ct = this.headers && this.headers.get("content-type") || this[INTERNALS].body && this[INTERNALS].body.type || "";
+        const ct = this.headers && this.headers.get("content-type") || this[INTERNALS$2].body && this[INTERNALS$2].body.type || "";
         const buf = await this.buffer();
         return new Blob([buf], {
           type: ct
@@ -60464,12 +60464,12 @@ var require_dist6 = __commonJS({
       text: { enumerable: true }
     });
     async function consumeBody(data) {
-      if (data[INTERNALS].disturbed) {
+      if (data[INTERNALS$2].disturbed) {
         throw new TypeError(`body used already for: ${data.url}`);
       }
-      data[INTERNALS].disturbed = true;
-      if (data[INTERNALS].error) {
-        throw data[INTERNALS].error;
+      data[INTERNALS$2].disturbed = true;
+      if (data[INTERNALS$2].error) {
+        throw data[INTERNALS$2].error;
       }
       let { body } = data;
       if (body === null) {
@@ -60528,7 +60528,7 @@ var require_dist6 = __commonJS({
         p2 = new Stream.PassThrough({ highWaterMark });
         body.pipe(p1);
         body.pipe(p2);
-        instance[INTERNALS].body = p1;
+        instance[INTERNALS$2].body = p1;
         body = p2;
       }
       return body;
@@ -60553,7 +60553,7 @@ var require_dist6 = __commonJS({
         return `multipart/form-data;boundary=${body.getBoundary()}`;
       }
       if (isFormData(body)) {
-        return `multipart/form-data; boundary=${request[INTERNALS].boundary}`;
+        return `multipart/form-data; boundary=${request[INTERNALS$2].boundary}`;
       }
       if (body instanceof Stream) {
         return null;
@@ -60575,7 +60575,7 @@ var require_dist6 = __commonJS({
         return body.hasKnownLength && body.hasKnownLength() ? body.getLengthSync() : null;
       }
       if (isFormData(body)) {
-        return getFormDataLength(request[INTERNALS].boundary);
+        return getFormDataLength(request[INTERNALS$2].boundary);
       }
       return null;
     };
@@ -60659,7 +60659,7 @@ var require_dist6 = __commonJS({
                   validateHeaderName(name);
                   validateHeaderValue(name, String(value));
                   return URLSearchParams.prototype[p].call(
-                    receiver,
+                    target,
                     String(name).toLowerCase(),
                     String(value)
                   );
@@ -60670,7 +60670,7 @@ var require_dist6 = __commonJS({
                 return (name) => {
                   validateHeaderName(name);
                   return URLSearchParams.prototype[p].call(
-                    receiver,
+                    target,
                     String(name).toLowerCase()
                   );
                 };
@@ -60877,9 +60877,9 @@ var require_dist6 = __commonJS({
       const hash = parsedURL.hash || (parsedURL.href[lastOffset] === "#" ? "#" : "");
       return parsedURL.href[lastOffset - hash.length] === "?" ? "?" : "";
     };
-    var INTERNALS$2 = Symbol("Request internals");
+    var INTERNALS = Symbol("Request internals");
     var isRequest = (object) => {
-      return typeof object === "object" && typeof object[INTERNALS$2] === "object";
+      return typeof object === "object" && typeof object[INTERNALS] === "object";
     };
     var Request = class extends Body {
       constructor(input, init = {}) {
@@ -60913,7 +60913,7 @@ var require_dist6 = __commonJS({
         if (signal !== null && !isAbortSignal(signal)) {
           throw new TypeError("Expected signal to be an instanceof AbortSignal");
         }
-        this[INTERNALS$2] = {
+        this[INTERNALS] = {
           method,
           redirect: init.redirect || input.redirect || "follow",
           headers,
@@ -60928,19 +60928,19 @@ var require_dist6 = __commonJS({
         this.insecureHTTPParser = init.insecureHTTPParser || input.insecureHTTPParser || false;
       }
       get method() {
-        return this[INTERNALS$2].method;
+        return this[INTERNALS].method;
       }
       get url() {
-        return url.format(this[INTERNALS$2].parsedURL);
+        return url.format(this[INTERNALS].parsedURL);
       }
       get headers() {
-        return this[INTERNALS$2].headers;
+        return this[INTERNALS].headers;
       }
       get redirect() {
-        return this[INTERNALS$2].redirect;
+        return this[INTERNALS].redirect;
       }
       get signal() {
-        return this[INTERNALS$2].signal;
+        return this[INTERNALS].signal;
       }
       /**
        * Clone this request
@@ -60963,8 +60963,8 @@ var require_dist6 = __commonJS({
       signal: { enumerable: true }
     });
     var getNodeRequestOptions = (request) => {
-      const { parsedURL } = request[INTERNALS$2];
-      const headers = new Headers(request[INTERNALS$2].headers);
+      const { parsedURL } = request[INTERNALS];
+      const headers = new Headers(request[INTERNALS].headers);
       if (!headers.has("Accept")) {
         headers.set("Accept", "*/*");
       }
@@ -61199,7 +61199,7 @@ var require_dist6 = __commonJS({
     exports2.Headers = Headers;
     exports2.Request = Request;
     exports2.Response = Response;
-    exports2.default = fetch;
+    exports2["default"] = fetch;
     exports2.isRedirect = isRedirect;
   }
 });
@@ -114191,10 +114191,12 @@ var require_satisfiesPackageManifest = __commonJS({
         };
       }
       const pickNonLinkedDeps = (0, pickBy_1.default)((spec) => !spec.startsWith("link:"));
+      let specs = importer.specifiers;
       if (opts?.excludeLinksFromLockfile) {
         existingDeps = pickNonLinkedDeps(existingDeps);
+        specs = pickNonLinkedDeps(specs);
       }
-      if (!(0, equals_1.default)(existingDeps, importer.specifiers) || importer.publishDirectory !== pkg.publishConfig?.directory) {
+      if (!(0, equals_1.default)(existingDeps, specs) || importer.publishDirectory !== pkg.publishConfig?.directory) {
         return false;
       }
       if (!(0, equals_1.default)(pkg.dependenciesMeta ?? {}, importer.dependenciesMeta ?? {}))
@@ -180700,14 +180702,13 @@ var require_lib131 = __commonJS({
         for (const { id, manifest } of selectedProjects) {
           if (filteredLockfile.importers[id]) {
             for (const depType of types_1.DEPENDENCIES_FIELDS) {
-              for (const [depName, spec] of Object.entries(manifest[depType] ?? {})) {
-                if (spec.startsWith("link:")) {
-                  if (!filteredLockfile.importers[id][depType]) {
-                    filteredLockfile.importers[id][depType] = {};
-                  }
-                  filteredLockfile.importers[id][depType][depName] = spec;
-                }
-              }
+              filteredLockfile.importers[id][depType] = {
+                ...filteredLockfile.importers[id][depType],
+                ...Object.entries(manifest[depType] ?? {}).filter(([_, spec]) => spec.startsWith("link:")).reduce((acc, [depName, spec]) => {
+                  acc[depName] = `link:${path_1.default.relative(opts.lockfileDir, spec.substring(5))}`;
+                  return acc;
+                }, {})
+              };
             }
           }
         }
@@ -186439,6 +186440,7 @@ var require_extendInstallOptions = __commonJS({
         enablePnp: false,
         engineStrict: false,
         force: false,
+        forceFullResolution: false,
         forceSharedLockfile: false,
         frozenLockfile: false,
         hoistPattern: void 0,
@@ -187147,7 +187149,7 @@ var require_install = __commonJS({
           onlyBuiltDependencies: opts.onlyBuiltDependencies,
           packageExtensionsChecksum,
           patchedDependencies
-        }) || opts.fixLockfile || !ctx.wantedLockfile.lockfileVersion.toString().startsWith("6.");
+        }) || opts.fixLockfile || !ctx.wantedLockfile.lockfileVersion.toString().startsWith("6.") || opts.forceFullResolution;
         if (needsFullResolution) {
           ctx.wantedLockfile.overrides = opts.overrides;
           ctx.wantedLockfile.neverBuiltDependencies = opts.neverBuiltDependencies;
@@ -189509,6 +189511,7 @@ var require_install2 = __commonJS({
       ...rcOptionsTypes(),
       ...(0, pick_1.default)(["force"], config_1.types),
       "fix-lockfile": Boolean,
+      "resolution-only": Boolean,
       recursive: Boolean
     });
     exports2.cliOptionsTypes = cliOptionsTypes;
@@ -189654,6 +189657,10 @@ var require_install2 = __commonJS({
                 description: "Only use the side effects cache if present, do not create it for new packages",
                 name: "--side-effects-cache-readonly"
               },
+              {
+                description: "Re-runs resolution: useful for printing out peer dependency issues",
+                name: "--resolution-only"
+              },
               ...common_cli_options_help_1.UNIVERSAL_OPTIONS
             ]
           },
@@ -189671,12 +189678,17 @@ var require_install2 = __commonJS({
         devDependencies: opts.dev !== false,
         optionalDependencies: opts.optional !== false
       };
-      return (0, installDeps_1.installDeps)({
+      const installDepsOptions = {
         ...opts,
         frozenLockfileIfExists: ci_info_1.isCI && !opts.lockfileOnly && typeof opts.rawLocalConfig["frozen-lockfile"] === "undefined" && typeof opts.rawLocalConfig["prefer-frozen-lockfile"] === "undefined",
         include,
         includeDirect: include
-      }, []);
+      };
+      if (opts.resolutionOnly) {
+        installDepsOptions.lockfileOnly = true;
+        installDepsOptions.forceFullResolution = true;
+      }
+      return (0, installDeps_1.installDeps)(installDepsOptions, []);
     }
     exports2.handler = handler;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "8.3.0-0",
+  "version": "8.3.1",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"