nx 15.3.0 → 15.3.2

package/src/lock-file/pnpm.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prunePnpmLockFile = exports.transitiveDependencyPnpmLookup = exports.stringifyPnpmLockFile = exports.parsePnpmLockFile = void 0;
 const tslib_1 = require("tslib");
 const js_yaml_1 = require("@zkochan/js-yaml");
-const sorting_1 = require("./utils/sorting");
 const mapping_1 = require("./utils/mapping");
 const hashing_1 = require("./utils/hashing");
 const semver_1 = require("semver");
+const object_sort_1 = require("../utils/object-sort");
 const LOCKFILE_YAML_FORMAT = {
     blankLines: true,
     lineWidth: 1000,
@@ -33,12 +33,11 @@ exports.parsePnpmLockFile = parsePnpmLockFile;
 function mapPackages(dependencies, devDependencies, specifiers, packages, inlineSpecifiers) {
     const mappedPackages = {};
     Object.entries(packages).forEach(([key, value]) => {
-        // construct packageMeta object
-        const meta = mapMetaInformation({ dependencies, devDependencies, specifiers }, inlineSpecifiers, key, value);
         // create new key
-        const version = key.split('/').pop().split('_')[0];
-        const packageName = key.slice(1, key.lastIndexOf('/'));
-        const newKey = `${packageName}@${version}`;
+        const { version, packageName, actualVersion } = parseVersionAndPackage(key, value, { dependencies, devDependencies });
+        const newKey = `${packageName}@${version.split('_')[0]}`;
+        // construct packageMeta object
+        const meta = mapMetaInformation({ dependencies, devDependencies, specifiers }, inlineSpecifiers, key, value, packageName, version);
         if (!mappedPackages[packageName]) {
             mappedPackages[packageName] = {};
         }
@@ -47,7 +46,7 @@ function mapPackages(dependencies, devDependencies, specifiers, packages, inline
         }
         else {
             const { dev, optional, peer } = value, rest = tslib_1.__rest(value, ["dev", "optional", "peer"]);
-            mappedPackages[packageName][newKey] = Object.assign(Object.assign({}, rest), { version, packageMeta: [meta] });
+            mappedPackages[packageName][newKey] = Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { version: version.split('_')[0] }), (actualVersion && { actualVersion })), { packageMeta: [meta] });
         }
     });
     Object.keys(mappedPackages).forEach((packageName) => {
@@ -66,11 +65,25 @@ function mapPackages(dependencies, devDependencies, specifiers, packages, inline
     });
     return mappedPackages;
 }
+function parseVersionAndPackage(key, value, { dependencies, devDependencies }) {
+    var _a;
+    let version, packageName, actualVersion;
+    const combinedDependencies = Object.assign(Object.assign({}, (dependencies || {})), (devDependencies || {}));
+    // check if it's a special case package - npm:... or github:...
+    packageName = Object.keys(combinedDependencies).find((k) => combinedDependencies[k] === key);
+    if (packageName) {
+        version = key;
+        actualVersion = (_a = value.version) !== null && _a !== void 0 ? _a : key;
+    }
+    else {
+        version = key.split('/').pop();
+        packageName = key.slice(1, key.lastIndexOf('/'));
+    }
+    return { version, packageName, actualVersion };
+}
 // maps packageMeta based on dependencies, devDependencies and (inline) specifiers
-function mapMetaInformation({ dependencies, devDependencies, specifiers, }, hasInlineSpefiers, key, _a) {
+function mapMetaInformation({ dependencies, devDependencies, specifiers, }, hasInlineSpefiers, key, _a, packageName, matchingVersion) {
     var { dev, optional, peer } = _a, dependencyDetails = tslib_1.__rest(_a, ["dev", "optional", "peer"]);
-    const matchingVersion = key.split('/').pop();
-    const packageName = key.slice(1, key.lastIndexOf('/'));
     const isDependency = isVersionMatch(dependencies === null || dependencies === void 0 ? void 0 : dependencies[packageName], matchingVersion, hasInlineSpefiers);
     const isDevDependency = isVersionMatch(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[packageName], matchingVersion, hasInlineSpefiers);
     let specifier;
@@ -137,17 +150,21 @@ function unmapLockFile(lockFileData) {
         const packageName = packageNames[i];
         const versions = Object.values(lockFileData.dependencies[packageName]);
         versions.forEach((_a) => {
-            var { packageMeta, version: _, rootVersion } = _a, rest = tslib_1.__rest(_a, ["packageMeta", "version", "rootVersion"]);
+            var { packageMeta, version: _, actualVersion, rootVersion } = _a, rest = tslib_1.__rest(_a, ["packageMeta", "version", "actualVersion", "rootVersion"]);
             packageMeta.forEach(({ key, specifier, isDependency, isDevDependency, dependencyDetails, dev, optional, peer, }) => {
                 let version;
                 if (inlineSpecifiers) {
                     version = {
                         specifier,
-                        version: key.slice(key.lastIndexOf('/') + 1),
+                        version: actualVersion
+                            ? key
+                            : key.slice(key.lastIndexOf('/') + 1),
                     };
                 }
                 else {
-                    version = key.slice(key.lastIndexOf('/') + 1);
+                    version = actualVersion
+                        ? key
+                        : key.slice(key.lastIndexOf('/') + 1);
                     if (specifier) {
                         specifiers[packageName] = specifier;
                     }
@@ -158,12 +175,21 @@ function unmapLockFile(lockFileData) {
                 if (isDevDependency) {
                     devDependencies[packageName] = version;
                 }
-                packages[key] = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { dev: !!dev }), (optional && { optional })), (peer && { peer })), dependencyDetails);
+                packages[key] = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, rest), (actualVersion &&
+                    actualVersion !== version && { version: actualVersion })), { dev: !!dev }), (optional && { optional })), (peer && { peer })), dependencyDetails);
             });
         });
     }
     const _a = lockFileData.lockFileMetadata, { time } = _a, lockFileMetatada = tslib_1.__rest(_a, ["time"]);
-    return Object.assign(Object.assign({}, lockFileMetatada), { specifiers: (0, sorting_1.sortObject)(specifiers), dependencies: (0, sorting_1.sortObject)(dependencies), devDependencies: (0, sorting_1.sortObject)(devDependencies), packages: (0, sorting_1.sortObject)(packages), time });
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, lockFileMetatada), (Object.keys(specifiers).length && {
+        specifiers: (0, object_sort_1.sortObjectByKeys)(specifiers),
+    })), (Object.keys(dependencies).length && {
+        dependencies: (0, object_sort_1.sortObjectByKeys)(dependencies),
+    })), (Object.keys(devDependencies).length && {
+        devDependencies: (0, object_sort_1.sortObjectByKeys)(devDependencies),
+    })), (Object.keys(packages).length && {
+        packages: (0, object_sort_1.sortObjectByKeys)(packages),
+    })), { time });
 }
 /**
  * Returns matching version of the dependency
@@ -183,29 +209,32 @@ exports.transitiveDependencyPnpmLookup = transitiveDependencyPnpmLookup;
  * @param lockFileData
  * @returns
  */
-function prunePnpmLockFile(lockFileData, packages, projectName) {
-    const dependencies = pruneDependencies(lockFileData.dependencies, packages, projectName);
+function prunePnpmLockFile(lockFileData, normalizedPackageJson) {
+    const dependencies = pruneDependencies(lockFileData.dependencies, normalizedPackageJson);
     const prunedLockFileData = {
         lockFileMetadata: pruneMetadata(lockFileData.lockFileMetadata, dependencies),
         dependencies,
-        hash: (0, hashing_1.generatePrunnedHash)(lockFileData.hash, packages, projectName),
+        hash: (0, hashing_1.generatePrunnedHash)(lockFileData.hash, normalizedPackageJson),
     };
     return prunedLockFileData;
 }
 exports.prunePnpmLockFile = prunePnpmLockFile;
 // iterate over packages to collect the affected tree of dependencies
-function pruneDependencies(dependencies, packages, projectName) {
+function pruneDependencies(dependencies, normalizedPackageJson) {
     const result = {};
-    packages.forEach((packageName) => {
+    Object.keys(Object.assign(Object.assign(Object.assign({}, normalizedPackageJson.dependencies), normalizedPackageJson.devDependencies), normalizedPackageJson.peerDependencies)).forEach((packageName) => {
+        var _a, _b, _c;
         if (dependencies[packageName]) {
-            const [key, _a] = Object.entries(dependencies[packageName]).find(([_, v]) => v.rootVersion), { packageMeta } = _a, value = tslib_1.__rest(_a, ["packageMeta"]);
+            const [key, _d] = Object.entries(dependencies[packageName]).find(([_, v]) => v.rootVersion), { packageMeta } = _d, value = tslib_1.__rest(_d, ["packageMeta"]);
             result[packageName] = result[packageName] || {};
             const metaKey = `/${packageName}/${value.version}`;
             const meta = packageMeta.find((m) => m.key.startsWith(metaKey));
             result[packageName][key] = Object.assign(value, {
                 packageMeta: [
                     {
-                        isDependency: true,
+                        isDependency: !!((_a = normalizedPackageJson.dependencies) === null || _a === void 0 ? void 0 : _a[packageName]) ||
+                            !!((_b = normalizedPackageJson.peerDependencies) === null || _b === void 0 ? void 0 : _b[packageName]),
+                        isDevDependency: !!((_c = normalizedPackageJson.devDependencies) === null || _c === void 0 ? void 0 : _c[packageName]),
                         key: meta.key,
                         specifier: value.version,
                         dependencyDetails: meta.dependencyDetails,

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

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

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

@@ -1,10 +1,16 @@
 import { ProjectGraph } from '../../config/project-graph';
+import { PackageJsonDeps } from './pruning';
 /**
  * Apply simple hashing of the content using the default hashing implementation
  * @param fileContent
  * @returns
  */
 export declare function hashString(fileContent: string): string;
+/**
+ * Hash partial graph's external nodes
+ * for task graph caching
+ * @param projectGraph
+ */
 export declare function hashExternalNodes(projectGraph: ProjectGraph): void;
 /**
  * Generate new hash based on the original hash and pruning input parameters - packages and project name
@@ -13,4 +19,4 @@ export declare function hashExternalNodes(projectGraph: ProjectGraph): void;
  * @param projectName
  * @returns
  */
-export declare function generatePrunnedHash(originalHash: string, packages: string[], projectName?: string): string;
+export declare function generatePrunnedHash(originalHash: string, normalizedPackageJson: PackageJsonDeps): string;

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

@@ -11,6 +11,11 @@ function hashString(fileContent) {
     return hashing_impl_1.defaultHashing.hashArray([fileContent]);
 }
 exports.hashString = hashString;
+/**
+ * Hash partial graph's external nodes
+ * for task graph caching
+ * @param projectGraph
+ */
 function hashExternalNodes(projectGraph) {
     Object.keys(projectGraph.externalNodes).forEach((key) => {
         if (!projectGraph.externalNodes[key].data.hash) {
@@ -27,6 +32,7 @@ function hashExternalNode(node, graph) {
     }
     else {
         const hashingInput = [hashKey];
+        // collect all dependencies' hashes
         traverseExternalNodesDependencies(node.name, graph, hashingInput);
         node.data.hash = hashing_impl_1.defaultHashing.hashArray(hashingInput.sort());
     }
@@ -50,11 +56,8 @@ function traverseExternalNodesDependencies(projectName, graph, visited) {
  * @param projectName
  * @returns
  */
-function generatePrunnedHash(originalHash, packages, projectName) {
-    const hashingInput = [originalHash, ...packages];
-    if (projectName) {
-        hashingInput.push(projectName);
-    }
+function generatePrunnedHash(originalHash, normalizedPackageJson) {
+    const hashingInput = [originalHash, JSON.stringify(normalizedPackageJson)];
     return hashing_impl_1.defaultHashing.hashArray(hashingInput);
 }
 exports.generatePrunnedHash = generatePrunnedHash;

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

@@ -1 +1 @@
-{"version":3,"file":"hashing.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/lock-file/utils/hashing.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAM3D;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,OAAO,6BAAc,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,gCAEC;AAED,SAAgB,iBAAiB,CAAC,YAA0B;IAC1D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACtD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE;YAC9C,kCAAkC;YAClC,gBAAgB,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;SACjE;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,8CAOC;AAED,SAAS,gBAAgB,CAAC,IAA8B,EAAE,KAAmB;IAC3E,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAChE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAClC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;KACtC;SAAM;QACL,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/B,iCAAiC,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,6BAAc,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;KAChE;AACH,CAAC;AAED,SAAS,iCAAiC,CACxC,WAAmB,EACnB,KAAmB,EACnB,OAAiB;IAEjB,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACtE,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;YACrC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxB,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;gBAChC,iCAAiC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;aAC7D;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,YAAoB,EACpB,QAAkB,EAClB,WAAoB;IAEpB,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,GAAG,QAAQ,CAAC,CAAC;IACjD,IAAI,WAAW,EAAE;QACf,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;KAChC;IACD,OAAO,6BAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC;AAVD,kDAUC"}
+{"version":3,"file":"hashing.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/lock-file/utils/hashing.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAO3D;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,OAAO,6BAAc,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,gCAEC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,YAA0B;IAC1D,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACtD,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE;YAC9C,kCAAkC;YAClC,gBAAgB,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;SACjE;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,8CAOC;AAED,SAAS,gBAAgB,CAAC,IAA8B,EAAE,KAAmB;IAC3E,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAEhE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAClC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;KACtC;SAAM;QACL,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC;QAE/B,mCAAmC;QACnC,iCAAiC,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,6BAAc,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;KAChE;AACH,CAAC;AAED,SAAS,iCAAiC,CACxC,WAAmB,EACnB,KAAmB,EACnB,OAAiB;IAEjB,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAEtE,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;YACrC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxB,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;gBAChC,iCAAiC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;aAC7D;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,YAAoB,EACpB,qBAAsC;IAEtC,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC3E,OAAO,6BAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC;AAND,kDAMC"}

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

@@ -3,6 +3,7 @@ export interface PackageDependency {
     rootVersion?: boolean;
     packageMeta: any[];
     dependencies?: Record<string, string>;
+    name?: string;
     [key: string]: any;
 }
 export declare type PackageVersions = Record<string, PackageDependency>;

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

@@ -1,12 +1,5 @@
 import { ProjectGraph } from '../../config/project-graph';
 import { LockFileData, PackageDependency, PackageVersions } from './lock-file-type';
-/**
- * Checks whether the package is a root dependency
- * @param packageName
- * @param version
- * @returns
- */
-export declare function isRootVersion(packageName: string, version: string): boolean;
 export declare type TransitiveLookupFunctionInput = {
     packageName: string;
     parentPackages: string[];
@@ -15,8 +8,23 @@ export declare type TransitiveLookupFunctionInput = {
 };
 declare type TransitiveLookupFunction = (data: TransitiveLookupFunctionInput) => PackageDependency;
 /**
- * Returns node name depending whether it's root version or nested
+ * Checks whether the package is a root dependency
+ * @param packageName
+ * @param version
+ * @returns
+ */
+export declare function isRootVersion(packageName: string, version: string): boolean;
+/**
+ * Returns node name depending on whether it's root version or nested
  */
 export declare function getNodeName(dep: string, version: string, rootVersion: boolean): `npm:${string}`;
+/**
+ * Maps the lockfile data to the partial project graph
+ * using package manager specific {@link TransitiveLookupFunction}
+ *
+ * @param lockFileData
+ * @param transitiveLookupFn
+ * @returns
+ */
 export declare function mapExternalNodes(lockFileData: LockFileData, transitiveLookupFn: TransitiveLookupFunction): ProjectGraph<any>;
 export {};

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

@@ -63,12 +63,20 @@ function mapTransitiveDependencies(parentPackages, packages, dependencies, versi
     return result;
 }
 /**
- * Returns node name depending whether it's root version or nested
+ * Returns node name depending on whether it's root version or nested
  */
 function getNodeName(dep, version, rootVersion) {
     return rootVersion ? `npm:${dep}` : `npm:${dep}@${version}`;
 }
 exports.getNodeName = getNodeName;
+/**
+ * Maps the lockfile data to the partial project graph
+ * using package manager specific {@link TransitiveLookupFunction}
+ *
+ * @param lockFileData
+ * @param transitiveLookupFn
+ * @returns
+ */
 function mapExternalNodes(lockFileData, transitiveLookupFn) {
     const result = {
         dependencies: {},
@@ -88,11 +96,12 @@ function mapExternalNodes(lockFileData, transitiveLookupFn) {
                     packageName,
                 },
             };
-            const combinedDependencies = dependencies || peerDependencies
+            // combine dependencies and peerDependencies
+            const allDependencies = dependencies || peerDependencies
                 ? Object.assign(Object.assign({}, (dependencies || {})), (peerDependencies || {})) : undefined;
-            if (combinedDependencies) {
+            if (allDependencies) {
                 const nodeDependencies = [];
-                const transitiveDeps = mapTransitiveDependencies([packageName], lockFileData.dependencies, combinedDependencies, versionCache, transitiveLookupFn);
+                const transitiveDeps = mapTransitiveDependencies([packageName], lockFileData.dependencies, allDependencies, versionCache, transitiveLookupFn);
                 transitiveDeps.forEach((target) => {
                     nodeDependencies.push({
                         type: 'static',

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

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

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

@@ -0,0 +1,13 @@
+import { PackageJson } from '../../utils/package-json';
+export declare type PackageJsonDeps = Pick<PackageJson, 'name' | 'version' | 'license' | 'dependencies' | 'devDependencies' | 'peerDependencies' | 'peerDependenciesMeta'>;
+/**
+ * Strip off non-pruning related fields from package.json
+ * Remove devDependencies if production target
+ * Remove optional peerDependencies if production target
+ *
+ * @param packageJson
+ * @param isProduction
+ * @param projectName
+ * @returns
+ */
+export declare function normalizePackageJson(packageJson: PackageJson, isProduction: boolean): PackageJsonDeps;

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

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizePackageJson = void 0;
+/**
+ * Strip off non-pruning related fields from package.json
+ * Remove devDependencies if production target
+ * Remove optional peerDependencies if production target
+ *
+ * @param packageJson
+ * @param isProduction
+ * @param projectName
+ * @returns
+ */
+function normalizePackageJson(packageJson, isProduction) {
+    const normalized = Object.assign({ name: packageJson.name, version: packageJson.version || '0.0.0' }, (packageJson.license && { license: packageJson.license }));
+    if (packageJson.dependencies) {
+        normalized.dependencies = packageJson.dependencies;
+    }
+    if (packageJson.devDependencies && !isProduction) {
+        normalized.devDependencies = packageJson.devDependencies;
+    }
+    if (packageJson.peerDependencies) {
+        if (isProduction) {
+            const normalizedPeedDeps = filterOptionalPeerDependencies(packageJson);
+            if (normalizedPeedDeps) {
+                normalized.peerDependencies = normalizedPeedDeps;
+            }
+        }
+        else {
+            normalized.peerDependencies = packageJson.peerDependencies;
+            if (packageJson.peerDependenciesMeta) {
+                normalized.peerDependenciesMeta = packageJson.peerDependenciesMeta;
+            }
+        }
+    }
+    return normalized;
+}
+exports.normalizePackageJson = normalizePackageJson;
+function filterOptionalPeerDependencies(packageJson) {
+    let peerDependencies;
+    Object.keys(packageJson.peerDependencies).forEach((key) => {
+        var _a, _b;
+        if (!((_b = (_a = packageJson.peerDependenciesMeta) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.optional)) {
+            peerDependencies = peerDependencies || {};
+            peerDependencies[key] = packageJson.peerDependencies[key];
+        }
+    });
+    return peerDependencies;
+}
+//# sourceMappingURL=pruning.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pruning.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/lock-file/utils/pruning.ts"],"names":[],"mappings":";;;AAaA;;;;;;;;;GASG;AACH,SAAgB,oBAAoB,CAClC,WAAwB,EACxB,YAAqB;IAErB,MAAM,UAAU,mBACd,IAAI,EAAE,WAAW,CAAC,IAAI,EACtB,OAAO,EAAE,WAAW,CAAC,OAAO,IAAI,OAAO,IACpC,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAC7D,CAAC;IACF,IAAI,WAAW,CAAC,YAAY,EAAE;QAC5B,UAAU,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;KACpD;IACD,IAAI,WAAW,CAAC,eAAe,IAAI,CAAC,YAAY,EAAE;QAChD,UAAU,CAAC,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;KAC1D;IACD,IAAI,WAAW,CAAC,gBAAgB,EAAE;QAChC,IAAI,YAAY,EAAE;YAChB,MAAM,kBAAkB,GAAG,8BAA8B,CAAC,WAAW,CAAC,CAAC;YACvE,IAAI,kBAAkB,EAAE;gBACtB,UAAU,CAAC,gBAAgB,GAAG,kBAAkB,CAAC;aAClD;SACF;aAAM;YACL,UAAU,CAAC,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;YAC3D,IAAI,WAAW,CAAC,oBAAoB,EAAE;gBACpC,UAAU,CAAC,oBAAoB,GAAG,WAAW,CAAC,oBAAoB,CAAC;aACpE;SACF;KACF;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AA9BD,oDA8BC;AAED,SAAS,8BAA8B,CACrC,WAAwB;IAExB,IAAI,gBAAgB,CAAC;IACrB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;QACxD,IAAI,CAAC,CAAA,MAAA,MAAA,WAAW,CAAC,oBAAoB,0CAAG,GAAG,CAAC,0CAAE,QAAQ,CAAA,EAAE;YACtD,gBAAgB,GAAG,gBAAgB,IAAI,EAAE,CAAC;YAC1C,gBAAgB,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;SAC3D;IACH,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}

package/src/lock-file/yarn.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 `yarn.lock` syml file and maps to {@link LockFileData}
  *
@@ -24,4 +25,4 @@ export declare function transitiveDependencyYarnLookup({ packageName, versions,
  * @param lockFileData
  * @returns
  */
-export declare function pruneYarnLockFile(lockFileData: LockFileData, packages: string[], projectName?: string): LockFileData;
+export declare function pruneYarnLockFile(lockFileData: LockFileData, normalizedPackageJson: PackageJsonDeps): LockFileData;