nx 22.0.0-canary.20251016-849f356 → 22.0.0-rc.0

package/src/devkit-internals.d.ts

@@ -28,4 +28,5 @@ export { interpolate } from './tasks-runner/utils';
 export { isCI } from './utils/is-ci';
 export { isUsingPrettierInTree } from './utils/is-using-prettier';
 export { readYamlFile } from './utils/fileutils';
+export { globalSpinner } from './utils/spinner';
 //# 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;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,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;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.globalSpinner = 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.
@@ -61,3 +61,5 @@ 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; } });
+var spinner_1 = require("./utils/spinner");
+Object.defineProperty(exports, "globalSpinner", { enumerable: true, get: function () { return spinner_1.globalSpinner; } });

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/package-json/create-nodes.js

@@ -125,7 +125,7 @@ function buildProjectConfigurationFromPackageJson(packageJson, workspaceRoot, pa
             }
         }
     }
-    if (!packageJson.name && projectRoot === '.') {
+    if (!packageJson.name && projectRoot === '.' && !packageJson.nx?.name) {
         throw new Error('Nx requires the root package.json to specify a name if it is being used as an Nx project.');
     }
     let name = packageJson.name ?? (0, to_project_name_1.toProjectName)(normalizedPath);

package/src/plugins/project-json/build-nodes/project-json.d.ts

@@ -3,5 +3,4 @@ import { NxPluginV2 } from '../../../project-graph/plugins';
 export declare const ProjectJsonProjectsPlugin: NxPluginV2;
 export default ProjectJsonProjectsPlugin;
 export declare function buildProjectFromProjectJson(json: Partial<ProjectConfiguration>, path: string): ProjectConfiguration;
-export declare function readNameFromPackageJson(path: string): string;
 //# sourceMappingURL=project-json.d.ts.map

package/src/plugins/project-json/build-nodes/project-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/project-json/build-nodes/project-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAGnF,OAAO,EAEL,UAAU,EACX,MAAM,gCAAgC,CAAC;AAGxC,eAAO,MAAM,yBAAyB,EAAE,UAyBvC,CAAC;AAEF,eAAe,yBAAyB,CAAC;AAEzC,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACnC,IAAI,EAAE,MAAM,GACX,oBAAoB,CAStB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO5D"}
+{"version":3,"file":"project-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/project-json/build-nodes/project-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAEnF,OAAO,EAEL,UAAU,EACX,MAAM,gCAAgC,CAAC;AAExC,eAAO,MAAM,yBAAyB,EAAE,UAyBvC,CAAC;AAEF,eAAe,yBAAyB,CAAC;AAEzC,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACnC,IAAI,EAAE,MAAM,GACX,oBAAoB,CAOtB"}

package/src/plugins/project-json/build-nodes/project-json.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectJsonProjectsPlugin = void 0;
 exports.buildProjectFromProjectJson = buildProjectFromProjectJson;
-exports.readNameFromPackageJson = readNameFromPackageJson;
 const node_path_1 = require("node:path");
-const to_project_name_1 = require("../../../config/to-project-name");
 const fileutils_1 = require("../../../utils/fileutils");
 const plugins_1 = require("../../../project-graph/plugins");
 exports.ProjectJsonProjectsPlugin = {
@@ -26,20 +24,10 @@ exports.ProjectJsonProjectsPlugin = {
 };
 exports.default = exports.ProjectJsonProjectsPlugin;
 function buildProjectFromProjectJson(json, path) {
-    const packageJsonPath = (0, node_path_1.join)((0, node_path_1.dirname)(path), 'package.json');
     const { name, root, ...rest } = json;
     return {
-        name: name ?? readNameFromPackageJson(packageJsonPath) ?? (0, to_project_name_1.toProjectName)(path),
+        name,
         root: root ?? (0, node_path_1.dirname)(path),
         ...rest,
     };
 }
-function readNameFromPackageJson(path) {
-    try {
-        const json = (0, fileutils_1.readJsonFile)(path);
-        return json.nx?.name ?? json.name;
-    }
-    catch {
-        return undefined;
-    }
-}

package/src/project-graph/plugins/public-api.d.ts

@@ -117,5 +117,5 @@ export type PostTasksExecution<TOptions = unknown> = (options: TOptions | undefi
 /**
  * A plugin which enhances the behavior of Nx
  */
-export type NxPlugin = NxPluginV2;
+export type NxPlugin<TOptions = unknown> = NxPluginV2<TOptions>;
 //# sourceMappingURL=public-api.d.ts.map

package/src/project-graph/plugins/public-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public-api.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/public-api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public-api.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/plugins/public-api.ts"],"names":[],"mappings":"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"}

package/src/project-graph/utils/project-configuration-utils.d.ts.map

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

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

@@ -18,10 +18,12 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const minimatch_1 = require("minimatch");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
+const node_fs_1 = require("node:fs");
 const error_types_1 = require("../error-types");
 const globs_1 = require("../../utils/globs");
 const delayed_spinner_1 = require("../../utils/delayed-spinner");
 const executor_utils_1 = require("../../command-line/run/executor-utils");
+const to_project_name_1 = require("../../config/to-project-name");
 function mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInformation, 
 // This function is used when reading project configuration
 // in generators, where we don't want to do this.
@@ -442,6 +444,13 @@ function validateAndNormalizeProjectRootMap(workspaceRoot, projectRootMap, nxJso
         // Strip it before returning configuration for usage.
         if (project['// targets'])
             delete project['// targets'];
+        // We initially did this in the project.json plugin, but
+        // that resulted in project.json files without names causing
+        // the resulting project to change names from earlier plugins...
+        if (!project.name &&
+            (0, node_fs_1.existsSync)((0, path_1.join)(workspaceRoot, project.root, 'project.json'))) {
+            project.name = (0, to_project_name_1.toProjectName)((0, path_1.join)(root, 'project.json'));
+        }
         try {
             validateProject(project, projects);
             projects[project.name] = project;

package/src/tasks-runner/life-cycles/task-history-life-cycle-old.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-history-life-cycle-old.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/task-history-life-cycle-old.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAS/C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEtD,qBAAa,0BAA2B,YAAW,SAAS;IAC1D,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,UAAU,CAAW;IAE7B,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE;IAgBlC,UAAU;IA2BhB,sBAAsB;CAevB"}
+{"version":3,"file":"task-history-life-cycle-old.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/task-history-life-cycle-old.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAU/C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEtD,qBAAa,0BAA2B,YAAW,SAAS;IAC1D,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,UAAU,CAAW;IAE7B,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE;IAgBlC,UAAU;IA2BhB,sBAAsB;CAmBvB"}

package/src/tasks-runner/life-cycles/task-history-life-cycle-old.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LegacyTaskHistoryLifeCycle = void 0;
+const nx_json_1 = require("../../config/nx-json");
 const legacy_task_history_1 = require("../../utils/legacy-task-history");
+const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const output_1 = require("../../utils/output");
 const serialize_target_1 = require("../../utils/serialize-target");
 const is_tui_enabled_1 = require("../is-tui-enabled");
@@ -52,8 +54,12 @@ class LegacyTaskHistoryLifeCycle {
                 bodyLines: [
                     ,
                     ...this.flakyTasks.map((t) => `  ${t}`),
-                    '',
-                    `Flaky tasks can disrupt your CI pipeline. Automatically retry them with Nx Cloud. Learn more at https://nx.dev/ci/features/flaky-tasks`,
+                    ...((0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())
+                        ? []
+                        : [
+                            '',
+                            `Flaky tasks can disrupt your CI pipeline. Automatically retry them with Nx Cloud. Learn more at https://nx.dev/ci/features/flaky-tasks`,
+                        ]),
                 ],
             });
         }

package/src/tasks-runner/life-cycles/task-history-life-cycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-history-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/task-history-life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAM/C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAQ3E,wBAAgB,wBAAwB,IACpC,oBAAoB,GACpB,0BAA0B,CAQ7B;AAED,qBAAa,oBAAqB,YAAW,SAAS;IACpD,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,QAAQ,CAA8B;IAC9C,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,UAAU,CAAW;;IAW7B,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE;IAgBlC,UAAU;IAgBhB,sBAAsB;CAsBvB"}
+{"version":3,"file":"task-history-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/task-history-life-cycle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAO/C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAQ3E,wBAAgB,wBAAwB,IACpC,oBAAoB,GACpB,0BAA0B,CAQ7B;AAED,qBAAa,oBAAqB,YAAW,SAAS;IACpD,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,QAAQ,CAA8B;IAC9C,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,UAAU,CAAW;;IAW7B,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE;IAgBlC,UAAU;IAgBhB,sBAAsB;CA0BvB"}

package/src/tasks-runner/life-cycles/task-history-life-cycle.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskHistoryLifeCycle = void 0;
 exports.getTasksHistoryLifeCycle = getTasksHistoryLifeCycle;
+const nx_json_1 = require("../../config/nx-json");
 const native_1 = require("../../native");
+const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
 const output_1 = require("../../utils/output");
 const serialize_target_1 = require("../../utils/serialize-target");
 const task_history_1 = require("../../utils/task-history");
@@ -69,8 +71,12 @@ class TaskHistoryLifeCycle {
                         const taskRun = this.taskRuns.get(hash);
                         return `  ${(0, serialize_target_1.serializeTarget)(taskRun.target.project, taskRun.target.target, taskRun.target.configuration)}`;
                     }),
-                    '',
-                    `Flaky tasks can disrupt your CI pipeline. Automatically retry them with Nx Cloud. Learn more at https://nx.dev/ci/features/flaky-tasks`,
+                    ...((0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())
+                        ? []
+                        : [
+                            '',
+                            `Flaky tasks can disrupt your CI pipeline. Automatically retry them with Nx Cloud. Learn more at https://nx.dev/ci/features/flaky-tasks`,
+                        ]),
                 ],
             });
         }