nx 18.1.0-canary.20240301-d705372 → 18.1.0-canary.20240306-cc2f655

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0-canary.20240301-d705372",
+  "version": "18.1.0-canary.20240306-cc2f655",
   "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-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.1.0-canary.20240301-d705372"
+    "@nrwl/tao": "18.1.0-canary.20240306-cc2f655"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-darwin-arm64": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240301-d705372",
-    "@nx/nx-freebsd-x64": "18.1.0-canary.20240301-d705372"
+    "@nx/nx-darwin-x64": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-darwin-arm64": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240306-cc2f655",
+    "@nx/nx-freebsd-x64": "18.1.0-canary.20240306-cc2f655"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -157,11 +157,16 @@
                     "$ref": "#/definitions/NxReleaseVersionConfiguration"
                   },
                   {
-                    "anyOf": [
+                    "allOf": [
                       {
                         "not": {
                           "required": ["git"]
                         }
+                      },
+                      {
+                        "not": {
+                          "required": ["preVersionCommand"]
+                        }
                       }
                     ]
                   }
@@ -576,6 +581,10 @@
         },
         "git": {
           "$ref": "#/definitions/NxReleaseGitConfiguration"
+        },
+        "preVersionCommand": {
+          "type": "string",
+          "description": "A command to run after validation of nx release configuration, but before versioning begins. Used for preparing build artifacts. If --dry-run is passed, the command is still executed, but with the NX_DRY_RUN environment variable set to 'true'."
         }
       }
     },

package/schemas/project-schema.json

@@ -127,6 +127,26 @@
       "items": {
         "type": "string"
       }
+    },
+    "release": {
+      "type": "object",
+      "description": "Configuration for the nx release commands.",
+      "properties": {
+        "version": {
+          "type": "object",
+          "description": "Configuration for the nx release version command.",
+          "properties": {
+            "generator": {
+              "type": "string",
+              "description": "The version generator to use. Defaults to @nx/js:release-version."
+            },
+            "generatorOptions": {
+              "type": "object",
+              "description": "Options for the version generator."
+            }
+          }
+        }
+      }
     }
   },
   "definitions": {

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

@@ -73,12 +73,12 @@ async function addNxToNest(options, packageJson) {
                     ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
                     : false);
     }
-    (0, utils_1.createNxJsonFile)(repoRoot, [], [...cacheableOperations, ...nestCacheableScripts], {});
+    (0, utils_1.createNxJsonFile)(repoRoot, [], [...cacheableOperations, ...nestCacheableScripts], scriptOutputs);
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     addNestPluginToPackageJson(repoRoot);
-    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, scriptOutputs, pmc);
+    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, pmc);
     createProjectJson(repoRoot, packageJson, nestCLIConfiguration);
     removeFile(repoRoot, 'nest-cli.json');
     updatePackageJsonScripts(repoRoot, isJS);

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

@@ -48,11 +48,11 @@ async function addNxToNpmRepo(options) {
                     ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
                     : false);
     }
-    (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, {});
+    (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, scriptOutputs);
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
-    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, scriptOutputs, pmc);
+    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, pmc);
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot, pmc);
     if (useNxCloud) {

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

@@ -8,9 +8,7 @@ export declare function updateGitIgnore(root: string): void;
 export declare function runInstall(repoRoot: string, pmc?: PackageManagerCommands): void;
 export declare function initCloud(repoRoot: string, installationSource: 'nx-init-angular' | 'nx-init-cra' | 'nx-init-monorepo' | 'nx-init-nest' | 'nx-init-npm-repo'): void;
 export declare function addVsCodeRecommendedExtensions(repoRoot: string, extensions: string[]): void;
-export declare function markRootPackageJsonAsNxProject(repoRoot: string, cacheableScripts: string[], scriptOutputs: {
-    [script: string]: string;
-}, pmc: PackageManagerCommands): void;
+export declare function markRootPackageJsonAsNxProject(repoRoot: string, cacheableScripts: string[], pmc: PackageManagerCommands): void;
 export declare function printFinalMessage({ learnMoreLink, bodyLines, }: {
     learnMoreLink?: string;
     bodyLines?: string[];

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

@@ -25,14 +25,14 @@ function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scr
             nxJson.targetDefaults[scriptName] ??= {};
             nxJson.targetDefaults[scriptName] = { dependsOn: [`^${scriptName}`] };
         }
-        for (const [scriptName, output] of Object.entries(scriptOutputs)) {
-            if (!output) {
-                // eslint-disable-next-line no-continue
-                continue;
-            }
-            nxJson.targetDefaults[scriptName] ??= {};
-            nxJson.targetDefaults[scriptName].outputs = [`{projectRoot}/${output}`];
+    }
+    for (const [scriptName, output] of Object.entries(scriptOutputs)) {
+        if (!output) {
+            // eslint-disable-next-line no-continue
+            continue;
         }
+        nxJson.targetDefaults[scriptName] ??= {};
+        nxJson.targetDefaults[scriptName].outputs = [`{projectRoot}/${output}`];
     }
     for (const target of cacheableOperations) {
         nxJson.targetDefaults[target] ??= {};
@@ -134,16 +134,9 @@ function addVsCodeRecommendedExtensions(repoRoot, extensions) {
     }
 }
 exports.addVsCodeRecommendedExtensions = addVsCodeRecommendedExtensions;
-function markRootPackageJsonAsNxProject(repoRoot, cacheableScripts, scriptOutputs, pmc) {
+function markRootPackageJsonAsNxProject(repoRoot, cacheableScripts, pmc) {
     const json = (0, fileutils_1.readJsonFile)((0, path_2.joinPathFragments)(repoRoot, `package.json`));
-    json.nx = { targets: {} };
-    for (let script of Object.keys(scriptOutputs)) {
-        if (scriptOutputs[script]) {
-            json.nx.targets[script] = {
-                outputs: [`{projectRoot}/${scriptOutputs[script]}`],
-            };
-        }
-    }
+    json.nx = {};
     for (let script of cacheableScripts) {
         const scriptDefinition = json.scripts[script];
         if (!scriptDefinition) {

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

@@ -32,7 +32,7 @@ async function initHandler(options) {
         }
         (0, add_nx_scripts_1.generateDotNxSetup)(version);
         // invokes the wrapper, thus invoking the initial installation process
-        (0, child_process_1.runNxSync)('');
+        (0, child_process_1.runNxSync)('--version', { stdio: 'ignore' });
         return;
     }
     // TODO(jack): Remove this Angular logic once `@nx/angular` is compatible with inferred targets.

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

@@ -9,6 +9,7 @@ const tmp_1 = require("tmp");
 const nx_json_1 = require("../../config/nx-json");
 const tree_1 = require("../../generators/tree");
 const register_1 = require("../../plugins/js/utils/register");
+const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const utils_1 = require("../../tasks-runner/utils");
 const is_ci_1 = require("../../utils/is-ci");
@@ -40,7 +41,7 @@ async function releaseChangelog(args) {
         process.env.NX_VERBOSE_LOGGING = 'true';
     }
     // Apply default configuration to any optional user configuration
-    const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, nxJson.release);
+    const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), nxJson.release);
     if (configError) {
         return await (0, config_1.handleNxReleaseConfigError)(configError);
     }
@@ -360,6 +361,9 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
     return;
 }
 function resolveChangelogRenderer(changelogRendererPath) {
+    const interpolatedChangelogRendererPath = (0, utils_1.interpolate)(changelogRendererPath, {
+        workspaceRoot: workspace_root_1.workspaceRoot,
+    });
     // Try and load the provided (or default) changelog renderer
     let changelogRenderer;
     let cleanupTranspiler = () => { };
@@ -368,7 +372,7 @@ function resolveChangelogRenderer(changelogRendererPath) {
         if (rootTsconfigPath) {
             cleanupTranspiler = (0, register_1.registerTsProject)(rootTsconfigPath);
         }
-        const r = require(changelogRendererPath);
+        const r = require(interpolatedChangelogRendererPath);
         changelogRenderer = r.default || r;
     }
     catch {

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

@@ -21,6 +21,7 @@ export type VersionOptions = NxReleaseArgs & GitCommitAndTagOptions & {
     specifier?: string;
     preid?: string;
     stageChanges?: boolean;
+    generatorOptionsOverrides?: Record<string, unknown>;
 };
 export type ChangelogOptions = NxReleaseArgs & GitCommitAndTagOptions & {
     version?: string | null;

package/src/command-line/release/config/config.d.ts

@@ -1,18 +1,5 @@
-/**
- * `nx release` is a powerful feature which spans many possible use cases. The possible variations
- * of configuration are therefore quite complex, particularly when you consider release groups.
- *
- * We want to provide the best possible DX for users so that they can harness the power of `nx release`
- * most effectively, therefore we need to both provide sensible defaults for common scenarios (to avoid
- * verbose nx.json files wherever possible), and proactively handle potential sources of config issues
- * in more complex use-cases.
- *
- * This file is the source of truth for all `nx release` configuration reconciliation, including sensible
- * defaults and user overrides, as well as handling common errors, up front to produce a single, consistent,
- * and easy to consume config object for all the `nx release` command implementations.
- */
 import { NxJsonConfiguration } from '../../../config/nx-json';
-import { type ProjectGraph } from '../../../devkit-exports';
+import { ProjectFileMap, ProjectGraph } from '../../../config/project-graph';
 type DeepRequired<T> = Required<{
     [K in keyof T]: T[K] extends Required<T[K]> ? T[K] : DeepRequired<T[K]>;
 }>;
@@ -48,7 +35,7 @@ export interface CreateNxReleaseConfigError {
     code: 'PROJECTS_AND_GROUPS_DEFINED' | 'RELEASE_GROUP_MATCHES_NO_PROJECTS' | 'RELEASE_GROUP_RELEASE_TAG_PATTERN_VERSION_PLACEHOLDER_MISSING_OR_EXCESSIVE' | 'PROJECT_MATCHES_MULTIPLE_GROUPS' | 'CONVENTIONAL_COMMITS_SHORTHAND_MIXED_WITH_OVERLAPPING_GENERATOR_OPTIONS' | 'GLOBAL_GIT_CONFIG_MIXED_WITH_GRANULAR_GIT_CONFIG';
     data: Record<string, string | string[]>;
 }
-export declare function createNxReleaseConfig(projectGraph: ProjectGraph, userConfig?: NxJsonConfiguration['release']): Promise<{
+export declare function createNxReleaseConfig(projectGraph: ProjectGraph, projectFileMap: ProjectFileMap, userConfig?: NxJsonConfiguration['release']): Promise<{
     error: null | CreateNxReleaseConfigError;
     nxReleaseConfig: NxReleaseConfig | null;
 }>;

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

@@ -1,12 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleNxReleaseConfigError = exports.createNxReleaseConfig = exports.IMPLICIT_DEFAULT_RELEASE_GROUP = void 0;
-const devkit_exports_1 = require("../../../devkit-exports");
+/**
+ * `nx release` is a powerful feature which spans many possible use cases. The possible variations
+ * of configuration are therefore quite complex, particularly when you consider release groups.
+ *
+ * We want to provide the best possible DX for users so that they can harness the power of `nx release`
+ * most effectively, therefore we need to both provide sensible defaults for common scenarios (to avoid
+ * verbose nx.json files wherever possible), and proactively handle potential sources of config issues
+ * in more complex use-cases.
+ *
+ * This file is the source of truth for all `nx release` configuration reconciliation, including sensible
+ * defaults and user overrides, as well as handling common errors, up front to produce a single, consistent,
+ * and easy to consume config object for all the `nx release` command implementations.
+ */
+const path_1 = require("path");
+const fileutils_1 = require("../../../utils/fileutils");
 const find_matching_projects_1 = require("../../../utils/find-matching-projects");
+const output_1 = require("../../../utils/output");
+const workspace_root_1 = require("../../../utils/workspace-root");
 const resolve_nx_json_error_message_1 = require("../utils/resolve-nx-json-error-message");
 exports.IMPLICIT_DEFAULT_RELEASE_GROUP = '__default__';
 // Apply default configuration to any optional user configuration and handle known errors
-async function createNxReleaseConfig(projectGraph, userConfig = {}) {
+async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig = {}) {
     if (userConfig.projects && userConfig.groups) {
         return {
             error: {
@@ -76,6 +92,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             conventionalCommits: userConfig.version?.conventionalCommits || false,
             generator: '@nx/js:release-version',
             generatorOptions: defaultGeneratorOptions,
+            preVersionCommand: userConfig.version?.preVersionCommand || '',
         },
         changelog: {
             git: changelogGitDefaults,
@@ -166,20 +183,22 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             git: userConfig.git,
         },
     ], normalizeTrueToEmptyObject(userConfig.changelog));
-    // git configuration is not supported at the group level, only the root/command level
-    const rootVersionWithoutGit = { ...rootVersionConfig };
-    delete rootVersionWithoutGit.git;
+    // these options are not supported at the group level, only the root/command level
+    const rootVersionWithoutGlobalOptions = { ...rootVersionConfig };
+    delete rootVersionWithoutGlobalOptions.git;
+    delete rootVersionWithoutGlobalOptions.preVersionCommand;
     // Apply conventionalCommits shorthand to the final group defaults if explicitly configured in the original user config
     if (userConfig.version?.conventionalCommits === true) {
-        rootVersionWithoutGit.generatorOptions = {
-            ...rootVersionWithoutGit.generatorOptions,
+        rootVersionWithoutGlobalOptions.generatorOptions = {
+            ...rootVersionWithoutGlobalOptions.generatorOptions,
             currentVersionResolver: 'git-tag',
             specifierSource: 'conventional-commits',
         };
     }
     if (userConfig.version?.conventionalCommits === false) {
-        delete rootVersionWithoutGit.generatorOptions.currentVersionResolver;
-        delete rootVersionWithoutGit.generatorOptions.specifierSource;
+        delete rootVersionWithoutGlobalOptions.generatorOptions
+            .currentVersionResolver;
+        delete rootVersionWithoutGlobalOptions.generatorOptions.specifierSource;
     }
     const groups = userConfig.groups && Object.keys(userConfig.groups).length
         ? ensureProjectsConfigIsArray(userConfig.groups)
@@ -193,14 +212,13 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
                     projects: userConfig.projects
                         ? // user-defined top level "projects" config takes priority if set
                             (0, find_matching_projects_1.findMatchingProjects)(ensureArray(userConfig.projects), projectGraph.nodes)
-                        : // default to all library projects in the workspace
-                            (0, find_matching_projects_1.findMatchingProjects)(['*'], projectGraph.nodes).filter((project) => projectGraph.nodes[project].type === 'lib'),
+                        : await getDefaultProjects(projectGraph, projectFileMap),
                     /**
                      * For properties which are overriding config at the root, we use the root level config as the
                      * default values to merge with so that the group that matches a specific project will always
                      * be the valid source of truth for that type of config.
                      */
-                    version: deepMergeDefaults([GROUP_DEFAULTS.version], rootVersionWithoutGit),
+                    version: deepMergeDefaults([GROUP_DEFAULTS.version], rootVersionWithoutGlobalOptions),
                     // If the user has set something custom for releaseTagPattern at the top level, respect it for the implicit default group
                     releaseTagPattern: userConfig.releaseTagPattern || GROUP_DEFAULTS.releaseTagPattern,
                     // Directly inherit the root level config for projectChangelogs, if set
@@ -265,7 +283,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             projects: matchingProjects,
             version: deepMergeDefaults(
             // First apply any group level defaults, then apply actual root level config, then group level config
-            [GROUP_DEFAULTS.version, rootVersionWithoutGit], releaseGroup.version),
+            [GROUP_DEFAULTS.version, rootVersionWithoutGlobalOptions], releaseGroup.version),
             // If the user has set any changelog config at all, including at the root level, then use one set of defaults, otherwise default to false for the whole feature
             changelog: releaseGroup.changelog || rootChangelogConfig.projectChangelogs
                 ? deepMergeDefaults(groupChangelogDefaults, releaseGroup.changelog || {})
@@ -325,7 +343,7 @@ async function handleNxReleaseConfigError(error) {
                     'release',
                     'projects',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `"projects" is not valid when explicitly defining release groups, and everything should be expressed within "groups" in that case. If you are using "groups" then you should remove the "projects" property`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -337,7 +355,7 @@ async function handleNxReleaseConfigError(error) {
                     'release',
                     'groups',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `Release group "${error.data.releaseGroupName}" matches no projects. Please ensure all release groups match at least one project:`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -349,7 +367,7 @@ async function handleNxReleaseConfigError(error) {
                     'release',
                     'groups',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `Project "${error.data.project}" matches multiple release groups. Please ensure all projects are part of only one release group:`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -363,7 +381,7 @@ async function handleNxReleaseConfigError(error) {
                     error.data.releaseGroupName,
                     'releaseTagPattern',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `Release group "${error.data.releaseGroupName}" has an invalid releaseTagPattern. Please ensure the pattern contains exactly one instance of the "{version}" placeholder`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -374,7 +392,7 @@ async function handleNxReleaseConfigError(error) {
                 const nxJsonMessage = await (0, resolve_nx_json_error_message_1.resolveNxJsonConfigErrorMessage)([
                     'release',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `You have configured both the shorthand "version.conventionalCommits" and one or more of the related "version.generatorOptions" that it sets for you. Please use one or the other:`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -386,7 +404,7 @@ async function handleNxReleaseConfigError(error) {
                     'release',
                     'git',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `You have duplicate conflicting git configurations. If you are using the top level 'nx release' command, then remove the 'release.version.git' and 'release.changelog.git' properties in favor of 'release.git'. If you are using the subcommands or the programmatic API, then remove the 'release.git' property in favor of 'release.version.git' and 'release.changelog.git':`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -499,3 +517,28 @@ function hasInvalidConventionalCommitsConfig(userConfig) {
 function hasInvalidGitConfig(userConfig) {
     return (!!userConfig.git && !!(userConfig.version?.git || userConfig.changelog?.git));
 }
+async function getDefaultProjects(projectGraph, projectFileMap) {
+    // default to all library projects in the workspace with a package.json file
+    return (0, find_matching_projects_1.findMatchingProjects)(['*'], projectGraph.nodes).filter((project) => projectGraph.nodes[project].type === 'lib' &&
+        // Exclude all projects with "private": true in their package.json because this is
+        // a common indicator that a project is not intended for release.
+        // Users can override this behavior by explicitly defining the projects they want to release.
+        isProjectPublic(project, projectGraph, projectFileMap));
+}
+function isProjectPublic(project, projectGraph, projectFileMap) {
+    const projectNode = projectGraph.nodes[project];
+    const packageJsonPath = (0, path_1.join)(projectNode.data.root, 'package.json');
+    if (!projectFileMap[project]?.find((f) => f.file === packageJsonPath)) {
+        return false;
+    }
+    try {
+        const fullPackageJsonPath = (0, path_1.join)(workspace_root_1.workspaceRoot, packageJsonPath);
+        const packageJson = (0, fileutils_1.readJsonFile)(fullPackageJsonPath);
+        return !(packageJson.private === true);
+    }
+    catch (e) {
+        // do nothing and assume that the project is not public if there is a parsing issue
+        // this will result in it being excluded from the default projects list
+        return false;
+    }
+}

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

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.releasePublish = exports.releasePublishCLIHandler = void 0;
 const nx_json_1 = require("../../config/nx-json");
-const devkit_exports_1 = require("../../devkit-exports");
+const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
+const output_1 = require("../../utils/output");
 const params_1 = require("../../utils/params");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
 const graph_1 = require("../graph/graph");
@@ -33,13 +34,13 @@ async function releasePublish(args, isCLI = false) {
         process.env.NX_VERBOSE_LOGGING = 'true';
     }
     // Apply default configuration to any optional user configuration
-    const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, nxJson.release);
+    const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), nxJson.release);
     if (configError) {
         return await (0, config_1.handleNxReleaseConfigError)(configError);
     }
     const { error: filterError, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, _args.projects, _args.groups);
     if (filterError) {
-        devkit_exports_1.output.error(filterError);
+        output_1.output.error(filterError);
         process.exit(1);
     }
     /**

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

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.release = exports.releaseCLIHandler = void 0;
 const enquirer_1 = require("enquirer");
 const nx_json_1 = require("../../config/nx-json");
-const devkit_exports_1 = require("../../devkit-exports");
+const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
+const output_1 = require("../../utils/output");
 const params_1 = require("../../utils/params");
 const changelog_1 = require("./changelog");
 const config_1 = require("./config/config");
@@ -30,14 +31,14 @@ async function release(args) {
             ? ['release', 'version', 'git']
             : ['release', 'changelog', 'git'];
         const nxJsonMessage = await (0, resolve_nx_json_error_message_1.resolveNxJsonConfigErrorMessage)(jsonConfigErrorPath);
-        devkit_exports_1.output.error({
+        output_1.output.error({
             title: `The "release" top level command cannot be used with granular git configuration. Instead, configure git options in the "release.git" property in nx.json, or use the version, changelog, and publish subcommands or programmatic API directly.`,
             bodyLines: [nxJsonMessage],
         });
         process.exit(1);
     }
     // Apply default configuration to any optional user configuration
-    const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, nxJson.release);
+    const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), nxJson.release);
     if (configError) {
         return await (0, config_1.handleNxReleaseConfigError)(configError);
     }
@@ -63,11 +64,11 @@ async function release(args) {
     });
     const { error: filterError, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, args.projects, args.groups);
     if (filterError) {
-        devkit_exports_1.output.error(filterError);
+        output_1.output.error(filterError);
         process.exit(1);
     }
     if (shouldCommit) {
-        devkit_exports_1.output.logSingleLine(`Committing changes with git`);
+        output_1.output.logSingleLine(`Committing changes with git`);
         const commitMessage = nxReleaseConfig.git.commitMessage;
         const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionResult.projectsVersionData, commitMessage);
         await (0, git_1.gitCommit)({
@@ -78,7 +79,7 @@ async function release(args) {
         });
     }
     if (shouldTag) {
-        devkit_exports_1.output.logSingleLine(`Tagging commit with git`);
+        output_1.output.logSingleLine(`Tagging commit with git`);
         // 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 = (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, versionResult.projectsVersionData);
         (0, shared_1.handleDuplicateGitTags)(gitTagValues);
@@ -96,14 +97,14 @@ async function release(args) {
     let hasPushedChanges = false;
     let latestCommit;
     if (shouldCreateWorkspaceRelease && changelogResult.workspaceChangelog) {
-        devkit_exports_1.output.logSingleLine(`Pushing to git remote`);
+        output_1.output.logSingleLine(`Pushing to git remote`);
         // Before we can create/update the release we need to ensure the commit exists on the remote
         await (0, git_1.gitPush)({
             dryRun: args.dryRun,
             verbose: args.verbose,
         });
         hasPushedChanges = true;
-        devkit_exports_1.output.logSingleLine(`Creating GitHub Release`);
+        output_1.output.logSingleLine(`Creating GitHub Release`);
         latestCommit = await (0, git_1.getCommitHash)('HEAD');
         await (0, github_1.createOrUpdateGithubRelease)(changelogResult.workspaceChangelog.releaseVersion, changelogResult.workspaceChangelog.contents, latestCommit, { dryRun: args.dryRun });
     }
@@ -122,7 +123,7 @@ async function release(args) {
                     continue;
                 }
                 if (!hasPushedChanges) {
-                    devkit_exports_1.output.logSingleLine(`Pushing to git remote`);
+                    output_1.output.logSingleLine(`Pushing to git remote`);
                     // Before we can create/update the release we need to ensure the commit exists on the remote
                     await (0, git_1.gitPush)({
                         dryRun: args.dryRun,
@@ -130,7 +131,7 @@ async function release(args) {
                     });
                     hasPushedChanges = true;
                 }
-                devkit_exports_1.output.logSingleLine(`Creating GitHub Release`);
+                output_1.output.logSingleLine(`Creating GitHub Release`);
                 if (!latestCommit) {
                     latestCommit = await (0, git_1.getCommitHash)('HEAD');
                 }
@@ -152,7 +153,7 @@ async function release(args) {
         await (0, publish_1.releasePublish)(args);
     }
     else {
-        devkit_exports_1.output.logSingleLine('Skipped publishing packages.');
+        output_1.output.logSingleLine('Skipped publishing packages.');
     }
     return versionResult;
 }

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

@@ -92,7 +92,26 @@ async function getGitDiff(from, to = 'HEAD') {
 exports.getGitDiff = getGitDiff;
 async function gitAdd({ changedFiles, dryRun, verbose, logFn, }) {
     logFn = logFn || console.log;
-    const commandArgs = ['add', ...changedFiles];
+    let ignoredFiles = [];
+    let filesToAdd = [];
+    for (const f of changedFiles) {
+        const isFileIgnored = await isIgnored(f);
+        if (isFileIgnored) {
+            ignoredFiles.push(f);
+        }
+        else {
+            filesToAdd.push(f);
+        }
+    }
+    if (verbose && ignoredFiles.length) {
+        logFn(`Will not add the following files because they are ignored by git:`);
+        ignoredFiles.forEach((f) => logFn(f));
+    }
+    if (!filesToAdd.length) {
+        logFn('\nNo files to stage. Skipping git add.');
+        return;
+    }
+    const commandArgs = ['add', ...filesToAdd];
     const message = dryRun
         ? `Would stage files in git with the following command, but --dry-run was set:`
         : `Staging files in git with the following command:`;
@@ -106,6 +125,16 @@ async function gitAdd({ changedFiles, dryRun, verbose, logFn, }) {
     return (0, exec_command_1.execCommand)('git', commandArgs);
 }
 exports.gitAdd = gitAdd;
+async function isIgnored(filePath) {
+    try {
+        // This command will error if the file is not ignored
+        await (0, exec_command_1.execCommand)('git', ['check-ignore', filePath]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, }) {
     logFn = logFn || console.log;
     const commandArgs = ['commit'];

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

@@ -12,7 +12,11 @@ export type ReleaseVersionGeneratorResult = {
     }) => Promise<string[]>;
 };
 export type VersionData = Record<string, {
-    newVersion: string;
+    /**
+     * newVersion will be null in the case that no changes are detected for the project,
+     * e.g. when using conventional commits
+     */
+    newVersion: string | null;
     currentVersion: string;
     dependentProjects: any[];
 }>;