nx 21.3.0-beta.2 → 21.3.0-beta.4

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

@@ -26,7 +26,7 @@ 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 = {}, checkAllBranchesWhen) {
+async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}, checkAllBranchesWhen, releaseTagPatternRequireSemver = true) {
     /**
      * 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.
@@ -105,17 +105,25 @@ async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolat
         const tagRegexp = `^${escapeRegExp(interpolatedTagPattern)
             .replace('%v%', '(.+)')
             .replace('%p%', '(.+)')}`;
-        const matchingSemverTags = tags.filter((tag) => 
-        // Do the match against SEMVER_REGEX to ensure that we skip tags that aren't valid semver versions
-        !!tag.match(tagRegexp) &&
-            tag.match(tagRegexp).some((r) => r.match(SEMVER_REGEX)));
-        if (!matchingSemverTags.length) {
+        const matchingTags = tags.filter((tag) => {
+            if (releaseTagPatternRequireSemver) {
+                // Match against Semver Regex when using semverVersioning to ensure only valid semver tags are matched
+                return (!!tag.match(tagRegexp) &&
+                    tag.match(tagRegexp).some((r) => r.match(SEMVER_REGEX)));
+            }
+            else {
+                return !!tag.match(tagRegexp);
+            }
+        });
+        if (!matchingTags.length) {
             return null;
         }
-        const [latestMatchingTag, ...rest] = matchingSemverTags[0].match(tagRegexp);
-        const version = rest.filter((r) => {
-            return r.match(SEMVER_REGEX);
-        })[0];
+        const [latestMatchingTag, ...rest] = matchingTags[0].match(tagRegexp);
+        const version = releaseTagPatternRequireSemver
+            ? rest.filter((r) => {
+                return r.match(SEMVER_REGEX);
+            })[0]
+            : rest[0];
         return {
             tag: latestMatchingTag,
             extractedVersion: version,

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

@@ -15,7 +15,13 @@ const git_1 = require("./git");
 exports.noDiffInChangelogMessage = chalk.yellow(`NOTE: There was no diff detected for the changelog entry. Maybe you intended to pass alternative git references via --from and --to?`);
 function isPrerelease(version) {
     // prerelease returns an array of matching prerelease "components", or null if the version is not a prerelease
-    return (0, semver_1.prerelease)(version) !== null;
+    try {
+        return (0, semver_1.prerelease)(version) !== null;
+    }
+    catch {
+        // If non-semver, prerelease will error. Prevent this from erroring the command
+        return false;
+    }
 }
 class ReleaseVersion {
     constructor({ version, // short form version string with no prefixes or patterns, e.g. 1.0.0

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

@@ -198,7 +198,7 @@ class ReleaseGroupProcessor {
                 if (finalConfigForProject.currentVersionResolver === 'git-tag') {
                     latestMatchingGitTag = await (0, git_1.getLatestGitTagForPattern)(releaseTagPattern, {
                         projectName: projectGraphNode.name,
-                    }, releaseGroupNode.group.releaseTagPatternCheckAllBranchesWhen);
+                    }, releaseGroupNode.group.releaseTagPatternCheckAllBranchesWhen, releaseGroupNode.group.releaseTagPatternRequireSemver);
                     this.cachedLatestMatchingGitTag.set(projectName, latestMatchingGitTag);
                 }
                 // Cache the current version for the project

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

@@ -4,7 +4,7 @@ exports.runOne = runOne;
 exports.parseRunOneOptions = parseRunOneOptions;
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
-const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../nx-cloud/connect/connect-to-nx-cloud");
 const project_graph_1 = require("../../project-graph/project-graph");
 const workspace_root_1 = require("../../utils/workspace-root");
 const split_target_1 = require("../../utils/split-target");

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

@@ -5,7 +5,7 @@ exports.projectsToRun = projectsToRun;
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
-const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
+const connect_to_nx_cloud_1 = require("../nx-cloud/connect/connect-to-nx-cloud");
 const perf_hooks_1 = require("perf_hooks");
 const project_graph_1 = require("../../project-graph/project-graph");
 const configuration_1 = require("../../config/configuration");

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

@@ -342,6 +342,13 @@ export interface NxReleaseConfiguration {
          * - 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[];
+        /**
+         * By default, we will use semver when searching through the tags to find the latest matching tag.
+         *
+         * - Setting this to true will cause us to use semver to match the version
+         * - Setting this to false will cause us to not use semver to match the version allowing for non-semver versions
+         */
+        releaseTagPatternRequireSemver?: boolean;
         /**
          * Enables using version plans as a specifier source for versioning and
          * to determine changes for changelog generation.
@@ -410,6 +417,13 @@ export interface NxReleaseConfiguration {
      * - 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[];
+    /**
+     * By default, we will use semver when searching through the tags to find the latest matching tag.
+     *
+     * - Setting this to true will cause us to use semver to match the version
+     * - Setting this to false will cause us to not use semver to match the version allowing for non-semver versions
+     */
+    releaseTagPatternRequireSemver?: boolean;
     /**
      * Enable and configure automatic git operations as part of the release
      */