nx 23.0.0-rc.4 → 23.0.1

package/README.md

@@ -7,13 +7,12 @@
 
 <div style="text-align: center;">
 
-[![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
 [![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
-[![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Join us on the Official Nx Discord Server](https://img.shields.io/discord/1143497901675401286?label=discord)](https://go.nx.dev/community)
+[![Nx Sandboxing](https://staging.nx.app/workspaces/62d013ea0852fe0a2df74438/sandbox-badge.svg)](https://nx.dev/docs/features/ci-features/sandboxing)
 
 </div>
 

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/agentic/prompts/system-prompt.js

@@ -80,9 +80,10 @@ function buildScopeRules(mode) {
     return [
         `<scope_rules>`,
         `- Apply only the changes the migration prompt asks for.`,
-        `- Do not refactor, reformat, or update dependencies beyond what the migration prompt directs.`,
+        `- Do not refactor or update dependencies beyond what the migration prompt directs, and do not reformat files you did not change.`,
+        `- After applying your changes and before writing the handoff, format the files you created or modified so they match the workspace's style. If the workspace uses Prettier, run \`nx format:write\`, which formats your uncommitted changes; if it has no formatter configured, skip this.`,
         `- Do not modify files outside the workspace root.`,
-        `- Do not run other \`nx\` commands that mutate workspace state (\`nx migrate\`, \`nx reset\`, \`nx run-many\`, generators, etc.). Read-only inspection (\`nx show\`, \`nx graph --file\`, reading files) is fine.`,
+        `- Do not run other \`nx\` commands that mutate workspace state (\`nx migrate\`, \`nx reset\`, \`nx run-many\`, generators, etc.), except \`nx format:write\` to format the files you changed. Read-only inspection (\`nx show\`, \`nx graph --file\`, reading files) is fine.`,
         `- If the migration instructions are unclear, internally inconsistent, or conflict with the current workspace state, ask the user for direction (see the handoff contract). Do not guess.`,
         `</scope_rules>`,
     ].join('\n');

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/resolve-package-version.js

@@ -137,9 +137,9 @@ async function resolveWithPolicy(packageName, version, policy, applySideEffects)
         if (applySideEffects && outcome.version !== outcome.unconstrained) {
             reportChangedOutcome(packageName, spec, outcome.version, outcome.unconstrained, policy);
         }
-        if (outcome.immature && applySideEffects) {
-            handleImmaturePick(packageName, outcome.version, policy);
-        }
+        // An immature loose pick is returned as-is. nx does not write the
+        // minimumReleaseAgeExclude entry here: migrate does not replace the install,
+        // so the real `pnpm install` (>=11.1.3) auto-writes it itself.
         return outcome.version;
     }
     catch (e) {
@@ -171,28 +171,6 @@ function reportChangedOutcome(packageName, spec, picked, unconstrained, policy)
         title: `Resolved ${packageName}@${picked} instead of ${unconstrained}: ${policy.sourceDescription}.`,
     });
 }
-// pnpm v11 loose installs an immature version; >=11.1.3 also records it as an
-// exclude in pnpm-workspace.yaml. Mirror that so a later real install agrees.
-function handleImmaturePick(packageName, version, policy) {
-    if (policy.behavior.packageManager !== 'pnpm' ||
-        !policy.behavior.writesExcludes) {
-        return;
-    }
-    const added = (0, pnpm_exclude_writer_1.appendMinimumReleaseAgeExcludes)(workspace_root_1.workspaceRoot, [
-        `${packageName}@${version}`,
-    ]);
-    // Already present (e.g. a prior pick or a pre-existing entry): nothing written,
-    // so do not claim we added it.
-    if (added.length === 0) {
-        return;
-    }
-    output_1.output.log({
-        title: `Added ${packageName}@${version} to minimumReleaseAgeExclude in pnpm-workspace.yaml.`,
-        bodyLines: [
-            `It is within the ${policy.sourceDescription} window; this mirrors what pnpm would write at install time.`,
-        ],
-    });
-}
 async function handleViolation(packageName, error, policy) {
     const isPnpmStrict = policy.behavior.packageManager === 'pnpm' &&
         policy.behavior.strict &&

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/command-line/nx-cloud/connect/connect-to-nx-cloud.js

@@ -181,7 +181,7 @@ function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function connectExistingRepoToNxCloudPrompt(command = 'init', key = 'setupNxCloud') {
-    const res = await nxCloudPrompt(key);
+    const res = await nxCloudPrompt(key, utmMediumForCommand(command));
     await (0, ab_testing_1.recordStat)({
         command,
         nxVersion: versions_1.nxVersion,
@@ -200,7 +200,7 @@ async function connectExistingRepoToNxCloudPrompt(command = 'init', key = 'setup
     return res;
 }
 async function connectToNxCloudWithPrompt(command) {
-    const setNxCloud = await nxCloudPrompt('setupNxCloud');
+    const setNxCloud = await nxCloudPrompt('setupNxCloud', utmMediumForCommand(command));
     let useCloud = false;
     if (setNxCloud === 'yes') {
         useCloud = await connectToNxCloudCommand({ generateToken: false }, command);
@@ -229,7 +229,17 @@ async function connectToNxCloudWithPrompt(command) {
         },
     });
 }
-async function nxCloudPrompt(key) {
+function utmMediumForCommand(command) {
+    switch (command) {
+        case 'migrate':
+            return 'nx-migrate';
+        case 'view-logs':
+            return 'nx-connect';
+        default:
+            return 'nx-init';
+    }
+}
+async function nxCloudPrompt(key, utmMedium) {
     const { message, choices, initial, footer, hint } = ab_testing_1.messages.getPrompt(key);
     const promptConfig = {
         name: 'NxCloud',
@@ -239,7 +249,7 @@ async function nxCloudPrompt(key) {
         initial,
     }; // meeroslav: types in enquirer are not up to date
     if (footer) {
-        promptConfig.footer = () => pc.dim(footer);
+        promptConfig.footer = () => pc.dim(`${footer} ${(0, ab_testing_1.nxCloudHyperlink)(utmMedium)}`);
     }
     if (hint) {
         promptConfig.hint = () => pc.dim(hint);