nx 19.6.0-canary.20240726-b3c67de → 19.6.0-canary.20240730-acd9bb7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.6.0-canary.20240726-b3c67de",
+  "version": "19.6.0-canary.20240730-acd9bb7",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.6.0-canary.20240726-b3c67de"
+    "@nrwl/tao": "19.6.0-canary.20240730-acd9bb7"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-darwin-arm64": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240726-b3c67de",
-    "@nx/nx-freebsd-x64": "19.6.0-canary.20240726-b3c67de"
+    "@nx/nx-darwin-x64": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-darwin-arm64": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-freebsd-x64": "19.6.0-canary.20240730-acd9bb7"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/release/changelog-renderer/index.js

@@ -25,10 +25,11 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
             }
         }
     }
+    let relevantChanges = changes;
     // workspace root level changelog
     if (project === null) {
         // No changes for the workspace
-        if (changes.length === 0) {
+        if (relevantChanges.length === 0) {
             if (dependencyBumps?.length) {
                 applyAdditionalDependencyBumps({
                     markdownLines,
@@ -42,7 +43,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
             }
             return markdownLines.join('\n').trim();
         }
-        const typeGroups = groupBy(changes, 'type');
+        const typeGroups = groupBy(relevantChanges, 'type');
         markdownLines.push('', createVersionTitle(releaseVersion, changelogRenderOptions), '');
         for (const type of Object.keys(changeTypes)) {
             const group = typeGroups[type];
@@ -75,7 +76,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
     }
     else {
         // project level changelog
-        const relevantChanges = changes.filter((c) => c.affectedProjects &&
+        relevantChanges = relevantChanges.filter((c) => c.affectedProjects &&
             (c.affectedProjects === '*' || c.affectedProjects.includes(project)));
         // Generating for a named project, but that project has no relevant changes in the current set of commits, exit early
         if (relevantChanges.length === 0) {
@@ -128,7 +129,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
     }
     if (changelogRenderOptions.authors) {
         const _authors = new Map();
-        for (const change of changes) {
+        for (const change of relevantChanges) {
             if (!change.author) {
                 continue;
             }

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

@@ -17,7 +17,7 @@ const find_matching_projects_1 = require("../../utils/find-matching-projects");
 const graph_1 = require("../graph/graph");
 const all_file_data_1 = require("../../utils/all-file-data");
 async function affected(command, args, extraTargetDependencies = {}, extraOptions = {
-    excludeTaskDependencies: false,
+    excludeTaskDependencies: args.excludeTaskDependencies,
     loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
 }) {
     perf_hooks_1.performance.mark('code-loading:end');

package/src/command-line/examples.js

@@ -311,6 +311,10 @@ exports.examples = {
             command: 'show projects --projects api-*',
             description: 'Show all projects with names starting with "api-". The "projects" option is useful to see which projects would be selected by run-many',
         },
+        {
+            command: 'show projects --projects tag:ui-*',
+            description: 'Show all projects with a tag starting with "ui-". The "projects" option is useful to see which projects would be selected by run-many',
+        },
         {
             command: 'show projects --with-target serve',
             description: 'Show all projects with a serve target',

package/src/command-line/release/changelog.js

@@ -296,6 +296,7 @@ async function releaseChangelog(args) {
                     let fromRef = args.from ||
                         (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {
                             projectName: project.name,
+                            releaseGroupName: releaseGroup.name,
                         }))?.tag;
                     if (!fromRef && useAutomaticFromRef) {
                         const firstCommit = await (0, git_1.getFirstGitCommit)();

package/src/command-line/release/config/config.js

@@ -73,6 +73,10 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         tag: true,
     };
     const defaultFixedReleaseTagPattern = 'v{version}';
+    /**
+     * TODO: in v20, make it so that this pattern is used by default when any custom groups are used
+     */
+    const defaultFixedGroupReleaseTagPattern = '{releaseGroupName}-v{version}';
     const defaultIndependentReleaseTagPattern = '{projectName}@{version}';
     const workspaceProjectsRelationship = userConfig.projectsRelationship || 'fixed';
     const defaultGeneratorOptions = {};

package/src/command-line/release/publish.js

@@ -48,7 +48,9 @@ async function releasePublish(args, isCLI = false) {
      * If the user is filtering to a subset of projects or groups, we should not run the publish task
      * for dependencies, because that could cause projects outset of the filtered set to be published.
      */
-    const shouldExcludeTaskDependencies = _args.projects?.length > 0 || _args.groups?.length > 0;
+    const shouldExcludeTaskDependencies = _args.projects?.length > 0 ||
+        _args.groups?.length > 0 ||
+        args.excludeTaskDependencies;
     let overallExitStatus = 0;
     if (args.projects?.length) {
         /**

package/src/command-line/release/utils/shared.js

@@ -169,6 +169,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
         if (projectVersionData.newVersion !== null) {
             tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
                 version: projectVersionData.newVersion,
+                releaseGroupName: releaseGroup.name,
             }));
         }
     }

package/src/command-line/run/run-one.js

@@ -14,7 +14,7 @@ const calculate_default_project_name_1 = require("../../config/calculate-default
 const workspace_configuration_check_1 = require("../../utils/workspace-configuration-check");
 const graph_1 = require("../graph/graph");
 async function runOne(cwd, args, extraTargetDependencies = {}, extraOptions = {
-    excludeTaskDependencies: false,
+    excludeTaskDependencies: args.excludeTaskDependencies,
     loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
 }) {
     perf_hooks_1.performance.mark('code-loading:end');

package/src/command-line/run-many/run-many.js

@@ -15,7 +15,7 @@ const find_matching_projects_1 = require("../../utils/find-matching-projects");
 const workspace_configuration_check_1 = require("../../utils/workspace-configuration-check");
 const graph_1 = require("../graph/graph");
 async function runMany(args, extraTargetDependencies = {}, extraOptions = {
-    excludeTaskDependencies: false,
+    excludeTaskDependencies: args.excludeTaskDependencies,
     loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
 }) {
     perf_hooks_1.performance.mark('code-loading:end');

package/src/command-line/yargs-utils/shared-options.d.ts

@@ -18,6 +18,7 @@ export interface RunOptions {
     dte: boolean;
     batch: boolean;
     useAgents: boolean;
+    excludeTaskDependencies: boolean;
 }
 export declare function withRunOptions<T>(yargs: Argv<T>): Argv<T & RunOptions>;
 export declare function withTargetAndConfigurationOption(yargs: Argv, demandOption?: boolean): Argv<{

package/src/command-line/yargs-utils/shared-options.js

@@ -66,6 +66,11 @@ function withRunOptions(yargs) {
         describe: 'Rerun the tasks even when the results are available in the cache',
         type: 'boolean',
         default: false,
+    })
+        .options('excludeTaskDependencies', {
+        describe: 'Skips running dependent tasks first',
+        type: 'boolean',
+        default: false,
     })
         .options('cloud', {
         type: 'boolean',

package/src/commands-runner/create-command-graph.js

@@ -36,8 +36,10 @@ const recursiveResolveDeps = (projectGraph, projectName, resolved) => {
 };
 function createCommandGraph(projectGraph, projectNames, nxArgs) {
     const dependencies = {};
-    for (const projectName of projectNames) {
-        recursiveResolveDeps(projectGraph, projectName, dependencies);
+    if (!nxArgs.excludeTaskDependencies) {
+        for (const projectName of projectNames) {
+            recursiveResolveDeps(projectGraph, projectName, dependencies);
+        }
     }
     const roots = Object.keys(dependencies).filter((d) => dependencies[d].length === 0);
     const commandGraph = {

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

@@ -17,10 +17,10 @@ const workspace_context_1 = require("../../utils/workspace-context");
 const output_1 = require("../../utils/output");
 const path_2 = require("../../utils/path");
 const json_1 = require("./json");
-const nx_json_1 = require("./nx-json");
-var nx_json_2 = require("./nx-json");
-Object.defineProperty(exports, "readNxJson", { enumerable: true, get: function () { return nx_json_2.readNxJson; } });
-Object.defineProperty(exports, "updateNxJson", { enumerable: true, get: function () { return nx_json_2.updateNxJson; } });
+const to_project_name_1 = require("../../config/to-project-name");
+var nx_json_1 = require("./nx-json");
+Object.defineProperty(exports, "readNxJson", { enumerable: true, get: function () { return nx_json_1.readNxJson; } });
+Object.defineProperty(exports, "updateNxJson", { enumerable: true, get: function () { return nx_json_1.updateNxJson; } });
 /**
  * Adds project configuration to the Nx workspace.
  *
@@ -56,10 +56,35 @@ function addProjectConfiguration(tree, projectName, projectConfiguration, standa
  * @param projectConfiguration - project configuration
  */
 function updateProjectConfiguration(tree, projectName, projectConfiguration) {
-    const projectConfigFile = (0, path_2.joinPathFragments)(projectConfiguration.root, 'project.json');
-    if (!tree.exists(projectConfigFile)) {
+    if (tree.exists((0, path_2.joinPathFragments)(projectConfiguration.root, 'project.json'))) {
+        updateProjectConfigurationInProjectJson(tree, projectName, projectConfiguration);
+    }
+    else if (tree.exists((0, path_2.joinPathFragments)(projectConfiguration.root, 'package.json'))) {
+        updateProjectConfigurationInPackageJson(tree, projectName, projectConfiguration);
+    }
+    else {
         throw new Error(`Cannot update Project ${projectName} at ${projectConfiguration.root}. It either doesn't exist yet, or may not use project.json for configuration. Use \`addProjectConfiguration()\` instead if you want to create a new project.`);
     }
+}
+function updateProjectConfigurationInPackageJson(tree, projectName, projectConfiguration) {
+    const packageJsonFile = (0, path_2.joinPathFragments)(projectConfiguration.root, 'package.json');
+    const packageJson = (0, json_1.readJson)(tree, packageJsonFile);
+    if (packageJson.name === projectConfiguration.name ?? projectName) {
+        delete projectConfiguration.name;
+    }
+    if (projectConfiguration.targets &&
+        !Object.keys(projectConfiguration.targets).length) {
+        delete projectConfiguration.targets;
+    }
+    packageJson.nx = {
+        ...packageJson.nx,
+        ...projectConfiguration,
+        root: undefined,
+    };
+    (0, json_1.writeJson)(tree, packageJsonFile, packageJson);
+}
+function updateProjectConfigurationInProjectJson(tree, projectName, projectConfiguration) {
+    const projectConfigFile = (0, path_2.joinPathFragments)(projectConfiguration.root, 'project.json');
     handleEmptyTargets(projectName, projectConfiguration);
     (0, json_1.writeJson)(tree, projectConfigFile, {
         name: projectConfiguration.name ?? projectName,
@@ -147,15 +172,20 @@ function readAndCombineAllProjectConfigurations(tree) {
         }
         else if ((0, path_1.basename)(projectFile) === 'package.json') {
             const packageJson = (0, json_1.readJson)(tree, projectFile);
-            const config = (0, package_json_1.buildProjectConfigurationFromPackageJson)(packageJson, tree.root, projectFile, (0, nx_json_1.readNxJson)(tree));
+            // 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.
+            // so rather than using `buildProjectFromPackageJson` and stripping it out
+            // we are going to build the config manually.
+            const config = {
+                root: (0, path_1.dirname)(projectFile),
+                name: packageJson.name ?? (0, to_project_name_1.toProjectName)(projectFile),
+                ...packageJson.nx,
+            };
             if (!rootMap[config.root]) {
                 (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
                 // Inferred targets, tags, etc don't show up when running generators
                 // This is to help avoid running into issues when trying to update the workspace
-                {
-                    name: config.name,
-                    root: config.root,
-                }, undefined, undefined, true);
+                config, undefined, undefined, true);
             }
         }
     }

package/src/utils/command-line-utils.d.ts

@@ -29,6 +29,7 @@ export interface NxArgs {
     nxIgnoreCycles?: boolean;
     type?: string;
     batch?: boolean;
+    excludeTaskDependencies?: boolean;
 }
 export declare function createOverrides(__overrides_unparsed__?: string[]): Record<string, any>;
 export declare function splitArgsIntoNxArgsAndOverrides(args: {

package/src/utils/package-json.d.ts

@@ -1,13 +1,6 @@
-import { InputDefinition, ProjectMetadata, TargetConfiguration } from '../config/workspace-json-project-json';
+import { ProjectConfiguration, ProjectMetadata, TargetConfiguration } from '../config/workspace-json-project-json';
 import { PackageManagerCommands } from './package-manager';
-export interface NxProjectPackageJsonConfiguration {
-    name?: string;
-    implicitDependencies?: string[];
-    tags?: string[];
-    namedInputs?: {
-        [inputName: string]: (string | InputDefinition)[];
-    };
-    targets?: Record<string, TargetConfiguration>;
+export interface NxProjectPackageJsonConfiguration extends Partial<ProjectConfiguration> {
     includedScripts?: string[];
 }
 export type ArrayPackageGroup = {