nx 22.0.0-canary.20251021-6934445 → 22.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nx",
3
- "version": "22.0.0-canary.20251021-6934445",
3
+ "version": "22.0.0",
4
4
  "private": false,
5
5
  "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
6
6
  "repository": {
@@ -83,16 +83,16 @@
83
83
  }
84
84
  },
85
85
  "optionalDependencies": {
86
- "@nx/nx-darwin-arm64": "22.0.0-canary.20251021-6934445",
87
- "@nx/nx-darwin-x64": "22.0.0-canary.20251021-6934445",
88
- "@nx/nx-freebsd-x64": "22.0.0-canary.20251021-6934445",
89
- "@nx/nx-linux-arm-gnueabihf": "22.0.0-canary.20251021-6934445",
90
- "@nx/nx-linux-arm64-gnu": "22.0.0-canary.20251021-6934445",
91
- "@nx/nx-linux-arm64-musl": "22.0.0-canary.20251021-6934445",
92
- "@nx/nx-linux-x64-gnu": "22.0.0-canary.20251021-6934445",
93
- "@nx/nx-linux-x64-musl": "22.0.0-canary.20251021-6934445",
94
- "@nx/nx-win32-arm64-msvc": "22.0.0-canary.20251021-6934445",
95
- "@nx/nx-win32-x64-msvc": "22.0.0-canary.20251021-6934445"
86
+ "@nx/nx-darwin-arm64": "22.0.0",
87
+ "@nx/nx-darwin-x64": "22.0.0",
88
+ "@nx/nx-freebsd-x64": "22.0.0",
89
+ "@nx/nx-linux-arm-gnueabihf": "22.0.0",
90
+ "@nx/nx-linux-arm64-gnu": "22.0.0",
91
+ "@nx/nx-linux-arm64-musl": "22.0.0",
92
+ "@nx/nx-linux-x64-gnu": "22.0.0",
93
+ "@nx/nx-linux-x64-musl": "22.0.0",
94
+ "@nx/nx-win32-arm64-msvc": "22.0.0",
95
+ "@nx/nx-win32-x64-msvc": "22.0.0"
96
96
  },
97
97
  "nx-migrations": {
98
98
  "migrations": "./migrations.json",
@@ -106,6 +106,7 @@
106
106
  "@nx/cypress",
107
107
  "@nx/detox",
108
108
  "@nx/devkit",
109
+ "@nx/dotnet",
109
110
  "@nx/esbuild",
110
111
  "@nx/eslint-plugin",
111
112
  "@nx/expo",
@@ -54,7 +54,7 @@ export default class DefaultChangelogRenderer {
54
54
  protected changelogRenderOptions: DefaultChangelogRenderOptions;
55
55
  protected isVersionPlans: boolean;
56
56
  protected dependencyBumps?: DependencyBump[];
57
- protected conventionalCommitsConfig: NxReleaseConfig['conventionalCommits'] | null;
57
+ protected conventionalCommitsConfig: NxReleaseConfig['conventionalCommits'];
58
58
  protected relevantChanges: ChangelogChange[];
59
59
  protected breakingChanges: string[];
60
60
  protected additionalChangesForAuthorsSection: ChangelogChange[];
@@ -71,7 +71,7 @@ export default class DefaultChangelogRenderer {
71
71
  * @param {boolean} config.isVersionPlans Whether or not Nx release version plans are the source of truth for the changelog entry
72
72
  * @param {ChangelogRenderOptions} config.changelogRenderOptions The options specific to the ChangelogRenderer implementation
73
73
  * @param {DependencyBump[]} config.dependencyBumps Optional list of additional dependency bumps that occurred as part of the release, outside of the change data
74
- * @param {NxReleaseConfig['conventionalCommits'] | null} config.conventionalCommitsConfig The configuration for conventional commits, or null if version plans are being used
74
+ * @param {NxReleaseConfig['conventionalCommits']} config.conventionalCommitsConfig The configuration for conventional commits
75
75
  * @param {RemoteReleaseClient} config.remoteReleaseClient The remote release client to use for formatting references
76
76
  */
77
77
  constructor(config: {
@@ -82,7 +82,7 @@ export default class DefaultChangelogRenderer {
82
82
  isVersionPlans: boolean;
83
83
  changelogRenderOptions: DefaultChangelogRenderOptions;
84
84
  dependencyBumps?: DependencyBump[];
85
- conventionalCommitsConfig: NxReleaseConfig['conventionalCommits'] | null;
85
+ conventionalCommitsConfig: NxReleaseConfig['conventionalCommits'];
86
86
  remoteReleaseClient: RemoteReleaseClient<unknown>;
87
87
  });
88
88
  protected filterChanges(changes: ChangelogChange[], project: string | null): ChangelogChange[];
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/release/changelog-renderer/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/release/changelog-renderer/index.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const semver_1 = require("semver");
4
- const conventional_commits_1 = require("../../src/command-line/release/config/conventional-commits");
5
4
  class DefaultChangelogRenderer {
6
5
  /**
7
6
  * A ChangelogRenderer class takes in the determined changes and other relevant metadata
@@ -15,7 +14,7 @@ class DefaultChangelogRenderer {
15
14
  * @param {boolean} config.isVersionPlans Whether or not Nx release version plans are the source of truth for the changelog entry
16
15
  * @param {ChangelogRenderOptions} config.changelogRenderOptions The options specific to the ChangelogRenderer implementation
17
16
  * @param {DependencyBump[]} config.dependencyBumps Optional list of additional dependency bumps that occurred as part of the release, outside of the change data
18
- * @param {NxReleaseConfig['conventionalCommits'] | null} config.conventionalCommitsConfig The configuration for conventional commits, or null if version plans are being used
17
+ * @param {NxReleaseConfig['conventionalCommits']} config.conventionalCommitsConfig The configuration for conventional commits
19
18
  * @param {RemoteReleaseClient} config.remoteReleaseClient The remote release client to use for formatting references
20
19
  */
21
20
  constructor(config) {
@@ -86,12 +85,6 @@ class DefaultChangelogRenderer {
86
85
  }
87
86
  }
88
87
  if (this.isVersionPlans) {
89
- this.conventionalCommitsConfig = {
90
- types: {
91
- feat: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types.feat,
92
- fix: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types.fix,
93
- },
94
- };
95
88
  for (let i = this.relevantChanges.length - 1; i >= 0; i--) {
96
89
  if (this.relevantChanges[i].isBreaking) {
97
90
  const change = this.relevantChanges[i];
@@ -256,9 +249,12 @@ class DefaultChangelogRenderer {
256
249
  if (description.includes('\n')) {
257
250
  [description, ...extraLines] = description.split('\n');
258
251
  const indentation = ' ';
259
- extraLinesStr = extraLines
260
- .filter((l) => l.trim().length > 0)
261
- .map((l) => `${indentation}${l}`)
252
+ extraLinesStr = (this.isVersionPlans
253
+ ? // Preserve newlines for version plan sources to allow author to maintain maximum control over final contents
254
+ extraLines
255
+ : extraLines.filter((l) => l.trim().length > 0))
256
+ // Only add indentation to lines with content
257
+ .map((l) => (l.trim().length > 0 ? `${indentation}${l}` : ''))
262
258
  .join('\n');
263
259
  }
264
260
  let changeLine = '- ' +
@@ -273,7 +269,7 @@ class DefaultChangelogRenderer {
273
269
  changeLine += this.remoteReleaseClient.formatReferences(change.githubReferences);
274
270
  }
275
271
  if (extraLinesStr) {
276
- changeLine += '\n\n' + extraLinesStr;
272
+ changeLine += (this.isVersionPlans ? '\n' : '\n\n') + extraLinesStr;
277
273
  }
278
274
  return changeLine;
279
275
  }
@@ -341,12 +337,18 @@ class DefaultChangelogRenderer {
341
337
  return null;
342
338
  }
343
339
  const startOfBreakingChange = startIndex + breakingChangeIdentifier.length;
344
- // Extract all text after BREAKING CHANGE: until we hit git metadata
340
+ // Extract all text after BREAKING CHANGE: until we hit a Co-authored-by section or git metadata
345
341
  let endOfBreakingChange = message.length;
346
- // Look for the git metadata delimiter (a line with just ")
347
- const gitMetadataMarker = message.indexOf('\n"', startOfBreakingChange);
348
- if (gitMetadataMarker !== -1) {
349
- endOfBreakingChange = gitMetadataMarker;
342
+ const coAuthoredBySection = message.indexOf('---------\n\nCo-authored-by:');
343
+ if (coAuthoredBySection !== -1) {
344
+ endOfBreakingChange = coAuthoredBySection;
345
+ }
346
+ else {
347
+ // Look for the git metadata delimiter (a line with just ")
348
+ const gitMetadataMarker = message.indexOf('"\n', startOfBreakingChange);
349
+ if (gitMetadataMarker !== -1) {
350
+ endOfBreakingChange = gitMetadataMarker;
351
+ }
350
352
  }
351
353
  return message.substring(startOfBreakingChange, endOfBreakingChange).trim();
352
354
  }
@@ -760,7 +760,7 @@ async function generateChangelogForWorkspace({ tree, args, nxReleaseConfig, work
760
760
  changes,
761
761
  changelogEntryVersion: releaseVersion.rawVersion,
762
762
  project: null,
763
- isVersionPlans: false,
763
+ isVersionPlans: !!nxReleaseConfig.versionPlans,
764
764
  entryWhenNoChanges: config.entryWhenNoChanges,
765
765
  changelogRenderOptions: config.renderOptions,
766
766
  conventionalCommitsConfig: nxReleaseConfig.conventionalCommits,
@@ -873,9 +873,7 @@ async function generateChangelogForProjects({ tree, args, changes, projectsVersi
873
873
  : false,
874
874
  changelogRenderOptions: config.renderOptions,
875
875
  isVersionPlans: !!releaseGroup.versionPlans,
876
- conventionalCommitsConfig: releaseGroup.versionPlans
877
- ? null
878
- : nxReleaseConfig.conventionalCommits,
876
+ conventionalCommitsConfig: nxReleaseConfig.conventionalCommits,
879
877
  dependencyBumps: projectToAdditionalDependencyBumps.get(project.name),
880
878
  remoteReleaseClient,
881
879
  });