pnpm 7.4.0-1 → 7.4.0-2

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.4.0-0
+packageManager: pnpm@7.4.0-1
 pendingBuilds:
   - /node-gyp/8.4.1
   - /encoding/0.1.13
-prunedAt: Fri, 24 Jun 2022 19:07:29 GMT
+prunedAt: Sun, 26 Jun 2022 22:37:49 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

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.4.0-1" != null && true ? "7.4.0-1" : "0.0.0"
+      version: "7.4.0-2" != null && true ? "7.4.0-2" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -23485,6 +23485,7 @@ var require_lib18 = __commonJS({
       "ignore-pnpmfile": Boolean,
       "ignore-workspace": Boolean,
       "ignore-workspace-root-check": Boolean,
+      "include-workspace-root": Boolean,
       "legacy-dir-filtering": Boolean,
       "link-workspace-packages": [Boolean, "deep"],
       lockfile: Boolean,
@@ -125954,7 +125955,7 @@ var require_install = __commonJS({
           ctx.wantedLockfile.patchedDependencies = patchedDependencies;
         }
         const frozenLockfile = opts.frozenLockfile || opts.frozenLockfileIfExists && ctx.existsWantedLockfile;
-        if (!ctx.lockfileHadConflicts && !opts.lockfileOnly && !opts.update && !opts.fixLockfile && installsOnly && (frozenLockfile || opts.ignorePackageManifest || !needsFullResolution && opts.preferFrozenLockfile && (!opts.pruneLockfileImporters || Object.keys(ctx.wantedLockfile.importers).length === ctx.projects.length) && ctx.existsWantedLockfile && ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION && await (0, allProjectsAreUpToDate_1.default)(ctx.projects, {
+        if (!ctx.lockfileHadConflicts && !opts.update && !opts.fixLockfile && installsOnly && (frozenLockfile || opts.ignorePackageManifest || !needsFullResolution && opts.preferFrozenLockfile && (!opts.pruneLockfileImporters || Object.keys(ctx.wantedLockfile.importers).length === ctx.projects.length) && ctx.existsWantedLockfile && ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION && await (0, allProjectsAreUpToDate_1.default)(ctx.projects, {
           linkWorkspacePackages: opts.linkWorkspacePackagesDepth >= 0,
           wantedLockfile: ctx.wantedLockfile,
           workspacePackages: opts.workspacePackages
@@ -125964,6 +125965,9 @@ var require_install = __commonJS({
               hint: 'Note that in CI environments this setting is true by default. If you still need to run install in such cases, use "pnpm install --no-frozen-lockfile"'
             });
           }
+          if (opts.lockfileOnly) {
+            return projects;
+          }
           if (!ctx.existsWantedLockfile) {
             if (ctx.projects.some((project) => pkgHasDependencies(project.manifest))) {
               throw new Error(`Headless installation requires a ${constants_1.WANTED_LOCKFILE} file`);
@@ -128102,6 +128106,7 @@ var require_lib108 = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
+    var fs_1 = __importDefault(require("fs"));
     var path_1 = __importDefault(require("path"));
     var error_1 = __importDefault(require_lib8());
     var find_up_1 = __importDefault(require_find_up());
@@ -128109,13 +128114,20 @@ var require_lib108 = __commonJS({
     var WORKSPACE_MANIFEST_FILENAME = "pnpm-workspace.yaml";
     async function findWorkspaceDir(cwd) {
       const workspaceManifestDirEnvVar = process.env[WORKSPACE_DIR_ENV_VAR] ?? process.env[WORKSPACE_DIR_ENV_VAR.toLowerCase()];
-      const workspaceManifestLocation = workspaceManifestDirEnvVar ? path_1.default.join(workspaceManifestDirEnvVar, "pnpm-workspace.yaml") : await (0, find_up_1.default)([WORKSPACE_MANIFEST_FILENAME, "pnpm-workspace.yml"], { cwd });
+      const workspaceManifestLocation = workspaceManifestDirEnvVar ? path_1.default.join(workspaceManifestDirEnvVar, "pnpm-workspace.yaml") : await (0, find_up_1.default)([WORKSPACE_MANIFEST_FILENAME, "pnpm-workspace.yml"], { cwd: await getRealPath(cwd) });
       if (workspaceManifestLocation?.endsWith(".yml")) {
         throw new error_1.default("BAD_WORKSPACE_MANIFEST_NAME", `The workspace manifest file should be named "pnpm-workspace.yaml". File found: ${workspaceManifestLocation}`);
       }
       return workspaceManifestLocation && path_1.default.dirname(workspaceManifestLocation);
     }
     exports2.default = findWorkspaceDir;
+    async function getRealPath(path2) {
+      return new Promise((resolve) => {
+        fs_1.default.realpath.native(path2, function(err, resolvedPath) {
+          resolve(err !== null ? path2 : resolvedPath);
+        });
+      });
+    }
   }
 });
 
@@ -191772,7 +191784,8 @@ var require_cmd = __commonJS({
       "use-stderr",
       "ignore-workspace",
       "workspace-packages",
-      "workspace-root"
+      "workspace-root",
+      "include-workspace-root"
     ], config_1.types);
     var commands = [
       plugin_commands_installation_1.add,
@@ -192241,7 +192254,7 @@ var require_main2 = __commonJS({
         const relativeWSDirPath = () => path_1.default.relative(process.cwd(), wsDir) || ".";
         if (config.workspaceRoot) {
           filters.push({ filter: `{${relativeWSDirPath()}}`, followProdDepsOnly: false });
-        } else if (cmd === "run" || cmd === "exec" || cmd === "add" || cmd === "test") {
+        } else if (!config.includeWorkspaceRoot && (cmd === "run" || cmd === "exec" || cmd === "add" || cmd === "test")) {
           filters.push({ filter: `!{${relativeWSDirPath()}}`, followProdDepsOnly: false });
         }
         const filterResults = await (0, filter_workspace_packages_1.filterPackages)(allProjects, filters, {

package/dist/pnpx.cjs

@@ -17853,6 +17853,7 @@ var require_lib17 = __commonJS({
       "ignore-pnpmfile": Boolean,
       "ignore-workspace": Boolean,
       "ignore-workspace-root-check": Boolean,
+      "include-workspace-root": Boolean,
       "legacy-dir-filtering": Boolean,
       "link-workspace-packages": [Boolean, "deep"],
       lockfile: Boolean,
@@ -120944,7 +120945,7 @@ var require_install = __commonJS({
           ctx.wantedLockfile.patchedDependencies = patchedDependencies;
         }
         const frozenLockfile = opts.frozenLockfile || opts.frozenLockfileIfExists && ctx.existsWantedLockfile;
-        if (!ctx.lockfileHadConflicts && !opts.lockfileOnly && !opts.update && !opts.fixLockfile && installsOnly && (frozenLockfile || opts.ignorePackageManifest || !needsFullResolution && opts.preferFrozenLockfile && (!opts.pruneLockfileImporters || Object.keys(ctx.wantedLockfile.importers).length === ctx.projects.length) && ctx.existsWantedLockfile && ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION && await (0, allProjectsAreUpToDate_1.default)(ctx.projects, {
+        if (!ctx.lockfileHadConflicts && !opts.update && !opts.fixLockfile && installsOnly && (frozenLockfile || opts.ignorePackageManifest || !needsFullResolution && opts.preferFrozenLockfile && (!opts.pruneLockfileImporters || Object.keys(ctx.wantedLockfile.importers).length === ctx.projects.length) && ctx.existsWantedLockfile && ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION && await (0, allProjectsAreUpToDate_1.default)(ctx.projects, {
           linkWorkspacePackages: opts.linkWorkspacePackagesDepth >= 0,
           wantedLockfile: ctx.wantedLockfile,
           workspacePackages: opts.workspacePackages
@@ -120954,6 +120955,9 @@ var require_install = __commonJS({
               hint: 'Note that in CI environments this setting is true by default. If you still need to run install in such cases, use "pnpm install --no-frozen-lockfile"'
             });
           }
+          if (opts.lockfileOnly) {
+            return projects;
+          }
           if (!ctx.existsWantedLockfile) {
             if (ctx.projects.some((project) => pkgHasDependencies(project.manifest))) {
               throw new Error(`Headless installation requires a ${constants_1.WANTED_LOCKFILE} file`);
@@ -123092,6 +123096,7 @@ var require_lib107 = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
+    var fs_1 = __importDefault2(require("fs"));
     var path_1 = __importDefault2(require("path"));
     var error_1 = __importDefault2(require_lib7());
     var find_up_1 = __importDefault2(require_find_up());
@@ -123099,13 +123104,20 @@ var require_lib107 = __commonJS({
     var WORKSPACE_MANIFEST_FILENAME = "pnpm-workspace.yaml";
     async function findWorkspaceDir(cwd) {
       const workspaceManifestDirEnvVar = process.env[WORKSPACE_DIR_ENV_VAR] ?? process.env[WORKSPACE_DIR_ENV_VAR.toLowerCase()];
-      const workspaceManifestLocation = workspaceManifestDirEnvVar ? path_1.default.join(workspaceManifestDirEnvVar, "pnpm-workspace.yaml") : await (0, find_up_1.default)([WORKSPACE_MANIFEST_FILENAME, "pnpm-workspace.yml"], { cwd });
+      const workspaceManifestLocation = workspaceManifestDirEnvVar ? path_1.default.join(workspaceManifestDirEnvVar, "pnpm-workspace.yaml") : await (0, find_up_1.default)([WORKSPACE_MANIFEST_FILENAME, "pnpm-workspace.yml"], { cwd: await getRealPath(cwd) });
       if (workspaceManifestLocation?.endsWith(".yml")) {
         throw new error_1.default("BAD_WORKSPACE_MANIFEST_NAME", `The workspace manifest file should be named "pnpm-workspace.yaml". File found: ${workspaceManifestLocation}`);
       }
       return workspaceManifestLocation && path_1.default.dirname(workspaceManifestLocation);
     }
     exports2.default = findWorkspaceDir;
+    async function getRealPath(path2) {
+      return new Promise((resolve) => {
+        fs_1.default.realpath.native(path2, function(err, resolvedPath) {
+          resolve(err !== null ? path2 : resolvedPath);
+        });
+      });
+    }
   }
 });
 
@@ -191772,7 +191784,8 @@ var require_cmd = __commonJS({
       "use-stderr",
       "ignore-workspace",
       "workspace-packages",
-      "workspace-root"
+      "workspace-root",
+      "include-workspace-root"
     ], config_1.types);
     var commands = [
       plugin_commands_installation_1.add,
@@ -192241,7 +192254,7 @@ var require_main2 = __commonJS({
         const relativeWSDirPath = () => path_1.default.relative(process.cwd(), wsDir) || ".";
         if (config.workspaceRoot) {
           filters.push({ filter: `{${relativeWSDirPath()}}`, followProdDepsOnly: false });
-        } else if (cmd === "run" || cmd === "exec" || cmd === "add" || cmd === "test") {
+        } else if (!config.includeWorkspaceRoot && (cmd === "run" || cmd === "exec" || cmd === "add" || cmd === "test")) {
           filters.push({ filter: `!{${relativeWSDirPath()}}`, followProdDepsOnly: false });
         }
         const filterResults = await (0, filter_workspace_packages_1.filterPackages)(allProjects, filters, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.4.0-1",
+  "version": "7.4.0-2",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -22,37 +22,37 @@
     "@pnpm/assert-project": "workspace:*",
     "@pnpm/byline": "^1.0.0",
     "@pnpm/cli-meta": "workspace:3.0.5",
-    "@pnpm/cli-utils": "workspace:0.7.15",
+    "@pnpm/cli-utils": "workspace:0.7.16",
     "@pnpm/client": "workspace:7.1.7",
     "@pnpm/command": "workspace:3.0.0",
     "@pnpm/common-cli-options-help": "workspace:0.9.0",
-    "@pnpm/config": "workspace:15.4.1",
+    "@pnpm/config": "workspace:15.5.0",
     "@pnpm/constants": "workspace:6.1.0",
     "@pnpm/core-loggers": "workspace:7.0.5",
-    "@pnpm/default-reporter": "workspace:9.1.5",
+    "@pnpm/default-reporter": "workspace:9.1.6",
     "@pnpm/file-reporter": "workspace:3.0.0",
-    "@pnpm/filter-workspace-packages": "workspace:5.0.15",
-    "@pnpm/find-workspace-dir": "workspace:4.0.1",
-    "@pnpm/find-workspace-packages": "workspace:4.0.15",
+    "@pnpm/filter-workspace-packages": "workspace:5.0.16",
+    "@pnpm/find-workspace-dir": "workspace:4.0.2",
+    "@pnpm/find-workspace-packages": "workspace:4.0.16",
     "@pnpm/lockfile-types": "workspace:4.2.0",
     "@pnpm/logger": "^4.0.0",
     "@pnpm/modules-yaml": "workspace:10.0.5",
     "@pnpm/nopt": "^0.2.1",
-    "@pnpm/parse-cli-args": "workspace:5.0.1",
+    "@pnpm/parse-cli-args": "workspace:5.0.2",
     "@pnpm/pick-registry-for-package": "workspace:3.0.5",
-    "@pnpm/plugin-commands-audit": "workspace:6.0.15",
-    "@pnpm/plugin-commands-env": "workspace:2.1.14",
-    "@pnpm/plugin-commands-init": "workspace:1.0.15",
-    "@pnpm/plugin-commands-installation": "workspace:10.3.1",
-    "@pnpm/plugin-commands-listing": "workspace:5.0.15",
-    "@pnpm/plugin-commands-outdated": "workspace:6.0.15",
-    "@pnpm/plugin-commands-patching": "workspace:1.0.1",
-    "@pnpm/plugin-commands-publishing": "workspace:5.1.2",
-    "@pnpm/plugin-commands-rebuild": "workspace:6.1.14",
-    "@pnpm/plugin-commands-script-runners": "workspace:5.0.18",
-    "@pnpm/plugin-commands-server": "workspace:4.0.15",
-    "@pnpm/plugin-commands-setup": "workspace:2.0.16",
-    "@pnpm/plugin-commands-store": "workspace:5.1.14",
+    "@pnpm/plugin-commands-audit": "workspace:6.0.16",
+    "@pnpm/plugin-commands-env": "workspace:2.1.15",
+    "@pnpm/plugin-commands-init": "workspace:1.0.16",
+    "@pnpm/plugin-commands-installation": "workspace:10.3.2",
+    "@pnpm/plugin-commands-listing": "workspace:5.0.16",
+    "@pnpm/plugin-commands-outdated": "workspace:6.0.16",
+    "@pnpm/plugin-commands-patching": "workspace:1.0.2",
+    "@pnpm/plugin-commands-publishing": "workspace:5.1.3",
+    "@pnpm/plugin-commands-rebuild": "workspace:6.1.15",
+    "@pnpm/plugin-commands-script-runners": "workspace:5.0.19",
+    "@pnpm/plugin-commands-server": "workspace:4.0.16",
+    "@pnpm/plugin-commands-setup": "workspace:2.0.17",
+    "@pnpm/plugin-commands-store": "workspace:5.1.15",
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-package-json": "workspace:6.0.6",
     "@pnpm/read-project-manifest": "workspace:3.0.6",