pnpm 11.2.0 → 11.2.2

package/dist/pnpm.mjs

@@ -1800,7 +1800,7 @@ var init_lib5 = __esm({
     "use strict";
     defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "11.2.0" : "0.0.0"
+      version: true ? "11.2.2" : "0.0.0"
     };
     pkgJson = defaultManifest;
     packageManager = {
@@ -12540,10 +12540,11 @@ function pickRegistryForPackage(registries, packageName, bareSpecifier) {
 }
 function getScope(pkgName, bareSpecifier) {
   if (bareSpecifier?.startsWith("npm:")) {
-    bareSpecifier = bareSpecifier.slice(4);
-    if (bareSpecifier[0] === "@") {
-      return bareSpecifier.substring(0, bareSpecifier.indexOf("/"));
+    const target2 = bareSpecifier.slice(4);
+    if (target2[0] === "@") {
+      return target2.substring(0, target2.indexOf("/"));
     }
+    return null;
   }
   if (pkgName[0] === "@") {
     return pkgName.substring(0, pkgName.indexOf("/"));
@@ -164265,8 +164266,16 @@ async function installConfigDeps(configDepsOrLockfile, opts2) {
   const globalVirtualStoreDir = path142.join(opts2.storeDir, "links");
   const configModulesDir = path142.join(opts2.rootDir, "node_modules/.pnpm-config");
   const existingConfigDeps = await readModulesDir(configModulesDir) ?? [];
+  let startedEmitted = false;
+  const reportStarted = () => {
+    if (startedEmitted)
+      return;
+    startedEmitted = true;
+    installingConfigDepsLogger.debug({ status: "started" });
+  };
   await Promise.all(existingConfigDeps.map(async (existingConfigDep) => {
     if (!normalizedDeps[existingConfigDep]) {
+      reportStarted();
       await rimraf(path142.join(configModulesDir, existingConfigDep));
     }
   }));
@@ -164281,8 +164290,8 @@ async function installConfigDeps(configDepsOrLockfile, opts2) {
     const relPath = calcGlobalVirtualStorePathWithSubdeps(fullPkgId, pkgName, pkg.version, optionalSubdepIds);
     const pkgDirInGlobalVirtualStore = path142.join(globalVirtualStoreDir, relPath, "node_modules", pkgName);
     const parentSymlinkAlreadyCorrect = existingConfigDeps.includes(pkgName) && await symlinkPointsTo(configDepPath, pkgDirInGlobalVirtualStore);
-    installingConfigDepsLogger.debug({ status: "started" });
     if (!fs75.existsSync(path142.join(pkgDirInGlobalVirtualStore, "package.json"))) {
+      reportStarted();
       const { fetching } = await opts2.store.fetchPackage({
         force: true,
         lockfileDir: opts2.rootDir,
@@ -164308,12 +164317,14 @@ async function installConfigDeps(configDepsOrLockfile, opts2) {
         parentNodeModulesDir: path142.join(globalVirtualStoreDir, relPath, "node_modules"),
         globalVirtualStoreDir,
         rootDir: opts2.rootDir,
-        store: opts2.store
+        store: opts2.store,
+        reportStarted
       });
     }
     if (parentSymlinkAlreadyCorrect) {
       return;
     }
+    reportStarted();
     if (existingConfigDeps.includes(pkgName)) {
       await rimraf(configDepPath);
     }
@@ -164417,12 +164428,17 @@ async function installOptionalSubdeps(opts2) {
   });
   const expectedSiblings = /* @__PURE__ */ new Set([opts2.parentName, ...compatibleSubdeps.map((s) => s.name)]);
   const existingSiblings = await readModulesDir(opts2.parentNodeModulesDir) ?? [];
-  await Promise.all(existingSiblings.filter((name) => !expectedSiblings.has(name)).map((name) => rimraf(path142.join(opts2.parentNodeModulesDir, name))));
+  const orphanSiblings = existingSiblings.filter((name) => !expectedSiblings.has(name));
+  if (orphanSiblings.length > 0) {
+    opts2.reportStarted();
+  }
+  await Promise.all(orphanSiblings.map((name) => rimraf(path142.join(opts2.parentNodeModulesDir, name))));
   await Promise.all(compatibleSubdeps.map(async (subdep) => {
     const subdepFullPkgId = `${subdep.name}@${subdep.version}:${subdep.resolution.integrity}`;
     const subdepRelPath = calcLeafGlobalVirtualStorePath(subdepFullPkgId, subdep.name, subdep.version);
     const subdepDirInGlobalVirtualStore = path142.join(opts2.globalVirtualStoreDir, subdepRelPath, "node_modules", subdep.name);
     if (!fs75.existsSync(path142.join(subdepDirInGlobalVirtualStore, "package.json"))) {
+      opts2.reportStarted();
       const { fetching } = await opts2.store.fetchPackage({
         force: true,
         lockfileDir: opts2.rootDir,
@@ -164439,6 +164455,10 @@ async function installOptionalSubdeps(opts2) {
       });
     }
     const linkPath = path142.join(opts2.parentNodeModulesDir, subdep.name);
+    if (await symlinkPointsTo(linkPath, subdepDirInGlobalVirtualStore)) {
+      return;
+    }
+    opts2.reportStarted();
     await fs75.promises.mkdir(path142.dirname(linkPath), { recursive: true });
     await symlinkDir(subdepDirInGlobalVirtualStore, linkPath);
   }));
@@ -164551,7 +164571,7 @@ async function resolveOptionalSubdeps(parentName, parentManifest, opts2) {
       ...pickPlatformFields(resolution.manifest)
     };
     if (opts2.envLockfile.snapshots[subdepKey] == null) {
-      opts2.envLockfile.snapshots[subdepKey] = {};
+      opts2.envLockfile.snapshots[subdepKey] = { optional: true };
     }
     resolved[subdepName] = subdepVersion;
   }));
@@ -166497,8 +166517,9 @@ import readline2 from "node:readline";
 function makeRunPacquet(opts2) {
   return async (callOpts) => {
     const pacquetBin = resolvePacquetBin(opts2.lockfileDir, opts2.packageName);
-    const args = ["--reporter=ndjson", "install", "--frozen-lockfile"];
-    const droppedFlags = collectDroppedFlags(opts2.argv);
+    const forwardedFlags = opts2.isInstallCommand ? collectForwardedFlags(opts2.argv) : [];
+    const args = ["--reporter=ndjson", "install", "--frozen-lockfile", "--ignore-manifest-check", ...forwardedFlags];
+    const droppedFlags = opts2.isInstallCommand ? [] : collectDroppedFlags(opts2.argv);
     if (droppedFlags.length > 0) {
       logger.warn({
         message: `The following CLI flags are not forwarded to pacquet and may not be honored: ${droppedFlags.join(" ")}. Move the equivalent settings into pnpm-workspace.yaml (or .npmrc for auth/registry) if pacquet needs them.`,
@@ -166551,18 +166572,57 @@ function resolvePacquetBin(lockfileDir, packageName) {
   const pacquetPkg = fs82.realpathSync(path150.join(lockfileDir, "node_modules/.pnpm-config", packageName, "package.json"));
   return createRequire7(pacquetPkg).resolve(`@pacquet/${process.platform}-${process.arch}/pacquet${ext}`);
 }
+function collectForwardedFlags(argv2) {
+  const result2 = [];
+  let positionalIdx = 0;
+  for (let i2 = 0; i2 < argv2.original.length; i2++) {
+    const arg = argv2.original[i2];
+    if (positionalIdx < argv2.remain.length && arg === argv2.remain[positionalIdx]) {
+      positionalIdx++;
+      continue;
+    }
+    if (isAlwaysInjected(arg))
+      continue;
+    if (arg.startsWith("--reporter="))
+      continue;
+    if (arg === "--reporter") {
+      i2++;
+      continue;
+    }
+    result2.push(arg);
+  }
+  return result2;
+}
+function isAlwaysInjected(arg) {
+  for (const name of ALWAYS_INJECTED_FLAGS) {
+    if (arg === `--${name}` || arg === `--no-${name}`)
+      return true;
+    if (arg.startsWith(`--${name}=`) || arg.startsWith(`--no-${name}=`))
+      return true;
+  }
+  return false;
+}
 function collectDroppedFlags(argv2) {
-  return argv2.filter((arg) => {
+  const result2 = [];
+  for (let i2 = 0; i2 < argv2.original.length; i2++) {
+    const arg = argv2.original[i2];
     if (!arg.startsWith("-"))
-      return false;
-    if (arg === "--frozen-lockfile" || arg === "--reporter=ndjson")
-      return false;
+      continue;
+    if (isAlwaysInjected(arg))
+      continue;
     if (arg.startsWith("--config."))
-      return false;
-    return true;
-  });
+      continue;
+    if (arg.startsWith("--reporter="))
+      continue;
+    if (arg === "--reporter") {
+      i2++;
+      continue;
+    }
+    result2.push(arg);
+  }
+  return result2;
 }
-var streamParserWritable;
+var streamParserWritable, ALWAYS_INJECTED_FLAGS;
 var init_runPacquet = __esm({
   "../installing/commands/lib/runPacquet.js"() {
     "use strict";
@@ -166570,6 +166630,7 @@ var init_runPacquet = __esm({
     init_lib3();
     init_source2();
     streamParserWritable = streamParser;
+    ALWAYS_INJECTED_FLAGS = ["frozen-lockfile", "ignore-manifest-check"];
   }
 });
 
@@ -166609,7 +166670,8 @@ async function installDeps(opts2, params) {
   const runPacquet = pacquetConfigDepName != null ? makeRunPacquet({
     lockfileDir: opts2.lockfileDir ?? opts2.dir,
     packageName: pacquetConfigDepName,
-    argv: opts2.argv.original
+    argv: { original: opts2.argv.original, remain: opts2.argv.remain ?? [] },
+    isInstallCommand: opts2.isInstallCommand === true
   }) : void 0;
   const includeDirect = opts2.includeDirect ?? {
     dependencies: true,
@@ -167606,7 +167668,8 @@ async function handler5(opts2, _params, commands2) {
     frozenLockfileIfExists: opts2.frozenLockfileIfExists ?? (opts2.ci && !opts2.lockfileOnly && typeof opts2.frozenLockfile === "undefined" && typeof opts2.preferFrozenLockfile === "undefined"),
     include,
     includeDirect: include,
-    fetchFullMetadata: getFetchFullMetadata(opts2)
+    fetchFullMetadata: getFetchFullMetadata(opts2),
+    isInstallCommand: true
   };
   if (opts2.resolutionOnly) {
     installDepsOptions.lockfileOnly = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pnpm",
-  "version": "11.2.0",
+  "version": "11.2.2",
   "description": "Fast, disk space efficient package manager",
   "keywords": [
     "pnpm",