nx 23.1.0-beta.0 → 23.1.0-beta.1

package/dist/release/changelog-renderer/index.d.ts

@@ -105,5 +105,6 @@ export default class DefaultChangelogRenderer {
     protected groupChangesByType(): Record<string, ChangelogChange[]>;
     protected groupChangesByScope(changes: ChangelogChange[]): Record<string, ChangelogChange[]>;
     protected extractBreakingChangeExplanation(message: string): string | null;
+    private isBreakingChangeBoundary;
     protected formatName(name?: string): string;
 }

package/dist/release/changelog-renderer/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const semver_1 = require("semver");
+// Stripped from breaking change explanations (e.g. bot/session markers).
+const HtmlCommentRegex = /<!--[\s\S]*?-->/g;
 class DefaultChangelogRenderer {
     /**
      * A ChangelogRenderer class takes in the determined changes and other relevant metadata
@@ -342,20 +344,33 @@ class DefaultChangelogRenderer {
             return null;
         }
         const startOfBreakingChange = startIndex + breakingChangeIdentifier.length;
-        // Extract all text after BREAKING CHANGE: until we hit a Co-authored-by section or git metadata
-        let endOfBreakingChange = message.length;
-        const coAuthoredBySection = message.indexOf('---------\n\nCo-authored-by:');
-        if (coAuthoredBySection !== -1) {
-            endOfBreakingChange = coAuthoredBySection;
-        }
-        else {
-            // Look for the git metadata delimiter (a line with just ")
-            const gitMetadataMarker = message.indexOf('"\n', startOfBreakingChange);
-            if (gitMetadataMarker !== -1) {
-                endOfBreakingChange = gitMetadataMarker;
+        // A squash-merged PR body can trail the note with template sections,
+        // trailers, and git metadata. Strip comments (they can appear anywhere),
+        // then keep lines until the first boundary.
+        const lines = message
+            .slice(startOfBreakingChange)
+            .replace(HtmlCommentRegex, '')
+            .split('\n');
+        // The rest of the "BREAKING CHANGE:" line is always kept; scan from the next.
+        const explanationLines = [lines[0]];
+        for (let i = 1; i < lines.length; i++) {
+            if (this.isBreakingChangeBoundary(lines[i])) {
+                break;
             }
+            explanationLines.push(lines[i]);
         }
-        return message.substring(startOfBreakingChange, endOfBreakingChange).trim();
+        return explanationLines.join('\n').trim();
+    }
+    isBreakingChangeBoundary(line) {
+        const trimmed = line.trim();
+        return (
+        // Markdown heading (e.g. "## Related issues")
+        /^#{1,6}\s/.test(trimmed) ||
+            // Horizontal rule / separator
+            /^-{3,}$/.test(trimmed) ||
+            /^Co-authored-by:/i.test(trimmed) ||
+            // Git metadata delimiter following the body
+            trimmed === '"');
     }
     formatName(name = '') {
         return name

package/dist/src/command-line/migrate/migrate.js

@@ -1413,7 +1413,8 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts, fetch) {
         // the user already has. Drop those before writing; nx migrate is
         // forward-only, never a downgrade.
         phase = 'package_updates';
-        const writableUpdates = (0, update_filters_1.filterDowngradedUpdates)(packageUpdates, originalPackageJson, installedPackageVersions);
+        // Resolve catalog: specifiers first so the filter compares real versions.
+        const writableUpdates = (0, update_filters_1.filterDowngradedUpdates)(packageUpdates, (0, catalog_1.resolveCatalogSpecifiers)(originalPackageJson), installedPackageVersions);
         const wrotePackageJson = await updatePackageJson(root, writableUpdates);
         const wroteNxJsonInstallation = await updateInstallationDetails(root, writableUpdates);
         const promptMigrationFiles = (0, prompt_files_1.writePromptMigrationFiles)(root, migrations, promptContents ?? {}, packageUpdates[walkedTargetPackage].version);

package/dist/src/command-line/migrate/update-filters.js

@@ -35,7 +35,8 @@ function filterDowngradedUpdates(packageUpdates, packageJson, getInstalledVersio
         if (!specifier) {
             continue;
         }
-        const floor = (0, semver_1.minVersion)(specifier);
+        // Skip specifiers that aren't semver ranges (workspace:/npm:/git/file).
+        const floor = (0, semver_1.validRange)(specifier) ? (0, semver_1.minVersion)(specifier) : null;
         if (floor && (0, semver_1.lt)(floor.version, resolvedNorm)) {
             result[name] = update;
         }

package/dist/src/utils/catalog/index.d.ts

@@ -1,4 +1,5 @@
 import type { Tree } from '../../generators/tree';
+import type { PackageJson } from '../package-json';
 import type { CatalogManager } from './manager';
 import { getCatalogManager } from './manager-factory';
 export { type CatalogManager, getCatalogManager };
@@ -8,6 +9,12 @@ export { type CatalogManager, getCatalogManager };
  * applies). Throws when the reference cannot be resolved.
  */
 export declare function resolveCatalogReferenceIfNeeded(packageName: string, version: string): string;
+/**
+ * Resolves a package.json's `catalog:` dependency / devDependency specifiers to
+ * their declared version range. Non-catalog or unresolvable specifiers are
+ * returned unchanged.
+ */
+export declare function resolveCatalogSpecifiers(packageJson: PackageJson | null): PackageJson | null;
 /**
  * Detects which packages in a package.json use catalog references
  * Returns Map of package name -> catalog name (undefined for default catalog)

package/dist/src/utils/catalog/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCatalogManager = void 0;
 exports.resolveCatalogReferenceIfNeeded = resolveCatalogReferenceIfNeeded;
+exports.resolveCatalogSpecifiers = resolveCatalogSpecifiers;
 exports.getCatalogDependenciesFromPackageJson = getCatalogDependenciesFromPackageJson;
 const json_1 = require("../../generators/utils/json");
 const workspace_root_1 = require("../workspace-root");
@@ -23,6 +24,36 @@ function resolveCatalogReferenceIfNeeded(packageName, version) {
     }
     return resolvedVersion;
 }
+/**
+ * Resolves a package.json's `catalog:` dependency / devDependency specifiers to
+ * their declared version range. Non-catalog or unresolvable specifiers are
+ * returned unchanged.
+ */
+function resolveCatalogSpecifiers(packageJson) {
+    if (!packageJson) {
+        return packageJson;
+    }
+    const resolveSection = (section) => {
+        const resolved = {};
+        for (const [name, specifier] of Object.entries(section)) {
+            try {
+                resolved[name] = resolveCatalogReferenceIfNeeded(name, specifier);
+            }
+            catch {
+                resolved[name] = specifier;
+            }
+        }
+        return resolved;
+    };
+    const result = { ...packageJson };
+    if (packageJson.dependencies) {
+        result.dependencies = resolveSection(packageJson.dependencies);
+    }
+    if (packageJson.devDependencies) {
+        result.devDependencies = resolveSection(packageJson.devDependencies);
+    }
+    return result;
+}
 /**
  * Detects which packages in a package.json use catalog references
  * Returns Map of package name -> catalog name (undefined for default catalog)

package/package.json

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