pnpm 7.32.5 → 7.33.0

package/dist/node_modules/.modules.yaml

@@ -204,7 +204,7 @@ packageManager: pnpm@7.24.2
 pendingBuilds:
   - /node-gyp/9.3.1
   - /encoding/0.1.13
-prunedAt: Tue, 23 May 2023 10:02:55 GMT
+prunedAt: Wed, 31 May 2023 09:32:43 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3244,7 +3244,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault3(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "7.32.5" : "0.0.0"
+      version: true ? "7.33.0" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -13336,7 +13336,7 @@ var require_lib7 = __commonJS({
     exports2.WORKSPACE_MANIFEST_FILENAME = exports2.LAYOUT_VERSION = exports2.ENGINE_NAME = exports2.LOCKFILE_VERSION_V6 = exports2.LOCKFILE_VERSION = exports2.WANTED_LOCKFILE = void 0;
     exports2.WANTED_LOCKFILE = "pnpm-lock.yaml";
     exports2.LOCKFILE_VERSION = 5.4;
-    exports2.LOCKFILE_VERSION_V6 = "6.0";
+    exports2.LOCKFILE_VERSION_V6 = "6.1";
     exports2.ENGINE_NAME = `${process.platform}-${process.arch}-node-${process.version.split(".")[0]}`;
     exports2.LAYOUT_VERSION = 5;
     exports2.WORKSPACE_MANIFEST_FILENAME = "pnpm-workspace.yaml";
@@ -111940,13 +111940,15 @@ var require_lib69 = __commonJS({
         });
       } catch (err) {
         if (workspacePackages != null && opts.projectDir) {
-          const resolvedFromLocal = tryResolveFromWorkspacePackages(workspacePackages, spec, {
-            projectDir: opts.projectDir,
-            lockfileDir: opts.lockfileDir,
-            hardLinkLocalPackages: wantedDependency.injected
-          });
-          if (resolvedFromLocal != null)
-            return resolvedFromLocal;
+          try {
+            return tryResolveFromWorkspacePackages(workspacePackages, spec, {
+              wantedDependency,
+              projectDir: opts.projectDir,
+              lockfileDir: opts.lockfileDir,
+              hardLinkLocalPackages: wantedDependency.injected
+            });
+          } catch {
+          }
         }
         throw err;
       }
@@ -111954,13 +111956,15 @@ var require_lib69 = __commonJS({
       const meta = pickResult.meta;
       if (pickedPackage == null) {
         if (workspacePackages != null && opts.projectDir) {
-          const resolvedFromLocal = tryResolveFromWorkspacePackages(workspacePackages, spec, {
-            projectDir: opts.projectDir,
-            lockfileDir: opts.lockfileDir,
-            hardLinkLocalPackages: wantedDependency.injected
-          });
-          if (resolvedFromLocal != null)
-            return resolvedFromLocal;
+          try {
+            return tryResolveFromWorkspacePackages(workspacePackages, spec, {
+              wantedDependency,
+              projectDir: opts.projectDir,
+              lockfileDir: opts.lockfileDir,
+              hardLinkLocalPackages: wantedDependency.injected
+            });
+          } catch {
+          }
         }
         throw new NoMatchingVersionError({ wantedDependency, packageMeta: meta });
       }
@@ -112017,22 +112021,23 @@ var require_lib69 = __commonJS({
       if (!opts.projectDir) {
         throw new Error("Cannot resolve package from workspace because opts.projectDir is not defined");
       }
-      const resolvedFromLocal = tryResolveFromWorkspacePackages(opts.workspacePackages, spec, {
+      return tryResolveFromWorkspacePackages(opts.workspacePackages, spec, {
+        wantedDependency,
         projectDir: opts.projectDir,
         hardLinkLocalPackages: wantedDependency.injected,
         lockfileDir: opts.lockfileDir
       });
-      if (resolvedFromLocal == null) {
-        throw new error_1.PnpmError("NO_MATCHING_VERSION_INSIDE_WORKSPACE", `In ${path_1.default.relative(process.cwd(), opts.projectDir)}: No matching version found for ${wantedDependency.alias ?? ""}@${pref} inside the workspace`);
-      }
-      return resolvedFromLocal;
     }
     function tryResolveFromWorkspacePackages(workspacePackages, spec, opts) {
-      if (!workspacePackages[spec.name])
-        return null;
+      if (!workspacePackages[spec.name]) {
+        throw new error_1.PnpmError("WORKSPACE_PKG_NOT_FOUND", `In ${path_1.default.relative(process.cwd(), opts.projectDir)}: "${spec.name}@${opts.wantedDependency.pref ?? ""}" is in the dependencies but no package named "${spec.name}" is present in the workspace`, {
+          hint: "Packages found in the workspace: " + Object.keys(workspacePackages).join(", ")
+        });
+      }
       const localVersion = pickMatchingLocalVersionOrNull(workspacePackages[spec.name], spec);
-      if (!localVersion)
-        return null;
+      if (!localVersion) {
+        throw new error_1.PnpmError("NO_MATCHING_VERSION_INSIDE_WORKSPACE", `In ${path_1.default.relative(process.cwd(), opts.projectDir)}: No matching version found for ${opts.wantedDependency.alias ?? ""}@${opts.wantedDependency.pref ?? ""} inside the workspace`);
+      }
       return resolveFromLocalPackage(workspacePackages[spec.name][localVersion], spec.normalizedPref, opts);
     }
     function pickMatchingLocalVersionOrNull(versions, spec) {
@@ -113548,12 +113553,13 @@ var require_sortLockfileKeys = __commonJS({
     };
     var ROOT_KEYS_ORDER = {
       lockfileVersion: 1,
+      settings: 2,
       // only and never are conflict options.
-      neverBuiltDependencies: 2,
-      onlyBuiltDependencies: 2,
-      overrides: 3,
-      packageExtensionsChecksum: 4,
-      patchedDependencies: 5,
+      neverBuiltDependencies: 3,
+      onlyBuiltDependencies: 3,
+      overrides: 4,
+      packageExtensionsChecksum: 5,
+      patchedDependencies: 6,
       specifiers: 10,
       dependencies: 11,
       optionalDependencies: 12,
@@ -113762,7 +113768,7 @@ var require_inlineSpecifiersLockfileConverters = __commonJS({
       }
       let revertedImporters = mapValues(importers, revertProjectSnapshot);
       let packages = lockfile.packages;
-      if (originalVersion === 6) {
+      if (originalVersionStr.startsWith("6.")) {
         revertedImporters = Object.fromEntries(Object.entries(revertedImporters ?? {}).map(([importerId, pkgSnapshot]) => {
           const newSnapshot = { ...pkgSnapshot };
           if (newSnapshot.dependencies != null) {
@@ -113793,7 +113799,7 @@ var require_inlineSpecifiersLockfileConverters = __commonJS({
         packages,
         importers: revertedImporters
       };
-      if (originalVersion === 6 && newLockfile.time) {
+      if (originalVersionStr.startsWith("6.") && newLockfile.time) {
         newLockfile.time = Object.fromEntries(Object.entries(newLockfile.time).map(([depPath, time]) => [convertLockfileV6DepPathToV5DepPath(depPath), time]));
       }
       return newLockfile;
@@ -114012,8 +114018,12 @@ var require_write = __commonJS({
           delete lockfileToSave.packages;
         }
       }
+      const isLockfileV6 = lockfileToSave.lockfileVersion.toString().startsWith("6.");
+      if (!isLockfileV6) {
+        delete lockfileToSave["settings"];
+      }
       if (lockfileToSave.time) {
-        lockfileToSave.time = (lockfileToSave.lockfileVersion.toString().startsWith("6.") ? pruneTimeInLockfileV6 : pruneTime)(lockfileToSave.time, lockfile.importers);
+        lockfileToSave.time = (isLockfileV6 ? pruneTimeInLockfileV6 : pruneTime)(lockfileToSave.time, lockfile.importers);
       }
       if (lockfileToSave.overrides != null && (0, isEmpty_1.default)(lockfileToSave.overrides)) {
         delete lockfileToSave.overrides;
@@ -114496,7 +114506,11 @@ var require_read = __commonJS({
       }, {});
       return {
         importers,
-        lockfileVersion: opts.lockfileVersion || constants_1.LOCKFILE_VERSION
+        lockfileVersion: opts.lockfileVersion || constants_1.LOCKFILE_VERSION,
+        settings: {
+          autoInstallPeers: opts.autoInstallPeers,
+          excludeLinksFromLockfile: false
+        }
       };
     }
     exports2.createLockfileObject = createLockfileObject;
@@ -125765,7 +125779,10 @@ var require_readLockfiles = __commonJS({
         }
       })());
       const files = await Promise.all(fileReads);
-      const sopts = { lockfileVersion: wantedLockfileVersion };
+      const sopts = {
+        autoInstallPeers: opts.autoInstallPeers,
+        lockfileVersion: wantedLockfileVersion
+      };
       const importerIds = opts.projects.map((importer) => importer.id);
       const currentLockfile = files[1] ?? (0, lockfile_file_1.createLockfileObject)(importerIds, sopts);
       for (const importerId of importerIds) {
@@ -125899,6 +125916,7 @@ var require_lib107 = __commonJS({
         storeDir: opts.storeDir,
         virtualStoreDir,
         ...await (0, readLockfiles_1.readLockfiles)({
+          autoInstallPeers: opts.autoInstallPeers,
           force: opts.force,
           forceSharedLockfile: opts.forceSharedLockfile,
           frozenLockfile: opts.frozenLockfile === true,
@@ -126073,6 +126091,7 @@ var require_lib107 = __commonJS({
         storeDir,
         virtualStoreDir,
         ...await (0, readLockfiles_1.readLockfiles)({
+          autoInstallPeers: opts.autoInstallPeers,
           force: opts.force,
           forceSharedLockfile: opts.forceSharedLockfile,
           frozenLockfile: false,
@@ -180816,6 +180835,10 @@ var require_lib131 = __commonJS({
         spec = spec.slice("workspace:".length);
       if (spec === "*")
         return isWorkspaceProtocol ? "patch" : "none";
+      if (spec.startsWith("npm:")) {
+        const index = spec.lastIndexOf("@");
+        spec = spec.slice(index + 1);
+      }
       const parsedRange = (0, semver_utils_1.parseRange)(spec);
       if (parsedRange.length !== 1)
         return void 0;
@@ -197197,6 +197220,13 @@ var require_install = __commonJS({
     var getPreferredVersions_1 = require_getPreferredVersions();
     var link_1 = require_link3();
     var reportPeerDependencyIssues_1 = require_reportPeerDependencyIssues2();
+    var LockfileConfigMismatchError = class extends error_1.PnpmError {
+      constructor(outdatedLockfileSettingName) {
+        super("LOCKFILE_CONFIG_MISMATCH", `Cannot proceed with the frozen installation. The current "${outdatedLockfileSettingName}" configuration doesn't match the value found in the lockfile`, {
+          hint: 'Update your lockfile using "pnpm install --no-frozen-lockfile"'
+        });
+      }
+    };
     var BROKEN_LOCKFILE_INTEGRITY_ERRORS = /* @__PURE__ */ new Set([
       "ERR_PNPM_UNEXPECTED_PKG_CONTENT_IN_STORE",
       "ERR_PNPM_TARBALL_INTEGRITY"
@@ -197319,21 +197349,39 @@ var require_install = __commonJS({
         if (opts.useLockfileV6 == null) {
           opts.useLockfileV6 = ctx.wantedLockfile.lockfileVersion.toString().startsWith("6.");
         }
-        let needsFullResolution = !maybeOpts.ignorePackageManifest && lockfileIsNotUpToDate(ctx.wantedLockfile, {
-          overrides: opts.overrides,
-          neverBuiltDependencies: opts.neverBuiltDependencies,
-          onlyBuiltDependencies: opts.onlyBuiltDependencies,
-          packageExtensionsChecksum,
-          patchedDependencies
-        }) || opts.fixLockfile || opts.useLockfileV6 && !ctx.wantedLockfile.lockfileVersion.toString().startsWith("6.");
+        const frozenLockfile = opts.frozenLockfile || opts.frozenLockfileIfExists && ctx.existsWantedLockfile;
+        let outdatedLockfileSettings = false;
+        if (!opts.ignorePackageManifest) {
+          const outdatedLockfileSettingName = getOutdatedLockfileSetting(ctx.wantedLockfile, {
+            autoInstallPeers: opts.autoInstallPeers,
+            overrides: opts.overrides,
+            neverBuiltDependencies: opts.neverBuiltDependencies,
+            onlyBuiltDependencies: opts.onlyBuiltDependencies,
+            packageExtensionsChecksum,
+            patchedDependencies
+          });
+          outdatedLockfileSettings = outdatedLockfileSettingName != null;
+          if (frozenLockfile && outdatedLockfileSettings) {
+            throw new LockfileConfigMismatchError(outdatedLockfileSettingName);
+          }
+        }
+        let needsFullResolution = outdatedLockfileSettings || opts.fixLockfile || opts.useLockfileV6 && !ctx.wantedLockfile.lockfileVersion.toString().startsWith("6.");
         if (needsFullResolution) {
+          ctx.wantedLockfile.settings = {
+            autoInstallPeers: opts.autoInstallPeers,
+            excludeLinksFromLockfile: false
+          };
           ctx.wantedLockfile.overrides = opts.overrides;
           ctx.wantedLockfile.neverBuiltDependencies = opts.neverBuiltDependencies;
           ctx.wantedLockfile.onlyBuiltDependencies = opts.onlyBuiltDependencies;
           ctx.wantedLockfile.packageExtensionsChecksum = packageExtensionsChecksum;
           ctx.wantedLockfile.patchedDependencies = patchedDependencies;
+        } else if (!frozenLockfile) {
+          ctx.wantedLockfile.settings = {
+            autoInstallPeers: opts.autoInstallPeers,
+            excludeLinksFromLockfile: false
+          };
         }
-        const frozenLockfile = opts.frozenLockfile || opts.frozenLockfileIfExists && ctx.existsWantedLockfile;
         if (!ctx.lockfileHadConflicts && !opts.fixLockfile && !opts.dedupe && installsOnly && (frozenLockfile && !opts.lockfileOnly || opts.ignorePackageManifest || !needsFullResolution && opts.preferFrozenLockfile && (!opts.pruneLockfileImporters || Object.keys(ctx.wantedLockfile.importers).length === Object.keys(ctx.projects).length) && ctx.existsWantedLockfile && (ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION || ctx.wantedLockfile.lockfileVersion === constants_1.LOCKFILE_VERSION_V6) && await (0, allProjectsAreUpToDate_1.allProjectsAreUpToDate)(Object.values(ctx.projects), {
           autoInstallPeers: opts.autoInstallPeers,
           linkWorkspacePackages: opts.linkWorkspacePackagesDepth >= 0,
@@ -197566,8 +197614,29 @@ var require_install = __commonJS({
         };
       }, patches);
     }
-    function lockfileIsNotUpToDate(lockfile, { neverBuiltDependencies, onlyBuiltDependencies, overrides, packageExtensionsChecksum, patchedDependencies }) {
-      return !(0, equals_1.default)(lockfile.overrides ?? {}, overrides ?? {}) || !(0, equals_1.default)((lockfile.neverBuiltDependencies ?? []).sort(), (neverBuiltDependencies ?? []).sort()) || !(0, equals_1.default)(onlyBuiltDependencies?.sort(), lockfile.onlyBuiltDependencies) || lockfile.packageExtensionsChecksum !== packageExtensionsChecksum || !(0, equals_1.default)(lockfile.patchedDependencies ?? {}, patchedDependencies ?? {});
+    function getOutdatedLockfileSetting(lockfile, { neverBuiltDependencies, onlyBuiltDependencies, overrides, packageExtensionsChecksum, patchedDependencies, autoInstallPeers }) {
+      if (!(0, equals_1.default)(lockfile.overrides ?? {}, overrides ?? {})) {
+        return "overrides";
+      }
+      if (!(0, equals_1.default)((lockfile.neverBuiltDependencies ?? []).sort(), (neverBuiltDependencies ?? []).sort())) {
+        return "neverBuiltDependencies";
+      }
+      if (!(0, equals_1.default)(onlyBuiltDependencies?.sort(), lockfile.onlyBuiltDependencies)) {
+        return "onlyBuiltDependencies";
+      }
+      if (lockfile.packageExtensionsChecksum !== packageExtensionsChecksum) {
+        return "packageExtensionsChecksum";
+      }
+      if (!(0, equals_1.default)(lockfile.patchedDependencies ?? {}, patchedDependencies ?? {})) {
+        return "patchedDependencies";
+      }
+      if (lockfile.settings?.autoInstallPeers != null && lockfile.settings.autoInstallPeers !== autoInstallPeers) {
+        return "settings.autoInstallPeers";
+      }
+      if (lockfile.settings?.excludeLinksFromLockfile) {
+        return "settings.excludeLinksFromLockfile";
+      }
+      return null;
     }
     function createObjectChecksum(obj) {
       const s = JSON.stringify(obj);
@@ -200587,6 +200656,7 @@ var require_outdated = __commonJS({
     var types_1 = require_lib25();
     var dp = __importStar4(require_lib78());
     var semver_12 = __importDefault3(require_semver2());
+    var matcher_1 = require_lib19();
     __exportStar3(require_createManifestGetter(), exports2);
     async function outdated(opts) {
       if (packageHasNoDeps(opts.manifest))
@@ -200598,6 +200668,7 @@ var require_outdated = __commonJS({
       const importerId = (0, lockfile_file_1.getLockfileImporterId)(opts.lockfileDir, opts.prefix);
       const currentLockfile = opts.currentLockfile ?? { importers: { [importerId]: {} } };
       const outdated2 = [];
+      const ignoreDependenciesMatcher = opts.ignoreDependencies?.length ? (0, matcher_1.createMatcher)(opts.ignoreDependencies) : void 0;
       await Promise.all(types_1.DEPENDENCIES_FIELDS.map(async (depType) => {
         if (opts.include?.[depType] === false || opts.wantedLockfile.importers[importerId][depType] == null)
           return;
@@ -200610,7 +200681,7 @@ var require_outdated = __commonJS({
             return;
           const ref = opts.wantedLockfile.importers[importerId][depType][alias];
           if (ref.startsWith("file:") || // ignoring linked packages. (For backward compatibility)
-          opts.ignoreDependencies?.has(alias)) {
+          ignoreDependenciesMatcher?.(alias)) {
             return;
           }
           const relativeDepPath = dp.refToRelative(ref, alias);
@@ -201117,7 +201188,7 @@ var require_update2 = __commonJS({
       const outdatedPkgsOfProjects = await (0, outdated_1.outdatedDepsOfProjects)(projects, input, {
         ...opts,
         compatible: opts.latest !== true,
-        ignoreDependencies: new Set(rootProject?.manifest?.pnpm?.updateConfig?.ignoreDependencies ?? []),
+        ignoreDependencies: rootProject?.manifest?.pnpm?.updateConfig?.ignoreDependencies,
         include,
         retry: {
           factor: opts.fetchRetryFactor,
@@ -221432,7 +221503,7 @@ var require_recursive4 = __commonJS({
       const outdatedPackagesByProject = await (0, outdated_1.outdatedDepsOfProjects)(pkgs, params, {
         ...opts,
         fullMetadata: opts.long,
-        ignoreDependencies: new Set(rootManifest?.manifest?.pnpm?.updateConfig?.ignoreDependencies ?? []),
+        ignoreDependencies: rootManifest?.manifest?.pnpm?.updateConfig?.ignoreDependencies,
         retry: {
           factor: opts.fetchRetryFactor,
           maxTimeout: opts.fetchRetryMaxtimeout,
@@ -221691,7 +221762,7 @@ pnpm outdated gulp-* @babel/core`,
       const [outdatedPackages] = await (0, outdated_1.outdatedDepsOfProjects)(packages, params, {
         ...opts,
         fullMetadata: opts.long,
-        ignoreDependencies: new Set(manifest?.pnpm?.updateConfig?.ignoreDependencies ?? []),
+        ignoreDependencies: manifest?.pnpm?.updateConfig?.ignoreDependencies,
         include,
         retry: {
           factor: opts.fetchRetryFactor,
@@ -222878,7 +222949,13 @@ var require_patchCommit = __commonJS({
       if (opts?.allProjectsGraph?.[lockfileDir].package.manifest) {
         opts.allProjectsGraph[lockfileDir].package.manifest = rootProjectManifest;
       }
-      return plugin_commands_installation_1.install.handler(opts);
+      return plugin_commands_installation_1.install.handler({
+        ...opts,
+        rawLocalConfig: {
+          ...opts.rawLocalConfig,
+          "frozen-lockfile": false
+        }
+      });
     }
     exports2.handler = handler;
     async function diffFolders(folderA, folderB) {

package/package.json

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