npm - nx - Versions diffs - 15.0.10 → 15.0.12 - Mend

nx 15.0.10 → 15.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (35) hide show

package/CHANGELOG.md +1 -1
package/migrations.json +6 -0
package/package.json +4 -4
package/src/command-line/affected.js +2 -2
package/src/command-line/nx-commands.js +2 -1
package/src/command-line/nx-commands.js.map +1 -1
package/src/config/workspaces.d.ts +1 -1
package/src/config/workspaces.js +37 -28
package/src/config/workspaces.js.map +1 -1
package/src/migrations/update-15-1-0/set-project-names.d.ts +2 -0
package/src/migrations/update-15-1-0/set-project-names.js +21 -0
package/src/migrations/update-15-1-0/set-project-names.js.map +1 -0
package/src/project-graph/affected/locators/project-glob-changes.js +2 -2
package/src/project-graph/affected/locators/project-glob-changes.js.map +1 -1
package/src/tasks-runner/tasks-schedule.js +5 -1
package/src/tasks-runner/tasks-schedule.js.map +1 -1
package/src/utils/assert-workspace-validity.js +9 -7
package/src/utils/assert-workspace-validity.js.map +1 -1
package/src/utils/lock-file/lock-file.d.ts +1 -1
package/src/utils/lock-file/lock-file.js +16 -29
package/src/utils/lock-file/lock-file.js.map +1 -1
package/src/utils/lock-file/npm.d.ts +5 -1
package/src/utils/lock-file/npm.js +13 -1
package/src/utils/lock-file/npm.js.map +1 -1
package/src/utils/lock-file/pnpm.d.ts +5 -1
package/src/utils/lock-file/pnpm.js +10 -1
package/src/utils/lock-file/pnpm.js.map +1 -1
package/src/utils/lock-file/utils.d.ts +4 -2
package/src/utils/lock-file/utils.js +45 -21
package/src/utils/lock-file/utils.js.map +1 -1
package/src/utils/lock-file/yarn.d.ts +5 -1
package/src/utils/lock-file/yarn.js +9 -1
package/src/utils/lock-file/yarn.js.map +1 -1
package/src/utils/register.js +5 -2
package/src/utils/register.js.map +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-## [15.0.10](https://github.com/nrwl/nx/compare/15.0.9...15.0.10) (2022-11-04)
+## [15.0.12](https://github.com/nrwl/nx/compare/15.0.11...15.0.12) (2022-11-08)
 **Note:** Version bump only for package nx

package/migrations.json CHANGED Viewed

@@ -41,6 +41,12 @@
       "version": "15.0.0-beta.1",
       "description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
       "implementation": "./src/migrations/update-15-0-0/prefix-outputs"
+    },
+    "15.1.0-set-project-names": {
+      "cli": "nx",
+      "version": "15.0.12-beta.1",
+      "description": "Set project names in project.json files",
+      "implementation": "./src/migrations/update-15-1-0/set-project-names"
     }
   }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "15.0.10",
+  "version": "15.0.12",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,8 +32,8 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/cli": "15.0.10",
-    "@nrwl/tao": "15.0.10",
+    "@nrwl/cli": "15.0.12",
+    "@nrwl/tao": "15.0.12",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "^3.0.0-rc.18",
@@ -120,5 +120,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "0ce26d36cb6d7e1d8f92ea63ddb01604c0f670d1"
+  "gitHead": "b3541f6e2a0abe85cb7201111b74348670d543d3"
 }

package/src/command-line/affected.js CHANGED Viewed

@@ -39,7 +39,7 @@ function affected(command, args, extraTargetDependencies = {}) {
                     else {
                         if (apps.length) {
                             output_1.output.warn({
-                                title: 'Deprecated: Use "nx print-affected --type=app --select=projects" instead. This command will be removed in v15.',
+                                title: 'Deprecated: Use "nx print-affected --type=app --select=projects" instead. This command will be removed in v16.',
                             });
                             output_1.output.log({
                                 title: 'Affected apps:',
@@ -58,7 +58,7 @@ function affected(command, args, extraTargetDependencies = {}) {
                     else {
                         if (libs.length) {
                             output_1.output.warn({
-                                title: 'Deprecated: Use "nx print-affected --type=lib --select=projects" instead. This command will be removed in v15.',
+                                title: 'Deprecated: Use "nx print-affected --type=lib --select=projects" instead. This command will be removed in v16.',
                             });
                             output_1.output.log({
                                 title: 'Affected libs:',

package/src/command-line/nx-commands.js CHANGED Viewed

@@ -589,11 +589,12 @@ function withWorkspaceGeneratorOptions(yargs, args) {
     });
 }
 function withCustomGeneratorOptions(yargs, generatorName) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const schema = (yield Promise.resolve().then(() => require('./workspace-generators'))).workspaceGeneratorSchema(generatorName);
         const options = [];
         const positionals = [];
-        Object.entries(schema.properties).forEach(([name, prop]) => {
+        Object.entries(((_a = schema.properties) !== null && _a !== void 0 ? _a : {})).forEach(([name, prop]) => {
             const option = {
                 name,
                 definition: {

package/src/command-line/nx-commands.js.map CHANGED Viewed

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

package/src/config/workspaces.d.ts CHANGED Viewed

@@ -46,7 +46,7 @@ export declare function resolveNewFormatWithInlineProjects(w: any, root?: string
  * Pulled from toFileName in names from @nrwl/devkit.
  * Todo: Should refactor, not duplicate.
  */
-export declare function toProjectName(fileName: string, nxJson: NxJsonConfiguration): string;
+export declare function toProjectName(fileName: string): string;
 export declare function getGlobPatternsFromPlugins(nxJson: NxJsonConfiguration, paths: string[], root?: string): string[];
 /**
  * Get the package.json globs from package manager workspaces

package/src/config/workspaces.js CHANGED Viewed

@@ -13,7 +13,8 @@ const fileutils_1 = require("../utils/fileutils");
 const logger_1 = require("../utils/logger");
 const nx_plugin_1 = require("../utils/nx-plugin");
 const yaml = require("js-yaml");
-const object_sort_1 = require("nx/src/utils/object-sort");
+const object_sort_1 = require("../utils/object-sort");
+const output_1 = require("../utils/output");
 function workspaceConfigName(root) {
     if ((0, fs_1.existsSync)(path.join(root, 'angular.json'))) {
         return 'angular.json';
@@ -395,16 +396,9 @@ function inlineProjectConfigurations(w, root = workspace_root_1.workspaceRoot) {
  * Pulled from toFileName in names from @nrwl/devkit.
  * Todo: Should refactor, not duplicate.
  */
-function toProjectName(fileName, nxJson) {
-    const directory = (0, path_1.dirname)(fileName);
-    let { appsDir, libsDir } = (nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) || {};
-    appsDir !== null && appsDir !== void 0 ? appsDir : (appsDir = 'apps');
-    libsDir !== null && libsDir !== void 0 ? libsDir : (libsDir = 'libs');
-    const parts = directory.split(/[\/\\]/g);
-    if ([appsDir, libsDir].includes(parts[0])) {
-        parts.splice(0, 1);
-    }
-    return parts.join('-').toLowerCase();
+function toProjectName(fileName) {
+    const parts = (0, path_1.dirname)(fileName).split(/[\/\\]/g);
+    return parts[parts.length - 1].toLowerCase();
 }
 exports.toProjectName = toProjectName;
 let projectGlobCache;
@@ -427,24 +421,27 @@ exports.getGlobPatternsFromPlugins = getGlobPatternsFromPlugins;
  * Get the package.json globs from package manager workspaces
  */
 function getGlobPatternsFromPackageManagerWorkspaces(root) {
+    var _a;
     try {
         try {
             const obj = yaml.load((0, fs_1.readFileSync)((0, path_1.join)(root, 'pnpm-workspace.yaml')));
-            return normalizePatterns(obj.packages);
+            return normalizePatterns(obj.packages || []);
         }
-        catch (_a) {
+        catch (_b) {
             const { workspaces } = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
-            return normalizePatterns(Array.isArray(workspaces) ? workspaces : workspaces === null || workspaces === void 0 ? void 0 : workspaces.packages);
+            const res = normalizePatterns(Array.isArray(workspaces) ? workspaces : (_a = workspaces === null || workspaces === void 0 ? void 0 : workspaces.packages) !== null && _a !== void 0 ? _a : []);
+            if (res.length > 0)
+                return res;
+            const { packages } = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'lerna.json'));
+            return packages.length > 0 ? normalizePatterns(packages) : ['packages/*'];
         }
     }
-    catch (_b) {
-        return ['**/package.json'];
+    catch (_c) {
+        return undefined;
     }
 }
 exports.getGlobPatternsFromPackageManagerWorkspaces = getGlobPatternsFromPackageManagerWorkspaces;
 function normalizePatterns(patterns) {
-    if (patterns === undefined)
-        return ['**/package.json'];
     return patterns.map((pattern) => removeRelativePath(pattern.endsWith('/package.json') ? pattern : `${pattern}/package.json`));
 }
 function removeRelativePath(pattern) {
@@ -459,7 +456,8 @@ function globForProjectFiles(root, nxJson, ignorePluginInference = false) {
         return projectGlobCache;
     }
     projectGlobCacheKey = cacheKey;
-    const globPatternsFromPackageManagerWorkspaces = getGlobPatternsFromPackageManagerWorkspaces(root);
+    const _globPatternsFromPackageManagerWorkspaces = getGlobPatternsFromPackageManagerWorkspaces(root);
+    const globPatternsFromPackageManagerWorkspaces = _globPatternsFromPackageManagerWorkspaces !== null && _globPatternsFromPackageManagerWorkspaces !== void 0 ? _globPatternsFromPackageManagerWorkspaces : [];
     const globsToInclude = globPatternsFromPackageManagerWorkspaces.filter((glob) => !glob.startsWith('!'));
     const globsToExclude = globPatternsFromPackageManagerWorkspaces
         .filter((glob) => glob.startsWith('!'))
@@ -487,6 +485,7 @@ function globForProjectFiles(root, nxJson, ignorePluginInference = false) {
         'node_modules',
         '**/node_modules',
         'dist',
+        '.git',
         ...globsToExclude,
     ];
     /**
@@ -507,8 +506,17 @@ function globForProjectFiles(root, nxJson, ignorePluginInference = false) {
         absolute: false,
         cwd: root,
         dot: true,
+        suppressErrors: true,
     });
     projectGlobCache = deduplicateProjectFiles(globResults, ig);
+    // TODO @vsavkin remove after Nx 16
+    if (projectGlobCache.length === 0 &&
+        _globPatternsFromPackageManagerWorkspaces === undefined &&
+        nxJson.extends === 'nx/presets/npm.json') {
+        output_1.output.warn({
+            title: 'Nx could not find any projects. Check if you need to configure workspaces in package.json or pnpm-workspace.yaml',
+        });
+    }
     perf_hooks_1.performance.mark('finish-glob-for-projects');
     perf_hooks_1.performance.measure('glob-for-project-files', 'start-glob-for-projects', 'finish-glob-for-projects');
     return projectGlobCache;
@@ -519,12 +527,12 @@ function deduplicateProjectFiles(files, ig) {
     files.forEach((file) => {
         const projectFolder = (0, path_1.dirname)(file);
         const projectFile = (0, path_1.basename)(file);
-        if ((ig === null || ig === void 0 ? void 0 : ig.ignores(file)) || // file is in .gitignore or .nxignore
-            file === 'package.json' || // file is workspace root package json
-            // project.json or equivallent inferred project file has been found
-            (filtered.has(projectFolder) && projectFile !== 'project.json')) {
+        if (ig === null || ig === void 0 ? void 0 : ig.ignores(file))
+            return; // file is in .gitignore or .nxignoreb
+        if (file === 'package.json')
+            return; // file is workspace root package json
+        if (filtered.has(projectFolder) && projectFile !== 'project.json')
             return;
-        }
         filtered.set(projectFolder, projectFile);
     });
     return Array.from(filtered.entries()).map(([folder, file]) => (0, path_1.join)(folder, file));
@@ -532,8 +540,9 @@ function deduplicateProjectFiles(files, ig) {
 exports.deduplicateProjectFiles = deduplicateProjectFiles;
 function buildProjectConfigurationFromPackageJson(path, packageJson, nxJson) {
     var _a, _b, _c, _d;
-    const directory = (0, path_1.dirname)(path).split('\\').join('/');
-    let name = (_a = packageJson.name) !== null && _a !== void 0 ? _a : toProjectName(directory, nxJson);
+    const normalizedPath = path.split('\\').join('/');
+    const directory = (0, path_1.dirname)(normalizedPath);
+    let name = (_a = packageJson.name) !== null && _a !== void 0 ? _a : toProjectName(normalizedPath);
     if (nxJson === null || nxJson === void 0 ? void 0 : nxJson.npmScope) {
         const npmPrefix = `@${nxJson.npmScope}/`;
         if (name.startsWith(npmPrefix)) {
@@ -555,7 +564,7 @@ function buildProjectConfigurationFromPackageJson(path, packageJson, nxJson) {
 function inferProjectFromNonStandardFile(file, nxJson) {
     const directory = (0, path_1.dirname)(file).split('\\').join('/');
     return {
-        name: toProjectName(file, nxJson),
+        name: toProjectName(file),
         root: directory,
     };
 }
@@ -575,7 +584,7 @@ readJson = fileutils_1.readJsonFile // making this an arg allows us to reuse in
             configuration.root = directory;
             let name = configuration.name;
             if (!configuration.name) {
-                name = toProjectName(file, nxJson);
+                name = toProjectName(file);
             }
             if (!projects[name]) {
                 projects[name] = configuration;

package/src/config/workspaces.js.map CHANGED Viewed

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

package/src/migrations/update-15-1-0/set-project-names.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { Tree } from '../../generators/tree';
2	+ export default function (tree: Tree): Promise<void>;

package/src/migrations/update-15-1-0/set-project-names.js ADDED Viewed

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const project_configuration_1 = require("../../generators/utils/project-configuration");
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const path_1 = require("path");
+function default_1(tree) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // This looks like it does nothing, but this will actually effectively migrate over all the configs that need to be moved over, but won't touch configs that don't need to be moved
+        for (const [projName, projConfig] of (0, project_configuration_1.getProjects)(tree)) {
+            if (tree.exists((0, path_1.join)(projConfig.root, 'project.json'))) {
+                (_a = projConfig.name) !== null && _a !== void 0 ? _a : (projConfig.name = projName);
+                (0, project_configuration_1.updateProjectConfiguration)(tree, projName, projConfig);
+            }
+        }
+        yield (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=set-project-names.js.map

package/src/migrations/update-15-1-0/set-project-names.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"set-project-names.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-15-1-0/set-project-names.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;AAC5I,+BAA4B;AAE5B,mBAA+B,IAAU;;;QACvC,mLAAmL;QACnL,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;gBACtD,MAAA,UAAU,CAAC,IAAI,oCAAf,UAAU,CAAC,IAAI,GAAK,QAAQ,EAAC;gBAC7B,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aACxD;SACF;QAED,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;;CACvD;AAVD,4BAUC"}

package/src/project-graph/affected/locators/project-glob-changes.js CHANGED Viewed

@@ -7,13 +7,13 @@ const workspaces_1 = require("nx/src/config/workspaces");
 const workspace_root_1 = require("nx/src/utils/workspace-root");
 const getTouchedProjectsFromProjectGlobChanges = (touchedFiles, projectGraphNodes, nxJson) => {
     const pluginGlobPatterns = (0, workspaces_1.getGlobPatternsFromPlugins)(nxJson, [workspace_root_1.workspaceRoot], workspace_root_1.workspaceRoot);
-    const workspacesGlobPatterns = (0, workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(workspace_root_1.workspaceRoot);
+    const workspacesGlobPatterns = (0, workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(workspace_root_1.workspaceRoot) || [];
     const patterns = [
         '**/project.json',
         ...pluginGlobPatterns,
         ...workspacesGlobPatterns,
     ];
-    const combinedGlobPattern = '{' + patterns.join(',') + '}';
+    const combinedGlobPattern = patterns.length === 1 ? '**/project.json' : '{' + patterns.join(',') + '}';
     const touchedProjects = new Set();
     for (const touchedFile of touchedFiles) {
         const isProjectFile = minimatch(touchedFile.file, combinedGlobPattern);

package/src/project-graph/affected/locators/project-glob-changes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"project-glob-changes.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/project-glob-changes.ts"],"names":[],"mappings":";;;AAAA,iDAI0B;AAG1B,uCAAwC;AACxC,yDAGkC;AAClC,gEAA4D;AAErD,MAAM,wCAAwC,GAEjD,CAAC,YAAY,EAAE,iBAAiB,EAAE,MAAM,EAAY,EAAE;IACxD,MAAM,kBAAkB,GAAG,IAAA,uCAA0B,EACnD,MAAM,EACN,CAAC,8BAAa,CAAC,EACf,8BAAa,CACd,CAAC;IACF,MAAM,sBAAsB,GAC1B,IAAA,wDAA2C,EAAC,8BAAa,CAAC,CAAC;~~IAE7D~~,MAAM,QAAQ,GAAG;QACf,iBAAiB;QACjB,GAAG,kBAAkB;QACrB,GAAG,sBAAsB;KAC1B,CAAC;IACF,MAAM,mBAAmB,~~GAAG~~,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;~~IAE3D~~,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACtC,MAAM,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QACvE,IAAI,aAAa,EAAE;YACjB,IACE,WAAW,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC,EACtE;gBACA,6EAA6E;gBAC7E,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aACvC;YAED,2EAA2E;YAC3E,8DAA8D;SAC/D;KACF;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AACrC,CAAC,CAAC;AAnCW,QAAA,wCAAwC,4CAmCnD"}
1	+ {"version":3,"file":"project-glob-changes.js","sourceRoot":"","sources":["../../../../../../../packages/nx/src/project-graph/affected/locators/project-glob-changes.ts"],"names":[],"mappings":";;;AAAA,iDAI0B;AAG1B,uCAAwC;AACxC,yDAGkC;AAClC,gEAA4D;AAErD,MAAM,wCAAwC,GAEjD,CAAC,YAAY,EAAE,iBAAiB,EAAE,MAAM,EAAY,EAAE;IACxD,MAAM,kBAAkB,GAAG,IAAA,uCAA0B,EACnD,MAAM,EACN,CAAC,8BAAa,CAAC,EACf,8BAAa,CACd,CAAC;IACF,MAAM,sBAAsB,GAC1B,IAAA,wDAA2C,EAAC,8BAAa,CAAC,IAAI,EAAE,CAAC;IAEnE,MAAM,QAAQ,GAAG;QACf,iBAAiB;QACjB,GAAG,kBAAkB;QACrB,GAAG,sBAAsB;KAC1B,CAAC;IACF,MAAM,mBAAmB,GACvB,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAC7E,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACtC,MAAM,aAAa,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QACvE,IAAI,aAAa,EAAE;YACjB,IACE,WAAW,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC,EACtE;gBACA,6EAA6E;gBAC7E,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;aACvC;YAED,2EAA2E;YAC3E,8DAA8D;SAC/D;KACF;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AACrC,CAAC,CAAC;AAnCW,QAAA,wCAAwC,4CAmCnD"}

package/src/tasks-runner/tasks-schedule.js CHANGED Viewed

@@ -63,7 +63,11 @@ class TasksSchedule {
             }
             this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, [taskId]);
             this.options.lifeCycle.scheduleTask(task);
-            this.scheduledTasks.push(taskId);
+            this.scheduledTasks = this.scheduledTasks
+                .concat(taskId)
+                // NOTE: sort task by most dependent on first
+                .sort((taskId1, taskId2) => this.reverseTaskDeps[taskId2].length -
+                this.reverseTaskDeps[taskId1].length);
         });
     }
     scheduleBatches() {

package/src/tasks-runner/tasks-schedule.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tasks-schedule.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":";;;;AAEA,mCAKiB;AAMjB,mDAA+C;AAO/C,MAAa,aAAa;IAUxB,YACmB,MAAc,EACd,MAA2B,EAC3B,YAA0B,EAC1B,SAAoB,EACpB,UAAsB,EACtB,OAAkC;QALlC,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAqB;QAC3B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAY;QACtB,YAAO,GAAP,OAAO,CAA2B;QAf7C,0BAAqB,GAAG,IAAI,CAAC,SAAS,CAAC;QACvC,oBAAe,GAAG,IAAA,4BAAoB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEvD,qBAAgB,GAAY,EAAE,CAAC;QAE/B,mBAAc,GAAa,EAAE,CAAC;QAE9B,mBAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IASxC,CAAC;IAES,iBAAiB;;YAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM,EAAE;gBACxC,IAAI,CAAC,eAAe,EAAE,CAAC;aACxB;YACD,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE;gBACjD,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;oBAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;iBAC/B;aACF;QACH,CAAC;KAAA;IAEM,QAAQ;QACb,OAAO,CACL,IAAI,CAAC,gBAAgB,CAAC,MAAM;YAC1B,IAAI,CAAC,cAAc,CAAC,MAAM;YAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,MAAM;YACtD,CAAC,CACF,CAAC;IACJ,CAAC;IAEM,QAAQ,CAAC,OAAiB;QAC/B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACjC;QACD,IAAI,CAAC,qBAAqB,GAAG,IAAA,gCAAwB,EACnD,IAAI,CAAC,qBAAqB,EAC1B,OAAO,CACR,CAAC;IACJ,CAAC;IAEM,QAAQ;QACb,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC;SAC1D;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE;YAC/B,CAAC,CAAC,IAAI,CAAC;IACX,CAAC;IAEa,YAAY,CAAC,MAAc;;YACvC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAE1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBACd,MAAM,IAAA,oBAAQ,EACZ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,SAAS,EACd,IAAI,CACL,CAAC;aACH;YAED,IAAI,CAAC,qBAAqB,GAAG,IAAA,gCAAwB,EACnD,IAAI,CAAC,qBAAqB,EAC1B,CAAC,MAAM,CAAC,CACT,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;~~QACnC~~,CAAC;KAAA;IAEO,eAAe;QACrB,MAAM,QAAQ,GAA8B,EAAE,CAAC;QAC/C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE;YACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACxD,MAAM,YAAY,GAAG,IAAA,8BAAsB,EACzC,QAAQ,EACR,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,CAClB,CAAC;YACF,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;SACpE;QACD,KAAK,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChE,IAAI,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;SACjD;IACH,CAAC;IAEO,aAAa,CAAC,EAAE,YAAY,EAAE,SAAS,EAAS;QACtD,2FAA2F;QAC3F,IAAI,CAAC,qBAAqB,GAAG,IAAA,gCAAwB,EACnD,IAAI,CAAC,qBAAqB,EAC1B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAC7B,CAAC;QAEF,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;IAEO,qBAAqB,CAC3B,OAAkC,EAClC,IAAU,EACV,gBAAwB,EACxB,MAAe;;QAEf,MAAM,EAAE,0BAA0B,EAAE,GAAG,IAAA,0BAAkB,EACvD,IAAI,EACJ,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,MAAM,YAAY,GAAG,IAAA,8BAAsB,EACzC,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,CAClB,CAAC;QACF,IAAI,gBAAgB,KAAK,YAAY,EAAE;YACrC,OAAO;SACR;QAED,IAAI,CAAC,0BAA0B,EAAE;YAC/B,OAAO;SACR;QAED,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACtC,MAAA,OAAO,CAAC,gBAAgB,CAAC,mCACxB;gBACC,KAAK,EAAE,EAAE;gBACT,YAAY,EAAE,EAAE;gBAChB,KAAK,EAAE,EAAE;aACI,CAAC,CAAC;QAEnB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QAC5B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,MAAM,EAAE;YACV,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC3B;QAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;SACvE;IACH,CAAC;IAEO,cAAc,CAAC,MAAc;QACnC,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAC5B,CAAC;IACJ,CAAC;CACF;~~AAhKD~~,~~sCAgKC~~"}
1	+ {"version":3,"file":"tasks-schedule.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":"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"}

package/src/utils/assert-workspace-validity.js CHANGED Viewed

@@ -48,13 +48,15 @@ function assertWorkspaceValidity(workspaceJson, nxJson) {
     if (invalidImplicitDependencies.size === 0) {
         return;
     }
-    let message = `The following implicitDependencies specified in project configurations are invalid:
-  `;
-    invalidImplicitDependencies.forEach((projectNames, key) => {
-        const str = `  ${key}
-    ${projectNames.map((projectName) => `    ${projectName}`).join('\n')}`;
-        message += str;
-    });
+    let message = `The following implicitDependencies specified in project configurations are invalid:\n`;
+    message += [...invalidImplicitDependencies.keys()]
+        .map((key) => {
+        const projectNames = invalidImplicitDependencies.get(key);
+        return `  ${key}\n${projectNames
+            .map((projectName) => `    ${projectName}`)
+            .join('\n')}`;
+    })
+        .join('\n\n');
     throw new Error(`Configuration Error\n${message}`);
 }
 exports.assertWorkspaceValidity = assertWorkspaceValidity;

package/src/utils/assert-workspace-validity.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"assert-workspace-validity.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/assert-workspace-validity.ts"],"names":[],"mappings":";;;AAIA,mDAA+C;AAE/C,SAAgB,uBAAuB,CACrC,aAAa,EACb,MAA2B;IAE3B,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAElE,MAAM,QAAQ,qBACT,aAAa,CAAC,QAAQ,CAC1B,CAAC;IAEF,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAAoB,CAAC;IAEhE,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,oBAAoB,IAAI,EAAE,CAClC;SACE,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QACrB,SAAS,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,EAAE,EAAE,IAAc;YAC5C,IAAI,KAAK,KAAK,GAAG,EAAE;gBACjB,uDAAuD;aACxD;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBACpC,uDAAuD;gBACvD,MAAM,IAAI,KAAK,CAAC,IAAA,4BAAY,EAAA;;gDAEU,IAAI,CAAC,IAAI,CAC9C,KAAK,CACN,uDAAuD,KAAK;WAC3D,CAAC,CAAC;aACJ;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC/B,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;aAC7B;iBAAM;gBACL,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;oBACvC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC;aACJ;QACH,CAAC;QAED,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjC,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC;SACL,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAqB,EAAE,EAAE;QAC5D,gCAAgC,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QACxE,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,2BAA2B,CAAC,CAAC;IAElC,qBAAqB;SAClB,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;QACtC,OAAO,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC;IACxC,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;QACtC,gCAAgC,CAC9B,GAAG,EACH,WAAW,EACX,OAAO,CAAC,oBAAoB,EAC5B,QAAQ,CACT,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,2BAA2B,CAAC,CAAC;IAElC,IAAI,2BAA2B,CAAC,IAAI,KAAK,CAAC,EAAE;QAC1C,OAAO;KACR;IAED,IAAI,OAAO,GAAG~~;GACb~~,CAAC;~~IACF~~,~~2BAA2B~~,CAAC,~~OAAO~~,~~CAAC~~,CAAC,~~YAAY~~,EAAE,GAAG,EAAE,EAAE;~~QACxD~~,MAAM,GAAG,GAAG,~~KAAK~~,GAAG~~;MAClB~~,~~YAAY~~,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,OAAO,WAAW,EAAE,CAAC,~~CAAC,~~IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;~~QACvE~~,~~OAAO~~,~~IAAI,GAAG,~~CAAC;~~IACjB~~,CAAC,CAAC,CAAC;~~IAEH~~,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC;AACrD,CAAC;~~AAzED~~,~~0DAyEC~~;AAED,SAAS,gCAAgC,CACvC,GAA0B,EAC1B,UAAkB,EAClB,mBAA6B,EAC7B,aAAkB;IAElB,MAAM,eAAe,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9D,MAAM,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC;YAC1C,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;YACvB,CAAC,CAAC,QAAQ,CAAC;QACb,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;KACtC;AACH,CAAC"}
1	+ {"version":3,"file":"assert-workspace-validity.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/assert-workspace-validity.ts"],"names":[],"mappings":"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"}

package/src/utils/lock-file/lock-file.d.ts CHANGED Viewed

@@ -18,7 +18,7 @@ export declare function parseLockFile(packageManager?: PackageManager): LockFile
  * @param lockFileData
  * @returns
  */
-export declare function mapLockFileDataToPartialGraph(lockFileData: LockFileData): ProjectGraph;
+export declare function mapLockFileDataToPartialGraph(lockFileData: LockFileData, packageManager?: PackageManager): ProjectGraph;
 /**
  * Stringifies {@link LockFileData} content and writes it to lock file
  */

package/src/utils/lock-file/lock-file.js CHANGED Viewed

@@ -75,35 +75,22 @@ exports.parseLockFile = parseLockFile;
  * @param lockFileData
  * @returns
  */
-function mapLockFileDataToPartialGraph(lockFileData) {
-    const result = {
-        dependencies: {},
-        externalNodes: {},
-        nodes: {},
-    };
-    const versionCache = {};
-    Object.keys(lockFileData.dependencies).forEach((dep) => {
-        const versions = lockFileData.dependencies[dep];
-        Object.keys(versions).forEach((nameVersion) => {
-            const packageVersion = versions[nameVersion];
-            // save external node
-            const nodeName = (0, utils_1.getNodeName)(dep, packageVersion.version, packageVersion.rootVersion);
-            result.externalNodes[nodeName] = {
-                type: 'npm',
-                name: nodeName,
-                data: {
-                    version: packageVersion.version,
-                    packageName: dep,
-                },
-            };
-            const dependencies = (0, utils_1.mapExternalNodeDependencies)(nodeName, packageVersion, lockFileData.dependencies, versionCache);
-            if (dependencies.length) {
-                result.dependencies[nodeName] = dependencies;
-            }
-        });
-    });
-    (0, utils_1.hashExternalNodes)(result);
-    return result;
+function mapLockFileDataToPartialGraph(lockFileData, packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
+    let externalNodes;
+    if (packageManager === 'yarn') {
+        externalNodes = (0, utils_1.mapExternalNodes)(lockFileData, yarn_1.transitiveDependencyYarnLookup);
+    }
+    if (packageManager === 'pnpm') {
+        externalNodes = (0, utils_1.mapExternalNodes)(lockFileData, pnpm_1.transitiveDependencyPnpmLookup);
+    }
+    if (packageManager === 'npm') {
+        externalNodes = (0, utils_1.mapExternalNodes)(lockFileData, npm_1.transitiveDependencyNpmLookup);
+    }
+    if (externalNodes) {
+        (0, utils_1.hashExternalNodes)(externalNodes);
+        return externalNodes;
+    }
+    throw Error(`Unknown package manager: ${packageManager}`);
 }
 exports.mapLockFileDataToPartialGraph = mapLockFileDataToPartialGraph;
 /**

package/src/utils/lock-file/lock-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"lock-file.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/lock-file.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AACvD,wDAA0E;AAC1E,~~iCAIgB~~;AAChB,+~~BAIe~~;AACf,~~iCAIgB~~;AAEhB,sDAAkD;AAClD,+BAA4B;AAC5B,~~mCAKiB~~;~~AAKjB~~,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,kBAAU,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~~;IAE1B~~,~~MAAM~~,~~MAAM~~,~~GAAiB;QAC3B~~,~~YAAY~~,~~EAAE~~,~~EAAE;QAChB~~,~~aAAa,EAAE,EAAE;QACjB,KAAK,EAAE,EAAE;KACV,~~CAAC;~~IACF~~,~~MAAM~~,~~YAAY~~,~~GAA2B,EAAE,~~CAAC;~~IAEhD~~,~~MAAM,CAAC,~~IAAI,~~CAAC~~,~~YAAY~~,~~CAAC~~,~~YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,~~EAAE~~,EAAE~~;~~QACrD~~,~~MAAM~~,~~QAAQ,~~GAAG,~~YAAY~~,~~CAAC~~,YAAY,~~CAAC~~,~~GAAG~~,~~CAAC~~,CAAC;~~QAChD~~,~~MAAM,CAAC,~~IAAI,~~CAAC~~,~~QAAQ~~,~~CAAC~~,~~CAAC,OAAO,CAAC,CAAC,WAAW,~~EAAE~~,EAAE~~;~~YAC5C~~,~~MAAM~~,~~cAAc,~~GAAG,~~QAAQ,CAAC,WAAW,CAAC,CAAC;YAE7C,qBAAqB;YACrB,MAAM,QAAQ,GAAG,~~IAAA,~~mBAAW~~,~~EAC1B~~,~~GAAG~~,~~EACH~~,~~cAAc~~,~~CAAC,OAAO,EACtB,cAAc,CAAC,WAAW,CAC3B,CAAC;YACF,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG;gBAC~~/B,~~IAAI,EAAE,KAAK~~;~~gBACX,IAAI,EAAE,QAAQ~~;~~gBACd~~,IAAI,~~EAAE;oBACJ,OAAO,EAAE,~~cAAc,~~CAAC~~,~~OAAO;oBAC/B~~,~~WAAW,~~EAAE~~,GAAG~~;~~iBACjB;aACF~~,~~CAAC;YAEF~~,~~MAAM,YAAY,~~GAAG,IAAA,~~mCAA2B~~,~~EAC9C~~,~~QAAQ,EACR,cAAc,EACd,~~YAAY,~~CAAC~~,~~YAAY~~,~~EACzB~~,~~YAAY,CACb,~~CAAC;~~YACF~~,IAAI,~~YAAY~~,~~CAAC,MAAM,~~EAAE;~~gBACvB~~,~~MAAM~~,~~CAAC~~,~~YAAY~~,~~CAAC~~,~~QAAQ,~~CAAC,~~GAAG,YAAY,~~CAAC;~~aAC9C;QACH~~,~~CAAC~~,~~CAAC~~,CAAC;~~IACL~~,~~CAAC~~,~~CAAC~~,CAAC~~;IACH~~,~~IAAA~~,~~yBAAiB~~,~~EAAC~~,~~MAAM,~~CAAC,CAAC;~~IAC1B~~,~~OAAO,MAAM,~~CAAC;~~AAChB~~,~~CAAC~~;~~AA3CD,sEA2CC;~~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,aAAa,CAC3B,QAAsB,EACtB,QAAkB,EAClB,iBAAiC,IAAA,sCAAoB,EAAC,8BAAa,CAAC;IAEpE,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,OAAO,IAAA,wBAAiB,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;KAC9C;IACD,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,OAAO,IAAA,wBAAiB,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;KAC9C;IACD,IAAI,cAAc,KAAK,KAAK,EAAE;QAC5B,OAAO,IAAA,sBAAgB,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;KAC7C;IACD,MAAM,KAAK,CAAC,4BAA4B,cAAc,EAAE,CAAC,CAAC;AAC5D,CAAC;AAfD,sCAeC"}
1	+ {"version":3,"file":"lock-file.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/lock-file.ts"],"names":[],"mappings":"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"}

package/src/utils/lock-file/npm.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { LockFileData } from './lock-file-type';
+import { LockFileData, PackageDependency, PackageVersions } from './lock-file-type';
 /**
  * Parses package-lock.json file to `LockFileData` object
  *
@@ -13,6 +13,10 @@ export declare function parseNpmLockFile(lockFile: string): LockFileData;
  * @returns
  */
 export declare function stringifyNpmLockFile(lockFileData: LockFileData): string;
+/**
+ * Returns matching version of the dependency
+ */
+export declare function transitiveDependencyNpmLookup(packageName: string, parentPackage: string, versions: PackageVersions, version: string): PackageDependency;
 /**
  * Prunes the lock file data based on the list of packages and their transitive dependencies
  *

package/src/utils/lock-file/npm.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pruneNpmLockFile = exports.stringifyNpmLockFile = exports.parseNpmLockFile = void 0;
+exports.pruneNpmLockFile = exports.transitiveDependencyNpmLookup = exports.stringifyNpmLockFile = exports.parseNpmLockFile = void 0;
 const tslib_1 = require("tslib");
 const utils_1 = require("./utils");
 /**
@@ -184,6 +184,18 @@ function sortDependencies(unsortedDependencies) {
     }
     return dependencies;
 }
+/**
+ * Returns matching version of the dependency
+ */
+function transitiveDependencyNpmLookup(packageName, parentPackage, versions, version) {
+    const nestedVersion = Object.values(versions).find((v) => v.packageMeta.some((p) => p.path.indexOf(`${parentPackage}/node_modules/${packageName}`) !== -1));
+    if (nestedVersion) {
+        return nestedVersion;
+    }
+    // otherwise search for the matching version
+    return Object.values(versions).find((v) => v.rootVersion);
+}
+exports.transitiveDependencyNpmLookup = transitiveDependencyNpmLookup;
 /**
  * Prunes the lock file data based on the list of packages and their transitive dependencies
  *

package/src/utils/lock-file/npm.js.map CHANGED Viewed

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

package/src/utils/lock-file/pnpm.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { LockFileData } from './lock-file-type';
+import { LockFileData, PackageDependency, PackageVersions } from './lock-file-type';
 /**
  * Parses pnpm-lock.yaml file to `LockFileData` object
  *
@@ -13,6 +13,10 @@ export declare function parsePnpmLockFile(lockFile: string): LockFileData;
  * @returns
  */
 export declare function stringifyPnpmLockFile(lockFileData: LockFileData): string;
+/**
+ * Returns matching version of the dependency
+ */
+export declare function transitiveDependencyPnpmLookup(packageName: string, parentPackage: string, versions: PackageVersions, version: string): PackageDependency;
 /**
  * Prunes the lock file data based on the list of packages and their transitive dependencies
  *

package/src/utils/lock-file/pnpm.js CHANGED Viewed

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prunePnpmLockFile = exports.stringifyPnpmLockFile = exports.parsePnpmLockFile = void 0;
+exports.prunePnpmLockFile = exports.transitiveDependencyPnpmLookup = exports.stringifyPnpmLockFile = exports.parsePnpmLockFile = void 0;
 const tslib_1 = require("tslib");
 const js_yaml_1 = require("@zkochan/js-yaml");
 const utils_1 = require("./utils");
+const semver_1 = require("semver");
 const LOCKFILE_YAML_FORMAT = {
     blankLines: true,
     lineWidth: 1000,
@@ -156,6 +157,14 @@ function unmapLockFile(lockFileData) {
     }
     return Object.assign(Object.assign({}, lockFileData.lockFileMetadata), { specifiers: (0, utils_1.sortObject)(specifiers), dependencies: (0, utils_1.sortObject)(dependencies), devDependencies: (0, utils_1.sortObject)(devDependencies), packages: (0, utils_1.sortObject)(packages) });
 }
+/**
+ * Returns matching version of the dependency
+ */
+function transitiveDependencyPnpmLookup(packageName, parentPackage, versions, version) {
+    // pnpm's dependencies always point to the exact version so this block is only for insurrance
+    return Object.values(versions).find((v) => (0, semver_1.satisfies)(v.version, version));
+}
+exports.transitiveDependencyPnpmLookup = transitiveDependencyPnpmLookup;
 /**
  * Prunes the lock file data based on the list of packages and their transitive dependencies
  *

package/src/utils/lock-file/pnpm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/pnpm.ts"],"names":[],"mappings":";;;;~~AACA~~,8CAA8C;AAC9C,mCAAgE;AA+~~BhE~~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"}
1	+ {"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/pnpm.ts"],"names":[],"mappings":"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"}

package/src/utils/lock-file/utils.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { PackageDependency, PackageVersions } from './lock-file-type';
+import { LockFileData, PackageDependency, PackageVersions } from './lock-file-type';
 import { ProjectGraph } from '../../config/project-graph';
 /**
  * Simple sort function to ensure keys are ordered alphabetically
@@ -18,5 +18,7 @@ export declare function isRootVersion(packageName: string, version: string): boo
  * Returns node name depending whether it's root version or nested
  */
 export declare function getNodeName(dep: string, version: string, rootVersion: boolean): `npm:${string}`;
-export declare function mapExternalNodeDependencies(nodeName: string, packageVersion: PackageDependency, dependencies: Record<string, PackageVersions>, versionCache: Record<string, string>): any[];
+declare type TransitiveLookupFunction = (packageName: string, parentPackage: string, versions: PackageVersions, version: string) => PackageDependency;
+export declare function mapExternalNodes(lockFileData: LockFileData, transitiveLookupFn: TransitiveLookupFunction): ProjectGraph<any>;
 export declare function hashExternalNodes(projectGraph: ProjectGraph): void;
+export {};

package/src/utils/lock-file/utils.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashExternalNodes = exports.mapExternalNodeDependencies = exports.getNodeName = exports.isRootVersion = exports.findMatchingVersion = exports.hashString = exports.sortObject = void 0;
+exports.hashExternalNodes = exports.mapExternalNodes = exports.getNodeName = exports.isRootVersion = exports.findMatchingVersion = exports.hashString = exports.sortObject = void 0;
 const semver_1 = require("semver");
 const hashing_impl_1 = require("../../hasher/hashing-impl");
 const workspace_root_1 = require("../workspace-root");
@@ -63,49 +63,73 @@ function getNodeName(dep, version, rootVersion) {
     return rootVersion ? `npm:${dep}` : `npm:${dep}@${version}`;
 }
 exports.getNodeName = getNodeName;
-function mapExternalNodeDependencies(nodeName, packageVersion, dependencies, versionCache) {
-    const result = [];
-    const combinedDependencies = packageVersion.dependencies || packageVersion.peerDependencies
-        ? Object.assign(Object.assign({}, (packageVersion.dependencies || {})), (packageVersion.peerDependencies || {})) : undefined;
-    const transitiveDeps = mapTransitiveDependencies(dependencies, combinedDependencies, versionCache);
-    // map transitive dependencies to dependencies hash map
-    transitiveDeps.forEach((dep) => {
-        result.push({
-            type: 'static',
-            source: nodeName,
-            target: dep,
+function mapExternalNodes(lockFileData, transitiveLookupFn) {
+    const result = {
+        dependencies: {},
+        externalNodes: {},
+        nodes: {},
+    };
+    const versionCache = {};
+    Object.entries(lockFileData.dependencies).forEach(([packageName, versions]) => {
+        Object.values(versions).forEach(({ version, rootVersion, dependencies, peerDependencies }) => {
+            // save external node
+            const nodeName = getNodeName(packageName, version, rootVersion);
+            result.externalNodes[nodeName] = {
+                type: 'npm',
+                name: nodeName,
+                data: {
+                    version,
+                    packageName,
+                },
+            };
+            const combinedDependencies = dependencies || peerDependencies
+                ? Object.assign(Object.assign({}, (dependencies || {})), (peerDependencies || {})) : undefined;
+            if (combinedDependencies) {
+                const nodeDependencies = [];
+                const transitiveDeps = mapTransitiveDependencies(packageName, lockFileData.dependencies, combinedDependencies, versionCache, transitiveLookupFn);
+                transitiveDeps.forEach((target) => {
+                    nodeDependencies.push({
+                        type: 'static',
+                        source: nodeName,
+                        target,
+                    });
+                });
+                result.dependencies[nodeName] = nodeDependencies;
+            }
         });
     });
     return result;
 }
-exports.mapExternalNodeDependencies = mapExternalNodeDependencies;
+exports.mapExternalNodes = mapExternalNodes;
 // Finds the maching version of each dependency of the package and
 // maps each {package}:{versionRange} pair to "npm:{package}@{version}" (when transitive) or "npm:{package}" (when root)
-function mapTransitiveDependencies(packages, dependencies, versionCache) {
+function mapTransitiveDependencies(parentPackage, packages, dependencies, versionCache, transitiveLookupFn) {
     if (!dependencies) {
         return [];
     }
     const result = [];
     Object.keys(dependencies).forEach((packageName) => {
-        var _a;
-        const cleanVersion = dependencies[packageName].split('_')[0];
-        const key = `${packageName}@${cleanVersion}`;
+        var _a, _b;
         // some of the peer dependencies might not be installed,
         // we don't have them as nodes in externalNodes
         // so there's no need to map them as dependencies
         if (!packages[packageName]) {
             return;
         }
+        // fix for pnpm versions that might have suffixes - `1.2.3_@babel+core@4.5.6`
+        const cleanVersion = dependencies[packageName].split('_')[0];
+        const key = `${packageName}@${cleanVersion}`;
         // if we already processed this dependency, use the version from the cache
         if (versionCache[key]) {
             result.push(versionCache[key]);
         }
         else {
-            const versions = packages[packageName];
-            const version = findMatchingVersion(packageName, versions, cleanVersion);
-            // for some peer dependencies, we won't find installed version so we'll just ignore those
+            const version = packages[packageName][`${packageName}@${cleanVersion}`]
+                ? cleanVersion
+                : (_a = transitiveLookupFn(packageName, parentPackage, packages[packageName], cleanVersion)) === null || _a === void 0 ? void 0 : _a.version;
+            // for some peer dependencies, we won't find installed version so we'll just ignore these
             if (version) {
-                const nodeName = getNodeName(packageName, version, (_a = versions[`${packageName}@${version}`]) === null || _a === void 0 ? void 0 : _a.rootVersion);
+                const nodeName = getNodeName(packageName, version, (_b = packages[packageName][`${packageName}@${version}`]) === null || _b === void 0 ? void 0 : _b.rootVersion);
                 result.push(nodeName);
                 versionCache[key] = nodeName;
             }

package/src/utils/lock-file/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/utils.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,4DAA2D;~~AAE3D~~,sDAAkD;AAClD,2BAA8C;~~AAO9C~~;;;;GAIG;AACH,SAAgB,UAAU,CACxB,GAAsB,EACtB,qBAAwC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EACxD,UAAU,GAAG,KAAK,EAClB,YAA+C;IAE/C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO;KACR;IACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxB,IAAI,UAAU,EAAE;QACd,IAAI,CAAC,OAAO,EAAE,CAAC;KAChB;IACD,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnB,MAAM,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAnBD,gCAmBC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,OAAO,6BAAc,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,gCAEC;AAED,SAAgB,mBAAmB,CACjC,WAAmB,EACnB,eAAgC,EAChC,OAAe;;IAEf,wCAAwC;IACxC,IAAI,eAAe,CAAC,GAAG,WAAW,IAAI,OAAO,EAAE,CAAC,EAAE;QAChD,OAAO,OAAO,CAAC;KAChB;IACD,4CAA4C;IAC5C,OAAO,MAAA,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,IAAA,kBAAS,EAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAC9B,0CAAE,OAAO,CAAC;AACb,CAAC;AAbD,kDAaC;AAED,SAAgB,aAAa,CAAC,WAAmB,EAAE,OAAe;IAChE,MAAM,QAAQ,GAAG,GAAG,8BAAa,iBAAiB,WAAW,eAAe,CAAC;IAC7E,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;QACxB,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC;KAChD;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AARD,sCAQC;AAED;;GAEG;AACH,SAAgB,WAAW,CACzB,GAAW,EACX,OAAe,EACf,WAAoB;IAEpB,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9D,CAAC;AAND,kCAMC;~~AAED~~,SAAgB,~~2BAA2B~~,~~CACzC~~,~~QAAgB~~,~~EAChB~~,~~cAAiC~~,~~EACjC~~,~~YAA6C~~,~~EAC7C~~,~~YAAoC~~;~~IAEpC~~,~~MAAM~~,MAAM,~~GAAG~~,EAAE,CAAC;~~IAElB~~,MAAM,~~oBAAoB~~,~~GACxB~~,~~cAAc~~,CAAC,YAAY,~~IAAI~~,~~cAAc~~,CAAC,~~gBAAgB~~;~~QAC5D~~,CAAC,~~iCACM~~,CAAC,~~cAAc~~,CAAC,YAAY,IAAI,EAAE,CAAC,~~GACnC~~,CAAC,~~cAAc~~,CAAC,gBAAgB,IAAI,EAAE,CAAC,~~EAE9C~~,CAAC,CAAC,SAAS,CAAC;~~IAChB~~,MAAM,cAAc,GAAG,yBAAyB,CAC9C,YAAY,~~EACZ~~,oBAAoB,EACpB,YAAY,~~CACb~~,CAAC;~~IACF~~,~~uDAAuD;IACvD,~~cAAc,CAAC,OAAO,CAAC,CAAC,~~GAAG~~,EAAE,EAAE;~~QAC7B~~,~~MAAM~~,CAAC,IAAI,CAAC;~~YACV~~,IAAI,EAAE,QAAQ;~~YACd~~,MAAM,EAAE,QAAQ;~~YAChB~~,MAAM,~~EAAE~~,~~GAAG~~;~~SACZ~~,CAAC,CAAC;~~IACL~~,CAAC,CAAC,CAAC;~~IAEH~~,OAAO,MAAM,CAAC;AAChB,CAAC;~~AA9BD~~,~~kEA8BC~~;AAED,kEAAkE;AAClE,wHAAwH;AACxH,SAAS,yBAAyB,CAChC,QAAyC,EACzC,YAAoC,EACpC,YAAoC;~~IAEpC~~,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;;QAChD,MAAM,YAAY,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,GAAG,WAAW,IAAI,YAAY,EAAE,CAAC;QAE7C,~~wDAAwD;QACxD,+CAA+C;QAC/C,iDAAiD;QACjD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC1B,OAAO;SACR;QAED,~~0EAA0E;QAC1E,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;SAChC;aAAM;YACL,MAAM,~~QAAQ~~,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;~~YACvC~~,~~MAAM~~,~~OAAO~~,~~GAAG~~,~~mBAAmB~~,CAAC,WAAW,~~EAAE~~,QAAQ,~~EAAE~~,~~YAAY~~,CAAC,CAAC;~~YACzE~~,yFAAyF;YACzF,IAAI,OAAO,EAAE;gBACX,MAAM,QAAQ,GAAG,WAAW,CAC1B,WAAW,EACX,OAAO,EACP,MAAA,QAAQ,CAAC,GAAG,WAAW,IAAI,OAAO,EAAE,CAAC,0CAAE,WAAW,~~CACnD~~,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACtB,YAAY,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;aAC9B;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;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"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/utils.ts"],"names":[],"mappings":"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"}

package/src/utils/lock-file/yarn.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { LockFileData } from './lock-file-type';
+import { LockFileData, PackageDependency, PackageVersions } from './lock-file-type';
 /**
  * Parses `yarn.lock` syml file and maps to {@link LockFileData}
  *
@@ -13,6 +13,10 @@ export declare function parseYarnLockFile(lockFile: string): LockFileData;
  * @returns
  */
 export declare function stringifyYarnLockFile(lockFileData: LockFileData): string;
+/**
+ * Returns matching version of the dependency
+ */
+export declare function transitiveDependencyYarnLookup(packageName: string, parentPackage: string, versions: PackageVersions, version: string): PackageDependency;
 /**
  * Prunes the lock file data based on the list of packages and their transitive dependencies
  *

package/src/utils/lock-file/yarn.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pruneYarnLockFile = exports.stringifyYarnLockFile = exports.parseYarnLockFile = void 0;
+exports.pruneYarnLockFile = exports.transitiveDependencyYarnLookup = exports.stringifyYarnLockFile = exports.parseYarnLockFile = void 0;
 const tslib_1 = require("tslib");
 const parsers_1 = require("@yarnpkg/parsers");
 const lockfile_1 = require("@yarnpkg/lockfile");
@@ -128,6 +128,14 @@ function unmapPackages(dependencies, isBerry = false) {
     });
     return packages;
 }
+/**
+ * Returns matching version of the dependency
+ */
+function transitiveDependencyYarnLookup(packageName, parentPackage, versions, version) {
+    return Object.values(versions).find((v) => v.packageMeta.some((p) => p === `${packageName}@${version}` ||
+        p === `${packageName}@npm:${version}`));
+}
+exports.transitiveDependencyYarnLookup = transitiveDependencyYarnLookup;
 /**
  * Prunes the lock file data based on the list of packages and their transitive dependencies
  *

package/src/utils/lock-file/yarn.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/yarn.ts"],"names":[],"mappings":";;;;AAAA,8CAA4D;AAC5D,gDAA8C;AAM9C,mCAAgE;~~AAOhE~~,MAAM,0BAA0B,GAAG,6HAA6H,CAAC;AAEjK;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,QAAgB;IAChD,MAAM,KAAkC,IAAA,mBAAS,EAAC,QAAQ,CAAC,EAArD,EAAE,UAAU,OAAyC,EAApC,YAAY,sBAA7B,cAA+B,CAAsB,CAAC;IAE5D,sFAAsF;IACtF,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,CAAC;IAC7B,MAAM,IAAI,GAAG,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAC;IAClC,IAAI,OAAO,EAAE;QACX,OAAO;YACL,YAAY,EAAE,cAAc;YAC5B,gBAAgB,EAAE;gBAChB,UAAU;gBACV,iBAAiB;aAClB;YACD,IAAI;SACL,CAAC;KACH;SAAM;QACL,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;KAC/C;AACH,CAAC;AAnBD,8CAmBC;AAED,2DAA2D;AAC3D,SAAS,WAAW,CAClB,QAA8B;IAE9B,MAAM,cAAc,GAAiC,EAAE,CAAC;IACxD,MAAM,iBAAiB,GAAyB,EAAE,CAAC;IAEnD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE;QACpD,qDAAqD;QACrD,8CAA8C;QAC9C,IAAI,KAAK,CAAC,QAAQ,KAAK,MAAM,EAAE;YAC7B,iBAAiB,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;SACpC;aAAM;YACL,8DAA8D;YAC9D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/D,MAAM,MAAM,GAAG,GAAG,WAAW,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAEjD,cAAc,CAAC,WAAW,CAAC,GAAG,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAChE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAAE;gBACxC,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,mCAC9B,KAAK,KACR,WAAW,EAAE,IAAI,GAClB,CAAC;aACH;iBAAM;gBACL,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;aAC/D;SACF;IACH,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAClD,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE1C,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;SAC7C;aAAM;YACL,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5C,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAChD,CAAC;YAEF,6CAA6C;YAC7C,IAAI,cAAc,EAAE;gBAClB,QAAQ,CAAC,cAAc,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;aAC7C;SACF;IACH,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;AAC7C,CAAC;AAED;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,YAA0B;;IAC9D,2CAA2C;IAC3C,yDAAyD;IACzD,MAAM,OAAO,GAAG,CAAC,CAAC,CAAA,MAAA,YAAY,CAAC,gBAAgB,0CAAE,UAAU,CAAA,CAAC;IAC5D,MAAM,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACvE,IAAI,OAAO,EAAE;QACX,MAAM,QAAQ,iCACZ,UAAU,EAAE,YAAY,CAAC,gBAAgB,CAAC,UAAU,IACjD,YAAY,CAAC,gBAAgB,CAAC,iBAAiB,GAC/C,YAAY,CAChB,CAAC;QACF,iDAAiD;QACjD,OAAO,0BAA0B,GAAG,IAAA,uBAAa,EAAC,QAAQ,CAAC,CAAC;KAC7D;SAAM;QACL,OAAO,IAAA,oBAAS,EAAC,YAAY,CAAC,CAAC;KAChC;AACH,CAAC;AAhBD,sDAgBC;AAED,8EAA8E;AAC9E,aAAa;AACb,YAAY;AACZ,oBAAoB;AACpB,gBAAgB;AAChB,iDAAiD;AACjD,OAAO;AACP,IAAI;AACJ,MAAM;AACN,+BAA+B;AAC/B,cAAc;AACd,KAAK;AACL,EAAE;AACF,SAAS,aAAa,CACpB,YAAkC,EAClC,OAAO,GAAG,KAAK;IAEf,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAE1C,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;QACtD,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/C,MAAM,EAAE,WAAW,EAAE,WAAW,KAAc,KAAK,EAAd,IAAI,kBAAK,KAAK,EAA7C,8BAAqC,CAAQ,CAAC;YACpD,IAAI,OAAO,EAAE;gBACX,oDAAoD;gBACpD,4BAA4B;gBAC5B,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;aACzC;iBAAM;gBACL,+DAA+D;gBAC/D,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC1B,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;gBACvB,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAC/B,YAA0B,EAC1B,QAAkB;;IAElB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAA,MAAA,YAAY,CAAC,gBAAgB,0CAAE,UAAU,CAAA,CAAC;IAC5D,MAAM,kBAAkB,GAAG,iBAAiB,CAC1C,YAAY,CAAC,YAAY,EACzB,QAAQ,CACT,CAAC;IAEF,IAAI,kBAAgC,CAAC;IACrC,IAAI,OAAO,EAAE;QACX,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC,gBAAgB,CAAC;QACxE,kBAAkB,GAAG;YACnB,gBAAgB,EAAE;gBAChB,UAAU;gBACV,iBAAiB,EAAE,sBAAsB,CACvC,iBAAiB,EACjB,kBAAkB,EAClB,QAAQ,CACT;aACF;YACD,YAAY,EAAE,kBAAkB;YAChC,IAAI,EAAE,EAAE;SACT,CAAC;KACH;SAAM;QACL,kBAAkB,GAAG,EAAE,YAAY,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;KACrE;IAED,kBAAkB,CAAC,IAAI,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACzE,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AA/BD,8CA+BC;AAED,qEAAqE;AACrE,SAAS,iBAAiB,CACxB,YAA0C,EAC1C,QAAkB;IAElB,MAAM,MAAM,GAAiC,EAAE,CAAC;IAEhD,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAC/B,IAAI,YAAY,CAAC,WAAW,CAAC,EAAE;YAC7B,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CACjE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CACzB,CAAC;YAEF,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAChD,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACjC,2BAA2B,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;SAC1D;aAAM;YACL,OAAO,CAAC,IAAI,CACV,kBAAkB,WAAW,gCAAgC,CAC9D,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,8DAA8D;AAC9D,kCAAkC;AAClC,wCAAwC;AACxC,SAAS,2BAA2B,CAClC,YAA0C,EAC1C,UAAwC,EACxC,KAAwB;IAExB,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;QACvB,OAAO;KACR;IAED,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;QACpE,IAAI,YAAY,CAAC,WAAW,CAAC,EAAE;YAC7B,qDAAqD;YACrD,oEAAoE;YACpE,MAAM,iBAAiB,GAAG,qBAAqB,CAC7C,YAAY,CAAC,WAAW,CAAC,EACzB,WAAW,EACX,OAAO,CACR,CAAC;YACF,IAAI,iBAAiB,EAAE;gBACrB,MAAM,CAAC,GAAG,MAA6B,WAAW,IAAI,iBAAiB,EAA3D,EAAE,WAAW,OAAY,EAAP,KAAK,sBAAvB,eAAyB,CAAkC,CAAC;gBACxE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;oBAC5B,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;iBAC9B;gBAED,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,EAAE;oBAChC,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;oBAC7D,IAAI,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE;wBAC3C,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBAC9B,WAAW,CAAC,IAAI,EAAE,CAAC;qBACpB;iBACF;qBAAM;oBACL,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,mCACvB,KAAK,KACR,WAAW,EAAE,CAAC,WAAW,CAAC,GAC3B,CAAC;oBACF,kCAAkC;oBAClC,2BAA2B,CACzB,YAAY,EACZ,UAAU,EACV,UAAU,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAC7B,CAAC;iBACH;aACF;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,iEAAiE;AACjE,SAAS,sBAAsB,CAC7B,iBAAuC,EACvC,kBAAgD,EAChD,QAAkB;IAElB,MAAM,MAAM,GAAyB,EAAE,CAAC;IAExC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CACvC,CAAC,EAAwC,EAAE,EAAE;YAA5C,CAAC,UAAU,UAA6B,EAA3B,EAAE,YAAY,OAAY,EAAP,KAAK,sBAAxB,gBAA0B,CAAF;QACpC,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;QAChE,MAAM,2BAA2B,GAAG,iCAAiC,CACnE,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,aAAa,CACd,CAAC;QACF,MAAM,CAAC,UAAU,CAAC,mCACb,KAAK,KACR,YAAY,EAAE,IAAA,kBAAU,EAAC,2BAA2B,CAAC,GACtD,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,iCAAiC,CACxC,YAAoC,EACpC,QAAkB,EAClB,kBAAgD,EAChD,MAAe;IAEf,MAAM,MAAM,GAA2B,EAAE,CAAC;IAE1C,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAClC,CAAC,CAAC,WAAW,EAAE,cAAc,CAAmB,EAAE,EAAE;QAClD,IACE,qBAAqB,CACnB,kBAAkB,CAAC,WAAW,CAAC,EAC/B,WAAW,EACX,cAAc,CACf,EACD;YACA,MAAM,CAAC,WAAW,CAAC,GAAG,cAAc,CAAC;SACtC;IACH,CAAC,CACF,CAAC;IACF,iDAAiD;IACjD,IAAI,MAAM,EAAE;QACV,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;gBACd,4DAA4D;gBAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;qBACxD,WAAW,CAAC,CAAC,CAAW,CAAC;gBAC5B,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,oEAAoE;AACpE,SAAS,qBAAqB,CAC5B,eAAgC,EAChC,WAAmB,EACnB,cAAsB;IAEtB,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IACD,MAAM,WAAW,GAAG,GAAG,WAAW,IAAI,cAAc,EAAE,CAAC;IACvD,MAAM,gBAAgB,GAAG,GAAG,WAAW,QAAQ,cAAc,EAAE,CAAC;IAEhE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,IACE,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;YAC3C,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAChD;YACA,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,uFAAuF;AACvF,+DAA+D;AAC/D,sEAAsE;AACtE,SAAS,qBAAqB,CAC5B,UAA2B,EAC3B,WAAmB,EACnB,OAAe;IAEf,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,WAAW,GAAG,GAAG,WAAW,IAAI,OAAO,EAAE,CAAC;QAC9C,IAAI,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;SAClC;QACD,6CAA6C;QAC7C,WAAW,GAAG,GAAG,WAAW,QAAQ,OAAO,EAAE,CAAC;QAC9C,IAAI,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3C,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;SAClC;KACF;IACD,OAAO;AACT,CAAC"}
1	+ {"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/yarn.ts"],"names":[],"mappings":"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"}

package/src/utils/register.js CHANGED Viewed

@@ -30,17 +30,20 @@ const registerTsProject = (path, configFilename = 'tsconfig.json') => {
         // We can fall back on ts-node if its available
         const tsNodeInstalled = packageIsInstalled('ts-node/register');
         if (tsNodeInstalled) {
-            warnTsNodeUsage();
             const { register } = require('ts-node');
             // ts-node doesn't provide a cleanup method
             registerTranspiler = () => {
-                register({
+                const service = register({
                     project: tsConfigPath,
                     transpileOnly: true,
                     compilerOptions: {
                         module: 'commonjs',
                     },
                 });
+                // Don't warn if a faster transpiler is enabled
+                if (!service.options.transpiler && !service.options.swc) {
+                    warnTsNodeUsage();
+                }
                 return () => { };
             };
         }

package/src/utils/register.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/register.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,qCAA0D;AAE1D;;;;;;;;;GASG;AACI,MAAM,iBAAiB,GAAG,CAC/B,IAAY,EACZ,cAAc,GAAG,eAAe,EAClB,EAAE;IAChB,gEAAgE;IAChE,IAAI,kBAAoC,CAAC;IAEzC,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAChD,MAAM,gBAAgB,GAAG,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC,CAAC;IAE/D,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,oBAAoB,CAAC,CAAC;IAClE,IAAI,gBAAgB,EAAE;QACpB,sEAAsE;QACtE,MAAM,EAAE,QAAQ,EAAE,GAChB,OAAO,CAAC,6BAA6B,CAAiD,CAAC;QACzF,MAAM,EACJ,mBAAmB,GACpB,GAAG,OAAO,CAAC,0CAA0C,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACnD,kBAAkB,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAC/C;SAAM;QACL,+CAA+C;QAC/C,MAAM,eAAe,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;QAC/D,IAAI,eAAe,EAAE;YACnB,~~eAAe,EAAE,CAAC;YAClB,~~MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAA6B,CAAC;YAEpE,2CAA2C;YAC3C,kBAAkB,GAAG,GAAG,EAAE;gBACxB,QAAQ,CAAC;~~oBACP~~,OAAO,EAAE,YAAY;oBACrB,aAAa,EAAE,IAAI;oBACnB,eAAe,EAAE;wBACf,MAAM,EAAE,UAAU;qBACnB;iBACF,CAAC,CAAC;gBACH,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;YAClB,CAAC,CAAC;SACH;KACF;IAED,IAAI,kBAAkB,EAAE;QACtB,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;KAC7C;SAAM;QACL,gBAAgB,EAAE,CAAC;KACpB;IAED,4DAA4D;IAC5D,2BAA2B;IAC3B,OAAO,GAAG,EAAE;QACV,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE;YAChC,CAAC,EAAE,CAAC;SACL;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;~~AAvDW~~,QAAA,iBAAiB,~~qBAuD5B~~;AAEF;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,YAAY;IAChD,IAAI;QACF;;WAEG;QACH,MAAM,aAAa,GAAoC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACjF,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAC9D;;;WAGG;QACH,IAAI,cAAc,CAAC,UAAU,KAAK,SAAS,EAAE;YAC3C,OAAO,aAAa,CAAC,QAAQ,CAAC;gBAC5B,OAAO,EAAE,cAAc,CAAC,eAAe;gBACvC,KAAK,EAAE,cAAc,CAAC,KAAK;aAC5B,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,mBAAmB,EAAE,CAAC;KACvB;IACD,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AAClB,CAAC;AArBD,sDAqBC;AAED,SAAS,eAAe;IACtB,eAAM,CAAC,IAAI,CACT,IAAA,oBAAW,EAAC,GAAG,kBAAS;6EACiD,CAAC,CAC3E,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB;IAC1B,eAAM,CAAC,IAAI,CACT,IAAA,oBAAW,EAAC,GAAG,kBAAS;2DAC+B,CAAC,CACzD,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB;IACvB,eAAM,CAAC,IAAI,CACT,IAAA,oBAAW,EAAC,GAAG,kBAAS;6EACiD,CAAC,CAC3E,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,CAAS;IACnC,IAAI;QACF,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
1	+ {"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/register.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,qCAA0D;AAE1D;;;;;;;;;GASG;AACI,MAAM,iBAAiB,GAAG,CAC/B,IAAY,EACZ,cAAc,GAAG,eAAe,EAClB,EAAE;IAChB,gEAAgE;IAChE,IAAI,kBAAoC,CAAC;IAEzC,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAChD,MAAM,gBAAgB,GAAG,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC,CAAC;IAE/D,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,oBAAoB,CAAC,CAAC;IAClE,IAAI,gBAAgB,EAAE;QACpB,sEAAsE;QACtE,MAAM,EAAE,QAAQ,EAAE,GAChB,OAAO,CAAC,6BAA6B,CAAiD,CAAC;QACzF,MAAM,EACJ,mBAAmB,GACpB,GAAG,OAAO,CAAC,0CAA0C,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACnD,kBAAkB,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAC/C;SAAM;QACL,+CAA+C;QAC/C,MAAM,eAAe,GAAG,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;QAC/D,IAAI,eAAe,EAAE;YACnB,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAA6B,CAAC;YAEpE,2CAA2C;YAC3C,kBAAkB,GAAG,GAAG,EAAE;gBACxB,MAAM,OAAO,GAAG,QAAQ,CAAC;oBACvB,OAAO,EAAE,YAAY;oBACrB,aAAa,EAAE,IAAI;oBACnB,eAAe,EAAE;wBACf,MAAM,EAAE,UAAU;qBACnB;iBACF,CAAC,CAAC;gBACH,+CAA+C;gBAC/C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;oBACvD,eAAe,EAAE,CAAC;iBACnB;gBACD,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;YAClB,CAAC,CAAC;SACH;KACF;IAED,IAAI,kBAAkB,EAAE;QACtB,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;KAC7C;SAAM;QACL,gBAAgB,EAAE,CAAC;KACpB;IAED,4DAA4D;IAC5D,2BAA2B;IAC3B,OAAO,GAAG,EAAE;QACV,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE;YAChC,CAAC,EAAE,CAAC;SACL;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,iBAAiB,qBA0D5B;AAEF;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,YAAY;IAChD,IAAI;QACF;;WAEG;QACH,MAAM,aAAa,GAAoC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACjF,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAC9D;;;WAGG;QACH,IAAI,cAAc,CAAC,UAAU,KAAK,SAAS,EAAE;YAC3C,OAAO,aAAa,CAAC,QAAQ,CAAC;gBAC5B,OAAO,EAAE,cAAc,CAAC,eAAe;gBACvC,KAAK,EAAE,cAAc,CAAC,KAAK;aAC5B,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,mBAAmB,EAAE,CAAC;KACvB;IACD,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AAClB,CAAC;AArBD,sDAqBC;AAED,SAAS,eAAe;IACtB,eAAM,CAAC,IAAI,CACT,IAAA,oBAAW,EAAC,GAAG,kBAAS;6EACiD,CAAC,CAC3E,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB;IAC1B,eAAM,CAAC,IAAI,CACT,IAAA,oBAAW,EAAC,GAAG,kBAAS;2DAC+B,CAAC,CACzD,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB;IACvB,eAAM,CAAC,IAAI,CACT,IAAA,oBAAW,EAAC,GAAG,kBAAS;6EACiD,CAAC,CAC3E,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,CAAS;IACnC,IAAI;QACF,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}