nx 22.0.0-canary.20251015-f37c13b → 22.0.0-canary.20251018-6549d2a

package/src/devkit-internals.d.ts

@@ -27,4 +27,5 @@ export { registerTsProject } from './plugins/js/utils/register';
 export { interpolate } from './tasks-runner/utils';
 export { isCI } from './utils/is-ci';
 export { isUsingPrettierInTree } from './utils/is-using-prettier';
+export { readYamlFile } from './utils/fileutils';
 //# sourceMappingURL=devkit-internals.d.ts.map

package/src/devkit-internals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.readYamlFile = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.getIgnoreObjectForTree = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -59,3 +59,5 @@ var is_ci_1 = require("./utils/is-ci");
 Object.defineProperty(exports, "isCI", { enumerable: true, get: function () { return is_ci_1.isCI; } });
 var is_using_prettier_1 = require("./utils/is-using-prettier");
 Object.defineProperty(exports, "isUsingPrettierInTree", { enumerable: true, get: function () { return is_using_prettier_1.isUsingPrettierInTree; } });
+var fileutils_1 = require("./utils/fileutils");
+Object.defineProperty(exports, "readYamlFile", { enumerable: true, get: function () { return fileutils_1.readYamlFile; } });

package/src/generators/utils/project-configuration.js

@@ -181,9 +181,21 @@ function readAndCombineAllProjectConfigurations(tree) {
         if ((0, path_1.basename)(projectFile) === 'project.json') {
             const json = (0, json_1.readJson)(tree, projectFile);
             const config = (0, project_json_1.buildProjectFromProjectJson)(json, projectFile);
+            if (!config.name) {
+                try {
+                    const packageJson = (0, json_1.readJson)(tree, (0, path_2.joinPathFragments)(config.root, 'package.json'));
+                    if (packageJson.name) {
+                        config.name = packageJson.name;
+                    }
+                }
+                catch {
+                    // Maybe no package json, is ok.
+                }
+                config.name ??= (0, to_project_name_1.toProjectName)(projectFile);
+            }
             (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, config, undefined, undefined, true);
         }
-        else if ((0, path_1.basename)(projectFile) === 'package.json') {
+        if ((0, path_1.basename)(projectFile) === 'package.json') {
             const packageJson = (0, json_1.readJson)(tree, projectFile);
             // We don't want to have all of the extra inferred stuff in here, as
             // when generators update the project they shouldn't inline that stuff.

package/src/migrations/update-15-0-0/prefix-outputs.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '../../generators/tree';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=prefix-outputs.d.ts.map

package/src/migrations/update-15-0-0/prefix-outputs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prefix-outputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-15-0-0/prefix-outputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAgB7C,yBAA+B,IAAI,EAAE,IAAI,iBAoDxC"}

package/src/migrations/update-15-0-0/prefix-outputs.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const project_configuration_1 = require("../../generators/utils/project-configuration");
+const nx_json_1 = require("../../generators/utils/nx-json");
+const path_1 = require("path");
+const utils_1 = require("../../tasks-runner/utils");
+const json_1 = require("../../generators/utils/json");
+async function default_1(tree) {
+    // If the workspace doesn't have a nx.json, don't make any changes
+    if (!tree.exists('nx.json')) {
+        return;
+    }
+    const nxJson = (0, nx_json_1.readNxJson)(tree);
+    for (const [projectName, project] of (0, project_configuration_1.getProjects)(tree)) {
+        for (const [_, target] of Object.entries(project.targets ?? {})) {
+            if (!target.outputs) {
+                continue;
+            }
+            target.outputs = (0, utils_1.transformLegacyOutputs)(project.root, target.outputs);
+        }
+        try {
+            (0, project_configuration_1.updateProjectConfiguration)(tree, projectName, project);
+        }
+        catch {
+            if (tree.exists((0, path_1.join)(project.root, 'package.json'))) {
+                (0, json_1.updateJson)(tree, (0, path_1.join)(project.root, 'package.json'), (json) => {
+                    for (const target of Object.values(json.nx?.targets ?? {})) {
+                        if (target.outputs) {
+                            target.outputs = (0, utils_1.transformLegacyOutputs)(project.root, target.outputs);
+                        }
+                    }
+                    return json;
+                });
+            }
+        }
+    }
+    if (nxJson.targetDefaults) {
+        for (const [_, target] of Object.entries(nxJson.targetDefaults)) {
+            if (!target.outputs) {
+                continue;
+            }
+            target.outputs = (0, utils_1.transformLegacyOutputs)('{projectRoot}', target.outputs);
+        }
+        (0, nx_json_1.updateNxJson)(tree, nxJson);
+    }
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+}

package/src/migrations/update-16-0-0/remove-nrwl-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '../../generators/tree';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=remove-nrwl-cli.d.ts.map

package/src/migrations/update-16-0-0/remove-nrwl-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-nrwl-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-0-0/remove-nrwl-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAI7C,yBAA+B,IAAI,EAAE,IAAI,iBAYxC"}

package/src/migrations/update-16-0-0/remove-nrwl-cli.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const json_1 = require("../../generators/utils/json");
+async function default_1(tree) {
+    (0, json_1.updateJson)(tree, 'package.json', (json) => {
+        for (const deps of [json.dependencies, json.devDependencies]) {
+            if (deps) {
+                delete deps['@nrwl/cli'];
+            }
+        }
+        return json;
+    });
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+}

package/src/migrations/update-16-0-0/update-depends-on-to-tokens.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '../../generators/tree';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-depends-on-to-tokens.d.ts.map

package/src/migrations/update-16-0-0/update-depends-on-to-tokens.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-depends-on-to-tokens.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-0-0/update-depends-on-to-tokens.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C,yBAA+B,IAAI,EAAE,IAAI,iBAyDxC"}

package/src/migrations/update-16-0-0/update-depends-on-to-tokens.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+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");
+async function default_1(tree) {
+    updateDependsOnAndInputsInsideNxJson(tree);
+    const projectsConfigurations = (0, project_configuration_1.getProjects)(tree);
+    for (const [projectName, projectConfiguration] of projectsConfigurations) {
+        let projectChanged = false;
+        for (const [targetName, targetConfiguration] of Object.entries(projectConfiguration.targets ?? {})) {
+            for (const dependency of targetConfiguration.dependsOn ?? []) {
+                if (typeof dependency !== 'string') {
+                    if (dependency.projects === 'self' ||
+                        dependency.projects === '{self}') {
+                        delete dependency.projects;
+                        projectChanged = true;
+                    }
+                    else if (dependency.projects === 'dependencies' ||
+                        dependency.projects === '{dependencies}') {
+                        delete dependency.projects;
+                        dependency.dependencies = true;
+                        projectChanged = true;
+                    }
+                }
+            }
+            for (let i = 0; i < (targetConfiguration.inputs?.length ?? 0); i++) {
+                const input = targetConfiguration.inputs[i];
+                if (typeof input !== 'string') {
+                    if ('projects' in input &&
+                        (input.projects === 'self' || input.projects === '{self}')) {
+                        delete input.projects;
+                        projectChanged = true;
+                    }
+                    else if ('projects' in input &&
+                        (input.projects === 'dependencies' ||
+                            input.projects === '{dependencies}')) {
+                        delete input.projects;
+                        targetConfiguration.inputs[i] = {
+                            ...input,
+                            dependencies: true,
+                        };
+                        projectChanged = true;
+                    }
+                }
+            }
+        }
+        if (projectChanged) {
+            (0, project_configuration_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+        }
+    }
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+}
+function updateDependsOnAndInputsInsideNxJson(tree) {
+    const nxJson = (0, project_configuration_1.readNxJson)(tree);
+    let nxJsonChanged = false;
+    for (const [target, defaults] of Object.entries(nxJson?.targetDefaults ?? {})) {
+        for (const dependency of defaults.dependsOn ?? []) {
+            if (typeof dependency !== 'string') {
+                if (dependency.projects === 'self' ||
+                    dependency.projects === '{self}') {
+                    delete dependency.projects;
+                    nxJsonChanged = true;
+                }
+                else if (dependency.projects === 'dependencies' ||
+                    dependency.projects === '{dependencies}') {
+                    delete dependency.projects;
+                    dependency.dependencies = true;
+                    nxJsonChanged = true;
+                }
+            }
+        }
+        for (let i = 0; i < (defaults.inputs?.length ?? 0); i++) {
+            const input = defaults.inputs[i];
+            if (typeof input !== 'string') {
+                if ('projects' in input &&
+                    (input.projects === 'self' || input.projects === '{self}')) {
+                    delete input.projects;
+                    nxJsonChanged = true;
+                }
+                else if ('projects' in input &&
+                    (input.projects === 'dependencies' ||
+                        input.projects === '{dependencies}')) {
+                    delete input.projects;
+                    defaults.inputs[i] = {
+                        ...input,
+                        dependencies: true,
+                    };
+                    nxJsonChanged = true;
+                }
+            }
+        }
+    }
+    if (nxJsonChanged) {
+        (0, project_configuration_1.updateNxJson)(tree, nxJson);
+    }
+}

package/src/migrations/update-16-0-0/update-nx-cloud-runner.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '../../generators/tree';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-nx-cloud-runner.d.ts.map

package/src/migrations/update-16-0-0/update-nx-cloud-runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-nx-cloud-runner.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-0-0/update-nx-cloud-runner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAI7C,yBAA+B,IAAI,EAAE,IAAI,iBAyBxC"}

package/src/migrations/update-16-0-0/update-nx-cloud-runner.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const project_configuration_1 = require("../../generators/utils/project-configuration");
+const json_1 = require("../../generators/utils/json");
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+async function default_1(tree) {
+    (0, json_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.dependencies && json.dependencies['@nrwl/nx-cloud']) {
+            json.dependencies['nx-cloud'] = json.dependencies['@nrwl/nx-cloud'];
+            delete json.dependencies['@nrwl/nx-cloud'];
+        }
+        if (json.devDependencies && json.devDependencies['@nrwl/nx-cloud']) {
+            json.devDependencies['nx-cloud'] = json.devDependencies['@nrwl/nx-cloud'];
+            delete json.devDependencies['@nrwl/nx-cloud'];
+        }
+        return json;
+    });
+    const nxJson = (0, project_configuration_1.readNxJson)(tree);
+    if (!nxJson)
+        return;
+    for (let opts of Object.values(nxJson.tasksRunnerOptions ?? {})) {
+        if (opts.runner === '@nrwl/nx-cloud') {
+            opts.runner = 'nx-cloud';
+        }
+    }
+    (0, project_configuration_1.updateNxJson)(tree, nxJson);
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+}

package/src/migrations/update-16-2-0/remove-run-commands-output-path.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '../../generators/tree';
+export default function removeRunCommandsOutputPath(tree: Tree): Promise<void>;
+//# sourceMappingURL=remove-run-commands-output-path.d.ts.map

package/src/migrations/update-16-2-0/remove-run-commands-output-path.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-run-commands-output-path.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-2-0/remove-run-commands-output-path.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAO7C,wBAA8B,2BAA2B,CAAC,IAAI,EAAE,IAAI,iBAoBnE"}

package/src/migrations/update-16-2-0/remove-run-commands-output-path.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = removeRunCommandsOutputPath;
+const path_1 = require("../../utils/path");
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const json_1 = require("../../generators/utils/json");
+const project_configuration_1 = require("../../generators/utils/project-configuration");
+async function removeRunCommandsOutputPath(tree) {
+    for (const [project, configuration] of (0, project_configuration_1.getProjects)(tree).entries()) {
+        const targets = configuration.targets ?? {};
+        let changed = false;
+        for (const [, target] of Object.entries(targets)) {
+            changed ||= updateTargetBlock(target);
+        }
+        if (changed) {
+            (0, project_configuration_1.updateProjectConfiguration)(tree, project, configuration);
+        }
+    }
+    if (tree.exists('nx.json')) {
+        (0, json_1.updateJson)(tree, 'nx.json', (json) => {
+            for (const [, target] of Object.entries(json.targetDefaults ?? {})) {
+                updateTargetBlock(target);
+            }
+            return json;
+        });
+    }
+    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+}
+function updateTargetBlock(target) {
+    let changed = false;
+    if (target.executor === 'nx:run-commands' && target.options?.outputPath) {
+        changed = true;
+        const outputs = new Set(target.outputs ?? []);
+        outputs.delete('{options.outputPath}');
+        const newOutputs = Array.isArray(target.options.outputPath)
+            ? target.options.outputPath.map((p) => (0, path_1.joinPathFragments)('{workspaceRoot}', p))
+            : [(0, path_1.joinPathFragments)('{workspaceRoot}', target.options.outputPath)];
+        for (const outputPath of newOutputs) {
+            outputs.add(outputPath);
+        }
+        delete target.options.outputPath;
+        target.outputs = Array.from(outputs);
+    }
+    return changed;
+}

package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.d.ts

@@ -0,0 +1,13 @@
+import { Tree } from '../../generators/tree';
+/**
+ * This function escapes dollar sign in env variables
+ * It will go through:
+ * - '.env', '.local.env', '.env.local'
+ * - .env.[target-name], .[target-name].env
+ * - .env.[target-name].[configuration-name], .[target-name].[configuration-name].env
+ * - .env.[configuration-name], .[configuration-name].env
+ * at each project root and workspace root
+ * @param tree
+ */
+export default function escapeDollarSignEnvVariables(tree: Tree): void;
+//# sourceMappingURL=escape-dollar-sign-env-variables.d.ts.map

package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"escape-dollar-sign-env-variables.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,4BAA4B,CAAC,IAAI,EAAE,IAAI,QAoC9D"}

package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = escapeDollarSignEnvVariables;
+const logger_1 = require("../../utils/logger");
+const project_configuration_1 = require("../../generators/utils/project-configuration");
+/**
+ * This function escapes dollar sign in env variables
+ * It will go through:
+ * - '.env', '.local.env', '.env.local'
+ * - .env.[target-name], .[target-name].env
+ * - .env.[target-name].[configuration-name], .[target-name].[configuration-name].env
+ * - .env.[configuration-name], .[configuration-name].env
+ * at each project root and workspace root
+ * @param tree
+ */
+function escapeDollarSignEnvVariables(tree) {
+    const envFiles = ['.env', '.local.env', '.env.local'];
+    for (const [_, configuration] of (0, project_configuration_1.getProjects)(tree).entries()) {
+        envFiles.push(`${configuration.root}/.env`, `${configuration.root}/.local.env`, `${configuration.root}/.env.local`);
+        for (const targetName in configuration.targets) {
+            const task = configuration.targets[targetName];
+            envFiles.push(`.env.${targetName}`, `.${targetName}.env`, `${configuration.root}/.env.${targetName}`, `${configuration.root}/.${targetName}.env`);
+            if (task.configurations) {
+                for (const configurationName in task.configurations) {
+                    envFiles.push(`.env.${targetName}.${configurationName}`, `.${targetName}.${configurationName}.env`, `.env.${configurationName}`, `.${configurationName}.env`, `${configuration.root}/.env.${targetName}.${configurationName}`, `${configuration.root}/.${targetName}.${configurationName}.env`, `${configuration.root}/.env.${configurationName}`, `${configuration.root}/.${configurationName}.env`);
+                }
+            }
+        }
+    }
+    for (const envFile of new Set(envFiles)) {
+        parseEnvFile(tree, envFile);
+    }
+}
+/**
+ * This function parse the env file and escape dollar sign
+ * @param tree
+ * @param envFilePath
+ * @returns
+ */
+function parseEnvFile(tree, envFilePath) {
+    if (!tree.exists(envFilePath)) {
+        return;
+    }
+    let envFileContent = tree.read(envFilePath, 'utf-8');
+    if (!envFileContent) {
+        // envFileContent is null if we fail to read the file for any reason
+        // e.g. the file is not utf-8 encoded
+        logger_1.logger.info(`Unable to update ${envFilePath}. Nx interpolates environment variables in the form of $VAR_NAME. To escape the dollar sign, use \\$VAR_NAME.`);
+        return;
+    }
+    envFileContent = envFileContent
+        .split('\n')
+        .map((line) => {
+        line = line.trim();
+        if (!line || !line.includes('$')) {
+            return line;
+        }
+        const declarations = line.split('=');
+        if (declarations[1].includes('$') && !declarations[1].includes(`\\$`)) {
+            declarations[1] = declarations[1].replace('$', `\\$`);
+            line = declarations.join('=');
+        }
+        return line;
+    })
+        .join('\n');
+    tree.write(envFilePath, envFileContent);
+}

package/src/plugins/js/lock-file/lock-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/lock-file.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EACL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,cAAc,EACf,MAAM,gCAAgC,CAAC;AA8BxC,eAAO,MAAM,SAAS,UAMrB,CAAC;AAQF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAqC1C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,yBAAyB,GACjC,yBAAyB,EAAE,CA8B7B;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBtE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAiBtE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAgCtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,cAAoD,GACnE,MAAM,CA8CR"}
+{"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/lock-file.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EACL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,cAAc,EACf,MAAM,gCAAgC,CAAC;AA8BxC,eAAO,MAAM,SAAS,UAMrB,CAAC;AAQF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAqC1C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,yBAAyB,GACjC,yBAAyB,EAAE,CA8B7B;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBtE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAiBtE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAgCtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,cAAoD,GACnE,MAAM,CAmDR"}

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

@@ -204,7 +204,7 @@ function createLockFile(packageJson, graph, packageManager = (0, package_manager
         }
         if (packageManager === 'pnpm') {
             const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);
-            return (0, pnpm_parser_1.stringifyPnpmLockfile)(prunedGraph, content, normalizedPackageJson);
+            return (0, pnpm_parser_1.stringifyPnpmLockfile)(prunedGraph, content, normalizedPackageJson, workspace_root_1.workspaceRoot);
         }
         if (packageManager === 'npm') {
             const prunedGraph = (0, project_graph_pruning_1.pruneProjectGraph)(graph, packageJson);

package/src/plugins/js/lock-file/pnpm-parser.d.ts

@@ -4,5 +4,5 @@ import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-
 import { CreateDependenciesContext } from '../../../project-graph/plugins';
 export declare function getPnpmLockfileNodes(lockFileContent: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
 export declare function getPnpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
-export declare function stringifyPnpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson): string;
+export declare function stringifyPnpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson, workspaceRoot: string): string;
 //# sourceMappingURL=pnpm-parser.d.ts.map

package/src/plugins/js/lock-file/pnpm-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA0B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CA8BR"}
+{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA2B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAqCR"}

package/src/plugins/js/lock-file/pnpm-parser.js

@@ -9,6 +9,7 @@ const object_sort_1 = require("../../../utils/object-sort");
 const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
 const project_graph_1 = require("../../../config/project-graph");
 const file_hasher_1 = require("../../../hasher/file-hasher");
+const catalog_1 = require("../../../utils/catalog");
 const project_graph_pruning_1 = require("./project-graph-pruning");
 const path_1 = require("path");
 const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
@@ -278,10 +279,10 @@ function getDependencies(data, keyMap, isV5, ctx) {
 function parseBaseVersion(rawVersion, isV5) {
     return isV5 ? rawVersion.split('_')[0] : rawVersion.split('(')[0];
 }
-function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson) {
+function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson, workspaceRoot) {
     const data = (0, pnpm_normalizer_1.parseAndNormalizePnpmLockfile)(rootLockFileContent);
     const { lockfileVersion, packages, importers } = data;
-    const { snapshot: rootSnapshot, importers: requiredImporters } = mapRootSnapshot(packageJson, importers, packages, graph, +lockfileVersion);
+    const { snapshot: rootSnapshot, importers: requiredImporters } = mapRootSnapshot(packageJson, importers, packages, graph, +lockfileVersion, workspaceRoot);
     const snapshots = mapSnapshots(data.packages, graph.externalNodes, +lockfileVersion);
     const workspaceDependencyImporters = {};
     for (const [packageName, importerPath] of Object.entries(requiredImporters)) {
@@ -407,7 +408,7 @@ function versionIsAlias(key, versionExpr, lockfileVersion) {
         ? key.startsWith(`${packageName}/${version}`)
         : key.startsWith(`${packageName}@${version}`);
 }
-function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVersion) {
+function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVersion, workspaceRoot) {
     const workspaceModules = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(graph);
     const snapshot = { specifiers: {} };
     const importers = {};
@@ -419,7 +420,14 @@ function mapRootSnapshot(packageJson, rootImporters, packages, graph, lockfileVe
     ].forEach((depType) => {
         if (packageJson[depType]) {
             Object.keys(packageJson[depType]).forEach((packageName) => {
-                const version = packageJson[depType][packageName];
+                let version = packageJson[depType][packageName];
+                const manager = (0, catalog_1.getCatalogManager)(workspaceRoot);
+                if (manager?.isCatalogReference(version)) {
+                    version = manager.resolveCatalogReference(packageName, version, workspaceRoot);
+                    if (!version) {
+                        throw new Error(`Could not resolve catalog reference for package ${packageName}@${version}.`);
+                    }
+                }
                 if (workspaceModules.has(packageName)) {
                     for (const [importerPath, importerSnapshot] of Object.entries(rootImporters)) {
                         const workspaceDep = importerSnapshot.dependencies &&

package/src/plugins/js/lock-file/project-graph-pruning.d.ts

@@ -1,11 +1,11 @@
 import { ProjectGraph, ProjectGraphExternalNode, ProjectGraphProjectNode } from '../../../config/project-graph';
-import { PackageJson } from '../../../utils/package-json';
 import { ProjectGraphBuilder } from '../../../project-graph/project-graph-builder';
+import { PackageJson } from '../../../utils/package-json';
 /**
  * Prune project graph's external nodes and their dependencies
  * based on the pruned package.json
  */
-export declare function pruneProjectGraph(graph: ProjectGraph, prunedPackageJson: PackageJson): ProjectGraph;
+export declare function pruneProjectGraph(graph: ProjectGraph, prunedPackageJson: PackageJson, workspaceRootPath?: string): ProjectGraph;
 export declare function findNodeMatchingVersion(graph: ProjectGraph, packageName: string, versionExpr: string): ProjectGraphExternalNode;
 export declare function addNodesAndDependencies(graph: ProjectGraph, packageJsonDeps: Record<string, string>, workspacePackages: Map<string, ProjectGraphProjectNode>, builder: ProjectGraphBuilder): void;
 export declare function rehoistNodes(graph: ProjectGraph, packageJsonDeps: Record<string, string>, builder: ProjectGraphBuilder): void;

package/src/plugins/js/lock-file/project-graph-pruning.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-graph-pruning.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAInF;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,YAAY,EACnB,iBAAiB,EAAE,WAAW,GAC7B,YAAY,CA0Bd;AAmDD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,4BAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACvD,OAAO,EAAE,mBAAmB,QAgB7B;AA+BD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,mBAAmB,QAiD7B"}
+{"version":3,"file":"project-graph-pruning.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAI1D;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,YAAY,EACnB,iBAAiB,EAAE,WAAW,EAC9B,iBAAiB,GAAE,MAAsB,GACxC,YAAY,CA2Bd;AA0ED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,4BAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,uBAAuB,CAAC,EACvD,OAAO,EAAE,mBAAmB,QAgB7B;AA+BD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,OAAO,EAAE,mBAAmB,QAiD7B"}

package/src/plugins/js/lock-file/project-graph-pruning.js

@@ -5,17 +5,19 @@ exports.findNodeMatchingVersion = findNodeMatchingVersion;
 exports.addNodesAndDependencies = addNodesAndDependencies;
 exports.rehoistNodes = rehoistNodes;
 const semver_1 = require("semver");
-const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
 const operators_1 = require("../../../project-graph/operators");
+const project_graph_builder_1 = require("../../../project-graph/project-graph-builder");
+const catalog_1 = require("../../../utils/catalog");
+const workspace_root_1 = require("../../../utils/workspace-root");
 const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
 /**
  * Prune project graph's external nodes and their dependencies
  * based on the pruned package.json
  */
-function pruneProjectGraph(graph, prunedPackageJson) {
+function pruneProjectGraph(graph, prunedPackageJson, workspaceRootPath = workspace_root_1.workspaceRoot) {
     const builder = new project_graph_builder_1.ProjectGraphBuilder();
     const workspacePackages = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(graph);
-    const combinedDependencies = normalizeDependencies(prunedPackageJson, graph, workspacePackages);
+    const combinedDependencies = normalizeDependencies(prunedPackageJson, graph, workspacePackages, workspaceRootPath);
     addNodesAndDependencies(graph, combinedDependencies, workspacePackages, builder);
     for (const project of workspacePackages.values()) {
         const node = graph.nodes[project.name];
@@ -28,7 +30,7 @@ function pruneProjectGraph(graph, prunedPackageJson) {
 }
 // ensure that dependency ranges from package.json (e.g. ^1.0.0)
 // are replaced with the actual version based on the available nodes (e.g. 1.0.1)
-function normalizeDependencies(packageJson, graph, workspacePackages) {
+function normalizeDependencies(packageJson, graph, workspacePackages, workspaceRootPath) {
     const { dependencies, devDependencies, optionalDependencies, peerDependencies, } = packageJson;
     const combinedDependencies = {
         ...dependencies,
@@ -37,24 +39,35 @@ function normalizeDependencies(packageJson, graph, workspacePackages) {
         ...peerDependencies,
     };
     Object.entries(combinedDependencies).forEach(([packageName, versionRange]) => {
-        if (graph.externalNodes[`npm:${packageName}@${versionRange}`]) {
+        let resolvedVersionRange = versionRange;
+        const manager = (0, catalog_1.getCatalogManager)(workspaceRootPath);
+        if (manager?.isCatalogReference(versionRange)) {
+            const resolvedVersionRange = manager.resolveCatalogReference(packageName, versionRange, workspaceRootPath);
+            if (!resolvedVersionRange) {
+                throw new Error(`Could not resolve catalog reference for ${packageName}@${versionRange}.`);
+            }
+        }
+        if (graph.externalNodes[`npm:${packageName}@${resolvedVersionRange}`]) {
+            combinedDependencies[packageName] = resolvedVersionRange;
             return;
         }
         if (graph.externalNodes[`npm:${packageName}`] &&
-            graph.externalNodes[`npm:${packageName}`].data.version === versionRange) {
+            graph.externalNodes[`npm:${packageName}`].data.version ===
+                resolvedVersionRange) {
+            combinedDependencies[packageName] = resolvedVersionRange;
             return;
         }
         // otherwise we need to find the correct version
-        const node = findNodeMatchingVersion(graph, packageName, versionRange);
+        const node = findNodeMatchingVersion(graph, packageName, resolvedVersionRange);
         if (node) {
             combinedDependencies[packageName] = node.data.version;
         }
         else if (workspacePackages.has(packageName)) {
             // workspace module, leave as is
-            combinedDependencies[packageName] = versionRange;
+            combinedDependencies[packageName] = resolvedVersionRange;
         }
         else {
-            throw new Error(`Pruned lock file creation failed. The following package was not found in the root lock file: ${packageName}@${versionRange}`);
+            throw new Error(`Pruned lock file creation failed. The following package was not found in the root lock file: ${packageName}@${resolvedVersionRange}`);
         }
     });
     return combinedDependencies;

package/src/plugins/js/package-json/create-package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-package-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/package-json/create-package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAY1D,UAAU,OAAO;IACf,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACtE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,YAAY,EACnB,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,CAAC;CACpB,EACN,OAAO,GAAE,cAAqB,GAC7B,WAAW,CA0Lb;AAED,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,uBAAuB,EACpC,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,WAAW,EAC5B,OAAO,EAAE;IACP,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,EACD,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CA8CT"}
+{"version":3,"file":"create-package-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/package-json/create-package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,WAAW,EACZ,MAAM,6BAA6B,CAAC;AAYrC,UAAU,OAAO;IACf,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACtE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,YAAY,EACnB,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,OAAO,CAAC;CACpB,EACN,OAAO,GAAE,cAAqB,GAC7B,WAAW,CA6Mb;AAED,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,uBAAuB,EACpC,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,WAAW,EAC5B,OAAO,EAAE;IACP,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,EACD,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CA8CT"}