nx 22.0.0-canary.20251014-82acc84 → 22.0.0-canary.20251016-849f356
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 +11 -11
- package/release/changelog-renderer/index.d.ts +5 -0
- package/release/changelog-renderer/index.d.ts.map +1 -1
- package/release/changelog-renderer/index.js +48 -16
- package/src/command-line/init/implementation/angular/index.d.ts.map +1 -1
- package/src/command-line/init/implementation/angular/index.js +4 -6
- package/src/command-line/migrate/migrate.d.ts.map +1 -1
- package/src/command-line/migrate/migrate.js +25 -8
- package/src/command-line/release/changelog.d.ts +1 -1
- package/src/command-line/release/changelog.d.ts.map +1 -1
- package/src/command-line/release/changelog.js +8 -6
- package/src/command-line/release/command-object.d.ts +1 -0
- package/src/command-line/release/command-object.d.ts.map +1 -1
- package/src/command-line/release/command-object.js +5 -0
- package/src/command-line/release/config/config.d.ts.map +1 -1
- package/src/command-line/release/config/config.js +6 -3
- package/src/command-line/release/index.d.ts +14 -2
- package/src/command-line/release/index.d.ts.map +1 -1
- package/src/command-line/release/index.js +13 -6
- package/src/command-line/release/publish.d.ts +1 -1
- package/src/command-line/release/publish.d.ts.map +1 -1
- package/src/command-line/release/publish.js +6 -3
- package/src/command-line/release/release.d.ts +1 -1
- package/src/command-line/release/release.d.ts.map +1 -1
- package/src/command-line/release/release.js +9 -7
- package/src/command-line/release/utils/resolve-changelog-renderer.d.ts +1 -1
- package/src/command-line/release/utils/resolve-changelog-renderer.d.ts.map +1 -1
- package/src/command-line/release/utils/resolve-changelog-renderer.js +6 -2
- package/src/command-line/release/version.d.ts +1 -1
- package/src/command-line/release/version.d.ts.map +1 -1
- package/src/command-line/release/version.js +6 -4
- package/src/config/nx-json.d.ts +10 -4
- package/src/config/nx-json.d.ts.map +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/devkit-internals.d.ts +1 -0
- package/src/devkit-internals.d.ts.map +1 -1
- package/src/devkit-internals.js +3 -1
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/js/lock-file/lock-file.d.ts.map +1 -1
- package/src/plugins/js/lock-file/lock-file.js +1 -1
- package/src/plugins/js/lock-file/pnpm-parser.d.ts +1 -1
- package/src/plugins/js/lock-file/pnpm-parser.d.ts.map +1 -1
- package/src/plugins/js/lock-file/pnpm-parser.js +12 -4
- package/src/plugins/js/lock-file/project-graph-pruning.d.ts +2 -2
- package/src/plugins/js/lock-file/project-graph-pruning.d.ts.map +1 -1
- package/src/plugins/js/lock-file/project-graph-pruning.js +22 -9
- package/src/plugins/js/package-json/create-package-json.d.ts.map +1 -1
- package/src/plugins/js/package-json/create-package-json.js +17 -5
- package/src/utils/catalog/index.d.ts +10 -0
- package/src/utils/catalog/index.d.ts.map +1 -0
- package/src/utils/catalog/index.js +38 -0
- package/src/utils/catalog/manager-factory.d.ts +6 -0
- package/src/utils/catalog/manager-factory.d.ts.map +1 -0
- package/src/utils/catalog/manager-factory.js +17 -0
- package/src/utils/catalog/manager.d.ts +40 -0
- package/src/utils/catalog/manager.d.ts.map +1 -0
- package/src/utils/catalog/manager.js +2 -0
- package/src/utils/catalog/pnpm-manager.d.ts +22 -0
- package/src/utils/catalog/pnpm-manager.d.ts.map +1 -0
- package/src/utils/catalog/pnpm-manager.js +257 -0
- package/src/utils/catalog/types.d.ts +5 -0
- package/src/utils/catalog/types.d.ts.map +1 -0
- package/src/utils/catalog/types.js +2 -0
- package/src/utils/package-json.d.ts +79 -0
- package/src/utils/package-json.d.ts.map +1 -1
- package/src/utils/package-json.js +81 -2
- package/src/utils/package-manager.d.ts.map +1 -1
- package/src/utils/package-manager.js +23 -6
- package/src/utils/pnpm-workspace.d.ts +9 -0
- package/src/utils/pnpm-workspace.d.ts.map +1 -0
- package/src/utils/pnpm-workspace.js +2 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "22.0.0-canary.
|
|
3
|
+
"version": "22.0.0-canary.20251016-849f356",
|
|
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.
|
|
87
|
-
"@nx/nx-darwin-x64": "22.0.0-canary.
|
|
88
|
-
"@nx/nx-freebsd-x64": "22.0.0-canary.
|
|
89
|
-
"@nx/nx-linux-arm-gnueabihf": "22.0.0-canary.
|
|
90
|
-
"@nx/nx-linux-arm64-gnu": "22.0.0-canary.
|
|
91
|
-
"@nx/nx-linux-arm64-musl": "22.0.0-canary.
|
|
92
|
-
"@nx/nx-linux-x64-gnu": "22.0.0-canary.
|
|
93
|
-
"@nx/nx-linux-x64-musl": "22.0.0-canary.
|
|
94
|
-
"@nx/nx-win32-arm64-msvc": "22.0.0-canary.
|
|
95
|
-
"@nx/nx-win32-x64-msvc": "22.0.0-canary.
|
|
86
|
+
"@nx/nx-darwin-arm64": "22.0.0-canary.20251016-849f356",
|
|
87
|
+
"@nx/nx-darwin-x64": "22.0.0-canary.20251016-849f356",
|
|
88
|
+
"@nx/nx-freebsd-x64": "22.0.0-canary.20251016-849f356",
|
|
89
|
+
"@nx/nx-linux-arm-gnueabihf": "22.0.0-canary.20251016-849f356",
|
|
90
|
+
"@nx/nx-linux-arm64-gnu": "22.0.0-canary.20251016-849f356",
|
|
91
|
+
"@nx/nx-linux-arm64-musl": "22.0.0-canary.20251016-849f356",
|
|
92
|
+
"@nx/nx-linux-x64-gnu": "22.0.0-canary.20251016-849f356",
|
|
93
|
+
"@nx/nx-linux-x64-musl": "22.0.0-canary.20251016-849f356",
|
|
94
|
+
"@nx/nx-win32-arm64-msvc": "22.0.0-canary.20251016-849f356",
|
|
95
|
+
"@nx/nx-win32-x64-msvc": "22.0.0-canary.20251016-849f356"
|
|
96
96
|
},
|
|
97
97
|
"nx-migrations": {
|
|
98
98
|
"migrations": "./migrations.json",
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import type { ChangelogChange } from '../../src/command-line/release/changelog';
|
|
2
2
|
import type { NxReleaseConfig } from '../../src/command-line/release/config/config';
|
|
3
3
|
import type { RemoteReleaseClient } from '../../src/command-line/release/utils/remote-release-clients/remote-release-client';
|
|
4
|
+
/**
|
|
5
|
+
* Re-export for ease of use in custom changelog renderers.
|
|
6
|
+
*/
|
|
7
|
+
export type { ChangelogChange };
|
|
4
8
|
/**
|
|
5
9
|
* The ChangelogRenderOptions are specific to each ChangelogRenderer implementation, and are taken
|
|
6
10
|
* from the user's nx.json configuration and passed as is into the ChangelogRenderer function.
|
|
@@ -95,6 +99,7 @@ export default class DefaultChangelogRenderer {
|
|
|
95
99
|
protected shouldRenderAuthors(): boolean;
|
|
96
100
|
protected renderAuthors(): Promise<string[]>;
|
|
97
101
|
protected formatChange(change: ChangelogChange): string;
|
|
102
|
+
protected formatBreakingChange(change: ChangelogChange): string;
|
|
98
103
|
protected groupChangesByType(): Record<string, ChangelogChange[]>;
|
|
99
104
|
protected groupChangesByScope(changes: ChangelogChange[]): Record<string, ChangelogChange[]>;
|
|
100
105
|
protected extractBreakingChangeExplanation(message: string): string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/release/changelog-renderer/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAEpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mFAAmF,CAAC;AAE7H;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE7D;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,6BAA8B,SAAQ,sBAAsB;IAC3E;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C,SAAS,CAAC,OAAO,EAAE,eAAe,EAAE,CAAC;IACrC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACxC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,SAAS,CAAC,kBAAkB,EAAE,MAAM,GAAG,KAAK,CAAC;IAC7C,SAAS,CAAC,sBAAsB,EAAE,6BAA6B,CAAC;IAChE,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7C,SAAS,CAAC,yBAAyB,EAC/B,eAAe,CAAC,qBAAqB,CAAC,GACtC,IAAI,CAAC;IACT,SAAS,CAAC,eAAe,EAAE,eAAe,EAAE,CAAC;IAC7C,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;IACpC,SAAS,CAAC,kCAAkC,EAAE,eAAe,EAAE,CAAC;IAChE,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE5D;;;;;;;;;;;;;;OAcG;gBACS,MAAM,EAAE;QAClB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,qBAAqB,EAAE,MAAM,CAAC;QAC9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,kBAAkB,EAAE,MAAM,GAAG,KAAK,CAAC;QACnC,cAAc,EAAE,OAAO,CAAC;QACxB,sBAAsB,EAAE,6BAA6B,CAAC;QACtD,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;QACnC,yBAAyB,EAAE,eAAe,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC;QACzE,mBAAmB,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;KACnD;IAgBD,SAAS,CAAC,aAAa,CACrB,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,eAAe,EAAE;IAWd,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAoC/B,SAAS,CAAC,iBAAiB,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/release/changelog-renderer/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,10 +105,7 @@ class DefaultChangelogRenderer {
|
|
|
105
105
|
else {
|
|
106
106
|
for (const change of this.relevantChanges) {
|
|
107
107
|
if (change.isBreaking) {
|
|
108
|
-
|
|
109
|
-
this.breakingChanges.push(breakingChangeExplanation
|
|
110
|
-
? `- ${change.scope ? `**${change.scope.trim()}:** ` : ''}${breakingChangeExplanation}`
|
|
111
|
-
: this.formatChange(change));
|
|
108
|
+
this.breakingChanges.push(this.formatBreakingChange(change));
|
|
112
109
|
}
|
|
113
110
|
}
|
|
114
111
|
}
|
|
@@ -170,10 +167,7 @@ class DefaultChangelogRenderer {
|
|
|
170
167
|
const line = this.formatChange(change);
|
|
171
168
|
markdownLines.push(line);
|
|
172
169
|
if (change.isBreaking && !this.isVersionPlans) {
|
|
173
|
-
|
|
174
|
-
this.breakingChanges.push(breakingChangeExplanation
|
|
175
|
-
? `- ${change.scope ? `**${change.scope.trim()}:** ` : ''}${breakingChangeExplanation}`
|
|
176
|
-
: line);
|
|
170
|
+
this.breakingChanges.push(this.formatBreakingChange(change));
|
|
177
171
|
}
|
|
178
172
|
}
|
|
179
173
|
}
|
|
@@ -184,10 +178,7 @@ class DefaultChangelogRenderer {
|
|
|
184
178
|
const line = this.formatChange(change);
|
|
185
179
|
markdownLines.push(line);
|
|
186
180
|
if (change.isBreaking && !this.isVersionPlans) {
|
|
187
|
-
|
|
188
|
-
this.breakingChanges.push(breakingChangeExplanation
|
|
189
|
-
? `- ${change.scope ? `**${change.scope.trim()}:** ` : ''}${breakingChangeExplanation}`
|
|
190
|
-
: line);
|
|
181
|
+
this.breakingChanges.push(this.formatBreakingChange(change));
|
|
191
182
|
}
|
|
192
183
|
}
|
|
193
184
|
}
|
|
@@ -277,7 +268,8 @@ class DefaultChangelogRenderer {
|
|
|
277
268
|
: '') +
|
|
278
269
|
description;
|
|
279
270
|
if (this.remoteReleaseClient.getRemoteRepoData() &&
|
|
280
|
-
this.changelogRenderOptions.commitReferences
|
|
271
|
+
this.changelogRenderOptions.commitReferences &&
|
|
272
|
+
change.githubReferences) {
|
|
281
273
|
changeLine += this.remoteReleaseClient.formatReferences(change.githubReferences);
|
|
282
274
|
}
|
|
283
275
|
if (extraLinesStr) {
|
|
@@ -285,6 +277,43 @@ class DefaultChangelogRenderer {
|
|
|
285
277
|
}
|
|
286
278
|
return changeLine;
|
|
287
279
|
}
|
|
280
|
+
formatBreakingChange(change) {
|
|
281
|
+
const explanation = this.extractBreakingChangeExplanation(change.body);
|
|
282
|
+
if (!explanation) {
|
|
283
|
+
// No explanation found, use the regular formatChange which includes references
|
|
284
|
+
return this.formatChange(change);
|
|
285
|
+
}
|
|
286
|
+
// Build the breaking change line with scope, explanation, and references
|
|
287
|
+
let breakingLine = '- ';
|
|
288
|
+
if (change.scope) {
|
|
289
|
+
breakingLine += `**${change.scope.trim()}:** `;
|
|
290
|
+
}
|
|
291
|
+
// Handle multi-line explanations
|
|
292
|
+
let explanationText = explanation;
|
|
293
|
+
let extraLines = [];
|
|
294
|
+
if (explanation.includes('\n')) {
|
|
295
|
+
[explanationText, ...extraLines] = explanation.split('\n');
|
|
296
|
+
}
|
|
297
|
+
breakingLine += explanationText;
|
|
298
|
+
// Add PR/commit references
|
|
299
|
+
if (this.remoteReleaseClient.getRemoteRepoData() &&
|
|
300
|
+
this.changelogRenderOptions.commitReferences &&
|
|
301
|
+
change.githubReferences) {
|
|
302
|
+
breakingLine += this.remoteReleaseClient.formatReferences(change.githubReferences);
|
|
303
|
+
}
|
|
304
|
+
// Add extra lines with indentation (matching formatChange behavior)
|
|
305
|
+
if (extraLines.length > 0) {
|
|
306
|
+
const indentation = ' ';
|
|
307
|
+
const extraLinesStr = extraLines
|
|
308
|
+
.filter((l) => l.trim().length > 0)
|
|
309
|
+
.map((l) => `${indentation}${l}`)
|
|
310
|
+
.join('\n');
|
|
311
|
+
if (extraLinesStr) {
|
|
312
|
+
breakingLine += '\n\n' + extraLinesStr;
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
return breakingLine;
|
|
316
|
+
}
|
|
288
317
|
groupChangesByType() {
|
|
289
318
|
const typeGroups = {};
|
|
290
319
|
for (const change of this.relevantChanges) {
|
|
@@ -312,9 +341,12 @@ class DefaultChangelogRenderer {
|
|
|
312
341
|
return null;
|
|
313
342
|
}
|
|
314
343
|
const startOfBreakingChange = startIndex + breakingChangeIdentifier.length;
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
344
|
+
// Extract all text after BREAKING CHANGE: until we hit git metadata
|
|
345
|
+
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;
|
|
318
350
|
}
|
|
319
351
|
return message.substring(startOfBreakingChange, endOfBreakingChange).trim();
|
|
320
352
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/angular/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/angular/index.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAqB,OAAO,EAAE,MAAM,SAAS,CAAC;AAa1D,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,OAAO,iBAqC3D"}
|
|
@@ -7,6 +7,7 @@ const fileutils_1 = require("../../../../utils/fileutils");
|
|
|
7
7
|
const versions_1 = require("../../../../utils/versions");
|
|
8
8
|
const object_sort_1 = require("../../../../utils/object-sort");
|
|
9
9
|
const output_1 = require("../../../../utils/output");
|
|
10
|
+
const package_json_1 = require("../../../../utils/package-json");
|
|
10
11
|
const utils_1 = require("../utils");
|
|
11
12
|
const integrated_workspace_1 = require("./integrated-workspace");
|
|
12
13
|
const legacy_angular_versions_1 = require("./legacy-angular-versions");
|
|
@@ -92,12 +93,9 @@ function addPluginDependencies() {
|
|
|
92
93
|
'@angular-devkit/schematics',
|
|
93
94
|
'@schematics/angular',
|
|
94
95
|
];
|
|
95
|
-
const angularCliVersion =
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
packageJson.dependencies?.['@angular-devkit/build-angular'] ??
|
|
99
|
-
packageJson.devDependencies['@angular/build'] ??
|
|
100
|
-
packageJson.dependencies?.['@angular/build'];
|
|
96
|
+
const angularCliVersion = (0, package_json_1.getDependencyVersionFromPackageJson)('@angular/cli', repoRoot, packageJson) ??
|
|
97
|
+
(0, package_json_1.getDependencyVersionFromPackageJson)('@angular-devkit/build-angular', repoRoot, packageJson) ??
|
|
98
|
+
(0, package_json_1.getDependencyVersionFromPackageJson)('@angular/build', repoRoot, packageJson);
|
|
101
99
|
for (const dep of peerDepsToInstall) {
|
|
102
100
|
if (!packageJson.devDependencies[dep] && !packageJson.dependencies?.[dep]) {
|
|
103
101
|
packageJson.devDependencies[dep] = angularCliVersion;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"AAkBA,OAAO,EACL,cAAc,EAEd,2BAA2B,IAAI,aAAa,EAE7C,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,UAAU,EAIX,MAAM,uBAAuB,CAAC;AAW/B,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/migrate/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
|
|
|
37
37
|
const project_graph_1 = require("../../project-graph/project-graph");
|
|
38
38
|
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
39
39
|
const provenance_1 = require("../../utils/provenance");
|
|
40
|
+
const catalog_1 = require("../../utils/catalog");
|
|
40
41
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
41
42
|
function normalizeVersion(version) {
|
|
42
43
|
const [semver, ...prereleaseTagParts] = version.split('-');
|
|
@@ -722,7 +723,21 @@ async function updatePackageJson(root, updatedPackages) {
|
|
|
722
723
|
}
|
|
723
724
|
const parseOptions = {};
|
|
724
725
|
const json = (0, fileutils_1.readJsonFile)(packageJsonPath, parseOptions);
|
|
726
|
+
const manager = (0, catalog_1.getCatalogManager)(root);
|
|
727
|
+
const catalogUpdates = [];
|
|
725
728
|
Object.keys(updatedPackages).forEach((p) => {
|
|
729
|
+
const existingVersion = json.dependencies?.[p] ?? json.devDependencies?.[p];
|
|
730
|
+
if (existingVersion && manager?.isCatalogReference(existingVersion)) {
|
|
731
|
+
const { catalogName } = manager.parseCatalogReference(existingVersion);
|
|
732
|
+
catalogUpdates.push({
|
|
733
|
+
packageName: p,
|
|
734
|
+
version: updatedPackages[p].version,
|
|
735
|
+
catalogName,
|
|
736
|
+
});
|
|
737
|
+
// don't overwrite the catalog reference with the new version
|
|
738
|
+
return;
|
|
739
|
+
}
|
|
740
|
+
// Update non-catalog packages in package.json
|
|
726
741
|
if (json.devDependencies?.[p]) {
|
|
727
742
|
json.devDependencies[p] = updatedPackages[p].version;
|
|
728
743
|
return;
|
|
@@ -740,6 +755,11 @@ async function updatePackageJson(root, updatedPackages) {
|
|
|
740
755
|
await writeFormattedJsonFile(packageJsonPath, json, {
|
|
741
756
|
appendNewLine: parseOptions.endsWithNewline,
|
|
742
757
|
});
|
|
758
|
+
// Update catalog definitions
|
|
759
|
+
if (catalogUpdates.length) {
|
|
760
|
+
// manager is guaranteed to be defined when there are catalog updates
|
|
761
|
+
manager.updateCatalogVersions(root, catalogUpdates);
|
|
762
|
+
}
|
|
743
763
|
}
|
|
744
764
|
async function updateInstallationDetails(root, updatedPackages) {
|
|
745
765
|
const nxJsonPath = (0, path_1.join)(root, 'nx.json');
|
|
@@ -777,13 +797,10 @@ async function isMigratingToNewMajor(from, to) {
|
|
|
777
797
|
}
|
|
778
798
|
return (0, semver_1.major)(from) < (0, semver_1.major)(to);
|
|
779
799
|
}
|
|
780
|
-
function readNxVersion(packageJson) {
|
|
781
|
-
return (
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
packageJson?.dependencies?.['@nx/workspace'] ??
|
|
785
|
-
packageJson?.devDependencies?.['@nrwl/workspace'] ??
|
|
786
|
-
packageJson?.dependencies?.['@nrwl/workspace']);
|
|
800
|
+
function readNxVersion(packageJson, root) {
|
|
801
|
+
return ((0, package_json_1.getDependencyVersionFromPackageJson)('nx', root, packageJson) ??
|
|
802
|
+
(0, package_json_1.getDependencyVersionFromPackageJson)('@nx/workspace', root, packageJson) ??
|
|
803
|
+
(0, package_json_1.getDependencyVersionFromPackageJson)('@nrwl/workspace', root, packageJson));
|
|
787
804
|
}
|
|
788
805
|
async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
|
|
789
806
|
const pmc = (0, package_manager_1.getPackageManagerCommand)();
|
|
@@ -794,7 +811,7 @@ async function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
|
|
|
794
811
|
: null;
|
|
795
812
|
const originalNxJson = (0, configuration_1.readNxJson)();
|
|
796
813
|
const from = originalNxJson.installation?.version ??
|
|
797
|
-
readNxVersion(originalPackageJson);
|
|
814
|
+
readNxVersion(originalPackageJson, root);
|
|
798
815
|
logger_1.logger.info(`Fetching meta data about packages.`);
|
|
799
816
|
logger_1.logger.info(`It may take a few minutes.`);
|
|
800
817
|
const migrator = new Migrator({
|
|
@@ -33,5 +33,5 @@ export interface ChangelogChange {
|
|
|
33
33
|
}
|
|
34
34
|
export type PostGitTask = (latestCommit: string) => Promise<void>;
|
|
35
35
|
export declare const releaseChangelogCLIHandler: (args: ChangelogOptions) => Promise<number>;
|
|
36
|
-
export declare function createAPI(overrideReleaseConfig: NxReleaseConfiguration): (args: ChangelogOptions) => Promise<NxReleaseChangelogResult>;
|
|
36
|
+
export declare function createAPI(overrideReleaseConfig: NxReleaseConfiguration, ignoreNxJsonConfig: boolean): (args: ChangelogOptions) => Promise<NxReleaseChangelogResult>;
|
|
37
37
|
//# sourceMappingURL=changelog.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/changelog.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAepD,OAAO,EAEL,SAAS,EAUV,MAAM,aAAa,CAAC;AASrB,OAAO,EACL,cAAc,EASf,MAAM,gBAAgB,CAAC;AAMxB,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;SACjC,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/changelog.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAepD,OAAO,EAEL,SAAS,EAUV,MAAM,aAAa,CAAC;AASrB,OAAO,EACL,cAAc,EASf,MAAM,gBAAgB,CAAC;AAMxB,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;SACjC,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACH,CAAC;AAE/D,wBAAgB,SAAS,CACvB,qBAAqB,EAAE,sBAAsB,EAC7C,kBAAkB,EAAE,OAAO,IAQzB,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CA+pBrC"}
|
|
@@ -31,9 +31,9 @@ const resolve_changelog_renderer_1 = require("./utils/resolve-changelog-renderer
|
|
|
31
31
|
const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
|
|
32
32
|
const shared_1 = require("./utils/shared");
|
|
33
33
|
const version_plan_utils_1 = require("./utils/version-plan-utils");
|
|
34
|
-
const releaseChangelogCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
|
|
34
|
+
const releaseChangelogCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({}, false)(args));
|
|
35
35
|
exports.releaseChangelogCLIHandler = releaseChangelogCLIHandler;
|
|
36
|
-
function createAPI(overrideReleaseConfig) {
|
|
36
|
+
function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
|
|
37
37
|
/**
|
|
38
38
|
* NOTE: This function is also exported for programmatic usage and forms part of the public API
|
|
39
39
|
* of Nx. We intentionally do not wrap the implementation with handleErrors because users need
|
|
@@ -41,8 +41,10 @@ function createAPI(overrideReleaseConfig) {
|
|
|
41
41
|
*/
|
|
42
42
|
return async function releaseChangelog(args) {
|
|
43
43
|
const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
|
|
44
|
-
const
|
|
45
|
-
const userProvidedReleaseConfig =
|
|
44
|
+
const overriddenConfig = overrideReleaseConfig ?? {};
|
|
45
|
+
const userProvidedReleaseConfig = ignoreNxJsonConfig
|
|
46
|
+
? overriddenConfig
|
|
47
|
+
: (0, deep_merge_json_1.deepMergeJson)((0, nx_json_1.readNxJson)().release ?? {}, overriddenConfig);
|
|
46
48
|
// Apply default configuration to any optional user configuration
|
|
47
49
|
const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), userProvidedReleaseConfig);
|
|
48
50
|
if (configError) {
|
|
@@ -782,7 +784,7 @@ async function generateChangelogForWorkspace({ tree, args, nxReleaseConfig, work
|
|
|
782
784
|
let rootChangelogContents = tree.exists(interpolatedTreePath)
|
|
783
785
|
? tree.read(interpolatedTreePath).toString()
|
|
784
786
|
: '';
|
|
785
|
-
if (rootChangelogContents) {
|
|
787
|
+
if (rootChangelogContents && !args.replaceExistingContents) {
|
|
786
788
|
// NOTE: right now existing releases are always expected to be in markdown format, but in the future we could potentially support others via a custom parser option
|
|
787
789
|
const changelogReleases = (0, markdown_1.parseChangelogMarkdown)(rootChangelogContents).releases;
|
|
788
790
|
const existingVersionToUpdate = changelogReleases.find((r) => r.version === releaseVersion.rawVersion);
|
|
@@ -795,7 +797,7 @@ async function generateChangelogForWorkspace({ tree, args, nxReleaseConfig, work
|
|
|
795
797
|
}
|
|
796
798
|
}
|
|
797
799
|
else {
|
|
798
|
-
// No existing changelog contents,
|
|
800
|
+
// No existing changelog contents, or replaceExistingContents is true, simply use the generated contents directly
|
|
799
801
|
rootChangelogContents = contents;
|
|
800
802
|
}
|
|
801
803
|
tree.write(interpolatedTreePath, rootChangelogContents);
|
|
@@ -41,6 +41,7 @@ export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Fi
|
|
|
41
41
|
from?: string;
|
|
42
42
|
interactive?: string;
|
|
43
43
|
createRelease?: false | 'github' | 'gitlab';
|
|
44
|
+
replaceExistingContents?: boolean;
|
|
44
45
|
releaseGraph?: ReleaseGraph;
|
|
45
46
|
};
|
|
46
47
|
export type PublishOptions = NxReleaseArgs & Partial<RunManyOptions> & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,aAAa,EAAY,MAAM,OAAO,CAAC;AAEhE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,cAAc,EAQpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGlD,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,UAAU,UAAU;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAClC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,aAAa,GACxC,UAAU,GACV,eAAe,GACf,gBAAgB,GAChB,uBAAuB,GAAG;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,8BAA8B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEzD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAEJ,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAC1C,UAAU,GACV,eAAe,GACf,gBAAgB,GAAG;IAEjB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/command-object.ts"],"names":[],"mappings":"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"}
|
|
@@ -157,6 +157,11 @@ const changelogCommand = {
|
|
|
157
157
|
type: 'string',
|
|
158
158
|
description: 'Interactively modify changelog markdown contents in your code editor before applying the changes. You can set it to be interactive for all changelogs, or only the workspace level, or only the project level.',
|
|
159
159
|
choices: ['all', 'workspace', 'projects'],
|
|
160
|
+
})
|
|
161
|
+
.option('replace-existing-contents', {
|
|
162
|
+
type: 'boolean',
|
|
163
|
+
description: 'Whether to overwrite the existing changelog contents instead of prepending to them.',
|
|
164
|
+
default: false,
|
|
160
165
|
})
|
|
161
166
|
.check((argv) => {
|
|
162
167
|
if (!argv.version) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -991,7 +991,8 @@ function validateChangelogConfig(releaseGroups, rootChangelogConfig) {
|
|
|
991
991
|
const uniqueRendererPaths = new Set();
|
|
992
992
|
if (rootChangelogConfig.workspaceChangelog &&
|
|
993
993
|
typeof rootChangelogConfig.workspaceChangelog !== 'boolean') {
|
|
994
|
-
if (rootChangelogConfig.workspaceChangelog.renderer
|
|
994
|
+
if (typeof rootChangelogConfig.workspaceChangelog.renderer === 'string' &&
|
|
995
|
+
rootChangelogConfig.workspaceChangelog.renderer.length > 0) {
|
|
995
996
|
uniqueRendererPaths.add(rootChangelogConfig.workspaceChangelog.renderer);
|
|
996
997
|
}
|
|
997
998
|
const createReleaseError = validateCreateReleaseConfig(rootChangelogConfig.workspaceChangelog);
|
|
@@ -1001,7 +1002,8 @@ function validateChangelogConfig(releaseGroups, rootChangelogConfig) {
|
|
|
1001
1002
|
}
|
|
1002
1003
|
if (rootChangelogConfig.projectChangelogs &&
|
|
1003
1004
|
typeof rootChangelogConfig.projectChangelogs !== 'boolean') {
|
|
1004
|
-
if (rootChangelogConfig.projectChangelogs.renderer
|
|
1005
|
+
if (typeof rootChangelogConfig.projectChangelogs.renderer === 'string' &&
|
|
1006
|
+
rootChangelogConfig.projectChangelogs.renderer.length > 0) {
|
|
1005
1007
|
uniqueRendererPaths.add(rootChangelogConfig.projectChangelogs.renderer);
|
|
1006
1008
|
}
|
|
1007
1009
|
const createReleaseError = validateCreateReleaseConfig(rootChangelogConfig.projectChangelogs);
|
|
@@ -1011,7 +1013,8 @@ function validateChangelogConfig(releaseGroups, rootChangelogConfig) {
|
|
|
1011
1013
|
}
|
|
1012
1014
|
for (const group of Object.values(releaseGroups)) {
|
|
1013
1015
|
if (group.changelog && typeof group.changelog !== 'boolean') {
|
|
1014
|
-
if (group.changelog.renderer
|
|
1016
|
+
if (typeof group.changelog.renderer === 'string' &&
|
|
1017
|
+
group.changelog.renderer.length > 0) {
|
|
1015
1018
|
uniqueRendererPaths.add(group.changelog.renderer);
|
|
1016
1019
|
}
|
|
1017
1020
|
const createReleaseError = validateCreateReleaseConfig(group.changelog);
|
|
@@ -3,12 +3,24 @@ import type { NxReleaseConfiguration } from '../../config/nx-json';
|
|
|
3
3
|
* @public
|
|
4
4
|
*/
|
|
5
5
|
export declare class ReleaseClient {
|
|
6
|
-
|
|
6
|
+
/**
|
|
7
|
+
* Nx release configuration to use for the current release client. By default, it will be combined with any
|
|
8
|
+
* configuration in nx.json, but you can choose to use it as the sole source of truth by setting ignoreNxJsonConfig
|
|
9
|
+
* to true.
|
|
10
|
+
*/
|
|
11
|
+
private nxReleaseConfig;
|
|
12
|
+
private ignoreNxJsonConfig;
|
|
7
13
|
releaseChangelog: (args: import("./command-object").ChangelogOptions) => Promise<import("./changelog").NxReleaseChangelogResult>;
|
|
8
14
|
releasePublish: (args: import("./command-object").PublishOptions) => Promise<import("./publish").PublishProjectsResult>;
|
|
9
15
|
releaseVersion: (args: import("./command-object").VersionOptions) => Promise<import("./version").NxReleaseVersionResult>;
|
|
10
16
|
release: (args: import("./command-object").ReleaseOptions) => Promise<import("./version").NxReleaseVersionResult | number>;
|
|
11
|
-
constructor(
|
|
17
|
+
constructor(
|
|
18
|
+
/**
|
|
19
|
+
* Nx release configuration to use for the current release client. By default, it will be combined with any
|
|
20
|
+
* configuration in nx.json, but you can choose to use it as the sole source of truth by setting ignoreNxJsonConfig
|
|
21
|
+
* to true.
|
|
22
|
+
*/
|
|
23
|
+
nxReleaseConfig: NxReleaseConfiguration, ignoreNxJsonConfig?: boolean);
|
|
12
24
|
}
|
|
13
25
|
declare const defaultClient: ReleaseClient;
|
|
14
26
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAMnE;;GAEG;AACH,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAMnE;;GAEG;AACH,qBAAa,aAAa;IAgBtB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IArB5B,gBAAgB,iHAGd;IACF,cAAc,0GAGZ;IACF,cAAc,2GAGZ;IACF,OAAO,oHAAmE;;IAGxE;;;;OAIG;IACK,eAAe,EAAE,sBAAsB,EACvC,kBAAkB,GAAE,OAAe;CAE9C;AAED,QAAA,MAAM,aAAa,eAAkD,CAAC;AAEtE;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAExB,OAAO,aAAa,CAAC,gBAAgB,CAAC;AAE3C;;GAEG;AACH,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD;;GAEG;AACH,eAAO,MAAM,cAAc,EAEtB,OAAO,aAAa,CAAC,cAAc,CAAC;AAEzC;;GAEG;AACH,eAAO,MAAM,cAAc,EAEtB,OAAO,aAAa,CAAC,cAAc,CAAC;AAEzC;;GAEG;AACH,eAAO,MAAM,OAAO,EAEf,OAAO,aAAa,CAAC,OAAO,CAAC;AAElC;;GAEG;AACH,OAAO,EACL,yBAAyB,EACzB,cAAc,GACf,MAAM,2BAA2B,CAAC"}
|
|
@@ -9,12 +9,19 @@ const version_1 = require("./version");
|
|
|
9
9
|
* @public
|
|
10
10
|
*/
|
|
11
11
|
class ReleaseClient {
|
|
12
|
-
constructor(
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
12
|
+
constructor(
|
|
13
|
+
/**
|
|
14
|
+
* Nx release configuration to use for the current release client. By default, it will be combined with any
|
|
15
|
+
* configuration in nx.json, but you can choose to use it as the sole source of truth by setting ignoreNxJsonConfig
|
|
16
|
+
* to true.
|
|
17
|
+
*/
|
|
18
|
+
nxReleaseConfig, ignoreNxJsonConfig = false) {
|
|
19
|
+
this.nxReleaseConfig = nxReleaseConfig;
|
|
20
|
+
this.ignoreNxJsonConfig = ignoreNxJsonConfig;
|
|
21
|
+
this.releaseChangelog = (0, changelog_1.createAPI)(this.nxReleaseConfig, this.ignoreNxJsonConfig);
|
|
22
|
+
this.releasePublish = (0, publish_1.createAPI)(this.nxReleaseConfig, this.ignoreNxJsonConfig);
|
|
23
|
+
this.releaseVersion = (0, version_1.createAPI)(this.nxReleaseConfig, this.ignoreNxJsonConfig);
|
|
24
|
+
this.release = (0, release_1.createAPI)(this.nxReleaseConfig, this.ignoreNxJsonConfig);
|
|
18
25
|
}
|
|
19
26
|
}
|
|
20
27
|
exports.ReleaseClient = ReleaseClient;
|
|
@@ -6,5 +6,5 @@ export interface PublishProjectsResult {
|
|
|
6
6
|
};
|
|
7
7
|
}
|
|
8
8
|
export declare const releasePublishCLIHandler: (args: PublishOptions) => Promise<number>;
|
|
9
|
-
export declare function createAPI(overrideReleaseConfig: NxReleaseConfiguration): (args: PublishOptions) => Promise<PublishProjectsResult>;
|
|
9
|
+
export declare function createAPI(overrideReleaseConfig: NxReleaseConfiguration, ignoreNxJsonConfig: boolean): (args: PublishOptions) => Promise<PublishProjectsResult>;
|
|
10
10
|
//# sourceMappingURL=publish.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EAEvB,MAAM,sBAAsB,CAAC;AAuB9B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASlD,MAAM,WAAW,qBAAqB;IACpC,CAAC,WAAW,EAAE,MAAM,GAAG;QACrB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH;AAED,eAAO,MAAM,wBAAwB,GAAI,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EAEvB,MAAM,sBAAsB,CAAC;AAuB9B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASlD,MAAM,WAAW,qBAAqB;IACpC,CAAC,WAAW,EAAE,MAAM,GAAG;QACrB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH;AAED,eAAO,MAAM,wBAAwB,GAAI,MAAM,cAAc,oBAYzD,CAAC;AAEL,wBAAgB,SAAS,CACvB,qBAAqB,EAAE,sBAAsB,EAC7C,kBAAkB,EAAE,OAAO,IAQzB,MAAM,cAAc,KACnB,OAAO,CAAC,qBAAqB,CAAC,CAuIlC"}
|
|
@@ -20,14 +20,14 @@ const deep_merge_json_1 = require("./config/deep-merge-json");
|
|
|
20
20
|
const print_config_1 = require("./utils/print-config");
|
|
21
21
|
const release_graph_1 = require("./utils/release-graph");
|
|
22
22
|
const releasePublishCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, async () => {
|
|
23
|
-
const publishProjectsResult = await createAPI({})(args);
|
|
23
|
+
const publishProjectsResult = await createAPI({}, false)(args);
|
|
24
24
|
// If all projects are published successfully, return 0, otherwise return 1
|
|
25
25
|
return Object.values(publishProjectsResult).every((result) => result.code === 0)
|
|
26
26
|
? 0
|
|
27
27
|
: 1;
|
|
28
28
|
});
|
|
29
29
|
exports.releasePublishCLIHandler = releasePublishCLIHandler;
|
|
30
|
-
function createAPI(overrideReleaseConfig) {
|
|
30
|
+
function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
|
|
31
31
|
/**
|
|
32
32
|
* NOTE: This function is also exported for programmatic usage and forms part of the public API
|
|
33
33
|
* of Nx. We intentionally do not wrap the implementation with handleErrors because users need
|
|
@@ -44,7 +44,10 @@ function createAPI(overrideReleaseConfig) {
|
|
|
44
44
|
const _args = args;
|
|
45
45
|
const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
|
|
46
46
|
const nxJson = (0, nx_json_1.readNxJson)();
|
|
47
|
-
const
|
|
47
|
+
const overriddenConfig = overrideReleaseConfig ?? {};
|
|
48
|
+
const userProvidedReleaseConfig = ignoreNxJsonConfig
|
|
49
|
+
? overriddenConfig
|
|
50
|
+
: (0, deep_merge_json_1.deepMergeJson)(nxJson.release ?? {}, overriddenConfig);
|
|
48
51
|
// Apply default configuration to any optional user configuration
|
|
49
52
|
const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), userProvidedReleaseConfig);
|
|
50
53
|
if (configError) {
|
|
@@ -2,5 +2,5 @@ import { NxReleaseConfiguration } from '../../config/nx-json';
|
|
|
2
2
|
import { ReleaseOptions, VersionOptions } from './command-object';
|
|
3
3
|
import { NxReleaseVersionResult } from './version';
|
|
4
4
|
export declare const releaseCLIHandler: (args: VersionOptions) => Promise<number>;
|
|
5
|
-
export declare function createAPI(overrideReleaseConfig: NxReleaseConfiguration): (args: ReleaseOptions) => Promise<NxReleaseVersionResult | number>;
|
|
5
|
+
export declare function createAPI(overrideReleaseConfig: NxReleaseConfiguration, ignoreNxJsonConfig: boolean): (args: ReleaseOptions) => Promise<NxReleaseVersionResult | number>;
|
|
6
6
|
//# sourceMappingURL=release.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/release.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAM1E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA2BlE,OAAO,EACL,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAEnB,eAAO,MAAM,iBAAiB,GAAI,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/release.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAM1E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA2BlE,OAAO,EACL,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAEnB,eAAO,MAAM,iBAAiB,GAAI,MAAM,cAAc,oBACQ,CAAC;AAE/D,wBAAgB,SAAS,CACvB,qBAAqB,EAAE,sBAAsB,EAC7C,kBAAkB,EAAE,OAAO,IAgBzB,MAAM,cAAc,KACnB,OAAO,CAAC,sBAAsB,GAAG,MAAM,CAAC,CA2W5C"}
|
|
@@ -21,16 +21,18 @@ const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-m
|
|
|
21
21
|
const shared_1 = require("./utils/shared");
|
|
22
22
|
const version_plan_utils_1 = require("./utils/version-plan-utils");
|
|
23
23
|
const version_1 = require("./version");
|
|
24
|
-
const releaseCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
|
|
24
|
+
const releaseCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({}, false)(args));
|
|
25
25
|
exports.releaseCLIHandler = releaseCLIHandler;
|
|
26
|
-
function createAPI(overrideReleaseConfig) {
|
|
27
|
-
const releaseVersion = (0, version_1.createAPI)(overrideReleaseConfig);
|
|
28
|
-
const releaseChangelog = (0, changelog_1.createAPI)(overrideReleaseConfig);
|
|
29
|
-
const releasePublish = (0, publish_1.createAPI)(overrideReleaseConfig);
|
|
26
|
+
function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
|
|
27
|
+
const releaseVersion = (0, version_1.createAPI)(overrideReleaseConfig, ignoreNxJsonConfig);
|
|
28
|
+
const releaseChangelog = (0, changelog_1.createAPI)(overrideReleaseConfig, ignoreNxJsonConfig);
|
|
29
|
+
const releasePublish = (0, publish_1.createAPI)(overrideReleaseConfig, ignoreNxJsonConfig);
|
|
30
30
|
return async function release(args) {
|
|
31
31
|
const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
|
|
32
|
-
const
|
|
33
|
-
const userProvidedReleaseConfig =
|
|
32
|
+
const overriddenConfig = overrideReleaseConfig ?? {};
|
|
33
|
+
const userProvidedReleaseConfig = ignoreNxJsonConfig
|
|
34
|
+
? overriddenConfig
|
|
35
|
+
: (0, deep_merge_json_1.deepMergeJson)((0, nx_json_1.readNxJson)().release ?? {}, overriddenConfig);
|
|
34
36
|
const hasVersionGitConfig = Object.keys(userProvidedReleaseConfig.version?.git ?? {}).length > 0;
|
|
35
37
|
const hasChangelogGitConfig = Object.keys(userProvidedReleaseConfig.changelog?.git ?? {}).length > 0;
|
|
36
38
|
if (hasVersionGitConfig || hasChangelogGitConfig) {
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type ChangelogRenderer from '../../../../release/changelog-renderer';
|
|
2
|
-
export declare function resolveChangelogRenderer(
|
|
2
|
+
export declare function resolveChangelogRenderer(changelogRendererPathOrImplementation: string | typeof ChangelogRenderer): typeof ChangelogRenderer;
|
|
3
3
|
//# sourceMappingURL=resolve-changelog-renderer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-changelog-renderer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/resolve-changelog-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,iBAAiB,MAAM,wCAAwC,CAAC;AAM5E,wBAAgB,wBAAwB,CACtC,
|
|
1
|
+
{"version":3,"file":"resolve-changelog-renderer.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/resolve-changelog-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,iBAAiB,MAAM,wCAAwC,CAAC;AAM5E,wBAAgB,wBAAwB,CACtC,qCAAqC,EAAE,MAAM,GAAG,OAAO,iBAAiB,GACvE,OAAO,iBAAiB,CA6B1B"}
|