nx 20.5.0-beta.2 → 20.5.0-beta.4

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

@@ -3,23 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initHandler = initHandler;
 exports.detectPlugins = detectPlugins;
 const fs_1 = require("fs");
+const enquirer_1 = require("enquirer");
 const semver_1 = require("semver");
-const output_1 = require("../../utils/output");
-const package_manager_1 = require("../../utils/package-manager");
-const add_nx_scripts_1 = require("./implementation/dot-nx/add-nx-scripts");
+const nx_json_1 = require("../../config/nx-json");
 const child_process_1 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
+const get_package_name_from_import_path_1 = require("../../utils/get-package-name-from-import-path");
+const output_1 = require("../../utils/output");
+const package_manager_1 = require("../../utils/package-manager");
 const versions_1 = require("../../utils/versions");
-const utils_1 = require("./implementation/utils");
-const enquirer_1 = require("enquirer");
-const angular_1 = require("./implementation/angular");
 const workspace_context_1 = require("../../utils/workspace-context");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
-const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
-const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
-const nx_json_1 = require("../../config/nx-json");
-const get_package_name_from_import_path_1 = require("../../utils/get-package-name-from-import-path");
 const configure_plugins_1 = require("./configure-plugins");
+const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
+const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
+const add_nx_to_turborepo_1 = require("./implementation/add-nx-to-turborepo");
+const angular_1 = require("./implementation/angular");
+const add_nx_scripts_1 = require("./implementation/dot-nx/add-nx-scripts");
+const utils_1 = require("./implementation/utils");
 async function initHandler(options) {
     process.env.NX_RUNNING_NX_INIT = 'true';
     const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
@@ -57,7 +58,29 @@ async function initHandler(options) {
         return;
     }
     const packageJson = (0, fileutils_1.readJsonFile)('package.json');
-    if ((0, utils_1.isMonorepo)(packageJson)) {
+    const _isTurborepo = (0, fs_1.existsSync)('turbo.json');
+    const _isMonorepo = (0, utils_1.isMonorepo)(packageJson);
+    const learnMoreLink = _isTurborepo
+        ? 'https://nx.dev/recipes/adopting-nx/from-turborepo'
+        : _isMonorepo
+            ? 'https://nx.dev/getting-started/tutorials/npm-workspaces-tutorial'
+            : 'https://nx.dev/recipes/adopting-nx/adding-to-existing-project';
+    /**
+     * Turborepo users must have set up individual scripts already, and we keep the transition as minimal as possible.
+     * We log a message during the conversion process in addNxToTurborepo about how they can learn more about the power
+     * of Nx plugins and how it would allow them to infer all the relevant scripts automatically, including all cache
+     * inputs and outputs.
+     */
+    if (_isTurborepo) {
+        await (0, add_nx_to_turborepo_1.addNxToTurborepo)({
+            interactive: options.interactive,
+        });
+        (0, utils_1.printFinalMessage)({
+            learnMoreLink,
+        });
+        return;
+    }
+    if (_isMonorepo) {
         await (0, add_nx_to_monorepo_1.addNxToMonorepo)({
             interactive: options.interactive,
             nxCloud: false,
@@ -69,9 +92,6 @@ async function initHandler(options) {
             nxCloud: false,
         });
     }
-    const learnMoreLink = (0, utils_1.isMonorepo)(packageJson)
-        ? 'https://nx.dev/getting-started/tutorials/npm-workspaces-tutorial'
-        : 'https://nx.dev/recipes/adopting-nx/adding-to-existing-project';
     const useNxCloud = options.nxCloud ??
         (options.interactive ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)() : false);
     const repoRoot = process.cwd();

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

@@ -191,8 +191,7 @@ function createAPI(overrideReleaseConfig) {
         }
         else {
             let workspaceChangelogFromRef = args.from ||
-                (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTagPattern))
-                    ?.tag;
+                (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTagPattern, {}, nxReleaseConfig.releaseTagPatternCheckAllBranchesWhen))?.tag;
             if (!workspaceChangelogFromRef) {
                 if (useAutomaticFromRef) {
                     workspaceChangelogFromRef = await (0, git_1.getFirstGitCommit)();
@@ -335,7 +334,7 @@ function createAPI(overrideReleaseConfig) {
                             (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {
                                 projectName: project.name,
                                 releaseGroupName: releaseGroup.name,
-                            }))?.tag;
+                            }, releaseGroup.releaseTagPatternCheckAllBranchesWhen))?.tag;
                         if (!fromRef && useAutomaticFromRef) {
                             const firstCommit = await (0, git_1.getFirstGitCommit)();
                             const allCommits = await getCommits(firstCommit, toSHA);
@@ -442,8 +441,7 @@ function createAPI(overrideReleaseConfig) {
                 }
                 else {
                     let fromRef = args.from ||
-                        (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern))
-                            ?.tag;
+                        (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {}, releaseGroup.releaseTagPatternCheckAllBranchesWhen))?.tag;
                     if (!fromRef) {
                         if (useAutomaticFromRef) {
                             fromRef = await (0, git_1.getFirstGitCommit)();

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

@@ -58,6 +58,7 @@ export type PlanCheckOptions = BaseNxReleaseArgs & {
 export type ReleaseOptions = NxReleaseArgs & FirstReleaseArgs & {
     specifier?: string;
     yes?: boolean;
+    preid?: VersionOptions['preid'];
     skipPublish?: boolean;
 };
 export type VersionPlanArgs = {

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

@@ -75,6 +75,11 @@ const releaseCommand = {
         .positional('specifier', {
         type: 'string',
         describe: 'Exact version or semver keyword to apply to the selected release group.',
+    })
+        .option('preid', {
+        type: 'string',
+        describe: 'The optional prerelease identifier to apply to the version. This will only be applied in the case that the specifier argument has been set to `prerelease` OR when conventional commits are enabled, in which case it will modify the resolved specifier from conventional commits to be its prerelease equivalent. E.g. minor -> preminor.',
+        default: '',
     })
         .option('yes', {
         type: 'boolean',

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

@@ -177,6 +177,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             (workspaceProjectsRelationship === 'independent'
                 ? defaultIndependentReleaseTagPattern
                 : defaultFixedReleaseTagPattern),
+        releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
         conventionalCommits: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG,
         versionPlans: (userConfig.versionPlans ||
             false),
@@ -207,6 +208,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         groupProjectsRelationship === 'independent'
             ? defaultIndependentReleaseTagPattern
             : WORKSPACE_DEFAULTS.releaseTagPattern,
+        releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
         versionPlans: false,
     };
     /**
@@ -365,6 +367,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
                 (projectsRelationship === 'independent'
                     ? defaultIndependentReleaseTagPattern
                     : userConfig.releaseTagPattern || defaultFixedReleaseTagPattern),
+            releaseTagPatternCheckAllBranchesWhen: releaseGroup.releaseTagPatternCheckAllBranchesWhen ??
+                userConfig.releaseTagPatternCheckAllBranchesWhen ??
+                undefined,
             versionPlans: releaseGroup.versionPlans ?? rootVersionPlansConfig,
         };
         const finalReleaseGroup = deepMergeDefaults([groupDefaults], {
@@ -413,6 +418,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         nxReleaseConfig: {
             projectsRelationship: WORKSPACE_DEFAULTS.projectsRelationship,
             releaseTagPattern: WORKSPACE_DEFAULTS.releaseTagPattern,
+            releaseTagPatternCheckAllBranchesWhen: WORKSPACE_DEFAULTS.releaseTagPatternCheckAllBranchesWhen,
             git: rootGitConfig,
             version: rootVersionConfig,
             changelog: rootChangelogConfig,

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

@@ -22,7 +22,7 @@ export interface GitCommit extends RawGitCommit {
     affectedFiles: string[];
     revertedHashes: string[];
 }
-export declare function getLatestGitTagForPattern(releaseTagPattern: string, additionalInterpolationData?: {}): Promise<{
+export declare function getLatestGitTagForPattern(releaseTagPattern: string, additionalInterpolationData?: {}, checkAllBranchesWhen?: boolean | string[]): Promise<{
     tag: string;
     extractedVersion: string;
 } | null>;

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

@@ -16,6 +16,7 @@ exports.getFirstGitCommit = getFirstGitCommit;
  * https://github.com/unjs/changelogen
  */
 const node_path_1 = require("node:path");
+const minimatch_1 = require("minimatch");
 const utils_1 = require("../../../tasks-runner/utils");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const exec_command_1 = require("./exec-command");
@@ -24,22 +25,69 @@ function escapeRegExp(string) {
 }
 // https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
 const SEMVER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/g;
-async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}) {
+async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}, checkAllBranchesWhen) {
+    /**
+     * By default, we will try and resolve the latest match for the releaseTagPattern from the current branch,
+     * falling back to all branches if no match is found on the current branch.
+     *
+     * - If checkAllBranchesWhen is true it will cause us to ALWAYS check all branches for the latest match.
+     * - If checkAllBranchesWhen is explicitly set to false it will cause us to ONLY check the current branch for the latest match.
+     * - If checkAllBranchesWhen is an array of strings it will cause us to check all branches WHEN the current branch is one of the strings in the array.
+     */
+    let alwaysCheckAllBranches = false;
+    if (typeof checkAllBranchesWhen !== 'undefined') {
+        if (typeof checkAllBranchesWhen === 'boolean') {
+            alwaysCheckAllBranches = checkAllBranchesWhen;
+        }
+        else if (Array.isArray(checkAllBranchesWhen)) {
+            /**
+             * Get the current git branch and determine whether to check all branches based on the checkAllBranchesWhen parameter
+             */
+            const currentBranch = await (0, exec_command_1.execCommand)('git', [
+                'rev-parse',
+                '--abbrev-ref',
+                'HEAD',
+            ]).then((r) => r.trim());
+            // Check exact match first
+            alwaysCheckAllBranches = checkAllBranchesWhen.includes(currentBranch);
+            // Check if any glob pattern matches next
+            if (!alwaysCheckAllBranches) {
+                alwaysCheckAllBranches = checkAllBranchesWhen.some((pattern) => {
+                    const r = minimatch_1.minimatch.makeRe(pattern, { dot: true });
+                    if (!r) {
+                        return false;
+                    }
+                    return r.test(currentBranch);
+                });
+            }
+        }
+    }
+    const defaultGitArgs = [
+        // Apply git config to take version suffixes into account when sorting, e.g. 1.0.0 is newer than 1.0.0-beta.1
+        '-c',
+        'versionsort.suffix=-',
+        'tag',
+        '--sort',
+        '-v:refname',
+    ];
     try {
         let tags;
         tags = await (0, exec_command_1.execCommand)('git', [
-            'tag',
-            '--sort',
-            '-v:refname',
-            '--merged',
+            ...defaultGitArgs,
+            ...(alwaysCheckAllBranches ? [] : ['--merged']),
         ]).then((r) => r
             .trim()
             .split('\n')
             .map((t) => t.trim())
             .filter(Boolean));
-        if (!tags.length) {
+        if (
+        // Do not run this fallback if the user explicitly set checkAllBranchesWhen to false
+        checkAllBranchesWhen !== false &&
+            !tags.length &&
+            // There is no point in running this fallback if we already checked against all branches
+            !alwaysCheckAllBranches) {
             // try again, but include all tags on the repo instead of just --merged ones
-            tags = await (0, exec_command_1.execCommand)('git', ['tag', '--sort', '-v:refname']).then((r) => r
+            tags = await (0, exec_command_1.execCommand)('git', defaultGitArgs).then((r) => r
                 .trim()
                 .split('\n')
                 .map((t) => t.trim())

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

@@ -1,6 +1,6 @@
 import type { ChangelogRenderOptions } from '../../release/changelog-renderer';
-import { PackageManager } from '../utils/package-manager';
-import { InputDefinition, TargetConfiguration, TargetDependencyConfig } from './workspace-json-project-json';
+import type { PackageManager } from '../utils/package-manager';
+import type { InputDefinition, TargetConfiguration, TargetDependencyConfig } from './workspace-json-project-json';
 export type ImplicitDependencyEntry<T = '*' | string[]> = {
     [key: string]: T | ImplicitJsonSubsetDependency<T>;
 };
@@ -215,6 +215,15 @@ export interface NxReleaseConfiguration {
          * Optionally override the git/release tag pattern to use for this group.
          */
         releaseTagPattern?: string;
+        /**
+         * By default, we will try and resolve the latest match for the releaseTagPattern from the current branch,
+         * falling back to all branches if no match is found on the current branch.
+         *
+         * - Setting this to true will cause us to ALWAYS check all branches for the latest match.
+         * - Setting it to false will cause us to ONLY check the current branch for the latest match.
+         * - Setting it to an array of strings will cause us to check all branches WHEN the current branch matches one of the strings in the array. Glob patterns are supported.
+         */
+        releaseTagPatternCheckAllBranchesWhen?: boolean | string[];
         /**
          * Enables using version plans as a specifier source for versioning and
          * to determine changes for changelog generation.
@@ -281,6 +290,15 @@ export interface NxReleaseConfiguration {
      * The default releaseTagPattern for independent releases at the project level is: "{projectName}@{version}"
      */
     releaseTagPattern?: string;
+    /**
+     * By default, we will try and resolve the latest match for the releaseTagPattern from the current branch,
+     * falling back to all branches if no match is found on the current branch.
+     *
+     * - Setting this to true will cause us to ALWAYS check all branches for the latest match.
+     * - Setting it to false will cause us to ONLY check the current branch for the latest match.
+     * - Setting it to an array of strings will cause us to check all branches WHEN the current branch matches one of the strings in the array. Glob patterns are supported.
+     */
+    releaseTagPatternCheckAllBranchesWhen?: boolean | string[];
     /**
      * Enable and configure automatic git operations as part of the release
      */
@@ -321,6 +339,7 @@ export interface NxSyncConfiguration {
  * @note: when adding properties here add them to `allowedWorkspaceExtensions` in adapter/compat.ts
  */
 export interface NxJsonConfiguration<T = '*' | string[]> {
+    $schema?: string;
     /**
      * Optional (additional) Nx.json configuration file which becomes a base for this one
      */
@@ -357,7 +376,7 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
         appsDir?: string;
     };
     /**
-     * @deprecated Custom task runners will no longer be supported in Nx 21. Use Nx Cloud or Nx Powerpack instead.
+     * @deprecated Custom task runners will be replaced by a new API starting with Nx 21. More info: https://nx.dev/deprecated/custom-tasks-runner
      * Available Task Runners for Nx to use
      */
     tasksRunnerOptions?: {