nx 20.5.0-beta.3 → 20.5.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.5.0-beta.3",
+  "version": "20.5.0-beta.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.5.0-beta.3",
-    "@nx/nx-darwin-x64": "20.5.0-beta.3",
-    "@nx/nx-freebsd-x64": "20.5.0-beta.3",
-    "@nx/nx-linux-arm-gnueabihf": "20.5.0-beta.3",
-    "@nx/nx-linux-arm64-gnu": "20.5.0-beta.3",
-    "@nx/nx-linux-arm64-musl": "20.5.0-beta.3",
-    "@nx/nx-linux-x64-gnu": "20.5.0-beta.3",
-    "@nx/nx-linux-x64-musl": "20.5.0-beta.3",
-    "@nx/nx-win32-arm64-msvc": "20.5.0-beta.3",
-    "@nx/nx-win32-x64-msvc": "20.5.0-beta.3"
+    "@nx/nx-darwin-arm64": "20.5.0-beta.4",
+    "@nx/nx-darwin-x64": "20.5.0-beta.4",
+    "@nx/nx-freebsd-x64": "20.5.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "20.5.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "20.5.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "20.5.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "20.5.0-beta.4",
+    "@nx/nx-linux-x64-musl": "20.5.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "20.5.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "20.5.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -21,6 +21,10 @@
       "additionalProperties": false,
       "deprecated": "Use `defaultBase` instead. Support for setting `defaultBase` in `affected` will be removed in Nx 20."
     },
+    "extends": {
+      "type": "string",
+      "description": "Specifies the base config to extend."
+    },
     "defaultBase": {
       "type": "string",
       "description": "Default --base used by affected logic."
@@ -169,7 +173,22 @@
                 ]
               },
               "releaseTagPattern": {
-                "type": "string"
+                "type": "string",
+                "description": "Optionally override the git/release tag pattern to use for this group."
+              },
+              "releaseTagPatternCheckAllBranchesWhen": {
+                "oneOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                ],
+                "description": "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 is one of the strings in the array. Glob patterns are supported."
               },
               "versionPlans": {
                 "oneOf": [
@@ -243,7 +262,22 @@
           ]
         },
         "releaseTagPattern": {
-          "type": "string"
+          "type": "string",
+          "description": "Optionally override the git/release tag pattern to use. This field is the source of truth for changelog generation and release tagging, as well as for conventional commits parsing. It supports interpolating the version as {version} and (if releasing independently or forcing project level version control system releases) the project name as {projectName} within the string. The default releaseTagPattern for fixed/unified releases is: \"v{version}\". The default releaseTagPattern for independent releases at the project level is: \"{projectName}@{version}\""
+        },
+        "releaseTagPatternCheckAllBranchesWhen": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ],
+          "description": "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 is one of the strings in the array. Glob patterns are supported."
         }
       }
     },

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

@@ -5,7 +5,6 @@ exports.addHandler = addHandler;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const ora = require("ora");
-const yargsParser = require("yargs-parser");
 const nx_json_1 = require("../../config/nx-json");
 const child_process_2 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
@@ -79,27 +78,18 @@ async function installPackage(pkgName, version, nxJson) {
     spinner.succeed();
 }
 async function initializePlugin(pkgName, options, nxJson) {
-    const parsedCommandArgs = yargsParser(options.__overrides_unparsed__, {
-        configuration: {
-            'parse-numbers': false,
-            'parse-positional-numbers': false,
-            'dot-notation': false,
-            'camel-case-expansion': false,
-        },
-    });
-    if (exports.coreNxPluginVersions.has(pkgName)) {
-        parsedCommandArgs.keepExistingVersions = true;
-        if (options.updatePackageScripts ||
+    let updatePackageScripts = false;
+    if (exports.coreNxPluginVersions.has(pkgName) &&
+        (options.updatePackageScripts ||
             (options.updatePackageScripts === undefined &&
                 nxJson.useInferencePlugins !== false &&
-                process.env.NX_ADD_PLUGINS !== 'false')) {
-            parsedCommandArgs.updatePackageScripts = true;
-        }
+                process.env.NX_ADD_PLUGINS !== 'false'))) {
+        updatePackageScripts = true;
     }
     const spinner = ora(`Initializing ${pkgName}...`);
     spinner.start();
     try {
-        await (0, configure_plugins_1.installPlugin)(pkgName, workspace_root_1.workspaceRoot, options.verbose, parsedCommandArgs);
+        await (0, configure_plugins_1.installPlugin)(pkgName, workspace_root_1.workspaceRoot, updatePackageScripts, options.verbose);
     }
     catch (e) {
         spinner.fail();

package/src/command-line/init/configure-plugins.d.ts

@@ -4,19 +4,18 @@ export declare function runPackageManagerInstallPlugins(repoRoot: string, pmc: P
  * Installs a plugin by running its init generator. It will change the file system tree passed in.
  * @param plugin The name of the plugin to install
  * @param repoRoot repo root
- * @param verbose verbose
- * @param options options passed to init generator
+ * @param pmc package manager commands
+ * @param updatePackageScripts whether to update package scripts
+ * @param verbose whether to run in verbose mode
  * @returns void
  */
-export declare function installPlugin(plugin: string, repoRoot: string, verbose: boolean, options: {
-    [k: string]: any;
-}): Promise<void>;
+export declare function installPlugin(plugin: string, repoRoot?: string, updatePackageScripts?: boolean, verbose?: boolean, pmc?: PackageManagerCommands): Promise<void>;
 /**
  * Install plugins
  * Get the implementation of the plugin's init generator and run it
  * @returns a list of succeeded plugins and a map of failed plugins to errors
  */
-export declare function installPlugins(plugins: string[], updatePackageScripts: boolean, repoRoot?: string, verbose?: boolean): Promise<{
+export declare function installPlugins(plugins: string[], updatePackageScripts: boolean, pmc: PackageManagerCommands, repoRoot?: string, verbose?: boolean): Promise<{
     succeededPlugins: string[];
     failedPlugins: {
         [plugin: string]: Error;

package/src/command-line/init/configure-plugins.js

@@ -7,10 +7,9 @@ exports.configurePlugins = configurePlugins;
 exports.getFailedToInstallPluginErrorMessages = getFailedToInstallPluginErrorMessages;
 const createSpinner = require("ora");
 const chalk_1 = require("chalk");
+const child_process_1 = require("child_process");
 const package_manager_1 = require("../../utils/package-manager");
 const output_1 = require("../../utils/output");
-const tree_1 = require("../../generators/tree");
-const generator_utils_1 = require("../generate/generator-utils");
 const workspace_root_1 = require("../../utils/workspace-root");
 const utils_1 = require("./implementation/utils");
 const plugins_1 = require("../../utils/plugins");
@@ -27,12 +26,12 @@ function runPackageManagerInstallPlugins(repoRoot, pmc = (0, package_manager_1.g
  * Installs a plugin by running its init generator. It will change the file system tree passed in.
  * @param plugin The name of the plugin to install
  * @param repoRoot repo root
- * @param verbose verbose
- * @param options options passed to init generator
+ * @param pmc package manager commands
+ * @param updatePackageScripts whether to update package scripts
+ * @param verbose whether to run in verbose mode
  * @returns void
  */
-async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot, verbose = false, options) {
-    const host = new tree_1.FsTree(repoRoot, verbose, `install ${plugin}`);
+async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot, updatePackageScripts = false, verbose = false, pmc = (0, package_manager_1.getPackageManagerCommand)()) {
     const capabilities = await (0, plugins_1.getPluginCapabilities)(repoRoot, plugin, {});
     const generators = capabilities?.generators;
     if (!generators) {
@@ -45,20 +44,18 @@ async function installPlugin(plugin, repoRoot = workspace_root_1.workspaceRoot,
         });
         return;
     }
-    const { implementationFactory } = (0, generator_utils_1.getGeneratorInformation)(plugin, initGenerator, repoRoot, {});
-    const implementation = implementationFactory();
-    const task = await implementation(host, options);
-    (0, tree_1.flushChanges)(repoRoot, host.listChanges());
-    if (task) {
-        await task();
-    }
+    (0, child_process_1.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${updatePackageScripts ? '--updatePackageScripts' : ''} ${verbose ? '--verbose' : ''}`, {
+        stdio: [0, 1, 2],
+        cwd: repoRoot,
+        windowsHide: false,
+    });
 }
 /**
  * Install plugins
  * Get the implementation of the plugin's init generator and run it
  * @returns a list of succeeded plugins and a map of failed plugins to errors
  */
-async function installPlugins(plugins, updatePackageScripts, repoRoot = workspace_root_1.workspaceRoot, verbose = false) {
+async function installPlugins(plugins, updatePackageScripts, pmc, repoRoot = workspace_root_1.workspaceRoot, verbose = false) {
     if (plugins.length === 0) {
         return {
             succeededPlugins: [],
@@ -71,13 +68,7 @@ async function installPlugins(plugins, updatePackageScripts, repoRoot = workspac
     for (const plugin of plugins) {
         try {
             spinner.start('Installing plugin ' + plugin);
-            await installPlugin(plugin, repoRoot, verbose, {
-                keepExistingVersions: true,
-                updatePackageScripts,
-                addPlugin: true,
-                skipFormat: false,
-                skipPackageJson: false,
-            });
+            await installPlugin(plugin, repoRoot, updatePackageScripts, verbose, pmc);
             succeededPlugins.push(plugin);
             spinner.succeed('Installed plugin ' + plugin);
         }
@@ -103,7 +94,7 @@ async function configurePlugins(plugins, updatePackageScripts, pmc, repoRoot = w
         };
     }
     output_1.output.log({ title: '🔨 Configuring plugins' });
-    let { succeededPlugins, failedPlugins } = await installPlugins(plugins, updatePackageScripts, repoRoot, verbose);
+    let { succeededPlugins, failedPlugins } = await installPlugins(plugins, updatePackageScripts, pmc, repoRoot, verbose);
     if (succeededPlugins.length > 0) {
         output_1.output.success({
             title: 'Installed Plugins',

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

@@ -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
      */
@@ -358,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?: {