nx 15.3.0 → 15.3.2

package/src/executors/run-commands/schema.json

@@ -138,6 +138,13 @@
     }
   },
   "additionalProperties": true,
-  "required": [],
+  "oneOf": [
+    {
+      "required": ["commands"]
+    },
+    {
+      "required": ["command"]
+    }
+  ],
   "examplesFile": "../../../docs/run-commands-examples.md"
 }

package/src/lock-file/lock-file.d.ts

@@ -1,6 +1,7 @@
 import { PackageManager } from '../utils/package-manager';
 import { LockFileData } from './utils/lock-file-type';
 import { ProjectGraph } from '../config/project-graph';
+import { PackageJson } from '../utils/package-json';
 /**
  * Check if lock file exists
  */
@@ -23,8 +24,22 @@ export declare function mapLockFileDataToPartialGraph(lockFileData: LockFileData
  * Stringifies {@link LockFileData} content and writes it to lock file
  */
 export declare function writeLockFile(lockFile: LockFileData, packageManager?: PackageManager): void;
+export declare function getLockFileName(packageManager?: PackageManager): string;
 /**
- * Prunes {@link LockFileData} based on minimal necessary set of packages
- * Returns new {@link LockFileData}
+ * Prune lock file based on the given project's dependencies and overrides in local package.json
+ *
+ * @param projectName Project to prune against
+ * @param isProduction Whether to include optional and dev dependencies
+ * @param packageManager Package manager to use (automatically detected based on lock file)
+ * @returns
+ */
+export declare function pruneLockFile(projectName: string, isProduction?: boolean, packageManager?: PackageManager): Promise<string>;
+/**
+ * Prune lock file based on the package.json
+ *
+ * @param packageJson
+ * @param isProduction
+ * @param packageManager
+ * @returns
  */
-export declare function pruneLockFileData(lockFile: LockFileData, packages: string[], projectName?: string, packageManager?: PackageManager): LockFileData;
+export declare function pruneLockFileFromPackageJson(packageJson: PackageJson, isProduction?: boolean, packageManager?: PackageManager): string;

package/src/lock-file/lock-file.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pruneLockFileData = exports.writeLockFile = exports.mapLockFileDataToPartialGraph = exports.parseLockFile = exports.lockFileHash = exports.lockFileExists = void 0;
+exports.pruneLockFileFromPackageJson = exports.pruneLockFile = exports.getLockFileName = exports.writeLockFile = exports.mapLockFileDataToPartialGraph = exports.parseLockFile = exports.lockFileHash = exports.lockFileExists = void 0;
+const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const package_manager_1 = require("../utils/package-manager");
 const yarn_1 = require("./yarn");
@@ -11,9 +12,15 @@ const path_1 = require("path");
 const mapping_1 = require("./utils/mapping");
 const hashing_1 = require("./utils/hashing");
 const fs_1 = require("fs");
-const YARN_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, 'yarn.lock');
-const NPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, 'package-lock.json');
-const PNPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-lock.yaml');
+const project_graph_1 = require("../project-graph/project-graph");
+const create_package_json_1 = require("../utils/create-package-json");
+const pruning_1 = require("./utils/pruning");
+const YARN_LOCK_FILE = 'yarn.lock';
+const NPM_LOCK_FILE = 'package-lock.json';
+const PNPM_LOCK_FILE = 'pnpm-lock.yaml';
+const YARN_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, YARN_LOCK_FILE);
+const NPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, NPM_LOCK_FILE);
+const PNPM_LOCK_PATH = (0, path_1.join)(workspace_root_1.workspaceRoot, PNPM_LOCK_FILE);
 /**
  * Check if lock file exists
  */
@@ -116,21 +123,62 @@ function writeLockFile(lockFile, packageManager = (0, package_manager_1.detectPa
     throw Error(`Unknown package manager: ${packageManager}`);
 }
 exports.writeLockFile = writeLockFile;
+function getLockFileName(packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
+    if (packageManager === 'yarn') {
+        return YARN_LOCK_FILE;
+    }
+    if (packageManager === 'pnpm') {
+        return PNPM_LOCK_FILE;
+    }
+    if (packageManager === 'npm') {
+        return NPM_LOCK_FILE;
+    }
+    throw Error(`Unknown package manager: ${packageManager}`);
+}
+exports.getLockFileName = getLockFileName;
+/**
+ * Prune lock file based on the given project's dependencies and overrides in local package.json
+ *
+ * @param projectName Project to prune against
+ * @param isProduction Whether to include optional and dev dependencies
+ * @param packageManager Package manager to use (automatically detected based on lock file)
+ * @returns
+ */
+function pruneLockFile(projectName, isProduction = true, packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
+        if (!projectGraph.nodes[projectName]) {
+            throw Error(`Project "${projectName}" was not found.`);
+        }
+        const packageJson = (0, create_package_json_1.createPackageJson)(projectName, projectGraph, {});
+        return pruneLockFileFromPackageJson(packageJson, isProduction, packageManager);
+    });
+}
+exports.pruneLockFile = pruneLockFile;
 /**
- * Prunes {@link LockFileData} based on minimal necessary set of packages
- * Returns new {@link LockFileData}
+ * Prune lock file based on the package.json
+ *
+ * @param packageJson
+ * @param isProduction
+ * @param packageManager
+ * @returns
  */
-function pruneLockFileData(lockFile, packages, projectName, packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
+function pruneLockFileFromPackageJson(packageJson, isProduction = true, packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
+    const lockFileData = parseLockFile(packageManager);
+    const normalizedPackageJson = (0, pruning_1.normalizePackageJson)(packageJson, isProduction);
     if (packageManager === 'yarn') {
-        return (0, yarn_1.pruneYarnLockFile)(lockFile, packages, projectName);
+        const prunedData = (0, yarn_1.pruneYarnLockFile)(lockFileData, normalizedPackageJson);
+        return (0, yarn_1.stringifyYarnLockFile)(prunedData);
     }
     if (packageManager === 'pnpm') {
-        return (0, pnpm_1.prunePnpmLockFile)(lockFile, packages, projectName);
+        const prunedData = (0, pnpm_1.prunePnpmLockFile)(lockFileData, normalizedPackageJson);
+        return (0, pnpm_1.stringifyPnpmLockFile)(prunedData);
     }
     if (packageManager === 'npm') {
-        return (0, npm_1.pruneNpmLockFile)(lockFile, packages, projectName);
+        const prunedData = (0, npm_1.pruneNpmLockFile)(lockFileData, normalizedPackageJson);
+        return (0, npm_1.stringifyNpmLockFile)(prunedData);
     }
     throw Error(`Unknown package manager: ${packageManager}`);
 }
-exports.pruneLockFileData = pruneLockFileData;
+exports.pruneLockFileFromPackageJson = pruneLockFileFromPackageJson;
 //# sourceMappingURL=lock-file.js.map

package/src/lock-file/lock-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"lock-file.js","sourceRoot":"","sources":["../../../../../packages/nx/src/lock-file/lock-file.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AACvD,8DAAgF;AAChF,iCAKgB;AAChB,+BAKe;AACf,iCAKgB;AAEhB,4DAAwD;AACxD,+BAA4B;AAC5B,6CAAmD;AACnD,6CAAgE;AAKhE,2BAAgC;AAEhC,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,8BAAa,EAAE,WAAW,CAAC,CAAC;AACxD,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,8BAAa,EAAE,mBAAmB,CAAC,CAAC;AAC/D,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,8BAAa,EAAE,gBAAgB,CAAC,CAAC;AAE7D;;GAEG;AACH,SAAgB,cAAc,CAC5B,iBAAiC,IAAA,sCAAoB,EAAC,8BAAa,CAAC;IAEpE,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,OAAO,IAAA,eAAU,EAAC,cAAc,CAAC,CAAC;KACnC;IACD,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,OAAO,IAAA,eAAU,EAAC,cAAc,CAAC,CAAC;KACnC;IACD,IAAI,cAAc,KAAK,KAAK,EAAE;QAC5B,OAAO,IAAA,eAAU,EAAC,aAAa,CAAC,CAAC;KAClC;IACD,MAAM,KAAK,CAAC,2BAA2B,cAAc,uBAAuB,CAAC,CAAC;AAChF,CAAC;AAbD,wCAaC;AAED;;GAEG;AACH,SAAgB,YAAY,CAC1B,iBAAiC,IAAA,sCAAoB,EAAC,8BAAa,CAAC;IAEpE,IAAI,IAAY,CAAC;IACjB,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,IAAI,GAAG,IAAA,uBAAY,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;KAC7C;IACD,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,IAAI,GAAG,IAAA,uBAAY,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;KAC7C;IACD,IAAI,cAAc,KAAK,KAAK,EAAE;QAC5B,IAAI,GAAG,IAAA,uBAAY,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;KAC5C;IACD,IAAI,IAAI,EAAE;QACR,OAAO,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC;KACzB;SAAM;QACL,MAAM,KAAK,CACT,2BAA2B,cAAc,uBAAuB,CACjE,CAAC;KACH;AACH,CAAC;AApBD,oCAoBC;AAED;;GAEG;AACH,SAAgB,aAAa,CAC3B,iBAAiC,IAAA,sCAAoB,EAAC,8BAAa,CAAC;IAEpE,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,MAAM,IAAI,GAAG,IAAA,uBAAY,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,IAAA,wBAAiB,EAAC,IAAI,CAAC,CAAC;KAChC;IACD,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,MAAM,IAAI,GAAG,IAAA,uBAAY,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,IAAA,wBAAiB,EAAC,IAAI,CAAC,CAAC;KAChC;IACD,IAAI,cAAc,KAAK,KAAK,EAAE;QAC5B,MAAM,IAAI,GAAG,IAAA,uBAAY,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACjD,OAAO,IAAA,sBAAgB,EAAC,IAAI,CAAC,CAAC;KAC/B;IACD,MAAM,KAAK,CAAC,4BAA4B,cAAc,EAAE,CAAC,CAAC;AAC5D,CAAC;AAhBD,sCAgBC;AAED;;;;GAIG;AACH,SAAgB,6BAA6B,CAC3C,YAA0B,EAC1B,iBAAiC,IAAA,sCAAoB,EAAC,8BAAa,CAAC;IAEpE,IAAI,aAAa,CAAC;IAElB,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,aAAa,GAAG,IAAA,0BAAgB,EAC9B,YAAY,EACZ,qCAA8B,CAC/B,CAAC;KACH;IACD,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,aAAa,GAAG,IAAA,0BAAgB,EAC9B,YAAY,EACZ,qCAA8B,CAC/B,CAAC;KACH;IACD,IAAI,cAAc,KAAK,KAAK,EAAE;QAC5B,aAAa,GAAG,IAAA,0BAAgB,EAC9B,YAAY,EACZ,mCAA6B,CAC9B,CAAC;KACH;IACD,IAAI,aAAa,EAAE;QACjB,IAAA,2BAAiB,EAAC,aAAa,CAAC,CAAC;QACjC,OAAO,aAAa,CAAC;KACtB;IACD,MAAM,KAAK,CAAC,4BAA4B,cAAc,EAAE,CAAC,CAAC;AAC5D,CAAC;AA7BD,sEA6BC;AAED;;GAEG;AACH,SAAgB,aAAa,CAC3B,QAAsB,EACtB,iBAAiC,IAAA,sCAAoB,EAAC,8BAAa,CAAC;IAEpE,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,MAAM,OAAO,GAAG,IAAA,4BAAqB,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAA,wBAAa,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO;KACR;IACD,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,MAAM,OAAO,GAAG,IAAA,4BAAqB,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAA,wBAAa,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO;KACR;IACD,IAAI,cAAc,KAAK,KAAK,EAAE;QAC5B,MAAM,OAAO,GAAG,IAAA,0BAAoB,EAAC,QAAQ,CAAC,CAAC;QAC/C,IAAA,wBAAa,EAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACtC,OAAO;KACR;IACD,MAAM,KAAK,CAAC,4BAA4B,cAAc,EAAE,CAAC,CAAC;AAC5D,CAAC;AApBD,sCAoBC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAC/B,QAAsB,EACtB,QAAkB,EAClB,WAAoB,EACpB,iBAAiC,IAAA,sCAAoB,EAAC,8BAAa,CAAC;IAEpE,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,OAAO,IAAA,wBAAiB,EAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;KAC3D;IACD,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,OAAO,IAAA,wBAAiB,EAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;KAC3D;IACD,IAAI,cAAc,KAAK,KAAK,EAAE;QAC5B,OAAO,IAAA,sBAAgB,EAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;KAC1D;IACD,MAAM,KAAK,CAAC,4BAA4B,cAAc,EAAE,CAAC,CAAC;AAC5D,CAAC;AAhBD,8CAgBC"}
+{"version":3,"file":"lock-file.js","sourceRoot":"","sources":["../../../../../packages/nx/src/lock-file/lock-file.ts"],"names":[],"mappings":"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"}

package/src/lock-file/npm.d.ts

@@ -1,5 +1,6 @@
 import { LockFileData, PackageDependency } from './utils/lock-file-type';
 import { TransitiveLookupFunctionInput } from './utils/mapping';
+import { PackageJsonDeps } from './utils/pruning';
 /**
  * Parses package-lock.json file to `LockFileData` object
  *
@@ -24,4 +25,4 @@ export declare function transitiveDependencyNpmLookup({ packageName, parentPacka
  * @param lockFileData
  * @returns
  */
-export declare function pruneNpmLockFile(lockFileData: LockFileData, packages: string[], projectName?: string): LockFileData;
+export declare function pruneNpmLockFile(lockFileData: LockFileData, normalizedPackageJson: PackageJsonDeps): LockFileData;

package/src/lock-file/npm.js

@@ -8,7 +8,6 @@ const fileutils_1 = require("../utils/fileutils");
 const output_1 = require("../utils/output");
 const path_1 = require("../utils/path");
 const workspace_root_1 = require("../utils/workspace-root");
-const sorting_1 = require("./utils/sorting");
 const hashing_1 = require("./utils/hashing");
 /**
  * Parses package-lock.json file to `LockFileData` object
@@ -30,7 +29,7 @@ function mapPackages(dependencies, packages, lockfileVersion) {
     const mappedPackages = {};
     if (lockfileVersion === 1) {
         Object.entries(dependencies).forEach(([packageName, value]) => {
-            const { newKey, packagePath } = prepareDependency(packageName, value.version, mappedPackages);
+            const { newKey, packagePath } = prepareDependency(packageName, value, mappedPackages);
             mapPackageDependency(mappedPackages, packageName, newKey, packagePath, value, lockfileVersion, true);
             // we need to map the nested dependencies recursively
             mapPackageDependencies(mappedPackages, value.dependencies, packagePath, lockfileVersion);
@@ -41,22 +40,41 @@ function mapPackages(dependencies, packages, lockfileVersion) {
             // we parse root package.json separately
             if (packagePath !== '') {
                 const packageName = packagePath.split('node_modules/').pop();
-                const { newKey } = prepareDependency(packageName, value.version, mappedPackages, undefined, packagePath);
-                mapPackageDependency(mappedPackages, packageName, newKey, packagePath, value, lockfileVersion);
+                const { newKey } = prepareDependency(packageName, value, mappedPackages, undefined, packagePath);
+                let dependency;
+                if (lockfileVersion === 2) {
+                    const path = packagePath.split(/\/?node_modules\//).slice(1);
+                    path.forEach((proj) => {
+                        if (!dependency) {
+                            dependency = dependencies[proj];
+                        }
+                        else {
+                            dependency = dependency.dependencies[proj];
+                        }
+                    });
+                    // if versions are same, no need to track it further
+                    if (dependency && value.version === dependency.version) {
+                        dependency = undefined;
+                    }
+                }
+                mapPackageDependency(mappedPackages, packageName, newKey, packagePath, value, lockfileVersion, undefined, dependency);
             }
         });
     }
     return mappedPackages;
 }
-function prepareDependency(packageName, version, mappedPackages, pathPrefix = '', path) {
+function prepareDependency(packageName, dependency, mappedPackages, pathPrefix = '', path) {
     mappedPackages[packageName] = mappedPackages[packageName] || {};
+    const version = dependency.integrity
+        ? dependency.version
+        : dependency.resolved;
     const newKey = packageName + '@' + version;
     const packagePath = path || pathPrefix
         ? `${pathPrefix}/node_modules/${packageName}`
         : `node_modules/${packageName}`;
     return { newKey, packagePath };
 }
-function mapPackageDependency(mappedPackages, packageName, key, packagePath, value, lockfileVersion, isRootVersion) {
+function mapPackageDependency(mappedPackages, packageName, key, packagePath, value, lockfileVersion, isRootVersion, dependencyValue) {
     const { dev, peer, optional } = value;
     const packageMeta = {
         path: packagePath,
@@ -74,7 +92,14 @@ function mapPackageDependency(mappedPackages, packageName, key, packagePath, val
             }
             value = rest;
         }
-        mappedPackages[packageName][key] = Object.assign(Object.assign({}, value), { packageMeta: [], rootVersion });
+        mappedPackages[packageName][key] = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, value), (!value.integrity && {
+            actualVersion: value.version,
+            version: value.resolved,
+        })), (value.integrity &&
+            dependencyValue && {
+            actualVersion: value.version,
+            version: dependencyValue.version,
+        })), (dependencyValue && { dependencyValue })), { packageMeta: [], rootVersion });
     }
     mappedPackages[packageName][key].packageMeta.push(packageMeta);
 }
@@ -83,7 +108,7 @@ function mapPackageDependencies(mappedPackages, dependencies, parentPath, lockfi
         return;
     }
     Object.entries(dependencies).forEach(([packageName, value]) => {
-        const { newKey, packagePath } = prepareDependency(packageName, value.version, mappedPackages, parentPath);
+        const { newKey, packagePath } = prepareDependency(packageName, value, mappedPackages, parentPath);
         mapPackageDependency(mappedPackages, packageName, newKey, packagePath, value, lockfileVersion, false);
         mapPackageDependencies(mappedPackages, value.dependencies, packagePath, lockfileVersion);
     });
@@ -116,20 +141,31 @@ function stringifyNpmLockFile(lockFileData) {
     }
     // generate package lock JSON
     const lockFileJson = Object.assign(Object.assign(Object.assign({}, lockFileData.lockFileMetadata.metadata), (notV1 && {
-        packages: (0, sorting_1.sortObject)(packages, (value) => value, false, (a, b) => a.localeCompare(b)),
+        packages: sortObject(packages),
     })), (notV3 && { dependencies: sortDependencies(dependencies) }));
     return JSON.stringify(lockFileJson, null, 2) + '\n';
 }
 exports.stringifyNpmLockFile = stringifyNpmLockFile;
+function sortObject(packages) {
+    const keys = Object.keys(packages);
+    if (keys.length === 0) {
+        return;
+    }
+    keys.sort((a, b) => a.localeCompare(b));
+    const result = {};
+    keys.forEach((key) => {
+        result[key] = packages[key];
+    });
+    return result;
+}
 // remapping the package back to package-lock format
 function unmapPackage(packages, dependency) {
-    const { packageMeta, rootVersion, version, resolved, integrity, dev, peer, optional } = dependency, value = tslib_1.__rest(dependency, ["packageMeta", "rootVersion", "version", "resolved", "integrity", "dev", "peer", "optional"]);
+    const { packageMeta, rootVersion, version, actualVersion, resolved, integrity, dev, peer, optional, dependencyValue } = dependency, value = tslib_1.__rest(dependency, ["packageMeta", "rootVersion", "version", "actualVersion", "resolved", "integrity", "dev", "peer", "optional", "dependencyValue"]);
     // we need to decompose value, to achieve particular field ordering
     for (let i = 0; i < packageMeta.length; i++) {
         const { path, dev, peer, optional } = packageMeta[i];
         // we are sorting the properties to get as close as possible to the original package-lock.json
-        packages[path] = Object.assign({ version,
-            resolved,
+        packages[path] = Object.assign({ version: actualVersion || version, resolved,
             integrity,
             dev,
             peer,
@@ -138,16 +174,17 @@ function unmapPackage(packages, dependency) {
 }
 function unmapDependencies(dependencies, packageName, _a) {
     var { packageMeta } = _a, value = tslib_1.__rest(_a, ["packageMeta"]);
-    const { version, resolved, integrity, devOptional } = value;
+    const { version, resolved, integrity, devOptional, dependencyValue, from } = value;
     for (let i = 0; i < packageMeta.length; i++) {
         const { path, dev, optional, peer } = packageMeta[i];
         const projectPath = path.split('node_modules/').slice(1);
         const requires = unmapDependencyRequires(value);
         const innerDeps = getProjectNodeAndEnsureParentHierarchy(projectPath, dependencies);
         // sorting fields to match package-lock structure
-        innerDeps[packageName] = Object.assign({ version,
+        innerDeps[packageName] = dependencyValue || Object.assign({ version,
             resolved,
             integrity,
+            from,
             dev,
             devOptional,
             optional,
@@ -238,11 +275,11 @@ function isPathMatching(path, packageName, parentPackages) {
  * @param lockFileData
  * @returns
  */
-function pruneNpmLockFile(lockFileData, packages, projectName) {
-    let isV1;
+function pruneNpmLockFile(lockFileData, normalizedPackageJson) {
+    const isV1 = lockFileData.lockFileMetadata.metadata.lockfileVersion === 1;
     // NPM V1 does not track full dependency list in the lock file,
     // so we can't reuse the lock file to generate a new one
-    if (lockFileData.lockFileMetadata.metadata.lockfileVersion === 1) {
+    if (isV1) {
         output_1.output.warn({
             title: 'Pruning v1 lock file',
             bodyLines: [
@@ -250,55 +287,68 @@ function pruneNpmLockFile(lockFileData, packages, projectName) {
                 `Run "npm ci" to ensure your installed packages are synchronized or upgrade to NPM v7+ to benefit from the new lock file format`,
             ],
         });
-        isV1 = true;
     }
-    const dependencies = pruneDependencies(lockFileData.dependencies, packages, isV1);
-    const lockFileMetadata = Object.assign(Object.assign({}, lockFileData.lockFileMetadata), pruneRootPackage(lockFileData, packages, projectName));
+    const dependencies = pruneDependencies(lockFileData.dependencies, normalizedPackageJson, isV1);
+    const lockFileMetadata = Object.assign(Object.assign({}, lockFileData.lockFileMetadata), pruneRootPackage(lockFileData, normalizedPackageJson));
     let prunedLockFileData;
     prunedLockFileData = {
         dependencies,
         lockFileMetadata,
-        hash: (0, hashing_1.generatePrunnedHash)(lockFileData.hash, packages, projectName),
+        hash: (0, hashing_1.generatePrunnedHash)(lockFileData.hash, normalizedPackageJson),
     };
     return prunedLockFileData;
 }
 exports.pruneNpmLockFile = pruneNpmLockFile;
-function pruneRootPackage(lockFileData, packages, projectName) {
+function pruneRootPackage(lockFileData, _a) {
+    var { name, version, license } = _a, dependencyInfo = tslib_1.__rest(_a, ["name", "version", "license"]);
     if (lockFileData.lockFileMetadata.metadata.lockfileVersion === 1) {
         return undefined;
     }
-    const rootPackage = Object.assign(Object.assign({ name: projectName || lockFileData.lockFileMetadata.rootPackage.name, version: lockFileData.lockFileMetadata.rootPackage.version }, (lockFileData.lockFileMetadata.rootPackage.license && {
-        license: lockFileData.lockFileMetadata.rootPackage.license,
-    })), { dependencies: {} });
-    for (const packageName of packages) {
-        const version = Object.values(lockFileData.dependencies[packageName]).find((v) => v.rootVersion).version;
-        rootPackage.dependencies[packageName] = version;
-    }
-    rootPackage.dependencies = (0, sorting_1.sortObject)(rootPackage.dependencies);
+    const rootPackage = Object.assign(Object.assign({ name: name || lockFileData.lockFileMetadata.rootPackage.name, version: version || lockFileData.lockFileMetadata.rootPackage.version }, (lockFileData.lockFileMetadata.rootPackage.license && {
+        license: license || lockFileData.lockFileMetadata.rootPackage.license,
+    })), dependencyInfo);
     return { rootPackage };
 }
 // iterate over packages to collect the affected tree of dependencies
-function pruneDependencies(dependencies, packages, isV1) {
+function pruneDependencies(dependencies, normalizedPackageJson, isV1) {
     const result = {};
-    packages.forEach((packageName) => {
+    const peerDependenciesToPrune = {};
+    Object.keys(Object.assign(Object.assign(Object.assign({}, normalizedPackageJson.dependencies), normalizedPackageJson.devDependencies), normalizedPackageJson.peerDependencies)).forEach((packageName) => {
+        var _a, _b, _c, _e;
         if (dependencies[packageName]) {
-            const [key, _a] = Object.entries(dependencies[packageName]).find(([_, v]) => v.rootVersion), { packageMeta, dev, peer, optional } = _a, value = tslib_1.__rest(_a, ["packageMeta", "dev", "peer", "optional"]);
+            const [key, _f] = Object.entries(dependencies[packageName]).find(([_, v]) => v.rootVersion), { packageMeta, dev: _d, peer: _p, optional: _o } = _f, value = tslib_1.__rest(_f, ["packageMeta", "dev", "peer", "optional"]);
+            const dev = (_a = normalizedPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[packageName];
+            const peer = (_b = normalizedPackageJson.peerDependencies) === null || _b === void 0 ? void 0 : _b[packageName];
+            const optional = (_e = (_c = normalizedPackageJson.peerDependenciesMeta) === null || _c === void 0 ? void 0 : _c[packageName]) === null || _e === void 0 ? void 0 : _e.optional;
+            const modifier = peer
+                ? 'peer'
+                : optional
+                    ? 'optional'
+                    : dev
+                        ? 'dev'
+                        : undefined;
             result[packageName] = result[packageName] || {};
             result[packageName][key] = Object.assign(value, {
-                packageMeta: [{ path: `node_modules/${packageName}` }],
+                packageMeta: [
+                    Object.assign(Object.assign(Object.assign({ path: `node_modules/${packageName}` }, (dev ? { dev } : {})), (optional ? { optional } : {})), (peer ? { peer } : {})),
+                ],
             });
-            pruneTransitiveDependencies([packageName], dependencies, result, result[packageName][key], isV1);
+            pruneTransitiveDependencies([packageName], dependencies, result, result[packageName][key], isV1, modifier, peerDependenciesToPrune);
         }
         else {
             console.warn(`Could not find ${packageName} in the lock file. Skipping...`);
         }
     });
+    // add all peer dependencies
+    Object.values(peerDependenciesToPrune).forEach(({ parentPackages, dependency, packageMeta, packageName, key }) => {
+        addPrunedDependency(parentPackages, dependencies, result, dependency, packageMeta, packageName, key, isV1);
+    });
     return result;
 }
 // find all transitive dependencies of already pruned packages
 // and adds them to the collection
 // recursively prune their dependencies
-function pruneTransitiveDependencies(parentPackages, dependencies, prunedDeps, value, isV1, modifier) {
+function pruneTransitiveDependencies(parentPackages, dependencies, prunedDeps, value, isV1, modifier, peerDependenciesToPrune) {
     let packageJSON;
     if (isV1) {
         const pathToPackageJSON = (0, path_1.joinPathFragments)(workspace_root_1.workspaceRoot, value.packageMeta[0].path, 'package.json');
@@ -313,6 +363,7 @@ function pruneTransitiveDependencies(parentPackages, dependencies, prunedDeps, v
         return;
     }
     Object.entries(Object.assign(Object.assign(Object.assign(Object.assign({}, value.dependencies), value.peerDependencies), value.optionalDependencies), packageJSON === null || packageJSON === void 0 ? void 0 : packageJSON.peerDependencies)).forEach(([packageName, version]) => {
+        var _a, _b;
         const versions = dependencies[packageName];
         if (versions) {
             const dependency = transitiveDependencyNpmLookup({
@@ -328,25 +379,41 @@ function pruneTransitiveDependencies(parentPackages, dependencies, prunedDeps, v
                     prunedDeps[packageName] = {};
                 }
                 const key = `${packageName}@${dependency.version}`;
-                if (prunedDeps[packageName][key]) {
-                    const currentMeta = prunedDeps[packageName][key].packageMeta;
-                    if (!currentMeta.find((p) => p.path === dependency.packageMeta[0].path)) {
-                        const packageMeta = setPackageMetaModifiers(packageName, dependency, packageJSON || value, modifier);
-                        currentMeta.push(packageMeta);
-                        currentMeta.sort();
-                    }
-                }
-                else {
-                    const packageMeta = setPackageMetaModifiers(packageName, dependency, packageJSON || value, modifier);
-                    dependency.packageMeta = [packageMeta];
-                    prunedDeps[packageName][key] = dependency;
-                    // recurively collect dependencies
-                    pruneTransitiveDependencies([...parentPackages, packageName], dependencies, prunedDeps, prunedDeps[packageName][key], isV1, getModifier(packageMeta));
+                const packageMeta = setPackageMetaModifiers(packageName, dependency, packageJSON || value, modifier);
+                // initially will collect only non-peer dependencies
+                // this gives priority to direct dependencies over peer ones
+                if (peerDependenciesToPrune &&
+                    (((_a = value.peerDependencies) === null || _a === void 0 ? void 0 : _a[packageName]) ||
+                        ((_b = packageJSON === null || packageJSON === void 0 ? void 0 : packageJSON.peerDependencies) === null || _b === void 0 ? void 0 : _b[packageName]))) {
+                    peerDependenciesToPrune[key] = peerDependenciesToPrune[key] || {
+                        parentPackages,
+                        dependency,
+                        packageMeta,
+                        packageName,
+                        key,
+                    };
+                    return;
                 }
+                addPrunedDependency(parentPackages, dependencies, prunedDeps, dependency, packageMeta, packageName, key, isV1, peerDependenciesToPrune);
             }
         }
     });
 }
+function addPrunedDependency(parentPackages, dependencies, prunedDeps, dependency, packageMeta, packageName, key, isV1, peerDependenciesToPrune) {
+    if (prunedDeps[packageName][key]) {
+        const currentMeta = prunedDeps[packageName][key].packageMeta;
+        if (!currentMeta.find((p) => p.path === dependency.packageMeta[0].path)) {
+            currentMeta.push(packageMeta);
+            currentMeta.sort();
+        }
+    }
+    else {
+        dependency.packageMeta = [packageMeta];
+        prunedDeps[packageName][key] = dependency;
+        // recurively collect dependencies
+        pruneTransitiveDependencies([...parentPackages, packageName], dependencies, prunedDeps, prunedDeps[packageName][key], isV1, getModifier(packageMeta), peerDependenciesToPrune);
+    }
+}
 function getModifier(packageMeta) {
     if (packageMeta.dev) {
         return 'dev';

package/src/lock-file/npm.js.map

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

package/src/lock-file/pnpm.d.ts

@@ -1,5 +1,6 @@
 import { LockFileData, PackageDependency } from './utils/lock-file-type';
 import { TransitiveLookupFunctionInput } from './utils/mapping';
+import { PackageJsonDeps } from './utils/pruning';
 /**
  * Parses pnpm-lock.yaml file to `LockFileData` object
  *
@@ -24,4 +25,4 @@ export declare function transitiveDependencyPnpmLookup({ packageName, versions,
  * @param lockFileData
  * @returns
  */
-export declare function prunePnpmLockFile(lockFileData: LockFileData, packages: string[], projectName?: string): LockFileData;
+export declare function prunePnpmLockFile(lockFileData: LockFileData, normalizedPackageJson: PackageJsonDeps): LockFileData;