nx 22.0.0-beta.3 → 22.0.0-beta.4
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/schemas/nx-schema.json +96 -83
- package/src/command-line/configure-ai-agents/command-object.d.ts +1 -1
- package/src/command-line/configure-ai-agents/command-object.d.ts.map +1 -1
- package/src/command-line/configure-ai-agents/command-object.js +18 -4
- package/src/command-line/configure-ai-agents/configure-ai-agents.d.ts.map +1 -1
- package/src/command-line/configure-ai-agents/configure-ai-agents.js +58 -31
- package/src/command-line/nx-cloud/login/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/login/command-object.js +2 -2
- package/src/command-line/nx-cloud/logout/command-object.js +1 -1
- package/src/command-line/release/changelog.d.ts.map +1 -1
- package/src/command-line/release/changelog.js +40 -29
- package/src/command-line/release/command-object.d.ts +7 -3
- package/src/command-line/release/command-object.d.ts.map +1 -1
- package/src/command-line/release/config/config.d.ts.map +1 -1
- package/src/command-line/release/config/config.js +14 -0
- package/src/command-line/release/config/version-plans.d.ts.map +1 -1
- package/src/command-line/release/config/version-plans.js +4 -1
- package/src/command-line/release/publish.d.ts.map +1 -1
- package/src/command-line/release/publish.js +35 -11
- package/src/command-line/release/release.d.ts.map +1 -1
- package/src/command-line/release/release.js +31 -30
- package/src/command-line/release/utils/release-graph.d.ts +219 -0
- package/src/command-line/release/utils/release-graph.d.ts.map +1 -0
- package/src/command-line/release/utils/release-graph.js +658 -0
- package/src/command-line/release/utils/semver.d.ts +1 -2
- package/src/command-line/release/utils/semver.d.ts.map +1 -1
- package/src/command-line/release/utils/semver.js +3 -5
- package/src/command-line/release/utils/shared.d.ts +1 -1
- package/src/command-line/release/utils/shared.d.ts.map +1 -1
- package/src/command-line/release/utils/shared.js +49 -15
- package/src/command-line/release/version/release-group-processor.d.ts +3 -152
- package/src/command-line/release/version/release-group-processor.d.ts.map +1 -1
- package/src/command-line/release/version/release-group-processor.js +50 -569
- package/src/command-line/release/version/resolve-current-version.d.ts +1 -1
- package/src/command-line/release/version/resolve-current-version.d.ts.map +1 -1
- package/src/command-line/release/version/resolve-current-version.js +1 -1
- package/src/command-line/release/version/test-utils.d.ts +13 -4
- package/src/command-line/release/version/test-utils.d.ts.map +1 -1
- package/src/command-line/release/version/test-utils.js +26 -11
- package/src/command-line/release/version/version-actions.d.ts +12 -5
- package/src/command-line/release/version/version-actions.d.ts.map +1 -1
- package/src/command-line/release/version/version-actions.js +36 -19
- package/src/command-line/release/version.d.ts +6 -1
- package/src/command-line/release/version.d.ts.map +1 -1
- package/src/command-line/release/version.js +57 -28
- package/src/config/nx-json.d.ts +26 -4
- package/src/config/nx-json.d.ts.map +1 -1
- package/src/config/nx-json.js +8 -8
- package/src/tasks-runner/run-command.js +2 -2
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { CommandModule } from 'yargs';
|
|
2
|
-
import { OutputStyle, RunManyOptions } from '../yargs-utils/shared-options';
|
|
3
|
-
import {
|
|
1
|
+
import { type CommandModule } from 'yargs';
|
|
2
|
+
import { type OutputStyle, type RunManyOptions } from '../yargs-utils/shared-options';
|
|
3
|
+
import type { ReleaseGraph } from './utils/release-graph';
|
|
4
|
+
import type { VersionData } from './utils/shared';
|
|
4
5
|
export interface BaseNxReleaseArgs {
|
|
5
6
|
verbose?: boolean;
|
|
6
7
|
printConfig?: boolean | 'debug';
|
|
@@ -31,6 +32,7 @@ export type VersionOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Firs
|
|
|
31
32
|
preid?: string;
|
|
32
33
|
stageChanges?: boolean;
|
|
33
34
|
versionActionsOptionsOverrides?: Record<string, unknown>;
|
|
35
|
+
releaseGraph?: ReleaseGraph;
|
|
34
36
|
};
|
|
35
37
|
export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & FirstReleaseArgs & {
|
|
36
38
|
version?: string | null;
|
|
@@ -39,6 +41,7 @@ export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Fi
|
|
|
39
41
|
from?: string;
|
|
40
42
|
interactive?: string;
|
|
41
43
|
createRelease?: false | 'github' | 'gitlab';
|
|
44
|
+
releaseGraph?: ReleaseGraph;
|
|
42
45
|
};
|
|
43
46
|
export type PublishOptions = NxReleaseArgs & Partial<RunManyOptions> & {
|
|
44
47
|
outputStyle?: OutputStyle;
|
|
@@ -48,6 +51,7 @@ export type PublishOptions = NxReleaseArgs & Partial<RunManyOptions> & {
|
|
|
48
51
|
access?: string;
|
|
49
52
|
otp?: number;
|
|
50
53
|
versionData?: VersionData;
|
|
54
|
+
releaseGraph?: ReleaseGraph;
|
|
51
55
|
};
|
|
52
56
|
export type PlanOptions = NxReleaseArgs & {
|
|
53
57
|
bump?: string;
|
|
@@ -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,
|
|
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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"}
|
|
@@ -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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"}
|
|
@@ -236,6 +236,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
|
|
|
236
236
|
releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
|
|
237
237
|
releaseTagPatternRequireSemver: userConfig.releaseTagPatternRequireSemver ??
|
|
238
238
|
defaultReleaseTagPatternRequireSemver,
|
|
239
|
+
releaseTagPatternPreferDockerVersion: userConfig.releaseTagPatternPreferDockerVersion ?? false,
|
|
239
240
|
releaseTagPatternStrictPreid: userConfig.releaseTagPatternStrictPreid ??
|
|
240
241
|
defaultReleaseTagPatternStrictPreid,
|
|
241
242
|
conventionalCommits: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG,
|
|
@@ -286,6 +287,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
|
|
|
286
287
|
: WORKSPACE_DEFAULTS.releaseTagPattern,
|
|
287
288
|
releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
|
|
288
289
|
releaseTagPatternRequireSemver: groupReleaseTagPatternRequireSemver,
|
|
290
|
+
releaseTagPatternPreferDockerVersion: false,
|
|
289
291
|
releaseTagPatternStrictPreid: groupReleaseTagPatternStrictPreid,
|
|
290
292
|
versionPlans: false,
|
|
291
293
|
};
|
|
@@ -483,6 +485,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
|
|
|
483
485
|
releaseTagPatternRequireSemver: releaseGroup.releaseTagPatternRequireSemver ??
|
|
484
486
|
userConfig.releaseTagPatternRequireSemver ??
|
|
485
487
|
defaultReleaseTagPatternRequireSemver,
|
|
488
|
+
releaseTagPatternPreferDockerVersion: releaseGroup.releaseTagPatternPreferDockerVersion ??
|
|
489
|
+
userConfig.releaseTagPatternPreferDockerVersion ??
|
|
490
|
+
false,
|
|
486
491
|
releaseTagPatternStrictPreid: releaseGroup.releaseTagPatternStrictPreid ??
|
|
487
492
|
userConfig.releaseTagPatternStrictPreid ??
|
|
488
493
|
defaultReleaseTagPatternStrictPreid,
|
|
@@ -533,6 +538,14 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
|
|
|
533
538
|
if (hasDockerProjects) {
|
|
534
539
|
// If any project in the group has docker configuration, disable semver requirement
|
|
535
540
|
releaseGroup.releaseTagPatternRequireSemver = false;
|
|
541
|
+
// Set releaseTagPatternPreferDockerVersion to true by default when docker projects exist,
|
|
542
|
+
// unless user has explicitly configured it
|
|
543
|
+
if (releaseGroup.releaseTagPatternPreferDockerVersion === false &&
|
|
544
|
+
userConfig.groups?.[releaseGroupName]
|
|
545
|
+
?.releaseTagPatternPreferDockerVersion === undefined &&
|
|
546
|
+
userConfig.releaseTagPatternPreferDockerVersion === undefined) {
|
|
547
|
+
releaseGroup.releaseTagPatternPreferDockerVersion = true;
|
|
548
|
+
}
|
|
536
549
|
}
|
|
537
550
|
}
|
|
538
551
|
const configError = validateChangelogConfig(releaseGroups, rootChangelogConfig);
|
|
@@ -554,6 +567,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
|
|
|
554
567
|
releaseTagPatternCheckAllBranchesWhen: WORKSPACE_DEFAULTS.releaseTagPatternCheckAllBranchesWhen,
|
|
555
568
|
releaseTagPatternRequireSemver: WORKSPACE_DEFAULTS.releaseTagPatternRequireSemver,
|
|
556
569
|
releaseTagPatternStrictPreid: WORKSPACE_DEFAULTS.releaseTagPatternStrictPreid,
|
|
570
|
+
releaseTagPatternPreferDockerVersion: WORKSPACE_DEFAULTS.releaseTagPatternPreferDockerVersion,
|
|
557
571
|
git: rootGitConfig,
|
|
558
572
|
docker: rootDockerConfig,
|
|
559
573
|
version: rootVersionConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-plans.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/version-plans.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,WAAW,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,gBAAgB,EAAE,WAAW,CAAC;IAC9B;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CAClD;AAID,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CA0BrE;AAED,wBAAsB,+BAA+B,CACnD,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,EAAE,oBAAoB,EAAE,EACrC,0BAA0B,EAAE,MAAM,EAAE,EACpC,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,oBAAoB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"version-plans.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/version-plans.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,WAAW,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,gBAAgB,EAAE,WAAW,CAAC;IAC9B;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CAClD;AAID,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CA0BrE;AAED,wBAAsB,+BAA+B,CACnD,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,EAAE,oBAAoB,EAAE,EACrC,0BAA0B,EAAE,MAAM,EAAE,EACpC,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAwNjC;AASD,wBAAgB,2BAA2B,WAE1C"}
|
|
@@ -149,7 +149,10 @@ async function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, a
|
|
|
149
149
|
}
|
|
150
150
|
}
|
|
151
151
|
else {
|
|
152
|
-
|
|
152
|
+
// Avoid duplicates when releaseGraph is reused and version plans are resolved multiple times
|
|
153
|
+
if (!existingPlan.triggeredByProjects.includes(key)) {
|
|
154
|
+
existingPlan.triggeredByProjects.push(key);
|
|
155
|
+
}
|
|
153
156
|
}
|
|
154
157
|
}
|
|
155
158
|
else {
|
|
@@ -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;
|
|
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,oBAWzD,CAAC;AAEL,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,cAAc,KACnB,OAAO,CAAC,qBAAqB,CAAC,CAuIlC"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.releasePublishCLIHandler = void 0;
|
|
4
4
|
exports.createAPI = createAPI;
|
|
5
5
|
const nx_json_1 = require("../../config/nx-json");
|
|
6
|
+
const tree_1 = require("../../generators/tree");
|
|
6
7
|
const native_1 = require("../../native");
|
|
7
8
|
const file_map_utils_1 = require("../../project-graph/file-map-utils");
|
|
8
9
|
const tasks_execution_hooks_1 = require("../../project-graph/plugins/tasks-execution-hooks");
|
|
@@ -16,8 +17,8 @@ const workspace_root_1 = require("../../utils/workspace-root");
|
|
|
16
17
|
const graph_1 = require("../graph/graph");
|
|
17
18
|
const config_1 = require("./config/config");
|
|
18
19
|
const deep_merge_json_1 = require("./config/deep-merge-json");
|
|
19
|
-
const filter_release_groups_1 = require("./config/filter-release-groups");
|
|
20
20
|
const print_config_1 = require("./utils/print-config");
|
|
21
|
+
const release_graph_1 = require("./utils/release-graph");
|
|
21
22
|
const releasePublishCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, async () => {
|
|
22
23
|
const publishProjectsResult = await createAPI({})(args);
|
|
23
24
|
// If all projects are published successfully, return 0, otherwise return 1
|
|
@@ -57,14 +58,26 @@ function createAPI(overrideReleaseConfig) {
|
|
|
57
58
|
isDebug: args.printConfig === 'debug',
|
|
58
59
|
});
|
|
59
60
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
61
|
+
// Use pre-built release graph if provided, otherwise create a new one
|
|
62
|
+
const releaseGraph = args.releaseGraph ||
|
|
63
|
+
(await (0, release_graph_1.createReleaseGraph)({
|
|
64
|
+
// Only build the tree if no existing graph, it's only needed for this
|
|
65
|
+
tree: new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose),
|
|
66
|
+
projectGraph,
|
|
67
|
+
nxReleaseConfig,
|
|
68
|
+
filters: {
|
|
69
|
+
projects: _args.projects,
|
|
70
|
+
groups: _args.groups,
|
|
71
|
+
},
|
|
72
|
+
firstRelease: args.firstRelease,
|
|
73
|
+
verbose: args.verbose,
|
|
74
|
+
// Publish doesn't need to resolve current versions during graph construction
|
|
75
|
+
skipVersionResolution: true,
|
|
76
|
+
}));
|
|
77
|
+
// Display filter log if filters were applied
|
|
78
|
+
if (releaseGraph.filterLog &&
|
|
66
79
|
process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG !== 'true') {
|
|
67
|
-
output_1.output.note(filterLog);
|
|
80
|
+
output_1.output.note(releaseGraph.filterLog);
|
|
68
81
|
}
|
|
69
82
|
/**
|
|
70
83
|
* If the user is filtering to a subset of projects or groups, we should not run the publish task
|
|
@@ -77,9 +90,15 @@ function createAPI(overrideReleaseConfig) {
|
|
|
77
90
|
if (args.projects?.length) {
|
|
78
91
|
/**
|
|
79
92
|
* Run publishing for all remaining release groups and filtered projects within them
|
|
93
|
+
* in topological order
|
|
80
94
|
*/
|
|
81
|
-
for (const
|
|
82
|
-
const
|
|
95
|
+
for (const releaseGroupName of releaseGraph.sortedReleaseGroups) {
|
|
96
|
+
const releaseGroup = releaseGraph.releaseGroups.find((g) => g.name === releaseGroupName);
|
|
97
|
+
if (!releaseGroup) {
|
|
98
|
+
// Release group was filtered out, skip
|
|
99
|
+
continue;
|
|
100
|
+
}
|
|
101
|
+
const publishProjectsResult = await runPublishOnProjects(_args, projectGraph, nxJson, Array.from(releaseGraph.releaseGroupToFilteredProjects.get(releaseGroup)), {
|
|
83
102
|
excludeTaskDependencies: shouldExcludeTaskDependencies,
|
|
84
103
|
loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
|
|
85
104
|
});
|
|
@@ -93,7 +112,12 @@ function createAPI(overrideReleaseConfig) {
|
|
|
93
112
|
/**
|
|
94
113
|
* Run publishing for all remaining release groups
|
|
95
114
|
*/
|
|
96
|
-
for (const
|
|
115
|
+
for (const releaseGroupName of releaseGraph.sortedReleaseGroups) {
|
|
116
|
+
const releaseGroup = releaseGraph.releaseGroups.find((g) => g.name === releaseGroupName);
|
|
117
|
+
if (!releaseGroup) {
|
|
118
|
+
// Release group was filtered out, skip
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
97
121
|
const publishProjectsResult = await runPublishOnProjects(_args, projectGraph, nxJson, releaseGroup.projects, {
|
|
98
122
|
excludeTaskDependencies: shouldExcludeTaskDependencies,
|
|
99
123
|
loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
|
|
@@ -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;
|
|
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,oBACC,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAMnE,MAAM,cAAc,KACnB,OAAO,CAAC,sBAAsB,GAAG,MAAM,CAAC,CA4W5C"}
|
|
@@ -12,7 +12,6 @@ const output_1 = require("../../utils/output");
|
|
|
12
12
|
const changelog_1 = require("./changelog");
|
|
13
13
|
const config_1 = require("./config/config");
|
|
14
14
|
const deep_merge_json_1 = require("./config/deep-merge-json");
|
|
15
|
-
const filter_release_groups_1 = require("./config/filter-release-groups");
|
|
16
15
|
const version_plans_1 = require("./config/version-plans");
|
|
17
16
|
const publish_1 = require("./publish");
|
|
18
17
|
const git_1 = require("./utils/git");
|
|
@@ -58,16 +57,6 @@ function createAPI(overrideReleaseConfig) {
|
|
|
58
57
|
isDebug: args.printConfig === 'debug',
|
|
59
58
|
});
|
|
60
59
|
}
|
|
61
|
-
const { error: filterError, filterLog, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, args.projects, args.groups);
|
|
62
|
-
if (filterError) {
|
|
63
|
-
output_1.output.error(filterError);
|
|
64
|
-
process.exit(1);
|
|
65
|
-
}
|
|
66
|
-
if (filterLog) {
|
|
67
|
-
output_1.output.note(filterLog);
|
|
68
|
-
}
|
|
69
|
-
// Do not repeat the filter log in the release subcommands
|
|
70
|
-
process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG = 'true';
|
|
71
60
|
const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
|
|
72
61
|
if (args.specifier && rawVersionPlans.length > 0) {
|
|
73
62
|
output_1.output.error({
|
|
@@ -84,21 +73,21 @@ function createAPI(overrideReleaseConfig) {
|
|
|
84
73
|
const shouldStage = (shouldCommit || userProvidedReleaseConfig.git?.stageChanges) ?? false;
|
|
85
74
|
const shouldTag = userProvidedReleaseConfig.git?.tag ?? true;
|
|
86
75
|
const shouldCreateWorkspaceRemoteRelease = shouldCreateRemoteRelease(nxReleaseConfig.changelog.workspaceChangelog);
|
|
87
|
-
|
|
88
|
-
const shouldPush = (shouldCreateWorkspaceRemoteRelease ||
|
|
89
|
-
releaseGroups.some((group) => shouldCreateRemoteRelease(group.changelog))) ??
|
|
90
|
-
false;
|
|
91
|
-
const versionResult = await releaseVersion({
|
|
76
|
+
const { workspaceVersion, projectsVersionData, releaseGraph, } = await releaseVersion({
|
|
92
77
|
...args,
|
|
93
78
|
stageChanges: shouldStage,
|
|
94
79
|
gitCommit: false,
|
|
95
80
|
gitTag: false,
|
|
96
81
|
deleteVersionPlans: false,
|
|
97
82
|
});
|
|
83
|
+
// Suppress the filter log for the changelog command as it would have already been printed by the version command
|
|
84
|
+
process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG = 'true';
|
|
98
85
|
const changelogResult = await releaseChangelog({
|
|
99
86
|
...args,
|
|
100
|
-
|
|
101
|
-
|
|
87
|
+
// Re-use existing release graph
|
|
88
|
+
releaseGraph,
|
|
89
|
+
versionData: projectsVersionData,
|
|
90
|
+
version: workspaceVersion,
|
|
102
91
|
stageChanges: shouldStage,
|
|
103
92
|
gitCommit: false,
|
|
104
93
|
gitTag: false,
|
|
@@ -106,16 +95,16 @@ function createAPI(overrideReleaseConfig) {
|
|
|
106
95
|
createRelease: false,
|
|
107
96
|
deleteVersionPlans: false,
|
|
108
97
|
});
|
|
109
|
-
await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
|
|
98
|
+
await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
|
|
110
99
|
// Validate version plans against the filter after resolution
|
|
111
|
-
const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGroups, releaseGroupToFilteredProjects);
|
|
100
|
+
const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
|
|
112
101
|
if (versionPlanValidationError) {
|
|
113
102
|
output_1.output.error(versionPlanValidationError);
|
|
114
103
|
process.exit(1);
|
|
115
104
|
}
|
|
116
105
|
const planFiles = new Set();
|
|
117
|
-
releaseGroups.forEach((group) => {
|
|
118
|
-
const filteredProjects = releaseGroupToFilteredProjects.get(group);
|
|
106
|
+
releaseGraph.releaseGroups.forEach((group) => {
|
|
107
|
+
const filteredProjects = releaseGraph.releaseGroupToFilteredProjects.get(group);
|
|
119
108
|
if (group.resolvedVersionPlans) {
|
|
120
109
|
// Check each version plan individually to see if it should be deleted
|
|
121
110
|
const plansToDelete = [];
|
|
@@ -162,7 +151,7 @@ function createAPI(overrideReleaseConfig) {
|
|
|
162
151
|
if (shouldCommit) {
|
|
163
152
|
output_1.output.logSingleLine(`Committing changes with git`);
|
|
164
153
|
const commitMessage = nxReleaseConfig.git.commitMessage;
|
|
165
|
-
const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects,
|
|
154
|
+
const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects, projectsVersionData, commitMessage);
|
|
166
155
|
await (0, git_1.gitCommit)({
|
|
167
156
|
messages: commitMessageValues,
|
|
168
157
|
additionalArgs: nxReleaseConfig.git.commitArgs,
|
|
@@ -173,7 +162,7 @@ function createAPI(overrideReleaseConfig) {
|
|
|
173
162
|
if (shouldTag) {
|
|
174
163
|
output_1.output.logSingleLine(`Tagging commit with git`);
|
|
175
164
|
// Resolve any git tags as early as possible so that we can hard error in case of any duplicates before reaching the actual git command
|
|
176
|
-
const gitTagValues = (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects,
|
|
165
|
+
const gitTagValues = (0, shared_1.createGitTagValues)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects, projectsVersionData);
|
|
177
166
|
(0, shared_1.handleDuplicateGitTags)(gitTagValues);
|
|
178
167
|
for (const tag of gitTagValues) {
|
|
179
168
|
await (0, git_1.gitTag)({
|
|
@@ -186,6 +175,10 @@ function createAPI(overrideReleaseConfig) {
|
|
|
186
175
|
}
|
|
187
176
|
}
|
|
188
177
|
let hasPushedChanges = false;
|
|
178
|
+
// If the workspace or any of the release groups specify that a remote release should be created, we need to push the changes to the remote
|
|
179
|
+
const shouldPush = (shouldCreateWorkspaceRemoteRelease ||
|
|
180
|
+
releaseGraph.releaseGroups.some((group) => shouldCreateRemoteRelease(group.changelog))) ??
|
|
181
|
+
false;
|
|
189
182
|
if (shouldPush) {
|
|
190
183
|
output_1.output.logSingleLine(`Pushing to git remote "origin"`);
|
|
191
184
|
await (0, git_1.gitPush)({
|
|
@@ -209,7 +202,11 @@ function createAPI(overrideReleaseConfig) {
|
|
|
209
202
|
latestCommit = await (0, git_1.getCommitHash)('HEAD');
|
|
210
203
|
await remoteReleaseClient.createOrUpdateRelease(changelogResult.workspaceChangelog.releaseVersion, changelogResult.workspaceChangelog.contents, latestCommit, { dryRun: args.dryRun });
|
|
211
204
|
}
|
|
212
|
-
for (const
|
|
205
|
+
for (const releaseGroupName of releaseGraph.sortedReleaseGroups) {
|
|
206
|
+
const releaseGroup = releaseGraph.releaseGroups.find((g) => g.name === releaseGroupName);
|
|
207
|
+
if (!releaseGroup) {
|
|
208
|
+
continue;
|
|
209
|
+
}
|
|
213
210
|
const shouldCreateProjectRemoteReleases = shouldCreateRemoteRelease(releaseGroup.changelog);
|
|
214
211
|
if (shouldCreateProjectRemoteReleases &&
|
|
215
212
|
changelogResult.projectChangelogs) {
|
|
@@ -219,7 +216,7 @@ function createAPI(overrideReleaseConfig) {
|
|
|
219
216
|
.createRelease);
|
|
220
217
|
const projects = args.projects?.length
|
|
221
218
|
? // If the user has passed a list of projects, we need to use the filtered list of projects within the release group
|
|
222
|
-
Array.from(releaseGroupToFilteredProjects.get(releaseGroup))
|
|
219
|
+
Array.from(releaseGraph.releaseGroupToFilteredProjects.get(releaseGroup))
|
|
223
220
|
: // Otherwise, we use the full list of projects within the release group
|
|
224
221
|
releaseGroup.projects;
|
|
225
222
|
const projectNodes = projects.map((name) => projectGraph.nodes[name]);
|
|
@@ -241,8 +238,8 @@ function createAPI(overrideReleaseConfig) {
|
|
|
241
238
|
}
|
|
242
239
|
let hasNewVersion = false;
|
|
243
240
|
// null means that all projects are versioned together but there were no changes
|
|
244
|
-
if (
|
|
245
|
-
hasNewVersion = Object.values(
|
|
241
|
+
if (workspaceVersion !== null) {
|
|
242
|
+
hasNewVersion = Object.values(projectsVersionData).some((version) =>
|
|
246
243
|
/**
|
|
247
244
|
* There is a scenario where applications will not have a newVersion created by VerisonActions,
|
|
248
245
|
* however, there will still be a dockerVersion created from the docker release.
|
|
@@ -257,7 +254,7 @@ function createAPI(overrideReleaseConfig) {
|
|
|
257
254
|
if (shouldPublish) {
|
|
258
255
|
const publishResults = await releasePublish({
|
|
259
256
|
...args,
|
|
260
|
-
versionData:
|
|
257
|
+
versionData: projectsVersionData,
|
|
261
258
|
});
|
|
262
259
|
const allExitOk = Object.values(publishResults).every((result) => result.code === 0);
|
|
263
260
|
if (!allExitOk) {
|
|
@@ -268,7 +265,11 @@ function createAPI(overrideReleaseConfig) {
|
|
|
268
265
|
else {
|
|
269
266
|
output_1.output.logSingleLine('Skipped publishing packages.');
|
|
270
267
|
}
|
|
271
|
-
return
|
|
268
|
+
return {
|
|
269
|
+
workspaceVersion,
|
|
270
|
+
projectsVersionData,
|
|
271
|
+
releaseGraph,
|
|
272
|
+
};
|
|
272
273
|
};
|
|
273
274
|
}
|
|
274
275
|
async function promptForPublish() {
|
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import type { NxReleaseDockerConfiguration, NxReleaseVersionConfiguration } from '../../../config/nx-json';
|
|
2
|
+
import type { ProjectGraph } from '../../../config/project-graph';
|
|
3
|
+
import type { Tree } from '../../../generators/tree';
|
|
4
|
+
import { type NxReleaseConfig } from '../config/config';
|
|
5
|
+
import type { ReleaseGroupWithName } from '../config/filter-release-groups';
|
|
6
|
+
import { ProjectLogger } from '../version/project-logger';
|
|
7
|
+
import { type AfterAllProjectsVersioned, type VersionActions } from '../version/version-actions';
|
|
8
|
+
/**
|
|
9
|
+
* Final configuration for a project after applying release group and project level overrides
|
|
10
|
+
*/
|
|
11
|
+
export interface FinalConfigForProject {
|
|
12
|
+
specifierSource: NxReleaseVersionConfiguration['specifierSource'];
|
|
13
|
+
currentVersionResolver: NxReleaseVersionConfiguration['currentVersionResolver'];
|
|
14
|
+
currentVersionResolverMetadata: NxReleaseVersionConfiguration['currentVersionResolverMetadata'];
|
|
15
|
+
fallbackCurrentVersionResolver: NxReleaseVersionConfiguration['fallbackCurrentVersionResolver'];
|
|
16
|
+
versionPrefix: NxReleaseVersionConfiguration['versionPrefix'];
|
|
17
|
+
preserveLocalDependencyProtocols: NxReleaseVersionConfiguration['preserveLocalDependencyProtocols'];
|
|
18
|
+
preserveMatchingDependencyRanges: NxReleaseVersionConfiguration['preserveMatchingDependencyRanges'];
|
|
19
|
+
versionActionsOptions: NxReleaseVersionConfiguration['versionActionsOptions'];
|
|
20
|
+
manifestRootsToUpdate: Array<Exclude<NxReleaseVersionConfiguration['manifestRootsToUpdate'][number], string>>;
|
|
21
|
+
dockerOptions: NxReleaseDockerConfiguration & {
|
|
22
|
+
groupPreVersionCommand?: string;
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
interface GroupNode {
|
|
26
|
+
group: ReleaseGroupWithName;
|
|
27
|
+
dependencies: Set<string>;
|
|
28
|
+
dependents: Set<string>;
|
|
29
|
+
}
|
|
30
|
+
export interface CreateReleaseGraphOptions {
|
|
31
|
+
tree: Tree;
|
|
32
|
+
projectGraph: ProjectGraph;
|
|
33
|
+
nxReleaseConfig: NxReleaseConfig;
|
|
34
|
+
filters: {
|
|
35
|
+
projects?: string[];
|
|
36
|
+
groups?: string[];
|
|
37
|
+
};
|
|
38
|
+
firstRelease: boolean;
|
|
39
|
+
preid?: string;
|
|
40
|
+
verbose: boolean;
|
|
41
|
+
/**
|
|
42
|
+
* Current version resolution is not needed for publishing, so in cases where the publish subcommand needs to build a release graph,
|
|
43
|
+
* we allow it to skip this step.
|
|
44
|
+
*/
|
|
45
|
+
skipVersionResolution?: boolean;
|
|
46
|
+
versionActionsOptionsOverrides?: Record<string, unknown>;
|
|
47
|
+
}
|
|
48
|
+
export declare const validReleaseVersionPrefixes: readonly ["auto", "", "~", "^", "="];
|
|
49
|
+
/**
|
|
50
|
+
* The complete release graph containing all relationships, caches, and computed data
|
|
51
|
+
* necessary for efficient release operations across versioning, changelog, and publishing.
|
|
52
|
+
*
|
|
53
|
+
* This class encapsulates the complex dependency graph between projects and release groups,
|
|
54
|
+
* providing convenient methods for querying relationships and accessing cached data.
|
|
55
|
+
*/
|
|
56
|
+
export declare class ReleaseGraph {
|
|
57
|
+
releaseGroups: ReleaseGroupWithName[];
|
|
58
|
+
readonly filters: {
|
|
59
|
+
projects?: string[];
|
|
60
|
+
groups?: string[];
|
|
61
|
+
};
|
|
62
|
+
readonly projectToReleaseGroup: Map<string, ReleaseGroupWithName>;
|
|
63
|
+
readonly projectToDependents: Map<string, Set<string>>;
|
|
64
|
+
readonly projectToDependencies: Map<string, Set<string>>;
|
|
65
|
+
readonly projectToUpdateDependentsSetting: Map<string, "never" | "auto" | "always">;
|
|
66
|
+
readonly groupGraph: Map<string, GroupNode>;
|
|
67
|
+
sortedReleaseGroups: string[];
|
|
68
|
+
readonly sortedProjects: Map<string, string[]>;
|
|
69
|
+
readonly allProjectsConfiguredForNxRelease: Set<string>;
|
|
70
|
+
allProjectsToProcess: Set<string>;
|
|
71
|
+
readonly finalConfigsByProject: Map<string, FinalConfigForProject>;
|
|
72
|
+
readonly projectsToVersionActions: Map<string, VersionActions>;
|
|
73
|
+
readonly uniqueAfterAllProjectsVersioned: Map<string, AfterAllProjectsVersioned>;
|
|
74
|
+
readonly projectLoggers: Map<string, ProjectLogger>;
|
|
75
|
+
readonly cachedCurrentVersions: Map<string, string>;
|
|
76
|
+
readonly cachedLatestMatchingGitTag: Map<string, import("./git").GitTagAndVersion>;
|
|
77
|
+
readonly currentVersionsPerFixedReleaseGroup: Map<string, {
|
|
78
|
+
currentVersion: string;
|
|
79
|
+
originatingProjectName: string;
|
|
80
|
+
logText: string;
|
|
81
|
+
}>;
|
|
82
|
+
readonly originalDependentProjectsPerProject: Map<string, {
|
|
83
|
+
source: string;
|
|
84
|
+
target: string;
|
|
85
|
+
type: string;
|
|
86
|
+
dependencyCollection: string;
|
|
87
|
+
rawVersionSpec: string;
|
|
88
|
+
}[]>;
|
|
89
|
+
readonly releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>;
|
|
90
|
+
private originalFilteredProjects;
|
|
91
|
+
/**
|
|
92
|
+
* User-friendly log describing what the filter matched.
|
|
93
|
+
* Null if no filters were applied.
|
|
94
|
+
*/
|
|
95
|
+
filterLog: {
|
|
96
|
+
title: string;
|
|
97
|
+
bodyLines: string[];
|
|
98
|
+
} | null;
|
|
99
|
+
constructor(releaseGroups: ReleaseGroupWithName[], filters: {
|
|
100
|
+
projects?: string[];
|
|
101
|
+
groups?: string[];
|
|
102
|
+
});
|
|
103
|
+
/**
|
|
104
|
+
* Initialize the graph by building all relationships and caches
|
|
105
|
+
* @internal - Called by createReleaseGraph(), not meant for external use
|
|
106
|
+
*/
|
|
107
|
+
init(options: CreateReleaseGraphOptions): Promise<void>;
|
|
108
|
+
/**
|
|
109
|
+
* Setup mapping from project to release group and cache updateDependents settings
|
|
110
|
+
*/
|
|
111
|
+
private setupProjectReleaseGroupMapping;
|
|
112
|
+
/**
|
|
113
|
+
* Apply initial filtering to construct releaseGroupToFilteredProjects based on filters.
|
|
114
|
+
* This determines the base set of projects and groups before considering dependencies.
|
|
115
|
+
*/
|
|
116
|
+
private applyInitialFiltering;
|
|
117
|
+
/**
|
|
118
|
+
* Check if any filters are applied
|
|
119
|
+
*/
|
|
120
|
+
private hasAnyFilters;
|
|
121
|
+
/**
|
|
122
|
+
* Setup projects to process and resolve version actions
|
|
123
|
+
*/
|
|
124
|
+
private setupProjectsToProcess;
|
|
125
|
+
/**
|
|
126
|
+
* Precompute dependency relationships between all projects
|
|
127
|
+
*/
|
|
128
|
+
private precomputeDependencyRelationships;
|
|
129
|
+
/**
|
|
130
|
+
* Apply dependency-aware filtering that considers updateDependents configuration.
|
|
131
|
+
* This includes transitive dependents when updateDependents='auto'.
|
|
132
|
+
*/
|
|
133
|
+
private applyDependencyAwareFiltering;
|
|
134
|
+
/**
|
|
135
|
+
* Validate that the filter doesn't try to isolate projects in fixed release groups
|
|
136
|
+
*/
|
|
137
|
+
private validateFilterAgainstFixedGroups;
|
|
138
|
+
/**
|
|
139
|
+
* Find dependents that should be included in processing based on updateDependents configuration
|
|
140
|
+
*/
|
|
141
|
+
private findDependentsToProcess;
|
|
142
|
+
/**
|
|
143
|
+
* Generate user-friendly log describing what the filter matched
|
|
144
|
+
*/
|
|
145
|
+
private generateFilterLog;
|
|
146
|
+
/**
|
|
147
|
+
* Build the group graph structure
|
|
148
|
+
*/
|
|
149
|
+
private buildGroupGraphStructure;
|
|
150
|
+
/**
|
|
151
|
+
* Resolve current versions for all projects that will be processed
|
|
152
|
+
*/
|
|
153
|
+
private resolveCurrentVersionsForProjects;
|
|
154
|
+
/**
|
|
155
|
+
* Build dependency relationships between release groups
|
|
156
|
+
*/
|
|
157
|
+
private buildGroupDependencyGraph;
|
|
158
|
+
/**
|
|
159
|
+
* Topologically sort release groups
|
|
160
|
+
*/
|
|
161
|
+
private topologicallySortReleaseGroups;
|
|
162
|
+
/**
|
|
163
|
+
* Topologically sort projects within a release group
|
|
164
|
+
*/
|
|
165
|
+
private topologicallySortProjects;
|
|
166
|
+
private populateDependentProjectsData;
|
|
167
|
+
/**
|
|
168
|
+
* Get all non-implicit dependents for a set of projects
|
|
169
|
+
*/
|
|
170
|
+
private getAllNonImplicitDependents;
|
|
171
|
+
/**
|
|
172
|
+
* Resolve final configuration for a project
|
|
173
|
+
*
|
|
174
|
+
* NOTE: We are providing ultimate fallback values via ?? here mainly just to keep TypeScript happy.
|
|
175
|
+
* All default values should have been applied by this point by config.ts but the types can't know
|
|
176
|
+
* that for sure at this point.
|
|
177
|
+
*/
|
|
178
|
+
private static resolveFinalConfigForProject;
|
|
179
|
+
/**
|
|
180
|
+
* Get the release group for a given project
|
|
181
|
+
*/
|
|
182
|
+
getReleaseGroupForProject(projectName: string): ReleaseGroupWithName | undefined;
|
|
183
|
+
/**
|
|
184
|
+
* Get the release group name for a given project
|
|
185
|
+
*/
|
|
186
|
+
getReleaseGroupNameForProject(projectName: string): string | null;
|
|
187
|
+
/**
|
|
188
|
+
* Get the dependencies of a project
|
|
189
|
+
*/
|
|
190
|
+
getProjectDependencies(projectName: string): Set<string>;
|
|
191
|
+
/**
|
|
192
|
+
* Get the dependents of a project (projects that depend on it)
|
|
193
|
+
*/
|
|
194
|
+
getProjectDependents(projectName: string): Set<string>;
|
|
195
|
+
/**
|
|
196
|
+
* Get the version actions for a project
|
|
197
|
+
*/
|
|
198
|
+
getVersionActionsForProject(projectName: string): VersionActions | undefined;
|
|
199
|
+
/**
|
|
200
|
+
* Check if a project will be processed
|
|
201
|
+
*/
|
|
202
|
+
isProjectToProcess(projectName: string): boolean;
|
|
203
|
+
/**
|
|
204
|
+
* Runs validation on resolved VersionActions instances. E.g. check that manifest files exist for all projects that will be processed.
|
|
205
|
+
* This should be called after preVersionCommand has run, as those commands may create manifest files that are needed for versioning.
|
|
206
|
+
*/
|
|
207
|
+
validate(tree: Tree): Promise<void>;
|
|
208
|
+
}
|
|
209
|
+
/**
|
|
210
|
+
* Creates a complete release graph by analyzing all release groups, projects, and their relationships.
|
|
211
|
+
*
|
|
212
|
+
* This function builds the graph structure, applies filtering logic that considers dependencies
|
|
213
|
+
* and updateDependents configuration, and caches all necessary data.
|
|
214
|
+
*
|
|
215
|
+
* The returned graph can be reused across versioning, changelog, and publishing operations.
|
|
216
|
+
*/
|
|
217
|
+
export declare function createReleaseGraph(options: CreateReleaseGraphOptions): Promise<ReleaseGraph>;
|
|
218
|
+
export {};
|
|
219
|
+
//# sourceMappingURL=release-graph.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"release-graph.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/release-graph.ts"],"names":[],"mappings":"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"}
|