@pnpm/installing.env-installer 1101.1.0 → 1101.1.2

package/lib/installConfigDeps.js

@@ -21,8 +21,16 @@ export async function installConfigDeps(configDepsOrLockfile, opts) {
     const globalVirtualStoreDir = path.join(opts.storeDir, 'links');
     const configModulesDir = path.join(opts.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(path.join(configModulesDir, existingConfigDep));
         }
     }));
@@ -49,8 +57,8 @@ export async function installConfigDeps(configDepsOrLockfile, opts) {
         // get pruned and relinked.
         const parentSymlinkAlreadyCorrect = existingConfigDeps.includes(pkgName) &&
             await symlinkPointsTo(configDepPath, pkgDirInGlobalVirtualStore);
-        installingConfigDepsLogger.debug({ status: 'started' });
         if (!fs.existsSync(path.join(pkgDirInGlobalVirtualStore, 'package.json'))) {
+            reportStarted();
             const { fetching } = await opts.store.fetchPackage({
                 force: true,
                 lockfileDir: opts.rootDir,
@@ -77,11 +85,13 @@ export async function installConfigDeps(configDepsOrLockfile, opts) {
                 globalVirtualStoreDir,
                 rootDir: opts.rootDir,
                 store: opts.store,
+                reportStarted,
             });
         }
         if (parentSymlinkAlreadyCorrect) {
             return;
         }
+        reportStarted();
         if (existingConfigDeps.includes(pkgName)) {
             await rimraf(configDepPath);
         }
@@ -206,14 +216,17 @@ async function installOptionalSubdeps(opts) {
     });
     const expectedSiblings = new Set([opts.parentName, ...compatibleSubdeps.map((s) => s.name)]);
     const existingSiblings = await readModulesDir(opts.parentNodeModulesDir) ?? [];
-    await Promise.all(existingSiblings
-        .filter((name) => !expectedSiblings.has(name))
-        .map((name) => rimraf(path.join(opts.parentNodeModulesDir, name))));
+    const orphanSiblings = existingSiblings.filter((name) => !expectedSiblings.has(name));
+    if (orphanSiblings.length > 0) {
+        opts.reportStarted();
+    }
+    await Promise.all(orphanSiblings.map((name) => rimraf(path.join(opts.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 = path.join(opts.globalVirtualStoreDir, subdepRelPath, 'node_modules', subdep.name);
         if (!fs.existsSync(path.join(subdepDirInGlobalVirtualStore, 'package.json'))) {
+            opts.reportStarted();
             const { fetching } = await opts.store.fetchPackage({
                 force: true,
                 lockfileDir: opts.rootDir,
@@ -230,6 +243,10 @@ async function installOptionalSubdeps(opts) {
             });
         }
         const linkPath = path.join(opts.parentNodeModulesDir, subdep.name);
+        if (await symlinkPointsTo(linkPath, subdepDirInGlobalVirtualStore)) {
+            return;
+        }
+        opts.reportStarted();
         await fs.promises.mkdir(path.dirname(linkPath), { recursive: true });
         await symlinkDir(subdepDirInGlobalVirtualStore, linkPath);
     }));

package/lib/resolveConfigDeps.js

@@ -8,6 +8,7 @@ import { createFetchFromRegistry } from '@pnpm/network.fetch';
 import { createNpmResolver } from '@pnpm/resolving.npm-resolver';
 import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency';
 import { installConfigDeps } from './installConfigDeps.js';
+import { pruneEnvLockfile } from './pruneEnvLockfile.js';
 import { resolveOptionalSubdeps } from './resolveOptionalSubdeps.js';
 export async function resolveConfigDeps(configDeps, opts) {
     if (opts.frozenLockfile) {
@@ -54,6 +55,7 @@ export async function resolveConfigDeps(configDeps, opts) {
         });
         envLockfile.snapshots[pkgKey] = optionalSubdeps ? { optionalDependencies: optionalSubdeps } : {};
     }));
+    pruneEnvLockfile(envLockfile);
     await Promise.all([
         writeSettings({
             ...opts,

package/lib/resolveOptionalSubdeps.js

@@ -65,7 +65,7 @@ export async function resolveOptionalSubdeps(parentName, parentManifest, opts) {
             ...pickPlatformFields(resolution.manifest),
         };
         if (opts.envLockfile.snapshots[subdepKey] == null) {
-            opts.envLockfile.snapshots[subdepKey] = {};
+            opts.envLockfile.snapshots[subdepKey] = { optional: true };
         }
         resolved[subdepName] = subdepVersion;
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.env-installer",
-  "version": "1101.1.0",
+  "version": "1101.1.2",
   "description": "Installer for configurational dependencies",
   "keywords": [
     "pnpm",
@@ -30,26 +30,26 @@
     "semver": "^7.7.2",
     "symlink-dir": "^10.0.1",
     "@pnpm/config.package-is-installable": "1100.0.6",
+    "@pnpm/config.pick-registry-for-package": "1100.0.5",
     "@pnpm/config.writer": "1100.0.9",
-    "@pnpm/config.pick-registry-for-package": "1100.0.4",
     "@pnpm/constants": "1100.0.0",
+    "@pnpm/core-loggers": "1100.1.1",
     "@pnpm/deps.graph-hasher": "1100.2.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/installing.deps-resolver": "1100.1.1",
     "@pnpm/fs.read-modules-dir": "1100.0.1",
     "@pnpm/lockfile.fs": "1100.1.1",
-    "@pnpm/lockfile.utils": "1100.0.9",
-    "@pnpm/lockfile.types": "1100.0.7",
+    "@pnpm/installing.deps-resolver": "1100.1.3",
     "@pnpm/lockfile.pruner": "1100.0.7",
-    "@pnpm/network.auth-header": "1100.0.3",
+    "@pnpm/lockfile.types": "1100.0.7",
+    "@pnpm/lockfile.utils": "1100.0.9",
     "@pnpm/network.fetch": "1100.0.6",
     "@pnpm/pkg-manifest.reader": "1100.0.4",
+    "@pnpm/resolving.npm-resolver": "1101.3.2",
     "@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
-    "@pnpm/store.controller-types": "1100.1.1",
     "@pnpm/store.controller": "1101.0.8",
+    "@pnpm/store.controller-types": "1100.1.1",
     "@pnpm/types": "1101.1.1",
-    "@pnpm/resolving.npm-resolver": "1101.3.0",
-    "@pnpm/core-loggers": "1100.1.1"
+    "@pnpm/network.auth-header": "1100.0.3"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0",
@@ -61,9 +61,9 @@
     "@types/semver": "7.7.1",
     "load-json-file": "^7.0.1",
     "read-yaml-file": "^3.0.0",
-    "@pnpm/installing.env-installer": "1101.1.0",
+    "@pnpm/installing.env-installer": "1101.1.2",
     "@pnpm/prepare": "1100.0.10",
-    "@pnpm/testing.temp-store": "1100.1.1"
+    "@pnpm/testing.temp-store": "1100.1.3"
   },
   "engines": {
     "node": ">=22.13"