nx 17.2.8 → 17.3.0-beta.2

package/README.md

@@ -1,4 +1,9 @@
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
+<p style="text-align: center;">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
+    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+  </picture>
+</p>
 
 <div style="text-align: center;">
 
@@ -15,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart, Fast and Extensible Build System
+# Nx: Smart Monorepos · Fast CI
 
-Nx is a next generation build system with first class monorepo support and powerful integrations.
+Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
 
 ## Getting Started
 
@@ -57,5 +62,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
+width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "17.2.8",
+  "version": "17.3.0-beta.2",
   "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.2.8"
+    "@nrwl/tao": "17.3.0-beta.2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "17.2.8",
-    "@nx/nx-darwin-arm64": "17.2.8",
-    "@nx/nx-linux-x64-gnu": "17.2.8",
-    "@nx/nx-linux-x64-musl": "17.2.8",
-    "@nx/nx-win32-x64-msvc": "17.2.8",
-    "@nx/nx-linux-arm64-gnu": "17.2.8",
-    "@nx/nx-linux-arm64-musl": "17.2.8",
-    "@nx/nx-linux-arm-gnueabihf": "17.2.8",
-    "@nx/nx-win32-arm64-msvc": "17.2.8",
-    "@nx/nx-freebsd-x64": "17.2.8"
+    "@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-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/ngcli-adapter.d.ts

@@ -24,15 +24,26 @@ export declare class NxScopedHost extends virtualFs.ScopedHost<any> {
     private root;
     constructor(root: string);
     read(path: Path): Observable<FileBuffer>;
-    private readMergedWorkspaceConfiguration;
+    protected readMergedWorkspaceConfiguration(): Observable<any>;
     write(path: Path, content: FileBuffer): Observable<void>;
     isFile(path: Path): Observable<boolean>;
     exists(path: Path): Observable<boolean>;
     mergeProjectConfiguration(existing: AngularProjectConfiguration, updated: AngularProjectConfiguration, projectName: string): AngularProjectConfiguration;
     readExistingAngularJson(): Observable<any>;
-    private readJson;
+    protected readJson<T = any>(path: string): Observable<T>;
+}
+/**
+ * Host used by Angular CLI builders. It reads the project configurations from
+ * the project graph to access the expanded targets.
+ */
+export declare class NxScopedHostForBuilders extends NxScopedHost {
+    protected readMergedWorkspaceConfiguration(): Observable<any>;
 }
 export declare function arrayBufferToString(buffer: any): string;
+/**
+ * Host used by Angular CLI schematics. It reads the project configurations from
+ * the project configuration files.
+ */
 export declare class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
     private readonly host;
     constructor(root: string, host: Tree);

package/src/adapter/ngcli-adapter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogger = exports.wrapAngularDevkitSchematic = exports.mockSchematicsForTesting = exports.runMigration = exports.generate = exports.NxScopeHostUsedForWrappedSchematics = exports.arrayBufferToString = exports.NxScopedHost = exports.scheduleTarget = exports.createBuilderContext = void 0;
+exports.getLogger = exports.wrapAngularDevkitSchematic = exports.mockSchematicsForTesting = exports.runMigration = exports.generate = exports.NxScopeHostUsedForWrappedSchematics = exports.arrayBufferToString = exports.NxScopedHostForBuilders = exports.NxScopedHost = exports.scheduleTarget = exports.createBuilderContext = void 0;
 const core_1 = require("@angular-devkit/core");
 const node_1 = require("@angular-devkit/core/node");
 const chalk = require("chalk");
@@ -23,7 +23,7 @@ const nx_plugin_1 = require("../utils/nx-plugin");
 const schema_utils_1 = require("../config/schema-utils");
 async function createBuilderContext(builderInfo, context) {
     require('./compat');
-    const fsHost = new NxScopedHost(context.root);
+    const fsHost = new NxScopedHostForBuilders(context.root);
     // the top level import is not patched because it is imported before the
     // patching happens so we require it here to use the patched version below
     const { workspaces } = require('@angular-devkit/core');
@@ -108,7 +108,7 @@ exports.createBuilderContext = createBuilderContext;
 async function scheduleTarget(root, opts, verbose) {
     const { Architect } = require('@angular-devkit/architect');
     const logger = (0, exports.getLogger)(verbose);
-    const fsHost = new NxScopedHost(root);
+    const fsHost = new NxScopedHostForBuilders(root);
     const { workspace } = await core_1.workspaces.readWorkspace('angular.json', core_1.workspaces.createWorkspaceHost(fsHost));
     const registry = new core_1.schema.CoreSchemaRegistry();
     registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
@@ -225,7 +225,7 @@ async function runSchematic(host, root, workflow, logger, opts, schematic, print
             .toPromise();
     }
     catch (e) {
-        console.log(e);
+        console.error(e);
         throw e;
     }
     if (!record.error) {
@@ -273,8 +273,8 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
                 return workspaceConfig;
             }));
         }), (0, operators_1.catchError)((err) => {
-            console.log('Unable to read angular.json');
-            console.log(err);
+            console.error('Unable to read angular.json');
+            console.error(err);
             process.exit(1);
         }));
     }
@@ -378,6 +378,30 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
     }
 }
 exports.NxScopedHost = NxScopedHost;
+/**
+ * Host used by Angular CLI builders. It reads the project configurations from
+ * the project graph to access the expanded targets.
+ */
+class NxScopedHostForBuilders extends NxScopedHost {
+    readMergedWorkspaceConfiguration() {
+        return (0, rxjs_1.zip)((0, rxjs_1.from)((0, project_graph_1.createProjectGraphAsync)()), this.readExistingAngularJson(), this.readJson('nx.json')).pipe((0, operators_1.map)(([graph, angularJson, nxJson]) => {
+            const workspaceConfig = (angularJson || { projects: {} });
+            workspaceConfig.cli ??= nxJson.cli;
+            workspaceConfig.schematics ??= nxJson.generators;
+            for (const projectName of Object.keys(graph.nodes)) {
+                workspaceConfig.projects[projectName] ??= {
+                    ...graph.nodes[projectName].data,
+                };
+            }
+            return workspaceConfig;
+        }), (0, operators_1.catchError)((err) => {
+            console.error('Unable to read angular.json');
+            console.error(err);
+            process.exit(1);
+        }));
+    }
+}
+exports.NxScopedHostForBuilders = NxScopedHostForBuilders;
 function arrayBufferToString(buffer) {
     const array = new Uint8Array(buffer);
     let result = '';
@@ -390,6 +414,10 @@ function arrayBufferToString(buffer) {
     return result;
 }
 exports.arrayBufferToString = arrayBufferToString;
+/**
+ * Host used by Angular CLI schematics. It reads the project configurations from
+ * the project configuration files.
+ */
 class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
     constructor(root, host) {
         super(root);

package/src/command-line/connect/command-object.d.ts

@@ -1,4 +1,3 @@
 import { CommandModule } from 'yargs';
-import type { ConnectToNxCloudOptions } from './connect-to-nx-cloud';
-export declare const yargsConnectCommand: CommandModule<{}, ConnectToNxCloudOptions>;
+export declare const yargsConnectCommand: CommandModule;
 export declare const yargsViewLogsCommand: CommandModule;

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

@@ -6,13 +6,9 @@ exports.yargsConnectCommand = {
     command: 'connect',
     aliases: ['connect-to-nx-cloud'],
     describe: `Connect workspace to Nx Cloud`,
-    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(yargs.option('interactive', {
-        type: 'boolean',
-        description: 'Prompt for confirmation',
-        default: true,
-    }), 'connect-to-nx-cloud'),
-    handler: async (options) => {
-        await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand(options);
+    builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)(yargs, 'connect-to-nx-cloud'),
+    handler: async () => {
+        await (await Promise.resolve().then(() => require('./connect-to-nx-cloud'))).connectToNxCloudCommand();
         process.exit(0);
     },
 };

package/src/command-line/connect/connect-to-nx-cloud.d.ts

@@ -2,8 +2,5 @@ import { NxJsonConfiguration } from '../../config/nx-json';
 import { NxArgs } from '../../utils/command-line-utils';
 export declare function onlyDefaultRunnerIsUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function connectToNxCloudIfExplicitlyAsked(opts: NxArgs): Promise<void>;
-export interface ConnectToNxCloudOptions {
-    interactive: boolean;
-    promptOverride?: string;
-}
-export declare function connectToNxCloudCommand({ promptOverride, interactive, }: ConnectToNxCloudOptions): Promise<boolean>;
+export declare function connectToNxCloudCommand(): Promise<boolean>;
+export declare function connectToNxCloudPrompt(prompt?: string): Promise<boolean>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.connectToNxCloudCommand = exports.connectToNxCloudIfExplicitlyAsked = exports.onlyDefaultRunnerIsUsed = void 0;
+exports.connectToNxCloudPrompt = exports.connectToNxCloudCommand = exports.connectToNxCloudIfExplicitlyAsked = exports.onlyDefaultRunnerIsUsed = void 0;
 const output_1 = require("../../utils/output");
 const configuration_1 = require("../../config/configuration");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
@@ -34,7 +34,7 @@ async function connectToNxCloudIfExplicitlyAsked(opts) {
     }
 }
 exports.connectToNxCloudIfExplicitlyAsked = connectToNxCloudIfExplicitlyAsked;
-async function connectToNxCloudCommand({ promptOverride, interactive, }) {
+async function connectToNxCloudCommand() {
     const nxJson = (0, configuration_1.readNxJson)();
     if ((0, nx_cloud_utils_1.isNxCloudUsed)(nxJson)) {
         output_1.output.log({
@@ -49,9 +49,6 @@ async function connectToNxCloudCommand({ promptOverride, interactive, }) {
         });
         return false;
     }
-    const res = interactive ? await connectToNxCloudPrompt(promptOverride) : true;
-    if (!res)
-        return false;
     (0, child_process_1.runNxSync)(`g nx:connect-to-nx-cloud --quiet --no-interactive`, {
         stdio: [0, 1, 2],
     });
@@ -79,3 +76,4 @@ async function connectToNxCloudPrompt(prompt) {
     ])
         .then((a) => a.NxCloud === 'Yes');
 }
+exports.connectToNxCloudPrompt = connectToNxCloudPrompt;

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -171,7 +171,6 @@ function createProjectJson(repoRoot, packageJson, nestCLIOptions) {
         // lint
         json.targets['lint'] = {
             executor: '@nx/eslint:lint',
-            outputs: ['{options.outputFile}'],
             options: {
                 lintFilePatterns: ['./src', './test'],
             },

package/src/command-line/init/implementation/angular/index.js

@@ -106,6 +106,7 @@ function addPluginDependencies() {
     (0, fileutils_1.writeJsonFile)(packageJsonPath, packageJson);
 }
 async function setupWorkspace(cacheableOperations, isIntegratedMigration) {
+    (0, utils_1.updateGitIgnore)(repoRoot);
     if (isIntegratedMigration) {
         (0, integrated_workspace_1.setupIntegratedWorkspace)();
     }

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

@@ -751,10 +751,8 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
                 (await isMigratingToNewMajor(from, opts.targetVersion)) &&
                 !(0, is_ci_1.isCI)() &&
                 !(0, nx_cloud_utils_1.isNxCloudUsed)(originalNxJson)) {
-                const useCloud = await (0, connect_to_nx_cloud_1.connectToNxCloudCommand)({
-                    promptOverride: ab_testing_1.messages.getPromptMessage('nxCloudMigration'),
-                    interactive: true,
-                });
+                const setNxCloud = await (0, connect_to_nx_cloud_1.connectToNxCloudPrompt)(ab_testing_1.messages.getPromptMessage('nxCloudMigration'));
+                const useCloud = setNxCloud ? await (0, connect_to_nx_cloud_1.connectToNxCloudCommand)() : false;
                 await (0, ab_testing_1.recordStat)({
                     command: 'migrate',
                     nxVersion: versions_1.nxVersion,

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

@@ -36,7 +36,7 @@ exports.parserConfiguration = {
  */
 exports.commandsObject = yargs
     .parserConfiguration(exports.parserConfiguration)
-    .usage(chalk.bold('Smart, Fast and Extensible Build System'))
+    .usage(chalk.bold('Smart Monorepos · Fast CI'))
     .demandCommand(1, '')
     .command(command_object_1.yargsAffectedBuildCommand)
     .command(command_object_1.yargsAffectedCommand)

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

@@ -73,24 +73,6 @@ async function releaseChangelog(args) {
     if (autoCommitEnabled && headSHA !== toSHA) {
         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 fromRef = args.from ||
-        (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTagPattern))?.tag;
-    if (!fromRef) {
-        throw new Error(`Unable to determine the previous git tag, please provide an explicit git reference using --from`);
-    }
-    // Make sure that the fromRef is actually resolvable
-    const fromSHA = await (0, git_1.getCommitHash)(fromRef);
-    const rawCommits = await (0, git_1.getGitDiff)(fromSHA, toSHA);
-    // Parse as conventional commits
-    const commits = (0, git_1.parseCommits)(rawCommits).filter((c) => {
-        const type = c.type;
-        // Always ignore non user-facing commits for now
-        // TODO: allow this filter to be configurable via config in a future release
-        if (type === 'feat' || type === 'fix' || type === 'perf') {
-            return true;
-        }
-        return 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);
@@ -100,23 +82,51 @@ async function releaseChangelog(args) {
         : [];
     (0, shared_1.handleDuplicateGitTags)(gitTagValues);
     const postGitTasks = [];
-    await generateChangelogForWorkspace(tree, args, projectGraph, nxReleaseConfig, workspaceChangelogVersion, commits, postGitTasks);
-    if (args.projects?.length) {
-        /**
-         * Run changelog generation for all remaining release groups and filtered projects within them
-         */
-        for (const releaseGroup of releaseGroups) {
-            const projectNodes = Array.from(releaseGroupToFilteredProjects.get(releaseGroup)).map((name) => projectGraph.nodes[name]);
-            await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, projectNodes);
-        }
-        return await applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTasks, commitMessageValues, gitTagValues);
+    const workspaceChangelogFromRef = args.from ||
+        (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTagPattern))?.tag;
+    if (!workspaceChangelogFromRef) {
+        throw new Error(`Unable to determine the previous git tag, please provide an explicit git reference using --from`);
     }
-    /**
-     * Run changelog generation for all remaining release groups
-     */
+    // Make sure that the fromRef is actually resolvable
+    const workspaceChangelogFromSHA = await (0, git_1.getCommitHash)(workspaceChangelogFromRef);
+    const workspaceChangelogCommits = await getCommits(workspaceChangelogFromSHA, toSHA);
+    await generateChangelogForWorkspace(tree, args, projectGraph, nxReleaseConfig, workspaceChangelogVersion, workspaceChangelogCommits, postGitTasks, nxJson.release?.changelog?.workspaceChangelog);
     for (const releaseGroup of releaseGroups) {
-        const projectNodes = releaseGroup.projects.map((name) => projectGraph.nodes[name]);
-        await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, projectNodes);
+        const config = releaseGroup.changelog;
+        // The entire feature is disabled at the release group level, exit early
+        if (config === false) {
+            continue;
+        }
+        const projects = args.projects?.length
+            ? // If the user has passed a list of projects, we need to use the filtered list of projects within the release group
+                Array.from(releaseGroupToFilteredProjects.get(releaseGroup))
+            : // Otherwise, we use the full list of projects within the release group
+                releaseGroup.projects;
+        const projectNodes = projects.map((name) => projectGraph.nodes[name]);
+        if (releaseGroup.projectsRelationship === 'independent') {
+            for (const project of projectNodes) {
+                const fromRef = args.from ||
+                    (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {
+                        projectName: project.name,
+                    }))?.tag;
+                if (!fromRef) {
+                    throw new Error(`Unable to determine the previous git tag, please provide an explicit git reference using --from`);
+                }
+                const commits = await getCommits(fromRef, toSHA);
+                await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, [project]);
+            }
+        }
+        else {
+            const fromRef = args.from ||
+                (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern))?.tag;
+            if (!fromRef) {
+                throw new Error(`Unable to determine the previous git tag, please provide an explicit git reference using --from`);
+            }
+            // Make sure that the fromRef is actually resolvable
+            const fromSHA = await (0, git_1.getCommitHash)(fromRef);
+            const commits = await getCommits(fromSHA, toSHA);
+            await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, projectNodes);
+        }
     }
     return await applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTasks, commitMessageValues, gitTagValues);
 }
@@ -225,7 +235,7 @@ function resolveChangelogRenderer(changelogRendererPath) {
     }
     return changelogRenderer;
 }
-async function generateChangelogForWorkspace(tree, args, projectGraph, nxReleaseConfig, workspaceChangelogVersion, commits, postGitTasks) {
+async function generateChangelogForWorkspace(tree, args, projectGraph, nxReleaseConfig, workspaceChangelogVersion, commits, postGitTasks, explicitWorkspaceChangelogConfig) {
     const config = nxReleaseConfig.changelog.workspaceChangelog;
     const isEnabled = args.workspaceChangelog ?? config;
     // The entire feature is disabled at the workspace level, exit early
@@ -243,6 +253,25 @@ async function generateChangelogForWorkspace(tree, args, projectGraph, nxRelease
     if (!workspaceChangelogVersion && args.workspaceChangelog) {
         throw new Error(`Workspace changelog is enabled but no overall version was provided. Please provide an explicit version using --version`);
     }
+    if (Object.entries(nxReleaseConfig.groups).length > 1 ||
+        Object.values(nxReleaseConfig.groups)[0].projectsRelationship ===
+            'independent') {
+        if (explicitWorkspaceChangelogConfig !== undefined &&
+            explicitWorkspaceChangelogConfig !== false) {
+            // only warn the user if they explicitly enabled workspace changelog
+            // if they didn't, then just disable it quietly, since it was enabled by default
+            output_1.output.warn({
+                title: `Workspace changelog is enabled, but you have multiple release groups configured or have configured an independent projects relationship. This is not supported, so workspace changelog will be disabled.`,
+                bodyLines: [
+                    `A single workspace version cannot be determined when defining multiple release groups because versions differ between each group.`,
+                    `Also, a single workspace version also cannot be determined when using independent projects because versions differ between each project.`,
+                    `If you want to generate a workspace changelog, please use a single release group.`,
+                    `Alternatively, project level changelogs can be enabled with the "projectChangelogs" property.`,
+                ],
+            });
+        }
+        return;
+    }
     // Only trigger interactive mode for the workspace changelog if the user explicitly requested it via "all" or "workspace"
     const interactive = args.interactive === 'all' || args.interactive === 'workspace';
     const dryRun = !!args.dryRun;
@@ -593,3 +622,16 @@ function checkChangelogFilesEnabled(nxReleaseConfig) {
     }
     return false;
 }
+async function getCommits(fromSHA, toSHA) {
+    const rawCommits = await (0, git_1.getGitDiff)(fromSHA, toSHA);
+    // Parse as conventional commits
+    return (0, git_1.parseCommits)(rawCommits).filter((c) => {
+        const type = c.type;
+        // Always ignore non user-facing commits for now
+        // TODO: allow this filter to be configurable via config in a future release
+        if (type === 'feat' || type === 'fix' || type === 'perf') {
+            return true;
+        }
+        return false;
+    });
+}

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

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatReferences = exports.getGithubReleaseByTag = exports.resolveGithubToken = exports.createOrUpdateGithubRelease = exports.getGitHubRepoSlug = void 0;
 const chalk = require("chalk");
+const enquirer_1 = require("enquirer");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
+const output_1 = require("../../../utils/output");
 const path_1 = require("../../../utils/path");
 // axios types and values don't seem to match
 const _axios = require("axios");
@@ -32,6 +34,66 @@ function getGitHubRepoSlug(remoteName = 'origin') {
 exports.getGitHubRepoSlug = getGitHubRepoSlug;
 async function createOrUpdateGithubRelease(githubRequestConfig, release, existingGithubReleaseForVersion) {
     const result = await syncGithubRelease(githubRequestConfig, release, existingGithubReleaseForVersion);
+    /**
+     * If something went wrong POSTing to Github we can still pre-populate the web form on github.com
+     * to allow the user to manually complete the release if they so choose.
+     */
+    if (result.status === 'manual') {
+        if (result.error) {
+            process.exitCode = 1;
+            if (result.error.response?.data) {
+                // There's a nicely formatted error from GitHub we can display to the user
+                output_1.output.error({
+                    title: `A GitHub API Error occurred when creating/updating the release`,
+                    bodyLines: [
+                        `GitHub Error: ${JSON.stringify(result.error.response.data)}`,
+                        `---`,
+                        `Request Data:`,
+                        `Repo: ${githubRequestConfig.repo}`,
+                        `Token: ${githubRequestConfig.token}`,
+                        `Body: ${JSON.stringify(result.requestData)}`,
+                    ],
+                });
+            }
+            else {
+                console.log(result.error);
+                console.error(`An unknown error occurred while trying to create a release on GitHub, please report this on https://github.com/nrwl/nx (NOTE: make sure to redact your GitHub token from the error message!)`);
+            }
+        }
+        const reply = await (0, enquirer_1.prompt)([
+            {
+                name: 'open',
+                message: 'Do you want to finish creating the release manually in your browser?',
+                type: 'autocomplete',
+                choices: [
+                    {
+                        name: 'Yes',
+                        hint: 'It will pre-populate the form for you',
+                    },
+                    {
+                        name: 'No',
+                    },
+                ],
+                initial: 'Yes',
+            },
+        ]).catch(() => {
+            return { open: 'No' };
+        });
+        if (reply.open === 'Yes') {
+            const open = require('open');
+            await open(result.url)
+                .then(() => {
+                console.info(`\nFollow up in the browser to manually create the release:\n\n` +
+                    chalk.underline(chalk.cyan(result.url)) +
+                    `\n`);
+            })
+                .catch(() => {
+                console.info(`Open this link to manually create a release: \n` +
+                    chalk.underline(chalk.cyan(result.url)) +
+                    '\n');
+            });
+        }
+    }
     /**
      * If something went wrong POSTing to Github we can still pre-populate the web form on github.com
      * to allow the user to manually complete the release.
@@ -79,6 +141,7 @@ async function syncGithubRelease(githubRequestConfig, release, existingGithubRel
             status: 'manual',
             error,
             url: githubNewReleaseURL(githubRequestConfig, release),
+            requestData: ghRelease,
         };
     }
 }
@@ -139,7 +202,7 @@ async function updateGithubRelease(config, id, body) {
     });
 }
 function githubNewReleaseURL(config, release) {
-    return `https://github.com/${config.repo}/releases/new?tag=v${release.version}&title=v${release.version}&body=${encodeURIComponent(release.body)}`;
+    return `https://github.com/${config.repo}/releases/new?tag=${release.version}&title=${release.version}&body=${encodeURIComponent(release.body)}`;
 }
 const providerToRefSpec = {
     github: { 'pull-request': 'pull', hash: 'commit', issue: 'issues' },

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

@@ -111,12 +111,14 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
         if (releaseGroup.projectsRelationship === 'independent') {
             for (const project of releaseGroupProjectNames) {
                 const projectVersionData = versionData[project];
-                const releaseVersion = new ReleaseVersion({
-                    version: projectVersionData.newVersion,
-                    releaseTagPattern: releaseGroup.releaseTagPattern,
-                    projectName: project,
-                });
-                commitMessageValues.push(`- project: ${project} ${releaseVersion.rawVersion}`);
+                if (projectVersionData.newVersion !== null) {
+                    const releaseVersion = new ReleaseVersion({
+                        version: projectVersionData.newVersion,
+                        releaseTagPattern: releaseGroup.releaseTagPattern,
+                        projectName: project,
+                    });
+                    commitMessageValues.push(`- project: ${project} ${releaseVersion.rawVersion}`);
+                }
             }
             continue;
         }
@@ -150,10 +152,12 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
         if (releaseGroup.projectsRelationship === 'independent') {
             for (const project of releaseGroupProjectNames) {
                 const projectVersionData = versionData[project];
-                tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
-                    version: projectVersionData.newVersion,
-                    projectName: project,
-                }));
+                if (projectVersionData.newVersion !== null) {
+                    tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
+                        version: projectVersionData.newVersion,
+                        projectName: project,
+                    }));
+                }
             }
             continue;
         }

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

@@ -67,6 +67,23 @@ async function releaseVersion(args) {
             : [];
         (0, shared_1.handleDuplicateGitTags)(gitTagValues);
         printAndFlushChanges(tree, !!args.dryRun);
+        const changedFiles = tree.listChanges().map((f) => f.path);
+        // No further actions are necessary in this scenario (e.g. if conventional commits detected no changes)
+        if (!changedFiles.length) {
+            return {
+                // An overall workspace version cannot be relevant when filtering to independent projects
+                workspaceVersion: undefined,
+                projectsVersionData: versionData,
+            };
+        }
+        if (args.stageChanges) {
+            devkit_exports_1.output.logSingleLine(`Staging changed files with git because --stage-changes was set`);
+            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);
         }