@pnpm/core 2.7.1 → 3.0.0

package/lib/getPeerDependencyIssues.js

@@ -1,18 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPeerDependencyIssues = void 0;
-const resolve_dependencies_1 = __importDefault(require("@pnpm/resolve-dependencies"));
-const getWantedDependencies_1 = __importDefault(require("@pnpm/resolve-dependencies/lib/getWantedDependencies"));
+const resolve_dependencies_1 = __importStar(require("@pnpm/resolve-dependencies"));
 const get_context_1 = __importDefault(require("@pnpm/get-context"));
 const install_1 = require("./install");
 const getPreferredVersions_1 = require("./install/getPreferredVersions");
 const normalize_registries_1 = require("@pnpm/normalize-registries");
 async function getPeerDependencyIssues(projects, opts) {
-    var _a, _b, _c, _d, _e;
-    const lockfileDir = (_a = opts.lockfileDir) !== null && _a !== void 0 ? _a : process.cwd();
+    const lockfileDir = opts.lockfileDir ?? process.cwd();
     const ctx = await (0, get_context_1.default)(projects, {
         force: false,
         forceSharedLockfile: false,
@@ -25,7 +46,7 @@ async function getPeerDependencyIssues(projects, opts) {
     const projectsToResolve = ctx.projects.map((project) => ({
         ...project,
         updatePackageManifest: false,
-        wantedDependencies: (0, getWantedDependencies_1.default)(project.manifest),
+        wantedDependencies: (0, resolve_dependencies_1.getWantedDependencies)(project.manifest),
     }));
     const preferredVersions = ctx.wantedLockfile.packages ? (0, getPreferredVersions_1.getPreferredVersionsFromLockfile)(ctx.wantedLockfile.packages) : undefined;
     const { peerDependencyIssuesByProjects, waitTillAllFetchingsFinish, } = await (0, resolve_dependencies_1.default)(projectsToResolve, {
@@ -40,12 +61,12 @@ async function getPeerDependencyIssues(projects, opts) {
                 lockfileDir,
                 overrides: opts.overrides,
                 packageExtensions: opts.packageExtensions,
-                readPackageHook: (_b = opts.hooks) === null || _b === void 0 ? void 0 : _b.readPackage,
+                readPackageHook: opts.hooks?.readPackage,
             }),
         },
-        linkWorkspacePackagesDepth: (_c = opts.linkWorkspacePackagesDepth) !== null && _c !== void 0 ? _c : (opts.saveWorkspaceProtocol ? 0 : -1),
+        linkWorkspacePackagesDepth: opts.linkWorkspacePackagesDepth ?? (opts.saveWorkspaceProtocol ? 0 : -1),
         lockfileDir,
-        nodeVersion: (_d = opts.nodeVersion) !== null && _d !== void 0 ? _d : process.version,
+        nodeVersion: opts.nodeVersion ?? process.version,
         pnpmVersion: '',
         preferWorkspacePackages: opts.preferWorkspacePackages,
         preferredVersions,
@@ -56,7 +77,7 @@ async function getPeerDependencyIssues(projects, opts) {
         tag: 'latest',
         virtualStoreDir: ctx.virtualStoreDir,
         wantedLockfile: ctx.wantedLockfile,
-        workspacePackages: (_e = opts.workspacePackages) !== null && _e !== void 0 ? _e : {},
+        workspacePackages: opts.workspacePackages ?? {},
     });
     await waitTillAllFetchingsFinish();
     return peerDependencyIssuesByProjects;

package/lib/getPeerDependencyIssues.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPeerDependencyIssues.js","sourceRoot":"","sources":["../src/getPeerDependencyIssues.ts"],"names":[],"mappings":";;;;;;AAAA,sFAA4D;AAC5D,iHAAwF;AAExF,oEAAiF;AACjF,uCAAiD;AACjD,yEAAiF;AAEjF,qEAA+D;AAexD,KAAK,UAAU,uBAAuB,CAC3C,QAA0B,EAC1B,IAA6B;;IAE7B,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,WAAW,mCAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IACrD,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAU,EAAC,QAAQ,EAAE;QACrC,KAAK,EAAE,KAAK;QACZ,mBAAmB,EAAE,KAAK;QAC1B,aAAa,EAAE,EAAE;QACjB,WAAW;QACX,UAAU,EAAE,yCAAkB;QAC9B,WAAW,EAAE,IAAI;QACjB,GAAG,IAAI;KACR,CAAC,CAAA;IACF,MAAM,iBAAiB,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACvD,GAAG,OAAO;QACV,qBAAqB,EAAE,KAAK;QAC5B,kBAAkB,EAAE,IAAA,+BAAqB,EAAC,OAAO,CAAC,QAAQ,CAAC;KAC5D,CAAC,CAAC,CAAA;IACH,MAAM,iBAAiB,GAAG,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,uDAAgC,EAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACjI,MAAM,EACJ,8BAA8B,EAC9B,0BAA0B,GAC3B,GAAG,MAAM,IAAA,8BAAmB,EAC3B,iBAAiB,EACjB;QACE,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,kBAAkB,EAAE,CAAC,CAAC;QACtB,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,KAAK;QACZ,mBAAmB,EAAE,IAAI;QACzB,KAAK,EAAE;YACL,WAAW,EAAE,IAAA,+BAAqB,EAAC;gBACjC,WAAW;gBACX,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,eAAe,EAAE,MAAA,IAAI,CAAC,KAAK,0CAAE,WAAW;aACzC,CAAC;SACH;QACD,0BAA0B,EAAE,MAAA,IAAI,CAAC,0BAA0B,mCAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpG,WAAW;QACX,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,mCAAI,OAAO,CAAC,OAAO;QAChD,WAAW,EAAE,EAAE;QACf,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,iBAAiB;QACjB,yBAAyB,EAAE,KAAK;QAChC,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,qBAAqB,EAAE,KAAK;QAC5B,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,GAAG,EAAE,QAAQ;QACb,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,iBAAiB,EAAE,MAAA,IAAI,CAAC,iBAAiB,mCAAI,EAAE;KAChD,CACF,CAAA;IAED,MAAM,0BAA0B,EAAE,CAAA;IAElC,OAAO,8BAA8B,CAAA;AACvC,CAAC;AA5DD,0DA4DC"}
+{"version":3,"file":"getPeerDependencyIssues.js","sourceRoot":"","sources":["../src/getPeerDependencyIssues.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mFAAuF;AAEvF,oEAAiF;AACjF,uCAAiD;AACjD,yEAAiF;AAEjF,qEAA+D;AAexD,KAAK,UAAU,uBAAuB,CAC3C,QAA0B,EAC1B,IAA6B;IAE7B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IACrD,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAU,EAAC,QAAQ,EAAE;QACrC,KAAK,EAAE,KAAK;QACZ,mBAAmB,EAAE,KAAK;QAC1B,aAAa,EAAE,EAAE;QACjB,WAAW;QACX,UAAU,EAAE,yCAAkB;QAC9B,WAAW,EAAE,IAAI;QACjB,GAAG,IAAI;KACR,CAAC,CAAA;IACF,MAAM,iBAAiB,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACvD,GAAG,OAAO;QACV,qBAAqB,EAAE,KAAK;QAC5B,kBAAkB,EAAE,IAAA,4CAAqB,EAAC,OAAO,CAAC,QAAQ,CAAC;KAC5D,CAAC,CAAC,CAAA;IACH,MAAM,iBAAiB,GAAG,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,uDAAgC,EAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACjI,MAAM,EACJ,8BAA8B,EAC9B,0BAA0B,GAC3B,GAAG,MAAM,IAAA,8BAAmB,EAC3B,iBAAiB,EACjB;QACE,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,kBAAkB,EAAE,CAAC,CAAC;QACtB,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,KAAK;QACZ,mBAAmB,EAAE,IAAI;QACzB,KAAK,EAAE;YACL,WAAW,EAAE,IAAA,+BAAqB,EAAC;gBACjC,WAAW;gBACX,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,eAAe,EAAE,IAAI,CAAC,KAAK,EAAE,WAAW;aACzC,CAAC;SACH;QACD,0BAA0B,EAAE,IAAI,CAAC,0BAA0B,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpG,WAAW;QACX,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO;QAChD,WAAW,EAAE,EAAE;QACf,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,iBAAiB;QACjB,yBAAyB,EAAE,KAAK;QAChC,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,qBAAqB,EAAE,KAAK;QAC5B,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,GAAG,EAAE,QAAQ;QACb,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,IAAI,EAAE;KAChD,CACF,CAAA;IAED,MAAM,0BAA0B,EAAE,CAAA;IAElC,OAAO,8BAA8B,CAAA;AACvC,CAAC;AA5DD,0DA4DC"}

package/lib/install/allProjectsAreUpToDate.js

@@ -40,7 +40,6 @@ function getWorkspacePackagesByDirectory(workspacePackages) {
     return workspacePackagesByDirectory;
 }
 async function linkedPackagesAreUpToDate({ linkWorkspacePackages, manifestsByDir, workspacePackages, }, project) {
-    var _a, _b, _c;
     for (const depField of types_1.DEPENDENCIES_FIELDS) {
         const lockfileDeps = project.snapshot[depField];
         const manifestDeps = project.manifest[depField];
@@ -61,7 +60,7 @@ async function linkedPackagesAreUpToDate({ linkWorkspacePackages, manifestsByDir
             }
             const linkedDir = isLinked
                 ? path_1.default.join(project.dir, lockfileRef.substr(5))
-                : (_b = (_a = workspacePackages === null || workspacePackages === void 0 ? void 0 : workspacePackages[depName]) === null || _a === void 0 ? void 0 : _a[lockfileRef]) === null || _b === void 0 ? void 0 : _b.dir;
+                : workspacePackages?.[depName]?.[lockfileRef]?.dir;
             if (!linkedDir)
                 continue;
             if (!linkWorkspacePackages && !currentSpec.startsWith('workspace:')) {
@@ -69,7 +68,7 @@ async function linkedPackagesAreUpToDate({ linkWorkspacePackages, manifestsByDir
                 // workspace:x.x.x dependency
                 continue;
             }
-            const linkedPkg = (_c = manifestsByDir[linkedDir]) !== null && _c !== void 0 ? _c : await (0, read_package_json_1.safeReadPackageFromDir)(linkedDir);
+            const linkedPkg = manifestsByDir[linkedDir] ?? await (0, read_package_json_1.safeReadPackageFromDir)(linkedDir);
             const availableRange = getVersionRange(currentSpec);
             // This should pass the same options to semver as @pnpm/npm-resolver
             const localPackageSatisfiesRange = availableRange === '*' ||
@@ -93,10 +92,9 @@ function getVersionRange(spec) {
     return spec;
 }
 function hasLocalTarballDepsInRoot(importer) {
-    var _a, _b, _c;
-    return (0, any_1.default)(refIsLocalTarball, Object.values((_a = importer.dependencies) !== null && _a !== void 0 ? _a : {})) ||
-        (0, any_1.default)(refIsLocalTarball, Object.values((_b = importer.devDependencies) !== null && _b !== void 0 ? _b : {})) ||
-        (0, any_1.default)(refIsLocalTarball, Object.values((_c = importer.optionalDependencies) !== null && _c !== void 0 ? _c : {}));
+    return (0, any_1.default)(refIsLocalTarball, Object.values(importer.dependencies ?? {})) ||
+        (0, any_1.default)(refIsLocalTarball, Object.values(importer.devDependencies ?? {})) ||
+        (0, any_1.default)(refIsLocalTarball, Object.values(importer.optionalDependencies ?? {}));
 }
 function refIsLocalTarball(ref) {
     return ref.startsWith('file:') && (ref.endsWith('.tgz') || ref.endsWith('.tar.gz') || ref.endsWith('.tar'));

package/lib/install/allProjectsAreUpToDate.js.map

@@ -1 +1 @@
-{"version":3,"file":"allProjectsAreUpToDate.js","sourceRoot":"","sources":["../../src/install/allProjectsAreUpToDate.ts"],"names":[],"mappings":";;;;;AAAA,gDAAuB;AAMvB,yDAA+D;AAC/D,+DAAsF;AAEtF,uCAIoB;AACpB,sDAA4B;AAC5B,wDAA+B;AAC/B,oDAA2B;AAEZ,KAAK,UAAU,sBAAsB,CAClD,QAAgD,EAChD,IAIC;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,+BAA+B,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC5G,MAAM,yBAAyB,GAAG,yCAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAC1F,MAAM,0BAA0B,GAAG,yBAAyB,CAAC,IAAI,CAAC,IAAI,EAAE;QACtE,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,cAAc;QACd,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;KAC1C,CAAC,CAAA;IACF,OAAO,IAAA,iBAAM,EAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC1D,OAAO,CAAC,yBAAyB,CAAC,QAAQ,CAAC;YACzC,yBAAyB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YACvD,0BAA0B,CAAC;gBACzB,GAAG,EAAE,OAAO,CAAC,OAAO;gBACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC;AAzBD,yCAyBC;AAED,SAAS,+BAA+B,CAAE,iBAAoC;IAC5E,MAAM,4BAA4B,GAAG,EAAE,CAAA;IACvC,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACvD,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACnE,4BAA4B,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAA;QAC5H,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,OAAO,4BAA4B,CAAA;AACrC,CAAC;AAED,KAAK,UAAU,yBAAyB,CACtC,EACE,qBAAqB,EACrB,cAAc,EACd,iBAAiB,GAKlB,EACD,OAIC;;IAED,KAAK,MAAM,QAAQ,IAAI,2BAAmB,EAAE;QAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAC/C,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC;YAAE,SAAQ;QAC9D,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC1C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YACzC,IAAI,CAAC,WAAW;gBAAE,SAAQ;YAC1B,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YACzC,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YAChD,IACE,QAAQ;gBACR,CACE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC;oBAC/B,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC;oBAC/B,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,CACtC,EACD;gBACA,SAAQ;aACT;YACD,MAAM,SAAS,GAAG,QAAQ;gBACxB,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC/C,CAAC,CAAC,MAAA,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,OAAO,CAAC,0CAAG,WAAW,CAAC,0CAAE,GAAG,CAAA;YACpD,IAAI,CAAC,SAAS;gBAAE,SAAQ;YACxB,IAAI,CAAC,qBAAqB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;gBACnE,sFAAsF;gBACtF,6BAA6B;gBAC7B,SAAQ;aACT;YACD,MAAM,SAAS,GAAG,MAAA,cAAc,CAAC,SAAS,CAAC,mCAAI,MAAM,IAAA,0CAAkB,EAAC,SAAS,CAAC,CAAA;YAClF,MAAM,cAAc,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;YACnD,oEAAoE;YACpE,MAAM,0BAA0B,GAAG,cAAc,KAAK,GAAG;gBACvD,SAAS,IAAI,gBAAM,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YACnF,IAAI,QAAQ,KAAK,0BAA0B;gBAAE,OAAO,KAAK,CAAA;SAC1D;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,eAAe,CAAE,IAAY;IACpC,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACzD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC3B,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;QAClC,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,OAAO,GAAG,CAAA;QAC5B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,GAAG,CAAA;KACrC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,yBAAyB,CAAE,QAAyB;;IAC3D,OAAO,IAAA,aAAG,EAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAA,QAAQ,CAAC,YAAY,mCAAI,EAAE,CAAC,CAAC;QACvE,IAAA,aAAG,EAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAA,QAAQ,CAAC,eAAe,mCAAI,EAAE,CAAC,CAAC;QACrE,IAAA,aAAG,EAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAA,QAAQ,CAAC,oBAAoB,mCAAI,EAAE,CAAC,CAAC,CAAA;AAC9E,CAAC;AAED,SAAS,iBAAiB,CAAE,GAAW;IACrC,OAAO,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;AAC7G,CAAC"}
+{"version":3,"file":"allProjectsAreUpToDate.js","sourceRoot":"","sources":["../../src/install/allProjectsAreUpToDate.ts"],"names":[],"mappings":"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"}

package/lib/install/createPeerDependencyPatcher.js

@@ -5,20 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const isEmpty_1 = __importDefault(require("ramda/src/isEmpty"));
 function default_1(peerDependencyRules) {
-    var _a;
-    const ignoreMissing = new Set((_a = peerDependencyRules.ignoreMissing) !== null && _a !== void 0 ? _a : []);
+    const ignoreMissing = new Set(peerDependencyRules.ignoreMissing ?? []);
     return ((pkg) => {
-        var _a, _b, _c, _d, _e;
         if ((0, isEmpty_1.default)(pkg.peerDependencies))
             return pkg;
-        for (const [peerName, peerVersion] of Object.entries((_a = pkg.peerDependencies) !== null && _a !== void 0 ? _a : {})) {
-            if (ignoreMissing.has(peerName) && !((_c = (_b = pkg.peerDependenciesMeta) === null || _b === void 0 ? void 0 : _b[peerName]) === null || _c === void 0 ? void 0 : _c.optional)) {
-                pkg.peerDependenciesMeta = (_d = pkg.peerDependenciesMeta) !== null && _d !== void 0 ? _d : {};
+        for (const [peerName, peerVersion] of Object.entries(pkg.peerDependencies ?? {})) {
+            if (ignoreMissing.has(peerName) && !pkg.peerDependenciesMeta?.[peerName]?.optional) {
+                pkg.peerDependenciesMeta = pkg.peerDependenciesMeta ?? {};
                 pkg.peerDependenciesMeta[peerName] = {
                     optional: true,
                 };
             }
-            if (((_e = peerDependencyRules.allowedVersions) === null || _e === void 0 ? void 0 : _e[peerName]) &&
+            if (peerDependencyRules.allowedVersions?.[peerName] &&
                 peerVersion !== '*') {
                 if (peerDependencyRules.allowedVersions[peerName] === '*') {
                     pkg.peerDependencies[peerName] = '*';

package/lib/install/createPeerDependencyPatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPeerDependencyPatcher.js","sourceRoot":"","sources":["../../src/install/createPeerDependencyPatcher.ts"],"names":[],"mappings":";;;;;AACA,gEAAuC;AAEvC,mBACE,mBAAwC;;IAExC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAA,mBAAmB,CAAC,aAAa,mCAAI,EAAE,CAAC,CAAA;IACtE,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;QACd,IAAI,IAAA,iBAAO,EAAC,GAAG,CAAC,gBAAgB,CAAC;YAAE,OAAO,GAAG,CAAA;QAC7C,KAAK,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAA,GAAG,CAAC,gBAAgB,mCAAI,EAAE,CAAC,EAAE;YAChF,IAAI,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA,MAAA,MAAA,GAAG,CAAC,oBAAoB,0CAAG,QAAQ,CAAC,0CAAE,QAAQ,CAAA,EAAE;gBAClF,GAAG,CAAC,oBAAoB,GAAG,MAAA,GAAG,CAAC,oBAAoB,mCAAI,EAAE,CAAA;gBACzD,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG;oBACnC,QAAQ,EAAE,IAAI;iBACf,CAAA;aACF;YACD,IACE,CAAA,MAAA,mBAAmB,CAAC,eAAe,0CAAG,QAAQ,CAAC;gBAC/C,WAAW,KAAK,GAAG,EACnB;gBACA,IAAI,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE;oBACzD,GAAG,CAAC,gBAAiB,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;iBACtC;qBAAM;oBACL,GAAG,CAAC,gBAAiB,CAAC,QAAQ,CAAC,IAAI,OAAO,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAA;iBAC1F;aACF;SACF;QACD,OAAO,GAAG,CAAA;IACZ,CAAC,CAAoB,CAAA;AACvB,CAAC;AA1BD,4BA0BC"}
+{"version":3,"file":"createPeerDependencyPatcher.js","sourceRoot":"","sources":["../../src/install/createPeerDependencyPatcher.ts"],"names":[],"mappings":";;;;;AACA,gEAAuC;AAEvC,mBACE,mBAAwC;IAExC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAAC,aAAa,IAAI,EAAE,CAAC,CAAA;IACtE,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACd,IAAI,IAAA,iBAAO,EAAC,GAAG,CAAC,gBAAgB,CAAC;YAAE,OAAO,GAAG,CAAA;QAC7C,KAAK,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,EAAE;YAChF,IAAI,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE;gBAClF,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAA;gBACzD,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG;oBACnC,QAAQ,EAAE,IAAI;iBACf,CAAA;aACF;YACD,IACE,mBAAmB,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC;gBAC/C,WAAW,KAAK,GAAG,EACnB;gBACA,IAAI,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE;oBACzD,GAAG,CAAC,gBAAiB,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;iBACtC;qBAAM;oBACL,GAAG,CAAC,gBAAiB,CAAC,QAAQ,CAAC,IAAI,OAAO,mBAAmB,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAA;iBAC1F;aACF;SACF;QACD,OAAO,GAAG,CAAA;IACZ,CAAC,CAAoB,CAAA;AACvB,CAAC;AA1BD,4BA0BC"}

package/lib/install/extendInstallOptions.d.ts

@@ -10,7 +10,6 @@ export interface StrictInstallOptions {
     frozenLockfile: boolean;
     frozenLockfileIfExists: boolean;
     enablePnp: boolean;
-    extendNodePath: boolean;
     extraBinPaths: string[];
     hoistingLimits?: HoistingLimits;
     useLockfile: boolean;

package/lib/install/extendInstallOptions.js

@@ -31,8 +31,7 @@ const error_1 = __importDefault(require("@pnpm/error"));
 const normalize_registries_1 = __importStar(require("@pnpm/normalize-registries"));
 const pnpmPkgJson_1 = __importDefault(require("../pnpmPkgJson"));
 const defaults = async (opts) => {
-    var _a, _b, _c;
-    const packageManager = (_a = opts.packageManager) !== null && _a !== void 0 ? _a : {
+    const packageManager = opts.packageManager ?? {
         name: pnpmPkgJson_1.default.name,
         version: pnpmPkgJson_1.default.version,
     };
@@ -41,7 +40,6 @@ const defaults = async (opts) => {
         depth: 0,
         enablePnp: false,
         engineStrict: false,
-        extendNodePath: true,
         force: false,
         forceSharedLockfile: false,
         frozenLockfile: false,
@@ -60,7 +58,7 @@ const defaults = async (opts) => {
             devDependencies: true,
             optionalDependencies: true,
         },
-        lockfileDir: (_c = (_b = opts.lockfileDir) !== null && _b !== void 0 ? _b : opts.dir) !== null && _c !== void 0 ? _c : process.cwd(),
+        lockfileDir: opts.lockfileDir ?? opts.dir ?? process.cwd(),
         lockfileOnly: false,
         nodeVersion: process.version,
         nodeLinker: 'isolated',
@@ -72,7 +70,7 @@ const defaults = async (opts) => {
         preferFrozenLockfile: true,
         preferWorkspacePackages: false,
         preserveWorkspaceProtocol: true,
-        pruneLockfileImporters: false,
+        pruneLockfileImporters: true,
         pruneStore: false,
         rawConfig: {},
         registries: normalize_registries_1.DEFAULT_REGISTRIES,
@@ -85,7 +83,7 @@ const defaults = async (opts) => {
         symlink: true,
         storeController: opts.storeController,
         storeDir: opts.storeDir,
-        strictPeerDependencies: false,
+        strictPeerDependencies: true,
         tag: 'latest',
         unsafePerm: process.platform === 'win32' ||
             process.platform === 'cygwin' ||

package/lib/install/extendInstallOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"extendInstallOptions.js","sourceRoot":"","sources":["../../src/install/extendInstallOptions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extendInstallOptions.js","sourceRoot":"","sources":["../../src/install/extendInstallOptions.ts"],"names":[],"mappings":"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"}

package/lib/install/index.d.ts

@@ -1,5 +1,5 @@
 import { ProjectOptions } from '@pnpm/get-context';
-import { PinnedVersion, WantedDependency } from '@pnpm/resolve-dependencies/lib/getWantedDependencies';
+import { PinnedVersion, WantedDependency } from '@pnpm/resolve-dependencies';
 import { PreferredVersions } from '@pnpm/resolver-base';
 import { DependenciesField, PackageExtension, PeerDependencyIssues, PeerDependencyRules, ProjectManifest, ReadPackageHook } from '@pnpm/types';
 import { InstallOptions } from './extendInstallOptions';

package/lib/install/index.js

@@ -46,8 +46,7 @@ const modules_yaml_1 = require("@pnpm/modules-yaml");
 const read_modules_dir_1 = __importDefault(require("@pnpm/read-modules-dir"));
 const read_project_manifest_1 = require("@pnpm/read-project-manifest");
 const remove_bins_1 = require("@pnpm/remove-bins");
-const resolve_dependencies_1 = __importDefault(require("@pnpm/resolve-dependencies"));
-const getWantedDependencies_1 = __importDefault(require("@pnpm/resolve-dependencies/lib/getWantedDependencies"));
+const resolve_dependencies_1 = __importStar(require("@pnpm/resolve-dependencies"));
 const rimraf_1 = __importDefault(require("@zkochan/rimraf"));
 const is_inner_link_1 = __importDefault(require("is-inner-link"));
 const p_filter_1 = __importDefault(require("p-filter"));
@@ -75,21 +74,19 @@ const BROKEN_LOCKFILE_INTEGRITY_ERRORS = new Set([
 ]);
 const DEV_PREINSTALL = 'pnpm:devPreinstall';
 async function install(manifest, opts) {
-    var _a;
     const projects = await mutateModules([
         {
             buildIndex: 0,
             manifest,
             mutation: 'install',
-            rootDir: (_a = opts.dir) !== null && _a !== void 0 ? _a : process.cwd(),
+            rootDir: opts.dir ?? process.cwd(),
         },
     ], opts);
     return projects[0].manifest;
 }
 exports.install = install;
 async function mutateModules(projects, maybeOpts) {
-    var _a, _b, _c;
-    const reporter = maybeOpts === null || maybeOpts === void 0 ? void 0 : maybeOpts.reporter;
+    const reporter = maybeOpts?.reporter;
     if ((reporter != null) && typeof reporter === 'function') {
         logger_1.streamParser.on('data', reporter);
     }
@@ -99,10 +96,10 @@ async function mutateModules(projects, maybeOpts) {
     }
     const installsOnly = projects.every((project) => project.mutation === 'install');
     opts['forceNewModules'] = installsOnly;
-    const rootProjectManifest = (_b = (_a = projects.find(({ rootDir }) => rootDir === opts.lockfileDir)) === null || _a === void 0 ? void 0 : _a.manifest) !== null && _b !== void 0 ? _b : 
-    // When running install/update on a subset of projects, the root project might not be included,
-    // so reading its manifest explicitly here.
-    await (0, read_project_manifest_1.safeReadProjectManifestOnly)(opts.lockfileDir);
+    const rootProjectManifest = projects.find(({ rootDir }) => rootDir === opts.lockfileDir)?.manifest ??
+        // When running install/update on a subset of projects, the root project might not be included,
+        // so reading its manifest explicitly here.
+        await (0, read_project_manifest_1.safeReadProjectManifestOnly)(opts.lockfileDir);
     opts.hooks.readPackage = createReadPackageHook({
         readPackageHook: opts.hooks.readPackage,
         overrides: opts.overrides,
@@ -111,7 +108,7 @@ async function mutateModules(projects, maybeOpts) {
         peerDependencyRules: opts.peerDependencyRules,
     });
     const ctx = await (0, get_context_1.default)(projects, opts);
-    const pruneVirtualStore = ((_c = ctx.modulesFile) === null || _c === void 0 ? void 0 : _c.prunedAt) && opts.modulesCacheMaxAge > 0
+    const pruneVirtualStore = ctx.modulesFile?.prunedAt && opts.modulesCacheMaxAge > 0
         ? cacheExpired(ctx.modulesFile.prunedAt, opts.modulesCacheMaxAge)
         : true;
     if (!maybeOpts.ignorePackageManifest) {
@@ -127,7 +124,6 @@ async function mutateModules(projects, maybeOpts) {
     }
     return result;
     async function _install() {
-        var _a, _b, _c, _d, _e, _f;
         const scriptsOpts = {
             extraBinPaths: opts.extraBinPaths,
             rawConfig: opts.rawConfig,
@@ -138,7 +134,7 @@ async function mutateModules(projects, maybeOpts) {
             storeController: opts.storeController,
             unsafePerm: opts.unsafePerm || false,
         };
-        if (!opts.ignoreScripts && !opts.ignorePackageManifest && ((_a = rootProjectManifest === null || rootProjectManifest === void 0 ? void 0 : rootProjectManifest.scripts) === null || _a === void 0 ? void 0 : _a[DEV_PREINSTALL])) {
+        if (!opts.ignoreScripts && !opts.ignorePackageManifest && rootProjectManifest?.scripts?.[DEV_PREINSTALL]) {
             await (0, lifecycle_1.default)(DEV_PREINSTALL, rootProjectManifest, {
                 ...scriptsOpts,
                 depPath: opts.lockfileDir,
@@ -146,7 +142,7 @@ async function mutateModules(projects, maybeOpts) {
                 rootModulesDir: ctx.rootModulesDir,
             });
         }
-        const packageExtensionsChecksum = (0, isEmpty_1.default)((_b = opts.packageExtensions) !== null && _b !== void 0 ? _b : {}) ? undefined : createObjectChecksum(opts.packageExtensions);
+        const packageExtensionsChecksum = (0, isEmpty_1.default)(opts.packageExtensions ?? {}) ? undefined : createObjectChecksum(opts.packageExtensions);
         let needsFullResolution = !maybeOpts.ignorePackageManifest &&
             lockfileIsUpToDate(ctx.wantedLockfile, {
                 overrides: opts.overrides,
@@ -206,7 +202,7 @@ async function mutateModules(projects, maybeOpts) {
                             pnpmVersion: opts.packageManager.name === 'pnpm' ? opts.packageManager.version : '',
                         },
                         projects: ctx.projects,
-                        prunedAt: (_c = ctx.modulesFile) === null || _c === void 0 ? void 0 : _c.prunedAt,
+                        prunedAt: ctx.modulesFile?.prunedAt,
                         pruneVirtualStore,
                         wantedLockfile: maybeOpts.ignorePackageManifest ? undefined : ctx.wantedLockfile,
                     });
@@ -248,7 +244,7 @@ async function mutateModules(projects, maybeOpts) {
                 case 'install': {
                     await installCase({
                         ...project,
-                        updatePackageManifest: (_d = opts.updatePackageManifest) !== null && _d !== void 0 ? _d : opts.update,
+                        updatePackageManifest: opts.updatePackageManifest ?? opts.update,
                     });
                     break;
                 }
@@ -278,8 +274,8 @@ async function mutateModules(projects, maybeOpts) {
                     break;
                 }
                 case 'unlinkSome': {
-                    if (((_e = project.manifest) === null || _e === void 0 ? void 0 : _e.name) && opts.globalBin) {
-                        await (0, remove_bins_1.removeBin)(path_1.default.join(opts.globalBin, (_f = project.manifest) === null || _f === void 0 ? void 0 : _f.name));
+                    if (project.manifest?.name && opts.globalBin) {
+                        await (0, remove_bins_1.removeBin)(path_1.default.join(opts.globalBin, project.manifest?.name));
                     }
                     const packagesToInstall = [];
                     const allDeps = (0, manifest_utils_1.getAllDependenciesFromManifest)(project.manifest);
@@ -317,17 +313,16 @@ async function mutateModules(projects, maybeOpts) {
             }
         }
         async function installCase(project) {
-            var _a, _b;
-            const wantedDependencies = (0, getWantedDependencies_1.default)(project.manifest, {
+            const wantedDependencies = (0, resolve_dependencies_1.getWantedDependencies)(project.manifest, {
                 includeDirect: opts.includeDirect,
                 updateWorkspaceDependencies: opts.update,
                 nodeExecPath: opts.nodeExecPath,
             })
                 .map((wantedDependency) => ({ ...wantedDependency, updateSpec: true }));
-            if ((_a = ctx.wantedLockfile) === null || _a === void 0 ? void 0 : _a.importers) {
+            if (ctx.wantedLockfile?.importers) {
                 forgetResolutionsOfPrevWantedDeps(ctx.wantedLockfile.importers[project.id], wantedDependencies);
             }
-            if (opts.ignoreScripts && ((_b = project.manifest) === null || _b === void 0 ? void 0 : _b.scripts) &&
+            if (opts.ignoreScripts && project.manifest?.scripts &&
                 (project.manifest.scripts.preinstall ||
                     project.manifest.scripts.install ||
                     project.manifest.scripts.postinstall ||
@@ -383,10 +378,9 @@ async function mutateModules(projects, maybeOpts) {
 }
 exports.mutateModules = mutateModules;
 function lockfileIsUpToDate(lockfile, { neverBuiltDependencies, onlyBuiltDependencies, overrides, packageExtensionsChecksum, }) {
-    var _a, _b;
-    return !(0, equals_1.default)((_a = lockfile.overrides) !== null && _a !== void 0 ? _a : {}, overrides !== null && overrides !== void 0 ? overrides : {}) ||
-        !(0, equals_1.default)(((_b = lockfile.neverBuiltDependencies) !== null && _b !== void 0 ? _b : []).sort(), (neverBuiltDependencies !== null && neverBuiltDependencies !== void 0 ? neverBuiltDependencies : []).sort()) ||
-        !(0, equals_1.default)(onlyBuiltDependencies === null || onlyBuiltDependencies === void 0 ? void 0 : onlyBuiltDependencies.sort(), lockfile.onlyBuiltDependencies) ||
+    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;
 }
 function createObjectChecksum(obj) {
@@ -396,10 +390,10 @@ function createObjectChecksum(obj) {
 exports.createObjectChecksum = createObjectChecksum;
 function createReadPackageHook({ lockfileDir, overrides, packageExtensions, peerDependencyRules, readPackageHook, }) {
     const hooks = [];
-    if (!(0, isEmpty_1.default)(overrides !== null && overrides !== void 0 ? overrides : {})) {
+    if (!(0, isEmpty_1.default)(overrides ?? {})) {
         hooks.push((0, createVersionsOverrider_1.default)(overrides, lockfileDir));
     }
-    if (!(0, isEmpty_1.default)(packageExtensions !== null && packageExtensions !== void 0 ? packageExtensions : {})) {
+    if (!(0, isEmpty_1.default)(packageExtensions ?? {})) {
         hooks.push((0, createPackageExtender_1.default)(packageExtensions));
     }
     if (peerDependencyRules != null &&
@@ -426,23 +420,21 @@ async function isExternalLink(storeDir, modules, pkgName) {
     return !link.isInner;
 }
 function pkgHasDependencies(manifest) {
-    var _a, _b, _c;
-    return Boolean((Object.keys((_a = manifest.dependencies) !== null && _a !== void 0 ? _a : {}).length > 0) ||
-        Object.keys((_b = manifest.devDependencies) !== null && _b !== void 0 ? _b : {}).length ||
-        Object.keys((_c = manifest.optionalDependencies) !== null && _c !== void 0 ? _c : {}).length);
+    return Boolean((Object.keys(manifest.dependencies ?? {}).length > 0) ||
+        Object.keys(manifest.devDependencies ?? {}).length ||
+        Object.keys(manifest.optionalDependencies ?? {}).length);
 }
 // If the specifier is new, the old resolution probably does not satisfy it anymore.
 // By removing these resolutions we ensure that they are resolved again using the new specs.
 function forgetResolutionsOfPrevWantedDeps(importer, wantedDeps) {
-    var _a, _b, _c, _d;
     if (!importer.specifiers)
         return;
-    importer.dependencies = (_a = importer.dependencies) !== null && _a !== void 0 ? _a : {};
-    importer.devDependencies = (_b = importer.devDependencies) !== null && _b !== void 0 ? _b : {};
-    importer.optionalDependencies = (_c = importer.optionalDependencies) !== null && _c !== void 0 ? _c : {};
+    importer.dependencies = importer.dependencies ?? {};
+    importer.devDependencies = importer.devDependencies ?? {};
+    importer.optionalDependencies = importer.optionalDependencies ?? {};
     for (const { alias, pref } of wantedDeps) {
         if (alias && importer.specifiers[alias] !== pref) {
-            if (!((_d = importer.dependencies[alias]) === null || _d === void 0 ? void 0 : _d.startsWith('link:'))) {
+            if (!importer.dependencies[alias]?.startsWith('link:')) {
                 delete importer.dependencies[alias];
             }
             delete importer.devDependencies[alias];
@@ -451,7 +443,6 @@ function forgetResolutionsOfPrevWantedDeps(importer, wantedDeps) {
     }
 }
 async function addDependenciesToPackage(manifest, dependencySelectors, opts) {
-    var _a, _b;
     const projects = await mutateModules([
         {
             allowNew: opts.allowNew,
@@ -460,18 +451,17 @@ async function addDependenciesToPackage(manifest, dependencySelectors, opts) {
             mutation: 'installSome',
             peer: opts.peer,
             pinnedVersion: opts.pinnedVersion,
-            rootDir: (_a = opts.dir) !== null && _a !== void 0 ? _a : process.cwd(),
+            rootDir: opts.dir ?? process.cwd(),
             targetDependenciesField: opts.targetDependenciesField,
         },
     ], {
         ...opts,
-        lockfileDir: (_b = opts.lockfileDir) !== null && _b !== void 0 ? _b : opts.dir,
+        lockfileDir: opts.lockfileDir ?? opts.dir,
     });
     return projects[0].manifest;
 }
 exports.addDependenciesToPackage = addDependenciesToPackage;
 const _installInContext = async (projects, ctx, opts) => {
-    var _a, _b, _c, _d, _e, _f;
     if (opts.lockfileOnly && ctx.existsCurrentLockfile) {
         logger_1.default.warn({
             message: '`node_modules` is present. Lockfile only installation will make it out-of-date',
@@ -506,7 +496,7 @@ const _installInContext = async (projects, ctx, opts) => {
         prefix: ctx.lockfileDir,
         stage: 'resolution_started',
     });
-    const preferredVersions = (_a = opts.preferredVersions) !== null && _a !== void 0 ? _a : ((!opts.update &&
+    const preferredVersions = opts.preferredVersions ?? ((!opts.update &&
         (ctx.wantedLockfile.packages != null) &&
         !(0, isEmpty_1.default)(ctx.wantedLockfile.packages))
         ? (0, getPreferredVersions_1.getPreferredVersionsFromLockfile)(ctx.wantedLockfile.packages)
@@ -541,7 +531,7 @@ const _installInContext = async (projects, ctx, opts) => {
         force: opts.force,
         forceFullResolution,
         hooks: opts.hooks,
-        linkWorkspacePackagesDepth: (_b = opts.linkWorkspacePackagesDepth) !== null && _b !== void 0 ? _b : (opts.saveWorkspaceProtocol ? 0 : -1),
+        linkWorkspacePackagesDepth: opts.linkWorkspacePackagesDepth ?? (opts.saveWorkspaceProtocol ? 0 : -1),
         lockfileDir: opts.lockfileDir,
         nodeVersion: opts.nodeVersion,
         pnpmVersion: opts.packageManager.name === 'pnpm' ? opts.packageManager.version : '',
@@ -561,8 +551,8 @@ const _installInContext = async (projects, ctx, opts) => {
         prefix: ctx.lockfileDir,
         stage: 'resolution_done',
     });
-    newLockfile = (((_c = opts.hooks) === null || _c === void 0 ? void 0 : _c.afterAllResolved) != null)
-        ? await ((_d = opts.hooks) === null || _d === void 0 ? void 0 : _d.afterAllResolved(newLockfile))
+    newLockfile = ((opts.hooks?.afterAllResolved) != null)
+        ? await opts.hooks?.afterAllResolved(newLockfile)
         : newLockfile;
     if (opts.updateLockfileMinorVersion) {
         newLockfile.lockfileVersion = constants_1.LOCKFILE_VERSION;
@@ -575,7 +565,6 @@ const _installInContext = async (projects, ctx, opts) => {
             dependenciesByProjectId,
             depsStateCache,
             force: opts.force,
-            extendNodePath: opts.extendNodePath,
             hoistedDependencies: ctx.hoistedDependencies,
             hoistedModulesDir: ctx.hoistedModulesDir,
             hoistPattern: ctx.hoistPattern,
@@ -599,7 +588,7 @@ const _installInContext = async (projects, ctx, opts) => {
         });
         await finishLockfileUpdates();
         if (opts.enablePnp) {
-            const importerNames = (0, fromPairs_1.default)(projects.map(({ manifest, id }) => { var _a; return [id, (_a = manifest.name) !== null && _a !== void 0 ? _a : id]; }));
+            const importerNames = (0, fromPairs_1.default)(projects.map(({ manifest, id }) => [id, manifest.name ?? id]));
             await (0, lockfile_to_pnp_1.writePnpFile)(result.currentLockfile, {
                 importerNames,
                 lockfileDir: ctx.lockfileDir,
@@ -615,7 +604,7 @@ const _installInContext = async (projects, ctx, opts) => {
                 .concat(result.newDepPaths
                 .filter((depPath) => dependenciesGraph[depPath].requiresBuild));
         }
-        else if ((_e = result.newDepPaths) === null || _e === void 0 ? void 0 : _e.length) {
+        else if (result.newDepPaths?.length) {
             // postinstall hooks
             const depPaths = Object.keys(dependenciesGraph);
             const rootNodes = depPaths.filter((depPath) => dependenciesGraph[depPath].depth === 0);
@@ -627,7 +616,6 @@ const _installInContext = async (projects, ctx, opts) => {
                 childConcurrency: opts.childConcurrency,
                 depsStateCache,
                 depsToBuild: new Set(result.newDepPaths),
-                extendNodePath: opts.extendNodePath,
                 extraBinPaths: ctx.extraBinPaths,
                 extraEnv,
                 lockfileDir: ctx.lockfileDir,
@@ -644,7 +632,7 @@ const _installInContext = async (projects, ctx, opts) => {
             });
         }
         const binWarn = (prefix, message) => logger_1.default.info({ message, prefix });
-        if ((_f = result.newDepPaths) === null || _f === void 0 ? void 0 : _f.length) {
+        if (result.newDepPaths?.length) {
             const newPkgs = (0, props_1.default)(result.newDepPaths, dependenciesGraph);
             await linkAllBins(newPkgs, dependenciesGraph, {
                 optional: opts.include.optionalDependencies,
@@ -652,10 +640,9 @@ const _installInContext = async (projects, ctx, opts) => {
             });
         }
         await Promise.all(projects.map(async (project, index) => {
-            var _a, _b;
             let linkedPackages;
-            if (((_a = ctx.publicHoistPattern) === null || _a === void 0 ? void 0 : _a.length) && path_1.default.relative(project.rootDir, opts.lockfileDir) === '') {
-                const nodeExecPathByAlias = Object.entries((_b = project.manifest.dependenciesMeta) !== null && _b !== void 0 ? _b : {})
+            if (ctx.publicHoistPattern?.length && path_1.default.relative(project.rootDir, opts.lockfileDir) === '') {
+                const nodeExecPathByAlias = Object.entries(project.manifest.dependenciesMeta ?? {})
                     .reduce((prev, [alias, { node }]) => {
                     if (node) {
                         prev[alias] = node;
@@ -664,7 +651,6 @@ const _installInContext = async (projects, ctx, opts) => {
                 }, {});
                 linkedPackages = await (0, link_bins_1.default)(project.modulesDir, project.binsDir, {
                     allowExoticManifests: true,
-                    extendNodePath: opts.extendNodePath,
                     projectManifest: project.manifest,
                     nodeExecPathByAlias,
                     warn: binWarn.bind(null, project.rootDir),
@@ -679,11 +665,10 @@ const _installInContext = async (projects, ctx, opts) => {
                     })),
                 ];
                 linkedPackages = await (0, link_bins_1.linkBinsOfPackages)((await Promise.all(directPkgs.map(async (dep) => {
-                    var _a, _b, _c, _d;
-                    const manifest = (_b = await ((_a = dep.fetchingBundledManifest) === null || _a === void 0 ? void 0 : _a.call(dep))) !== null && _b !== void 0 ? _b : await (0, read_project_manifest_1.safeReadProjectManifestOnly)(dep.dir);
+                    const manifest = await dep.fetchingBundledManifest?.() ?? await (0, read_project_manifest_1.safeReadProjectManifestOnly)(dep.dir);
                     let nodeExecPath;
-                    if (manifest === null || manifest === void 0 ? void 0 : manifest.name) {
-                        nodeExecPath = (_d = (_c = project.manifest.dependenciesMeta) === null || _c === void 0 ? void 0 : _c[manifest.name]) === null || _d === void 0 ? void 0 : _d.node;
+                    if (manifest?.name) {
+                        nodeExecPath = project.manifest.dependenciesMeta?.[manifest.name]?.node;
                     }
                     return {
                         location: dep.dir,
@@ -691,12 +676,12 @@ const _installInContext = async (projects, ctx, opts) => {
                         nodeExecPath,
                     };
                 })))
-                    .filter(({ manifest }) => manifest != null), project.binsDir, { extendNodePath: opts.extendNodePath, warn: binWarn.bind(null, project.rootDir) });
+                    .filter(({ manifest }) => manifest != null), project.binsDir);
             }
             const projectToInstall = projects[index];
             if (opts.global && projectToInstall.mutation.includes('install')) {
                 projectToInstall.wantedDependencies.forEach(pkg => {
-                    if (!(linkedPackages === null || linkedPackages === void 0 ? void 0 : linkedPackages.includes(pkg.alias))) {
+                    if (!linkedPackages?.includes(pkg.alias)) {
                         logger_1.default.warn({ message: `${pkg.alias} has no binaries`, prefix: opts.lockfileDir });
                     }
                 });
@@ -793,7 +778,6 @@ function createAllowBuildFunction(opts) {
     return undefined;
 }
 const installInContext = async (projects, ctx, opts) => {
-    var _a;
     try {
         if (opts.nodeLinker === 'hoisted' && !opts.lockfileOnly) {
             const result = await _installInContext(projects, ctx, {
@@ -808,7 +792,7 @@ const installInContext = async (projects, ctx, opts) => {
                     pnpmVersion: opts.packageManager.name === 'pnpm' ? opts.packageManager.version : '',
                 },
                 projects: ctx.projects,
-                prunedAt: (_a = ctx.modulesFile) === null || _a === void 0 ? void 0 : _a.prunedAt,
+                prunedAt: ctx.modulesFile?.prunedAt,
                 wantedLockfile: result.newLockfile,
             });
             return result;