nx 17.3.0-beta.2 → 17.3.0-beta.3

package/migrations.json

@@ -76,6 +76,12 @@
       "version": "17.0.0-rc.1",
       "description": "Migration for v17.0.0-rc.1",
       "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope"
+    },
+    "17.3.0-nx-release-git-operations-explicit-opt-out": {
+      "cli": "nx",
+      "version": "17.3.0-beta.3",
+      "description": "Explicitly opt-out of git operations in nx release",
+      "implementation": "./src/migrations/update-17-3-0/nx-release-git-operations-explicit-opt-out"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "17.3.0-beta.2",
+  "version": "17.3.0-beta.3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs": "^17.6.2",
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
-    "@nrwl/tao": "17.3.0-beta.2"
+    "@nrwl/tao": "17.3.0-beta.3"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "17.3.0-beta.2",
-    "@nx/nx-darwin-arm64": "17.3.0-beta.2",
-    "@nx/nx-linux-x64-gnu": "17.3.0-beta.2",
-    "@nx/nx-linux-x64-musl": "17.3.0-beta.2",
-    "@nx/nx-win32-x64-msvc": "17.3.0-beta.2",
-    "@nx/nx-linux-arm64-gnu": "17.3.0-beta.2",
-    "@nx/nx-linux-arm64-musl": "17.3.0-beta.2",
-    "@nx/nx-linux-arm-gnueabihf": "17.3.0-beta.2",
-    "@nx/nx-win32-arm64-msvc": "17.3.0-beta.2",
-    "@nx/nx-freebsd-x64": "17.3.0-beta.2"
+    "@nx/nx-darwin-x64": "17.3.0-beta.3",
+    "@nx/nx-darwin-arm64": "17.3.0-beta.3",
+    "@nx/nx-linux-x64-gnu": "17.3.0-beta.3",
+    "@nx/nx-linux-x64-musl": "17.3.0-beta.3",
+    "@nx/nx-win32-x64-msvc": "17.3.0-beta.3",
+    "@nx/nx-linux-arm64-gnu": "17.3.0-beta.3",
+    "@nx/nx-linux-arm64-musl": "17.3.0-beta.3",
+    "@nx/nx-linux-arm-gnueabihf": "17.3.0-beta.3",
+    "@nx/nx-win32-arm64-msvc": "17.3.0-beta.3",
+    "@nx/nx-freebsd-x64": "17.3.0-beta.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/connect/connect-to-nx-cloud.js

@@ -60,7 +60,7 @@ async function connectToNxCloudPrompt(prompt) {
         .prompt([
         {
             name: 'NxCloud',
-            message: prompt ?? `Enable distributed caching to make your CI faster`,
+            message: prompt ?? `Enable remote caching to make your CI faster`,
             type: 'autocomplete',
             choices: [
                 {

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

@@ -16,6 +16,8 @@ const affected_project_graph_1 = require("../../project-graph/affected/affected-
 const configuration_1 = require("../../config/configuration");
 const chunkify_1 = require("../../utils/chunkify");
 const all_file_data_1 = require("../../utils/all-file-data");
+const workspace_root_1 = require("../../utils/workspace-root");
+const output_1 = require("../../utils/output");
 const PRETTIER_PATH = getPrettierPath();
 async function format(command, args) {
     const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: false }, (0, configuration_1.readNxJson)());
@@ -52,21 +54,28 @@ async function getPatterns(args) {
         }
         const p = (0, command_line_utils_1.parseFiles)(args);
         // In prettier v3 the getSupportInfo result is a promise
-        const supportedExtensions = (await prettier.getSupportInfo()).languages
+        const supportedExtensions = new Set((await prettier.getSupportInfo()).languages
             .flatMap((language) => language.extensions)
             .filter((extension) => !!extension)
             // Prettier supports ".swcrc" as a file instead of an extension
             // So we add ".swcrc" as a supported extension manually
             // which allows it to be considered for calculating "patterns"
-            .concat('.swcrc');
-        const patterns = p.files.filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.includes(path.extname(f)));
+            .concat('.swcrc'));
+        const patterns = p.files
+            .map((f) => path.relative(workspace_root_1.workspaceRoot, f))
+            .filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.has(path.extname(f)));
         // exclude patterns in .nxignore or .gitignore
         const nonIgnoredPatterns = (0, ignore_1.getIgnoreObject)().filter(patterns);
         return args.libsAndApps
             ? await getPatternsFromApps(nonIgnoredPatterns, await (0, all_file_data_1.allFileData)(), graph)
             : nonIgnoredPatterns;
     }
-    catch {
+    catch (err) {
+        output_1.output.error({
+            title: err?.message ||
+                'Something went wrong when resolving the list of files for the formatter',
+            bodyLines: [`Defaulting to all files pattern: "${allFilesPattern}"`],
+        });
         return allFilesPattern;
     }
 }

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

@@ -305,6 +305,7 @@ async function startServer(html, environmentJs, host, port = 4211, watchForchang
     currentProjectGraphClientResponse.focus = focus;
     currentProjectGraphClientResponse.groupByFolder = groupByFolder;
     currentProjectGraphClientResponse.exclude = exclude;
+    currentSourceMapsClientResponse = sourceMapResponse;
     const app = http.createServer(async (req, res) => {
         // parse URL
         const parsedUrl = new node_url_1.URL(req.url, `http://${host}:${port}`);
@@ -312,6 +313,7 @@ async function startServer(html, environmentJs, host, port = 4211, watchForchang
         // Avoid https://en.wikipedia.org/wiki/Directory_traversal_attack
         // e.g curl --path-as-is http://localhost:9000/../fileInDanger.txt
         // by limiting the path to current directory only
+        res.setHeader('Access-Control-Allow-Origin', '*');
         const sanitizePath = (0, path_1.basename)(parsedUrl.pathname);
         if (sanitizePath === 'project-graph.json') {
             res.writeHead(200, { 'Content-Type': 'application/json' });
@@ -417,7 +419,8 @@ function createFileWatcher() {
             output_1.output.note({ title: 'Recalculating project graph...' });
             const { projectGraphClientResponse, sourceMapResponse } = await createProjectGraphAndSourceMapClientResponse();
             if (projectGraphClientResponse.hash !==
-                currentProjectGraphClientResponse.hash) {
+                currentProjectGraphClientResponse.hash &&
+                sourceMapResponse) {
                 output_1.output.note({ title: 'Graph changes updated.' });
                 currentProjectGraphClientResponse = projectGraphClientResponse;
                 currentSourceMapsClientResponse = sourceMapResponse;
@@ -439,7 +442,7 @@ async function createProjectGraphAndSourceMapClientResponse(affected = []) {
     const projects = Object.values(graph.nodes);
     const dependencies = graph.dependencies;
     const hasher = (0, crypto_1.createHash)('sha256');
-    hasher.update(JSON.stringify({ layout, projects, dependencies }));
+    hasher.update(JSON.stringify({ layout, projects, dependencies, sourceMaps }));
     const hash = hasher.digest('hex');
     perf_hooks_1.performance.mark('project graph response generation:end');
     perf_hooks_1.performance.measure('project graph watch calculation', 'project graph watch calculation:start', 'project graph watch calculation:end');

package/src/command-line/init/command-object.js

@@ -4,7 +4,7 @@ exports.yargsInitCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsInitCommand = {
     command: 'init',
-    describe: 'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up distributed caching. For more info, check https://nx.dev/recipes/adopting-nx.',
+    describe: 'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up remote caching. For more info, check https://nx.dev/recipes/adopting-nx.',
     builder: (yargs) => withInitOptions(yargs),
     handler: async (args) => {
         await (await Promise.resolve().then(() => require('./init'))).initHandler(args);
@@ -15,7 +15,7 @@ function withInitOptions(yargs) {
     return yargs
         .option('nxCloud', {
         type: 'boolean',
-        description: 'Set up distributed caching with Nx Cloud.',
+        description: 'Set up remote caching with Nx Cloud.',
     })
         .option('interactive', {
         describe: 'When false disables interactive input prompts for options.',

package/src/command-line/init/implementation/utils.js

@@ -16,7 +16,7 @@ async function askAboutNxCloud() {
         .prompt([
         {
             name: 'NxCloud',
-            message: `Enable distributed caching to make your CI faster`,
+            message: `Enable remote caching to make your CI faster`,
             type: 'autocomplete',
             choices: [
                 {

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

@@ -74,8 +74,8 @@ async function releaseChangelog(args) {
         throw new Error(`You are attempting to recreate the changelog for an old release, but you have enabled auto-commit mode. Please disable auto-commit mode by updating your nx.json, or passing --git-commit=false`);
     }
     const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose);
-    const userCommitMessage = args.gitCommitMessage || nxReleaseConfig.changelog.git.commitMessage;
-    const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, projectsVersionData, userCommitMessage);
+    const commitMessage = args.gitCommitMessage || nxReleaseConfig.changelog.git.commitMessage;
+    const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, projectsVersionData, commitMessage);
     // Resolve any git tags as early as possible so that we can hard error in case of any duplicates before reaching the actual git command
     const gitTagValues = args.gitTag ?? nxReleaseConfig.changelog.git.tag
         ? (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, projectsVersionData)

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

@@ -101,10 +101,9 @@ const versionCommand = {
         describe: 'The optional prerelease identifier to apply to the version, in the case that specifier has been set to prerelease.',
         default: '',
     })
-        .option('stageChanges', {
+        .option('stage-changes', {
         type: 'boolean',
-        describe: 'Whether or not to stage the changes made by this command, irrespective of the git config in nx.json related to automated commits. Useful when combining this command with changelog generation.',
-        default: false,
+        describe: 'Whether or not to stage the changes made by this command. Useful when combining this command with changelog generation.',
     })),
     handler: (args) => Promise.resolve().then(() => require('./version')).then((m) => m.releaseVersionCLIHandler(args))
         .then((versionDataOrExitCode) => {

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

@@ -21,12 +21,21 @@ requiredTargetName) {
     }
     const gitDefaults = {
         commit: false,
-        commitMessage: '',
+        commitMessage: 'chore(release): publish {version}',
         commitArgs: '',
         tag: false,
         tagMessage: '',
         tagArgs: '',
     };
+    const versionGitDefaults = {
+        ...gitDefaults,
+        stageChanges: true,
+    };
+    const changelogGitDefaults = {
+        ...gitDefaults,
+        commit: true,
+        tag: true,
+    };
     const defaultFixedReleaseTagPattern = 'v{version}';
     const defaultIndependentReleaseTagPattern = '{projectName}@{version}';
     const workspaceProjectsRelationship = userConfig.projectsRelationship || 'fixed';
@@ -35,12 +44,12 @@ requiredTargetName) {
         projectsRelationship: workspaceProjectsRelationship,
         git: gitDefaults,
         version: {
-            git: gitDefaults,
+            git: versionGitDefaults,
             generator: '@nx/js:release-version',
             generatorOptions: {},
         },
         changelog: {
-            git: gitDefaults,
+            git: changelogGitDefaults,
             workspaceChangelog: {
                 createRelease: false,
                 entryWhenNoChanges: 'This was a version bump only, there were no code changes.',

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

@@ -39,9 +39,11 @@ async function release(args) {
     }
     const versionResult = await (0, version_1.releaseVersion)({
         ...args,
-        // if enabled, committing and tagging will be handled by the changelog
-        // command, so we should only stage the changes in the version command
-        stageChanges: nxReleaseConfig.git?.commit,
+        // We should stage the changes in the version command only if
+        // the changelog command will actually be committing the files.
+        // Since git.commit defaults to true for the changelog command, we
+        // only need to disable staging if git.commit is explicitly set to false.
+        stageChanges: nxReleaseConfig.git?.commit ?? true,
         gitCommit: false,
         gitTag: false,
     });

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

@@ -19,7 +19,7 @@ export declare class ReleaseVersion {
     });
 }
 export declare function commitChanges(changedFiles: string[], isDryRun: boolean, isVerbose: boolean, gitCommitMessages: string[], gitCommitArgs?: string): Promise<void>;
-export declare function createCommitMessageValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData, userCommitMessage?: string): string[];
+export declare function createCommitMessageValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData, commitMessage: string): string[];
 export declare function createGitTagValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData): string[];
 export declare function handleDuplicateGitTags(gitTagValues: string[]): void;
 export declare function getCommitsRelevantToProjects(projectGraph: ProjectGraph, commits: GitCommit[], projects: string[]): Promise<GitCommit[]>;

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

@@ -46,11 +46,8 @@ async function commitChanges(changedFiles, isDryRun, isVerbose, gitCommitMessage
     });
 }
 exports.commitChanges = commitChanges;
-function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects, versionData, userCommitMessage) {
-    const defaultCommitMessage = `chore(release): publish {version}`;
-    const commitMessageValues = userCommitMessage
-        ? [userCommitMessage]
-        : [defaultCommitMessage];
+function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage) {
+    const commitMessageValues = [commitMessage];
     if (releaseGroups.length === 0) {
         return commitMessageValues;
     }
@@ -76,7 +73,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
      */
     if (releaseGroups.length === 1 &&
         releaseGroups[0].projectsRelationship === 'independent' &&
-        userCommitMessage?.includes('{projectName}')) {
+        commitMessage.includes('{projectName}')) {
         const releaseGroup = releaseGroups[0];
         const releaseGroupProjectNames = Array.from(releaseGroupToFilteredProjects.get(releaseGroup));
         if (releaseGroupProjectNames.length === 1) {

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

@@ -45,7 +45,7 @@ async function releaseVersion(args) {
     }
     const tree = new tree_1.FsTree(devkit_exports_1.workspaceRoot, args.verbose);
     const versionData = {};
-    const userCommitMessage = args.gitCommitMessage || nxReleaseConfig.version.git.commitMessage;
+    const commitMessage = args.gitCommitMessage || nxReleaseConfig.version.git.commitMessage;
     if (args.projects?.length) {
         /**
          * Run versioning for all remaining release groups and filtered projects within them
@@ -76,17 +76,17 @@ async function releaseVersion(args) {
                 projectsVersionData: versionData,
             };
         }
-        if (args.stageChanges) {
-            devkit_exports_1.output.logSingleLine(`Staging changed files with git because --stage-changes was set`);
+        if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
+            await (0, shared_1.commitChanges)(tree.listChanges().map((f) => f.path), !!args.dryRun, !!args.verbose, (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage), args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs);
+        }
+        else if (args.stageChanges ?? nxReleaseConfig.version.git.stageChanges) {
+            devkit_exports_1.output.logSingleLine(`Staging changed files with git`);
             await (0, git_1.gitAdd)({
                 changedFiles,
                 dryRun: args.dryRun,
                 verbose: args.verbose,
             });
         }
-        if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
-            await (0, shared_1.commitChanges)(tree.listChanges().map((f) => f.path), !!args.dryRun, !!args.verbose, (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, userCommitMessage), args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs);
-        }
         if (args.gitTag ?? nxReleaseConfig.version.git.tag) {
             devkit_exports_1.output.logSingleLine(`Tagging commit with git`);
             for (const tag of gitTagValues) {
@@ -144,17 +144,17 @@ async function releaseVersion(args) {
             projectsVersionData: versionData,
         };
     }
-    if (args.stageChanges) {
-        devkit_exports_1.output.logSingleLine(`Staging changed files with git because --stage-changes was set`);
+    if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
+        await (0, shared_1.commitChanges)(changedFiles, !!args.dryRun, !!args.verbose, (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage), args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs);
+    }
+    else if (args.stageChanges ?? nxReleaseConfig.version.git.stageChanges) {
+        devkit_exports_1.output.logSingleLine(`Staging changed files with git`);
         await (0, git_1.gitAdd)({
             changedFiles,
             dryRun: args.dryRun,
             verbose: args.verbose,
         });
     }
-    if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
-        await (0, shared_1.commitChanges)(changedFiles, !!args.dryRun, !!args.verbose, (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, userCommitMessage), args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs);
-    }
     if (args.gitTag ?? nxReleaseConfig.version.git.tag) {
         devkit_exports_1.output.logSingleLine(`Tagging commit with git`);
         for (const tag of gitTagValues) {

package/src/config/nx-json.d.ts

@@ -194,7 +194,12 @@ interface NxReleaseConfiguration {
         /**
          * Enable or override configuration for git operations as part of the version subcommand
          */
-        git?: NxReleaseGitConfiguration;
+        git?: NxReleaseGitConfiguration & {
+            /**
+             * Whether or not to stage the changes made by this command. Useful when combining the version command with changelog generation.
+             */
+            stageChanges?: boolean;
+        };
     };
     /**
      * Optionally override the git/release tag pattern to use. This field is the source of truth