nx 18.1.0 → 18.1.2

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[];
 }>;

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

@@ -1,10 +1,11 @@
 import { ProjectGraph, ProjectGraphProjectNode } from '../../config/project-graph';
 import { VersionOptions } from './command-object';
+import { NxReleaseConfig } from './config/config';
 import { ReleaseGroupWithName } from './config/filter-release-groups';
 import { VersionData } from './utils/shared';
 export { deriveNewSemverVersion } from './utils/semver';
 export type { ReleaseVersionGeneratorResult, VersionData, } from './utils/shared';
-export declare const validReleaseVersionPrefixes: string[];
+export declare const validReleaseVersionPrefixes: readonly ["auto", "", "~", "^", "="];
 export interface ReleaseVersionGeneratorSchema {
     projects: ProjectGraphProjectNode[];
     releaseGroup: ReleaseGroupWithName;
@@ -18,6 +19,10 @@ export interface ReleaseVersionGeneratorSchema {
     fallbackCurrentVersionResolver?: 'disk';
     firstRelease?: boolean;
     versionPrefix?: typeof validReleaseVersionPrefixes[number];
+    skipLockFileUpdate?: boolean;
+    installArgs?: string;
+    installIgnoreScripts?: boolean;
+    conventionalCommitsConfig?: NxReleaseConfig['conventionalCommits'];
 }
 export interface NxReleaseVersionResult {
     /**

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

@@ -2,13 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseVersion = exports.releaseVersionCLIHandler = exports.validReleaseVersionPrefixes = exports.deriveNewSemverVersion = void 0;
 const chalk = require("chalk");
+const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const nx_json_1 = require("../../config/nx-json");
-const devkit_exports_1 = require("../../devkit-exports");
 const tree_1 = require("../../generators/tree");
+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 path_1 = require("../../utils/path");
+const workspace_root_1 = require("../../utils/workspace-root");
 const generate_1 = require("../generate/generate");
 const generator_utils_1 = require("../generate/generator-utils");
 const config_1 = require("./config/config");
@@ -18,10 +22,11 @@ const git_1 = require("./utils/git");
 const print_changes_1 = require("./utils/print-changes");
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
 const shared_1 = require("./utils/shared");
+const LARGE_BUFFER = 1024 * 1000000;
 // Reexport some utils for use in plugin release-version generator implementations
 var semver_1 = require("./utils/semver");
 Object.defineProperty(exports, "deriveNewSemverVersion", { enumerable: true, get: function () { return semver_1.deriveNewSemverVersion; } });
-exports.validReleaseVersionPrefixes = ['auto', '', '~', '^'];
+exports.validReleaseVersionPrefixes = ['auto', '', '~', '^', '='];
 const releaseVersionCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => releaseVersion(args));
 exports.releaseVersionCLIHandler = releaseVersionCLIHandler;
 /**
@@ -37,7 +42,7 @@ async function releaseVersion(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);
     }
@@ -53,7 +58,7 @@ async function releaseVersion(args) {
             'release',
             'git',
         ]);
-        devkit_exports_1.output.error({
+        output_1.output.error({
             title: `The "release.git" property in nx.json may not be used with the "nx release version" subcommand or programmatic API. Instead, configure git options for subcommands directly with "release.version.git" and "release.changelog.git".`,
             bodyLines: [nxJsonMessage],
         });
@@ -61,10 +66,14 @@ async function releaseVersion(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);
     }
-    const tree = new tree_1.FsTree(devkit_exports_1.workspaceRoot, args.verbose);
+    runPreVersionCommand(nxReleaseConfig.version.preVersionCommand, {
+        dryRun: args.dryRun,
+        verbose: args.verbose,
+    });
+    const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose);
     const versionData = {};
     const commitMessage = args.gitCommitMessage || nxReleaseConfig.version.git.commitMessage;
     const additionalChangedFiles = new Set();
@@ -88,13 +97,16 @@ async function releaseVersion(args) {
                     // all project data from the project graph (not to be confused with projectNamesToRunVersionOn)
                     projects,
                 });
-                const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, projectNames, releaseGroup, versionData);
+                const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData, nxReleaseConfig.conventionalCommits);
                 // Capture the callback so that we can run it after flushing the changes to disk
                 generatorCallbacks.push(async () => {
                     const changedFiles = await generatorCallback(tree, {
                         dryRun: !!args.dryRun,
                         verbose: !!args.verbose,
-                        generatorOptions,
+                        generatorOptions: {
+                            ...generatorOptions,
+                            ...args.generatorOptionsOverrides,
+                        },
                     });
                     changedFiles.forEach((f) => additionalChangedFiles.add(f));
                 });
@@ -125,7 +137,7 @@ async function releaseVersion(args) {
             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`);
+            output_1.output.logSingleLine(`Staging changed files with git`);
             await (0, git_1.gitAdd)({
                 changedFiles,
                 dryRun: args.dryRun,
@@ -133,7 +145,7 @@ async function releaseVersion(args) {
             });
         }
         if (args.gitTag ?? nxReleaseConfig.version.git.tag) {
-            devkit_exports_1.output.logSingleLine(`Tagging commit with git`);
+            output_1.output.logSingleLine(`Tagging commit with git`);
             for (const tag of gitTagValues) {
                 await (0, git_1.gitTag)({
                     tag,
@@ -167,13 +179,16 @@ async function releaseVersion(args) {
                 // all project data from the project graph (not to be confused with projectNamesToRunVersionOn)
                 projects,
             });
-            const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, projectNames, releaseGroup, versionData);
+            const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData, nxReleaseConfig.conventionalCommits);
             // Capture the callback so that we can run it after flushing the changes to disk
             generatorCallbacks.push(async () => {
                 const changedFiles = await generatorCallback(tree, {
                     dryRun: !!args.dryRun,
                     verbose: !!args.verbose,
-                    generatorOptions,
+                    generatorOptions: {
+                        ...generatorOptions,
+                        ...args.generatorOptionsOverrides,
+                    },
                 });
                 changedFiles.forEach((f) => additionalChangedFiles.add(f));
             });
@@ -212,7 +227,7 @@ async function releaseVersion(args) {
         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`);
+        output_1.output.logSingleLine(`Staging changed files with git`);
         await (0, git_1.gitAdd)({
             changedFiles,
             dryRun: args.dryRun,
@@ -220,7 +235,7 @@ async function releaseVersion(args) {
         });
     }
     if (args.gitTag ?? nxReleaseConfig.version.git.tag) {
-        devkit_exports_1.output.logSingleLine(`Tagging commit with git`);
+        output_1.output.logSingleLine(`Tagging commit with git`);
         for (const tag of gitTagValues) {
             await (0, git_1.gitTag)({
                 tag,
@@ -247,20 +262,22 @@ function appendVersionData(existingVersionData, newVersionData) {
     }
     return existingVersionData;
 }
-async function runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, projectNames, releaseGroup, versionData) {
+async function runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, generatorOverrides, projectNames, releaseGroup, versionData, conventionalCommitsConfig) {
     const generatorOptions = {
         // Always ensure a string to avoid generator schema validation errors
         specifier: args.specifier ?? '',
         preid: args.preid ?? '',
         ...generatorData.configGeneratorOptions,
+        ...(generatorOverrides ?? {}),
         // The following are not overridable by user config
         projects: projectNames.map((p) => projectGraph.nodes[p]),
         projectGraph,
         releaseGroup,
         firstRelease: args.firstRelease ?? false,
+        conventionalCommitsConfig,
     };
     // Apply generator defaults from schema.json file etc
-    const combinedOpts = await (0, params_1.combineOptionsForGenerator)(generatorOptions, generatorData.collectionName, generatorData.normalizedGeneratorName, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson, generatorData.schema, false, null, (0, node_path_1.relative)(process.cwd(), devkit_exports_1.workspaceRoot), args.verbose);
+    const combinedOpts = await (0, params_1.combineOptionsForGenerator)(generatorOptions, generatorData.collectionName, generatorData.normalizedGeneratorName, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson, generatorData.schema, false, null, (0, node_path_1.relative)(process.cwd(), workspace_root_1.workspaceRoot), args.verbose);
     const releaseVersionGenerator = generatorData.implementationFactory();
     // We expect all version generator implementations to return a ReleaseVersionGeneratorResult object, rather than a GeneratorCallback
     const versionResult = (await releaseVersionGenerator(tree, combinedOpts));
@@ -282,7 +299,7 @@ function printAndFlushChanges(tree, isDryRun) {
         }
         else if (f.type === 'UPDATE') {
             console.error(`${chalk.white('UPDATE')} ${f.path}${isDryRun ? chalk.keyword('orange')(' [dry-run]') : ''}`);
-            const currentContentsOnDisk = (0, node_fs_1.readFileSync)((0, devkit_exports_1.joinPathFragments)(tree.root, f.path)).toString();
+            const currentContentsOnDisk = (0, node_fs_1.readFileSync)((0, path_1.joinPathFragments)(tree.root, f.path)).toString();
             (0, print_changes_1.printDiff)(currentContentsOnDisk, f.content?.toString() || '');
         }
         else if (f.type === 'DELETE') {
@@ -290,7 +307,7 @@ function printAndFlushChanges(tree, isDryRun) {
         }
     });
     if (!isDryRun) {
-        (0, tree_1.flushChanges)(devkit_exports_1.workspaceRoot, changes);
+        (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, changes);
     }
 }
 function extractGeneratorCollectionAndName(description, generatorString) {
@@ -306,7 +323,7 @@ function extractGeneratorCollectionAndName(description, generatorString) {
 }
 function resolveGeneratorData({ collectionName, generatorName, configGeneratorOptions, projects, }) {
     try {
-        const { normalizedGeneratorName, schema, implementationFactory } = (0, generator_utils_1.getGeneratorInformation)(collectionName, generatorName, devkit_exports_1.workspaceRoot, projects);
+        const { normalizedGeneratorName, schema, implementationFactory } = (0, generator_utils_1.getGeneratorInformation)(collectionName, generatorName, workspace_root_1.workspaceRoot, projects);
         return {
             collectionName,
             generatorName,
@@ -339,3 +356,38 @@ function resolveGeneratorData({ collectionName, generatorName, configGeneratorOp
         throw err;
     }
 }
+function runPreVersionCommand(preVersionCommand, { dryRun, verbose }) {
+    if (!preVersionCommand) {
+        return;
+    }
+    output_1.output.logSingleLine(`Executing pre-version command`);
+    if (verbose) {
+        console.log(`Executing the following pre-version command:`);
+        console.log(preVersionCommand);
+    }
+    let env = {
+        ...process.env,
+    };
+    if (dryRun) {
+        env.NX_DRY_RUN = 'true';
+    }
+    const stdio = verbose ? 'inherit' : 'pipe';
+    try {
+        (0, node_child_process_1.execSync)(preVersionCommand, {
+            encoding: 'utf-8',
+            maxBuffer: LARGE_BUFFER,
+            stdio,
+            env,
+        });
+    }
+    catch (e) {
+        const title = verbose
+            ? `The pre-version command failed. See the full output above.`
+            : `The pre-version command failed. Retry with --verbose to see the full output of the pre-version command.`;
+        output_1.output.error({
+            title,
+            bodyLines: [preVersionCommand, e],
+        });
+        process.exit(1);
+    }
+}

package/src/command-line/run/executor-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExecutorInformation = exports.normalizeExecutorSchema = void 0;
 const path_1 = require("path");
-const plugins_1 = require("../../project-graph/plugins");
+const nx_plugin_1 = require("../../utils/nx-plugin");
 const fileutils_1 = require("../../utils/fileutils");
 const schema_utils_1 = require("../../config/schema-utils");
 const installation_directory_1 = require("../../utils/installation-directory");
@@ -55,7 +55,7 @@ function getExecutorInformation(nodeModule, executor, root, projects) {
 }
 exports.getExecutorInformation = getExecutorInformation;
 function readExecutorJson(nodeModule, executor, root, projects) {
-    const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, projects, root
+    const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(nodeModule, projects, root
         ? [root, __dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)()]
         : [__dirname, process.cwd(), ...(0, installation_directory_1.getNxRequirePaths)()]);
     const executorsFile = packageJson.executors ?? packageJson.builders;

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

@@ -7,10 +7,10 @@ const path_1 = require("path");
 const serialize_overrides_into_command_line_1 = require("../../utils/serialize-overrides-into-command-line");
 const project_graph_1 = require("../../project-graph/project-graph");
 const configuration_1 = require("../../config/configuration");
-const native_1 = require("../../native");
 const async_iterator_1 = require("../../utils/async-iterator");
 const executor_utils_1 = require("./executor-utils");
-const child_process_1 = require("../../utils/child-process");
+const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
+const child_process_1 = require("child_process");
 function printRunHelp(opts, schema, plugin) {
     (0, print_help_1.printHelp)(`run ${opts.project}:${opts.target}`, schema, {
         mode: 'run',
@@ -67,12 +67,22 @@ async function printTargetRunHelpInternal({ project, target }, root, projectsCon
         executor === 'run-commands' &&
         targetConfig.options.command) {
         const command = targetConfig.options.command.split(' ')[0];
-        await new Promise(() => {
-            const cp = new child_process_1.PseudoTtyProcess((0, native_1.runCommand)(`${command} --help`));
-            cp.onExit((code) => {
+        const helpCommand = `${command} --help`;
+        if (pseudo_terminal_1.PseudoTerminal.isSupported()) {
+            const terminal = (0, pseudo_terminal_1.getPseudoTerminal)();
+            await new Promise(() => {
+                const cp = terminal.runCommand(helpCommand);
+                cp.onExit((code) => {
+                    process.exit(code);
+                });
+            });
+        }
+        else {
+            const cp = (0, child_process_1.exec)(helpCommand);
+            cp.on('exit', (code) => {
                 process.exit(code);
             });
-        });
+        }
     }
     else {
         process.exit(0);

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

@@ -120,6 +120,30 @@ export interface NxReleaseGitConfiguration {
      */
     tagArgs?: string;
 }
+export interface NxReleaseConventionalCommitsConfiguration {
+    types?: Record<string, 
+    /**
+     * A map of commit types to their configuration.
+     * If a type is set to 'true', then it will be enabled with the default 'semverBump' of 'patch' and will appear in the changelog.
+     * If a type is set to 'false', then it will not trigger a version bump and will be hidden from the changelog.
+     */
+    {
+        /**
+         * The semver bump to apply when a commit of this type is found.
+         * If set to "none", the commit will be ignored for versioning purposes.
+         */
+        semverBump?: 'patch' | 'minor' | 'major' | 'none';
+        /**
+         * Configuration for the changelog section for commits of this type.
+         * If set to 'true', then commits of this type will be included in the changelog with their default title for the type.
+         * If set to 'false', then commits of this type will not be included in the changelog.
+         */
+        changelog?: {
+            title?: string;
+            hidden?: boolean;
+        } | boolean;
+    } | boolean>;
+}
 interface NxReleaseConfiguration {
     /**
      * Shorthand for amending the projects which will be included in the implicit default release group (all projects by default).
@@ -207,6 +231,12 @@ interface NxReleaseConfiguration {
          * Enable or override configuration for git operations as part of the version subcommand
          */
         git?: NxReleaseGitConfiguration;
+        /**
+         * 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'.
+         */
+        preVersionCommand?: string;
     };
     /**
      * Optionally override the git/release tag pattern to use. This field is the source of truth
@@ -223,6 +253,7 @@ interface NxReleaseConfiguration {
      * Enable and configure automatic git operations as part of the release
      */
     git?: NxReleaseGitConfiguration;
+    conventionalCommits?: NxReleaseConventionalCommitsConfiguration;
 }
 /**
  * Nx.json configuration

package/src/config/schema-utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveSchema = exports.resolveImplementation = exports.getImplementationFactory = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
-const plugins_1 = require("../project-graph/plugins");
+const nx_plugin_1 = require("../utils/nx-plugin");
 /**
  * This function is used to get the implementation factory of an executor or generator.
  * @param implementation path to the implementation
@@ -15,7 +15,7 @@ function getImplementationFactory(implementation, directory) {
     return () => {
         const modulePath = resolveImplementation(implementationModulePath, directory);
         if ((0, path_1.extname)(modulePath) === '.ts') {
-            (0, plugins_1.registerPluginTSTranspiler)();
+            (0, nx_plugin_1.registerPluginTSTranspiler)();
         }
         const module = require(modulePath);
         return implementationExportName