pnpm 7.7.0-0 → 7.7.0-1

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.6.0
+packageManager: pnpm@7.7.0-0
 pendingBuilds:
   - /node-gyp/8.4.1
   - /encoding/0.1.13
-prunedAt: Wed, 27 Jul 2022 09:56:06 GMT
+prunedAt: Thu, 28 Jul 2022 13:58:38 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/node_modules/.pnpm/lock.yaml

@@ -83,9 +83,9 @@ packages:
     dev: false
     optional: true
 
-  /are-we-there-yet/3.0.0:
-    resolution: {integrity: sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16}
+  /are-we-there-yet/3.0.1:
+    resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       delegates: 1.0.0
       readable-stream: 3.6.0
@@ -512,7 +512,7 @@ packages:
     resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
-      are-we-there-yet: 3.0.0
+      are-we-there-yet: 3.0.1
       console-control-strings: 1.1.0
       gauge: 4.0.4
       set-blocking: 2.0.0

package/dist/node_modules/are-we-there-yet/lib/tracker-group.js

@@ -103,7 +103,7 @@ TrackerGroup.prototype.finish = function () {
 var buffer = '                                  '
 TrackerGroup.prototype.debug = function (depth) {
   depth = depth || 0
-  var indent = depth ? buffer.substr(0, depth) : ''
+  var indent = depth ? buffer.slice(0, depth) : ''
   var output = indent + (this.name || 'top') + ': ' + this.completed() + '\n'
   this.trackers.forEach(function (tracker) {
     if (tracker instanceof TrackerGroup) {

package/dist/node_modules/are-we-there-yet/package.json

@@ -1,12 +1,12 @@
 {
   "name": "are-we-there-yet",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Keep track of the overall completion of many disparate processes",
   "main": "lib/index.js",
   "scripts": {
     "test": "tap",
     "npmclilint": "npmcli-lint",
-    "lint": "eslint '**/*.js'",
+    "lint": "eslint \"**/*.js\"",
     "lintfix": "npm run lint -- --fix",
     "posttest": "npm run lint",
     "postsnap": "npm run lintfix --",
@@ -14,8 +14,8 @@
     "postversion": "npm publish",
     "prepublishOnly": "git push origin --follow-tags",
     "snap": "tap",
-    "postlint": "npm-template-check",
-    "template-copy": "npm-template-copy --force"
+    "postlint": "template-oss-check",
+    "template-oss-apply": "template-oss-apply --force"
   },
   "repository": {
     "type": "git",
@@ -28,22 +28,20 @@
   },
   "homepage": "https://github.com/npm/are-we-there-yet",
   "devDependencies": {
-    "@npmcli/eslint-config": "^2.0.0",
-    "@npmcli/template-oss": "^2.7.1",
-    "eslint": "^8.8.0",
-    "eslint-plugin-node": "^11.1.0",
-    "tap": "^15.0.9"
+    "@npmcli/eslint-config": "^3.0.1",
+    "@npmcli/template-oss": "3.5.0",
+    "tap": "^16.0.1"
   },
   "dependencies": {
     "delegates": "^1.0.0",
     "readable-stream": "^3.6.0"
   },
   "files": [
-    "bin",
-    "lib"
+    "bin/",
+    "lib/"
   ],
   "engines": {
-    "node": "^12.13.0 || ^14.15.0 || >=16"
+    "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
   },
   "tap": {
     "branches": 68,
@@ -52,6 +50,7 @@
     "lines": 92
   },
   "templateOSS": {
-    "version": "2.7.1"
+    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
+    "version": "3.5.0"
   }
 }

package/dist/pnpm.cjs

@@ -3182,7 +3182,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.0-0" != null && true ? "7.7.0-0" : "0.0.0"
+      version: "7.7.0-1" != null && true ? "7.7.0-1" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -87881,7 +87881,7 @@ var require_satisfiesPackageManifest = __commonJS({
           }
         };
       }
-      if (!(0, equals_js_1.default)(existingDeps, importer.specifiers)) {
+      if (!(0, equals_js_1.default)(existingDeps, importer.specifiers) || importer.publishDirectory !== pkg.publishConfig?.directory) {
         return false;
       }
       if (!(0, equals_js_1.default)(pkg.dependenciesMeta ?? {}, importer.dependenciesMeta ?? {}))
@@ -87907,7 +87907,7 @@ var require_satisfiesPackageManifest = __commonJS({
           return false;
         }
         for (const depName of pkgDepNames) {
-          if (!importerDeps[depName] || importer.specifiers[depName] !== pkgDeps[depName])
+          if (!importerDeps[depName] || importer.specifiers?.[depName] !== pkgDeps[depName])
             return false;
         }
       }
@@ -88592,20 +88592,23 @@ var require_write = __commonJS({
         return (0, rimraf_1.default)(lockfilePath);
       }
       const lockfileToStringify = opts?.useInlineSpecifiersFormat ?? false ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(wantedLockfile) : wantedLockfile;
-      const yamlDoc = yamlStringify(lockfileToStringify, opts?.forceSharedFormat === true);
+      const yamlDoc = yamlStringify(lockfileToStringify, {
+        forceSharedFormat: opts?.forceSharedFormat === true,
+        includeEmptySpecifiersField: !opts?.useInlineSpecifiersFormat
+      });
       return writeFileAtomic(lockfilePath, yamlDoc);
     }
-    function yamlStringify(lockfile, forceSharedFormat) {
-      let normalizedLockfile = normalizeLockfile(lockfile, forceSharedFormat);
+    function yamlStringify(lockfile, opts) {
+      let normalizedLockfile = normalizeLockfile(lockfile, opts);
       normalizedLockfile = (0, sortLockfileKeys_1.sortLockfileKeys)(normalizedLockfile);
       return js_yaml_1.default.dump(normalizedLockfile, LOCKFILE_YAML_FORMAT);
     }
     function isEmptyLockfile(lockfile) {
       return Object.values(lockfile.importers).every((importer) => (0, isEmpty_js_1.default)(importer.specifiers ?? {}) && (0, isEmpty_js_1.default)(importer.dependencies ?? {}));
     }
-    function normalizeLockfile(lockfile, forceSharedFormat) {
+    function normalizeLockfile(lockfile, opts) {
       let lockfileToSave;
-      if (!forceSharedFormat && (0, equals_js_1.default)(Object.keys(lockfile.importers), ["."])) {
+      if (!opts.forceSharedFormat && (0, equals_js_1.default)(Object.keys(lockfile.importers), ["."])) {
         lockfileToSave = {
           ...lockfile,
           ...lockfile.importers["."]
@@ -88624,9 +88627,10 @@ var require_write = __commonJS({
           ...lockfile,
           importers: Object.keys(lockfile.importers).reduce((acc, alias) => {
             const importer = lockfile.importers[alias];
-            const normalizedImporter = {
-              specifiers: importer.specifiers ?? {}
-            };
+            const normalizedImporter = {};
+            if (!(0, isEmpty_js_1.default)(importer.specifiers ?? {}) || opts.includeEmptySpecifiersField) {
+              normalizedImporter["specifiers"] = importer.specifiers ?? {};
+            }
             if (importer.dependenciesMeta != null && !(0, isEmpty_js_1.default)(importer.dependenciesMeta)) {
               normalizedImporter["dependenciesMeta"] = importer.dependenciesMeta;
             }
@@ -88635,6 +88639,9 @@ var require_write = __commonJS({
                 normalizedImporter[depType] = importer[depType];
               }
             }
+            if (importer.publishDirectory) {
+              normalizedImporter.publishDirectory = importer.publishDirectory;
+            }
             acc[alias] = normalizedImporter;
             return acc;
           }, {})
@@ -88678,7 +88685,11 @@ var require_write = __commonJS({
       }
       const forceSharedFormat = opts?.forceSharedFormat === true;
       const wantedLockfileToStringify = opts.useInlineSpecifiersFormat ?? false ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(opts.wantedLockfile) : opts.wantedLockfile;
-      const yamlDoc = yamlStringify(wantedLockfileToStringify, forceSharedFormat);
+      const normalizeOpts = {
+        forceSharedFormat,
+        includeEmptySpecifiersField: !opts.useInlineSpecifiersFormat
+      };
+      const yamlDoc = yamlStringify(wantedLockfileToStringify, normalizeOpts);
       if (opts.wantedLockfile === opts.currentLockfile) {
         await Promise.all([
           writeFileAtomic(wantedLockfilePath, yamlDoc),
@@ -88693,7 +88704,7 @@ var require_write = __commonJS({
         message: `\`${constants_1.WANTED_LOCKFILE}\` differs from \`${path_1.default.relative(opts.wantedLockfileDir, currentLockfilePath)}\``,
         prefix: opts.wantedLockfileDir
       });
-      const currentYamlDoc = yamlStringify(opts.currentLockfile, forceSharedFormat);
+      const currentYamlDoc = yamlStringify(opts.currentLockfile, normalizeOpts);
       await Promise.all([
         writeFileAtomic(wantedLockfilePath, yamlDoc),
         (async () => {
@@ -124183,6 +124194,9 @@ var require_lib105 = __commonJS({
         optionalDependencies: {},
         specifiers: {}
       };
+      if (newManifest.publishConfig?.directory) {
+        newProjectSnapshot.publishDirectory = newManifest.publishConfig.directory;
+      }
       linkedPackages.forEach((linkedPkg) => {
         newProjectSnapshot.specifiers[linkedPkg.alias] = (0, manifest_utils_1.getSpecFromPackageManifest)(newManifest, linkedPkg.alias);
       });
@@ -181580,7 +181594,8 @@ var require_deploy = __commonJS({
         throw new error_1.default("INVALID_DEPLOY_TARGET", "This command requires one parameter");
       }
       const deployedDir = selectedDirs[0];
-      const deployDir = path_1.default.join(opts.workspaceDir, params[0]);
+      const deployDirParam = params[0];
+      const deployDir = path_1.default.isAbsolute(deployDirParam) ? deployDirParam : path_1.default.join(opts.dir, deployDirParam);
       await (0, rimraf_1.default)(deployDir);
       await fs_1.default.promises.mkdir(deployDir, { recursive: true });
       await copyProject(deployedDir, deployDir);

package/dist/pnpx.cjs

@@ -82871,7 +82871,7 @@ var require_satisfiesPackageManifest = __commonJS({
           }
         };
       }
-      if (!(0, equals_js_1.default)(existingDeps, importer.specifiers)) {
+      if (!(0, equals_js_1.default)(existingDeps, importer.specifiers) || importer.publishDirectory !== pkg.publishConfig?.directory) {
         return false;
       }
       if (!(0, equals_js_1.default)(pkg.dependenciesMeta ?? {}, importer.dependenciesMeta ?? {}))
@@ -82897,7 +82897,7 @@ var require_satisfiesPackageManifest = __commonJS({
           return false;
         }
         for (const depName of pkgDepNames) {
-          if (!importerDeps[depName] || importer.specifiers[depName] !== pkgDeps[depName])
+          if (!importerDeps[depName] || importer.specifiers?.[depName] !== pkgDeps[depName])
             return false;
         }
       }
@@ -83582,20 +83582,23 @@ var require_write = __commonJS({
         return (0, rimraf_1.default)(lockfilePath);
       }
       const lockfileToStringify = opts?.useInlineSpecifiersFormat ?? false ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(wantedLockfile) : wantedLockfile;
-      const yamlDoc = yamlStringify(lockfileToStringify, opts?.forceSharedFormat === true);
+      const yamlDoc = yamlStringify(lockfileToStringify, {
+        forceSharedFormat: opts?.forceSharedFormat === true,
+        includeEmptySpecifiersField: !opts?.useInlineSpecifiersFormat
+      });
       return writeFileAtomic(lockfilePath, yamlDoc);
     }
-    function yamlStringify(lockfile, forceSharedFormat) {
-      let normalizedLockfile = normalizeLockfile(lockfile, forceSharedFormat);
+    function yamlStringify(lockfile, opts) {
+      let normalizedLockfile = normalizeLockfile(lockfile, opts);
       normalizedLockfile = (0, sortLockfileKeys_1.sortLockfileKeys)(normalizedLockfile);
       return js_yaml_1.default.dump(normalizedLockfile, LOCKFILE_YAML_FORMAT);
     }
     function isEmptyLockfile(lockfile) {
       return Object.values(lockfile.importers).every((importer) => (0, isEmpty_js_1.default)(importer.specifiers ?? {}) && (0, isEmpty_js_1.default)(importer.dependencies ?? {}));
     }
-    function normalizeLockfile(lockfile, forceSharedFormat) {
+    function normalizeLockfile(lockfile, opts) {
       let lockfileToSave;
-      if (!forceSharedFormat && (0, equals_js_1.default)(Object.keys(lockfile.importers), ["."])) {
+      if (!opts.forceSharedFormat && (0, equals_js_1.default)(Object.keys(lockfile.importers), ["."])) {
         lockfileToSave = {
           ...lockfile,
           ...lockfile.importers["."]
@@ -83614,9 +83617,10 @@ var require_write = __commonJS({
           ...lockfile,
           importers: Object.keys(lockfile.importers).reduce((acc, alias) => {
             const importer = lockfile.importers[alias];
-            const normalizedImporter = {
-              specifiers: importer.specifiers ?? {}
-            };
+            const normalizedImporter = {};
+            if (!(0, isEmpty_js_1.default)(importer.specifiers ?? {}) || opts.includeEmptySpecifiersField) {
+              normalizedImporter["specifiers"] = importer.specifiers ?? {};
+            }
             if (importer.dependenciesMeta != null && !(0, isEmpty_js_1.default)(importer.dependenciesMeta)) {
               normalizedImporter["dependenciesMeta"] = importer.dependenciesMeta;
             }
@@ -83625,6 +83629,9 @@ var require_write = __commonJS({
                 normalizedImporter[depType] = importer[depType];
               }
             }
+            if (importer.publishDirectory) {
+              normalizedImporter.publishDirectory = importer.publishDirectory;
+            }
             acc[alias] = normalizedImporter;
             return acc;
           }, {})
@@ -83668,7 +83675,11 @@ var require_write = __commonJS({
       }
       const forceSharedFormat = opts?.forceSharedFormat === true;
       const wantedLockfileToStringify = opts.useInlineSpecifiersFormat ?? false ? (0, inlineSpecifiersLockfileConverters_1.convertToInlineSpecifiersFormat)(opts.wantedLockfile) : opts.wantedLockfile;
-      const yamlDoc = yamlStringify(wantedLockfileToStringify, forceSharedFormat);
+      const normalizeOpts = {
+        forceSharedFormat,
+        includeEmptySpecifiersField: !opts.useInlineSpecifiersFormat
+      };
+      const yamlDoc = yamlStringify(wantedLockfileToStringify, normalizeOpts);
       if (opts.wantedLockfile === opts.currentLockfile) {
         await Promise.all([
           writeFileAtomic(wantedLockfilePath, yamlDoc),
@@ -83683,7 +83694,7 @@ var require_write = __commonJS({
         message: `\`${constants_1.WANTED_LOCKFILE}\` differs from \`${path_1.default.relative(opts.wantedLockfileDir, currentLockfilePath)}\``,
         prefix: opts.wantedLockfileDir
       });
-      const currentYamlDoc = yamlStringify(opts.currentLockfile, forceSharedFormat);
+      const currentYamlDoc = yamlStringify(opts.currentLockfile, normalizeOpts);
       await Promise.all([
         writeFileAtomic(wantedLockfilePath, yamlDoc),
         (async () => {
@@ -119173,6 +119184,9 @@ var require_lib104 = __commonJS({
         optionalDependencies: {},
         specifiers: {}
       };
+      if (newManifest.publishConfig?.directory) {
+        newProjectSnapshot.publishDirectory = newManifest.publishConfig.directory;
+      }
       linkedPackages.forEach((linkedPkg) => {
         newProjectSnapshot.specifiers[linkedPkg.alias] = (0, manifest_utils_1.getSpecFromPackageManifest)(newManifest, linkedPkg.alias);
       });
@@ -181055,7 +181069,8 @@ var require_deploy = __commonJS({
         throw new error_1.default("INVALID_DEPLOY_TARGET", "This command requires one parameter");
       }
       const deployedDir = selectedDirs[0];
-      const deployDir = path_1.default.join(opts.workspaceDir, params[0]);
+      const deployDirParam = params[0];
+      const deployDir = path_1.default.isAbsolute(deployDirParam) ? deployDirParam : path_1.default.join(opts.dir, deployDirParam);
       await (0, rimraf_1.default)(deployDir);
       await fs_1.default.promises.mkdir(deployDir, { recursive: true });
       await copyProject(deployedDir, deployDir);

package/package.json

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