pnpm 7.7.1 → 7.8.0

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.7.0
+packageManager: pnpm@7.7.1
 pendingBuilds:
   - /node-gyp/8.4.1
   - /encoding/0.1.13
-prunedAt: Sat, 30 Jul 2022 09:37:18 GMT
+prunedAt: Sun, 31 Jul 2022 08:41:15 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3206,7 +3206,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault(require_load_json_file());
     var defaultManifest = {
       name: "pnpm" != null && true ? "pnpm" : "pnpm",
-      version: "7.7.1" != null && true ? "7.7.1" : "0.0.0"
+      version: "7.8.0" != null && true ? "7.8.0" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -13460,9 +13460,9 @@ var require_config_chain = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/envKeyToSetting.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/envKeyToSetting.js
 var require_envKeyToSetting = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/envKeyToSetting.js"(exports2, module2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/envKeyToSetting.js"(exports2, module2) {
     module2.exports = function(x) {
       const colonIndex = x.indexOf(":");
       if (colonIndex === -1) {
@@ -13485,9 +13485,9 @@ var require_envKeyToSetting = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/util.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/util.js
 var require_util = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/util.js"(exports2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/util.js"(exports2) {
     "use strict";
     var fs2 = require("fs");
     var path2 = require("path");
@@ -13597,9 +13597,9 @@ var require_util = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/types.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/types.js
 var require_types2 = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/types.js"(exports2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/types.js"(exports2) {
     "use strict";
     var path2 = require("path");
     var Stream = require("stream").Stream;
@@ -13732,9 +13732,9 @@ var require_types2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/conf.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/conf.js
 var require_conf = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/conf.js"(exports2, module2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/conf.js"(exports2, module2) {
     "use strict";
     var { readCAFileSync } = require_dist();
     var fs2 = require("fs");
@@ -13771,10 +13771,9 @@ var require_conf = __commonJS({
           if (error.code === "ENOENT") {
             this.add({}, marker);
           } else {
-            throw error;
+            return `Issue while reading "${file}". ${error.message}`;
           }
         }
-        return this;
       }
       addEnv(env) {
         env = env || process.env;
@@ -13865,9 +13864,9 @@ var require_conf = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/defaults.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/defaults.js
 var require_defaults = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/defaults.js"(exports2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/defaults.js"(exports2) {
     "use strict";
     var os = require("os");
     var path2 = require("path");
@@ -14032,9 +14031,9 @@ var require_defaults = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/index.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/index.js
 var require_npm_conf = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/index.js"(exports2, module2) {
     "use strict";
     var path2 = require("path");
     var Conf = require_conf();
@@ -14042,6 +14041,7 @@ var require_npm_conf = __commonJS({
     module2.exports = (opts, types, defaults2) => {
       const conf = new Conf(Object.assign({}, _defaults.defaults, defaults2), types);
       conf.add(Object.assign({}, opts), "cli");
+      const warnings = [];
       if (require.resolve.paths) {
         const paths = require.resolve.paths("npm");
         let npmPath;
@@ -14050,7 +14050,7 @@ var require_npm_conf = __commonJS({
         } catch (error) {
         }
         if (npmPath) {
-          conf.addFile(path2.resolve(path2.dirname(npmPath), "..", "npmrc"), "builtin");
+          warnings.push(conf.addFile(path2.resolve(path2.dirname(npmPath), "..", "npmrc"), "builtin"));
         }
       }
       conf.addEnv();
@@ -14058,27 +14058,30 @@ var require_npm_conf = __commonJS({
       const projectConf = path2.resolve(conf.localPrefix, ".npmrc");
       const userConf = conf.get("userconfig");
       if (!conf.get("global") && projectConf !== userConf) {
-        conf.addFile(projectConf, "project");
+        warnings.push(conf.addFile(projectConf, "project"));
       } else {
         conf.add({}, "project");
       }
       if (conf.get("workspace-prefix") && conf.get("workspace-prefix") !== projectConf) {
         const workspaceConf = path2.resolve(conf.get("workspace-prefix"), ".npmrc");
-        conf.addFile(workspaceConf, "workspace");
+        warnings.push(conf.addFile(workspaceConf, "workspace"));
       }
-      conf.addFile(conf.get("userconfig"), "user");
+      warnings.push(conf.addFile(conf.get("userconfig"), "user"));
       if (conf.get("prefix")) {
         const etc = path2.resolve(conf.get("prefix"), "etc");
         conf.root.globalconfig = path2.resolve(etc, "npmrc");
         conf.root.globalignorefile = path2.resolve(etc, "npmignore");
       }
-      conf.addFile(conf.get("globalconfig"), "global");
+      warnings.push(conf.addFile(conf.get("globalconfig"), "global"));
       conf.loadUser();
       const caFile = conf.get("cafile");
       if (caFile) {
         conf.loadCAFile(caFile);
       }
-      return conf;
+      return {
+        config: conf,
+        warnings: warnings.filter(Boolean)
+      };
     };
     Object.defineProperty(module2.exports, "defaults", {
       get() {
@@ -23680,7 +23683,6 @@ var require_lib18 = __commonJS({
       const env = opts.env ?? process.env;
       const packageManager = opts.packageManager ?? { name: "pnpm", version: "undefined" };
       const cliOptions = opts.cliOptions ?? {};
-      const warnings = new Array();
       if (cliOptions["hoist"] === false) {
         if (cliOptions["shamefully-hoist"] === true) {
           throw new error_1.default("CONFIG_CONFLICT_HOIST", "--shamefully-hoist cannot be used with --no-hoist");
@@ -23705,7 +23707,7 @@ var require_lib18 = __commonJS({
         cliOptions["prefix"] = cliOptions.dir;
       }
       const rcOptionsTypes = { ...exports2.types, ...opts.rcOptionsTypes };
-      const npmConfig = (0, npm_conf_1.default)(cliOptions, rcOptionsTypes, {
+      const { config: npmConfig, warnings } = (0, npm_conf_1.default)(cliOptions, rcOptionsTypes, {
         "auto-install-peers": false,
         bail: true,
         color: "auto",
@@ -86417,7 +86419,7 @@ var require_lib46 = __commonJS({
       };
     }
     function resolveLocalPackageDir(localPackage) {
-      if (localPackage.manifest.publishConfig?.directory == null)
+      if (localPackage.manifest.publishConfig?.directory == null || localPackage.manifest.publishConfig?.linkDirectory !== true)
         return localPackage.dir;
       return path_1.default.join(localPackage.dir, localPackage.manifest.publishConfig.directory);
     }
@@ -89499,7 +89501,8 @@ var require_read = __commonJS({
         lockfileFile.importers = {
           ".": {
             specifiers: lockfileFile["specifiers"] ?? {},
-            dependenciesMeta: lockfileFile["dependenciesMeta"]
+            dependenciesMeta: lockfileFile["dependenciesMeta"],
+            publishDirectory: lockfileFile["publishDirectory"]
           }
         };
         delete lockfileFile.specifiers;

package/dist/pnpx.cjs

@@ -7790,9 +7790,9 @@ var require_config_chain = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/envKeyToSetting.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/envKeyToSetting.js
 var require_envKeyToSetting = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/envKeyToSetting.js"(exports2, module2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/envKeyToSetting.js"(exports2, module2) {
     module2.exports = function(x) {
       const colonIndex = x.indexOf(":");
       if (colonIndex === -1) {
@@ -7815,9 +7815,9 @@ var require_envKeyToSetting = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/util.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/util.js
 var require_util = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/util.js"(exports2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/util.js"(exports2) {
     "use strict";
     var fs2 = require("fs");
     var path2 = require("path");
@@ -7927,9 +7927,9 @@ var require_util = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/types.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/types.js
 var require_types = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/types.js"(exports2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/types.js"(exports2) {
     "use strict";
     var path2 = require("path");
     var Stream = require("stream").Stream;
@@ -8062,9 +8062,9 @@ var require_types = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/conf.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/conf.js
 var require_conf = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/conf.js"(exports2, module2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/conf.js"(exports2, module2) {
     "use strict";
     var { readCAFileSync } = require_dist();
     var fs2 = require("fs");
@@ -8101,10 +8101,9 @@ var require_conf = __commonJS({
           if (error.code === "ENOENT") {
             this.add({}, marker);
           } else {
-            throw error;
+            return `Issue while reading "${file}". ${error.message}`;
           }
         }
-        return this;
       }
       addEnv(env) {
         env = env || process.env;
@@ -8195,9 +8194,9 @@ var require_conf = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/defaults.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/defaults.js
 var require_defaults = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/lib/defaults.js"(exports2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/lib/defaults.js"(exports2) {
     "use strict";
     var os = require("os");
     var path2 = require("path");
@@ -8362,9 +8361,9 @@ var require_defaults = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/index.js
+// ../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/index.js
 var require_npm_conf = __commonJS({
-  "../../node_modules/.pnpm/@pnpm+npm-conf@1.0.5/node_modules/@pnpm/npm-conf/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/@pnpm+npm-conf@2.0.0/node_modules/@pnpm/npm-conf/index.js"(exports2, module2) {
     "use strict";
     var path2 = require("path");
     var Conf = require_conf();
@@ -8372,6 +8371,7 @@ var require_npm_conf = __commonJS({
     module2.exports = (opts, types, defaults2) => {
       const conf = new Conf(Object.assign({}, _defaults.defaults, defaults2), types);
       conf.add(Object.assign({}, opts), "cli");
+      const warnings = [];
       if (require.resolve.paths) {
         const paths = require.resolve.paths("npm");
         let npmPath;
@@ -8380,7 +8380,7 @@ var require_npm_conf = __commonJS({
         } catch (error) {
         }
         if (npmPath) {
-          conf.addFile(path2.resolve(path2.dirname(npmPath), "..", "npmrc"), "builtin");
+          warnings.push(conf.addFile(path2.resolve(path2.dirname(npmPath), "..", "npmrc"), "builtin"));
         }
       }
       conf.addEnv();
@@ -8388,27 +8388,30 @@ var require_npm_conf = __commonJS({
       const projectConf = path2.resolve(conf.localPrefix, ".npmrc");
       const userConf = conf.get("userconfig");
       if (!conf.get("global") && projectConf !== userConf) {
-        conf.addFile(projectConf, "project");
+        warnings.push(conf.addFile(projectConf, "project"));
       } else {
         conf.add({}, "project");
       }
       if (conf.get("workspace-prefix") && conf.get("workspace-prefix") !== projectConf) {
         const workspaceConf = path2.resolve(conf.get("workspace-prefix"), ".npmrc");
-        conf.addFile(workspaceConf, "workspace");
+        warnings.push(conf.addFile(workspaceConf, "workspace"));
       }
-      conf.addFile(conf.get("userconfig"), "user");
+      warnings.push(conf.addFile(conf.get("userconfig"), "user"));
       if (conf.get("prefix")) {
         const etc = path2.resolve(conf.get("prefix"), "etc");
         conf.root.globalconfig = path2.resolve(etc, "npmrc");
         conf.root.globalignorefile = path2.resolve(etc, "npmignore");
       }
-      conf.addFile(conf.get("globalconfig"), "global");
+      warnings.push(conf.addFile(conf.get("globalconfig"), "global"));
       conf.loadUser();
       const caFile = conf.get("cafile");
       if (caFile) {
         conf.loadCAFile(caFile);
       }
-      return conf;
+      return {
+        config: conf,
+        warnings: warnings.filter(Boolean)
+      };
     };
     Object.defineProperty(module2.exports, "defaults", {
       get() {
@@ -18010,7 +18013,6 @@ var require_lib17 = __commonJS({
       const env = opts.env ?? process.env;
       const packageManager = opts.packageManager ?? { name: "pnpm", version: "undefined" };
       const cliOptions = opts.cliOptions ?? {};
-      const warnings = new Array();
       if (cliOptions["hoist"] === false) {
         if (cliOptions["shamefully-hoist"] === true) {
           throw new error_1.default("CONFIG_CONFLICT_HOIST", "--shamefully-hoist cannot be used with --no-hoist");
@@ -18035,7 +18037,7 @@ var require_lib17 = __commonJS({
         cliOptions["prefix"] = cliOptions.dir;
       }
       const rcOptionsTypes = { ...exports2.types, ...opts.rcOptionsTypes };
-      const npmConfig = (0, npm_conf_1.default)(cliOptions, rcOptionsTypes, {
+      const { config: npmConfig, warnings } = (0, npm_conf_1.default)(cliOptions, rcOptionsTypes, {
         "auto-install-peers": false,
         bail: true,
         color: "auto",
@@ -81376,7 +81378,7 @@ var require_lib45 = __commonJS({
       };
     }
     function resolveLocalPackageDir(localPackage) {
-      if (localPackage.manifest.publishConfig?.directory == null)
+      if (localPackage.manifest.publishConfig?.directory == null || localPackage.manifest.publishConfig?.linkDirectory !== true)
         return localPackage.dir;
       return path_1.default.join(localPackage.dir, localPackage.manifest.publishConfig.directory);
     }
@@ -84458,7 +84460,8 @@ var require_read = __commonJS({
         lockfileFile.importers = {
           ".": {
             specifiers: lockfileFile["specifiers"] ?? {},
-            dependenciesMeta: lockfileFile["dependenciesMeta"]
+            dependenciesMeta: lockfileFile["dependenciesMeta"],
+            publishDirectory: lockfileFile["publishDirectory"]
           }
         };
         delete lockfileFile.specifiers;

package/package.json

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