nx 21.4.0-canary.20250725-0359f0d → 21.4.0-canary.20250726-64897b7
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/.eslintrc.json +2 -0
- package/bin/nx.js +6 -6
- package/package.json +12 -11
- package/schemas/nx-schema.json +77 -0
- package/src/command-line/nx-cloud/connect/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/connect/command-object.js +2 -1
- package/src/command-line/nx-cloud/connect/connect-to-nx-cloud.d.ts +1 -0
- package/src/command-line/nx-cloud/connect/connect-to-nx-cloud.d.ts.map +1 -1
- package/src/command-line/nx-cloud/connect/connect-to-nx-cloud.js +12 -0
- package/src/command-line/release/changelog.d.ts.map +1 -1
- package/src/command-line/release/changelog.js +6 -2
- 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 +4 -0
- package/src/command-line/release/config/config.d.ts +10 -3
- package/src/command-line/release/config/config.d.ts.map +1 -1
- package/src/command-line/release/config/config.js +103 -0
- package/src/command-line/release/config/filter-release-groups.d.ts +5 -1
- package/src/command-line/release/config/filter-release-groups.d.ts.map +1 -1
- package/src/command-line/release/release.d.ts.map +1 -1
- package/src/command-line/release/release.js +6 -1
- package/src/command-line/release/utils/shared.d.ts +9 -0
- package/src/command-line/release/utils/shared.d.ts.map +1 -1
- package/src/command-line/release/utils/shared.js +25 -4
- package/src/command-line/release/version/project-logger.d.ts.map +1 -1
- package/src/command-line/release/version/project-logger.js +1 -0
- package/src/command-line/release/version/release-group-processor.d.ts +6 -1
- package/src/command-line/release/version/release-group-processor.d.ts.map +1 -1
- package/src/command-line/release/version/release-group-processor.js +73 -3
- package/src/command-line/release/version/version-actions.d.ts +21 -0
- package/src/command-line/release/version/version-actions.d.ts.map +1 -1
- package/src/command-line/release/version/version-actions.js +32 -1
- package/src/command-line/release/version.d.ts.map +1 -1
- package/src/command-line/release/version.js +42 -11
- package/src/command-line/sync/sync.d.ts.map +1 -1
- package/src/command-line/sync/sync.js +8 -2
- package/src/config/nx-json.d.ts +58 -0
- package/src/config/nx-json.d.ts.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +2 -1
- package/src/config/workspace-json-project-json.d.ts.map +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/daemon/server/handle-get-sync-generator-changes.d.ts.map +1 -1
- package/src/daemon/server/handle-get-sync-generator-changes.js +1 -0
- package/src/native/index.d.ts +1 -0
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/js/lock-file/pnpm-parser.js +2 -1
- package/src/project-graph/utils/normalize-project-nodes.d.ts +5 -5
- package/src/project-graph/utils/normalize-project-nodes.d.ts.map +1 -1
- package/src/project-graph/utils/normalize-project-nodes.js +35 -6
- package/src/tasks-runner/life-cycle.d.ts +2 -0
- package/src/tasks-runner/life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycle.js +7 -0
- package/src/tasks-runner/task-orchestrator.d.ts.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +5 -0
- package/src/tasks-runner/tasks-schedule.d.ts +1 -0
- package/src/tasks-runner/tasks-schedule.d.ts.map +1 -1
- package/src/tasks-runner/tasks-schedule.js +3 -0
- package/src/utils/git-utils.d.ts +1 -0
- package/src/utils/git-utils.d.ts.map +1 -1
- package/src/utils/git-utils.js +11 -4
- package/src/utils/sync-generators.d.ts +3 -1
- package/src/utils/sync-generators.d.ts.map +1 -1
- package/src/utils/sync-generators.js +7 -1
@@ -4,6 +4,8 @@ exports.ReleaseVersion = exports.noDiffInChangelogMessage = void 0;
|
|
4
4
|
exports.isPrerelease = isPrerelease;
|
5
5
|
exports.commitChanges = commitChanges;
|
6
6
|
exports.createCommitMessageValues = createCommitMessageValues;
|
7
|
+
exports.shouldPreferDockerVersionForReleaseGroup = shouldPreferDockerVersionForReleaseGroup;
|
8
|
+
exports.shouldSkipVersionActions = shouldSkipVersionActions;
|
7
9
|
exports.createGitTagValues = createGitTagValues;
|
8
10
|
exports.handleDuplicateGitTags = handleDuplicateGitTags;
|
9
11
|
exports.getCommitsRelevantToProjects = getCommitsRelevantToProjects;
|
@@ -156,6 +158,17 @@ function stripPlaceholders(str, placeholders) {
|
|
156
158
|
}
|
157
159
|
return str;
|
158
160
|
}
|
161
|
+
function shouldPreferDockerVersionForReleaseGroup(releaseGroup) {
|
162
|
+
// The inference was already done in the config phase, so if docker projects exist,
|
163
|
+
// releaseTagPatternRequireSemver would be false
|
164
|
+
return !releaseGroup.releaseTagPatternRequireSemver;
|
165
|
+
}
|
166
|
+
function shouldSkipVersionActions(dockerOptions, projectName) {
|
167
|
+
return (dockerOptions.skipVersionActions === true ||
|
168
|
+
(Array.isArray(dockerOptions.skipVersionActions) &&
|
169
|
+
// skipVersionActions as string[] already normalized to matching projects in config.ts
|
170
|
+
dockerOptions.skipVersionActions.includes(projectName)));
|
171
|
+
}
|
159
172
|
function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versionData) {
|
160
173
|
const tags = [];
|
161
174
|
for (const releaseGroup of releaseGroups) {
|
@@ -164,9 +177,13 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
|
|
164
177
|
if (releaseGroup.projectsRelationship === 'independent') {
|
165
178
|
for (const project of releaseGroupProjectNames) {
|
166
179
|
const projectVersionData = versionData[project];
|
167
|
-
if (projectVersionData.newVersion !== null
|
180
|
+
if (projectVersionData.newVersion !== null ||
|
181
|
+
projectVersionData.dockerVersion !== null) {
|
182
|
+
const preferDockerVersion = shouldPreferDockerVersionForReleaseGroup(releaseGroup);
|
168
183
|
tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
|
169
|
-
version:
|
184
|
+
version: preferDockerVersion
|
185
|
+
? projectVersionData.dockerVersion
|
186
|
+
: projectVersionData.newVersion,
|
170
187
|
projectName: project,
|
171
188
|
}));
|
172
189
|
}
|
@@ -175,9 +192,13 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
|
|
175
192
|
}
|
176
193
|
// For fixed groups we want one tag for the overall group
|
177
194
|
const projectVersionData = versionData[releaseGroupProjectNames[0]]; // all at the same version, so we can just pick the first one
|
178
|
-
if (projectVersionData.newVersion !== null
|
195
|
+
if (projectVersionData.newVersion !== null ||
|
196
|
+
projectVersionData.dockerVersion !== null) {
|
197
|
+
const preferDockerVersion = shouldPreferDockerVersionForReleaseGroup(releaseGroup);
|
179
198
|
tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
|
180
|
-
version:
|
199
|
+
version: preferDockerVersion
|
200
|
+
? projectVersionData.dockerVersion
|
201
|
+
: projectVersionData.newVersion,
|
181
202
|
releaseGroupName: releaseGroup.name,
|
182
203
|
}));
|
183
204
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"project-logger.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/project-logger.ts"],"names":[],"mappings":"AA0BA,qBAAa,aAAa;IAIZ,OAAO,CAAC,WAAW;IAH/B,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,KAAK,CAA0B;gBAEnB,WAAW,EAAE,MAAM;IAIvC,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,KAAK;
|
1
|
+
{"version":3,"file":"project-logger.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/project-logger.ts"],"names":[],"mappings":"AA0BA,qBAAa,aAAa;IAIZ,OAAO,CAAC,WAAW;IAH/B,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,KAAK,CAA0B;gBAEnB,WAAW,EAAE,MAAM;IAIvC,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,KAAK;CAcN"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { ManifestRootToUpdate, NxReleaseVersionConfiguration } from '../../../config/nx-json';
|
1
|
+
import { ManifestRootToUpdate, NxReleaseDockerConfiguration, NxReleaseVersionConfiguration } from '../../../config/nx-json';
|
2
2
|
import { ProjectGraph } from '../../../config/project-graph';
|
3
3
|
import { Tree } from '../../../generators/tree';
|
4
4
|
import { type NxReleaseConfig } from '../config/config';
|
@@ -18,6 +18,9 @@ export interface FinalConfigForProject {
|
|
18
18
|
preserveLocalDependencyProtocols: NxReleaseVersionConfiguration['preserveLocalDependencyProtocols'];
|
19
19
|
versionActionsOptions: NxReleaseVersionConfiguration['versionActionsOptions'];
|
20
20
|
manifestRootsToUpdate: Array<Exclude<ManifestRootToUpdate, string>>;
|
21
|
+
dockerOptions: NxReleaseDockerConfiguration & {
|
22
|
+
groupPreVersionCommand?: string;
|
23
|
+
};
|
21
24
|
}
|
22
25
|
export declare const BUMP_TYPE_REASON_TEXT: {
|
23
26
|
readonly DEPENDENCY_WAS_BUMPED: ", because a dependency was bumped, ";
|
@@ -27,6 +30,7 @@ export declare const BUMP_TYPE_REASON_TEXT: {
|
|
27
30
|
readonly VERSION_PLANS: ", read from version plan {versionPlanPath}, ";
|
28
31
|
readonly DEPENDENCY_ACROSS_GROUPS_WAS_BUMPED: ", because a dependency project belonging to another release group was bumped, ";
|
29
32
|
readonly OTHER_PROJECT_IN_FIXED_GROUP_WAS_BUMPED_DUE_TO_DEPENDENCY: ", because of a dependency-only bump to another project in the same fixed release group, ";
|
33
|
+
readonly NOOP_VERSION_ACTIONS: ", because this project uses docker and has been configured to skip VersionActions, ";
|
30
34
|
};
|
31
35
|
interface ReleaseGroupProcessorOptions {
|
32
36
|
dryRun: boolean;
|
@@ -213,6 +217,7 @@ export declare class ReleaseGroupProcessor {
|
|
213
217
|
changedFiles: string[];
|
214
218
|
deletedFiles: string[];
|
215
219
|
}>;
|
220
|
+
processDockerProjects(dockerVersionScheme?: string): Promise<void>;
|
216
221
|
private processGroup;
|
217
222
|
private propagateChangesToDependentGroups;
|
218
223
|
private bumpVersions;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"release-group-processor.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/release-group-processor.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,EACpB,6BAA6B,EAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,YAAY,EAEb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kBAAkB,CAAC;
|
1
|
+
{"version":3,"file":"release-group-processor.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/release-group-processor.ts"],"names":[],"mappings":"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"}
|
@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ReleaseGroupProcessor = exports.BUMP_TYPE_REASON_TEXT = void 0;
|
4
4
|
const semver = require("semver");
|
5
5
|
const config_1 = require("../config/config");
|
6
|
+
const workspace_root_1 = require("../../../utils/workspace-root");
|
6
7
|
const git_1 = require("../utils/git");
|
7
8
|
const resolve_semver_specifier_1 = require("../utils/resolve-semver-specifier");
|
9
|
+
const shared_1 = require("../utils/shared");
|
8
10
|
const version_1 = require("../version");
|
9
11
|
const derive_specifier_from_conventional_commits_1 = require("./derive-specifier-from-conventional-commits");
|
10
12
|
const deriver_specifier_from_version_plans_1 = require("./deriver-specifier-from-version-plans");
|
@@ -20,6 +22,7 @@ exports.BUMP_TYPE_REASON_TEXT = {
|
|
20
22
|
VERSION_PLANS: ', read from version plan {versionPlanPath}, ',
|
21
23
|
DEPENDENCY_ACROSS_GROUPS_WAS_BUMPED: ', because a dependency project belonging to another release group was bumped, ',
|
22
24
|
OTHER_PROJECT_IN_FIXED_GROUP_WAS_BUMPED_DUE_TO_DEPENDENCY: ', because of a dependency-only bump to another project in the same fixed release group, ',
|
25
|
+
NOOP_VERSION_ACTIONS: ', because this project uses docker and has been configured to skip VersionActions, ',
|
23
26
|
};
|
24
27
|
class ReleaseGroupProcessor {
|
25
28
|
constructor(tree, projectGraph, nxReleaseConfig, releaseGroups, releaseGroupToFilteredProjects, options) {
|
@@ -215,6 +218,7 @@ class ReleaseGroupProcessor {
|
|
215
218
|
this.versionData.set(projectName, {
|
216
219
|
currentVersion: this.getCurrentCachedVersionForProject(projectName),
|
217
220
|
newVersion: null,
|
221
|
+
dockerVersion: null,
|
218
222
|
dependentProjects: this.getOriginalDependentProjects(projectName),
|
219
223
|
});
|
220
224
|
}
|
@@ -296,7 +300,13 @@ class ReleaseGroupProcessor {
|
|
296
300
|
if (!this.uniqueAfterAllProjectsVersioned.has(versionActionsPath)) {
|
297
301
|
this.uniqueAfterAllProjectsVersioned.set(versionActionsPath, afterAllProjectsVersioned);
|
298
302
|
}
|
299
|
-
|
303
|
+
let versionActionsToUse = versionActions;
|
304
|
+
// Check if this project should skip version actions based on docker configuration
|
305
|
+
const shouldSkip = (0, shared_1.shouldSkipVersionActions)(finalConfigForProject.dockerOptions, project);
|
306
|
+
if (shouldSkip) {
|
307
|
+
versionActionsToUse = new version_actions_1.NOOP_VERSION_ACTIONS(releaseGroup, projectGraphNode, finalConfigForProject);
|
308
|
+
}
|
309
|
+
this.projectsToVersionActions.set(project, versionActionsToUse);
|
300
310
|
});
|
301
311
|
}
|
302
312
|
}
|
@@ -476,6 +486,43 @@ class ReleaseGroupProcessor {
|
|
476
486
|
deletedFiles: Array.from(deletedFiles),
|
477
487
|
};
|
478
488
|
}
|
489
|
+
async processDockerProjects(dockerVersionScheme) {
|
490
|
+
const dockerProjects = new Map();
|
491
|
+
for (const project of this.versionData.keys()) {
|
492
|
+
const finalConfigForProject = this.finalConfigsByProject.get(project);
|
493
|
+
if (Object.keys(finalConfigForProject.dockerOptions).length === 0) {
|
494
|
+
continue;
|
495
|
+
}
|
496
|
+
dockerProjects.set(project, finalConfigForProject);
|
497
|
+
}
|
498
|
+
// If no docker projects to process, exit early to avoid unnecessary loading of docker handling
|
499
|
+
if (dockerProjects.size === 0) {
|
500
|
+
return;
|
501
|
+
}
|
502
|
+
let handleDockerVersion;
|
503
|
+
try {
|
504
|
+
const { handleDockerVersion: _handleDockerVersion,
|
505
|
+
// nx-ignore-next-line
|
506
|
+
} = require(// @ts-ignore
|
507
|
+
'@nx/docker/release/version-utils');
|
508
|
+
handleDockerVersion = _handleDockerVersion;
|
509
|
+
}
|
510
|
+
catch (e) {
|
511
|
+
console.error('Could not find `@nx/docker`. Please run `nx add @nx/docker` before attempting to release Docker images.');
|
512
|
+
throw e;
|
513
|
+
}
|
514
|
+
for (const [project, finalConfigForProject] of dockerProjects.entries()) {
|
515
|
+
const projectNode = this.projectGraph.nodes[project];
|
516
|
+
const { newVersion, logs } = await handleDockerVersion(workspace_root_1.workspaceRoot, projectNode, finalConfigForProject, dockerVersionScheme);
|
517
|
+
logs.forEach((log) => this.getProjectLoggerForProject(project).buffer(log));
|
518
|
+
const newVersionData = {
|
519
|
+
...this.versionData.get(project),
|
520
|
+
dockerVersion: newVersion,
|
521
|
+
};
|
522
|
+
this.versionData.set(project, newVersionData);
|
523
|
+
}
|
524
|
+
this.flushAllProjectLoggers();
|
525
|
+
}
|
479
526
|
async processGroup(releaseGroupName) {
|
480
527
|
const groupNode = this.groupGraph.get(releaseGroupName);
|
481
528
|
const bumped = await this.bumpVersions(groupNode.group);
|
@@ -559,6 +606,7 @@ class ReleaseGroupProcessor {
|
|
559
606
|
this.versionData.set(project, {
|
560
607
|
currentVersion: this.getCurrentCachedVersionForProject(project),
|
561
608
|
newVersion: null,
|
609
|
+
dockerVersion: null,
|
562
610
|
dependentProjects: this.getOriginalDependentProjects(project),
|
563
611
|
});
|
564
612
|
if (project === firstProject) {
|
@@ -691,6 +739,14 @@ class ReleaseGroupProcessor {
|
|
691
739
|
}
|
692
740
|
return `${log} within release group "${releaseGroup.name}"`;
|
693
741
|
};
|
742
|
+
const versionActions = this.getVersionActionsForProject(projectName);
|
743
|
+
if (versionActions instanceof version_actions_1.NOOP_VERSION_ACTIONS) {
|
744
|
+
return {
|
745
|
+
newVersionInput: 'none',
|
746
|
+
newVersionInputReason: 'NOOP_VERSION_ACTIONS',
|
747
|
+
newVersionInputReasonData: {},
|
748
|
+
};
|
749
|
+
}
|
694
750
|
if (cachedFinalConfigForProject.specifierSource === 'prompt') {
|
695
751
|
let specifier;
|
696
752
|
if (releaseGroup.projectsRelationship === 'independent') {
|
@@ -745,6 +801,7 @@ class ReleaseGroupProcessor {
|
|
745
801
|
resolveFinalConfigForProject(releaseGroup, projectGraphNode) {
|
746
802
|
const releaseGroupVersionConfig = releaseGroup.version;
|
747
803
|
const projectVersionConfig = projectGraphNode.data.release?.version;
|
804
|
+
const projectDockerConfig = projectGraphNode.data.release?.docker;
|
748
805
|
/**
|
749
806
|
* specifierSource
|
750
807
|
*
|
@@ -770,13 +827,25 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
|
|
770
827
|
.map((s) => `"${s}"`)
|
771
828
|
.join(', ')}`);
|
772
829
|
}
|
830
|
+
// Merge docker options configured in project with release group config
|
831
|
+
// Project level configuration should take preference
|
832
|
+
const dockerOptions = {
|
833
|
+
...(releaseGroup.docker ?? {}),
|
834
|
+
...(projectDockerConfig ?? {}),
|
835
|
+
};
|
773
836
|
/**
|
774
837
|
* currentVersionResolver, defaults to disk
|
775
838
|
*/
|
776
|
-
|
839
|
+
let currentVersionResolver = projectVersionConfig?.currentVersionResolver ??
|
777
840
|
releaseGroupVersionConfig?.currentVersionResolver ??
|
778
841
|
'disk';
|
779
|
-
if
|
842
|
+
// Check if this project should skip version actions based on docker configuration
|
843
|
+
const shouldSkip = (0, shared_1.shouldSkipVersionActions)(dockerOptions, projectGraphNode.name);
|
844
|
+
if (shouldSkip) {
|
845
|
+
// If the project skips version actions, it doesn't need to resolve a current version
|
846
|
+
currentVersionResolver = 'none';
|
847
|
+
}
|
848
|
+
else if (specifierSource === 'conventional-commits' &&
|
780
849
|
currentVersionResolver !== 'git-tag') {
|
781
850
|
throw new Error(`Invalid currentVersionResolver "${currentVersionResolver}" provided for project "${projectGraphNode.name}". Must be "git-tag" when "specifierSource" is "conventional-commits"`);
|
782
851
|
}
|
@@ -833,6 +902,7 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
|
|
833
902
|
preserveLocalDependencyProtocols,
|
834
903
|
versionActionsOptions,
|
835
904
|
manifestRootsToUpdate,
|
905
|
+
dockerOptions,
|
836
906
|
};
|
837
907
|
}
|
838
908
|
async calculateNewVersion(project, newVersionInput, // any arbitrary string, whether or not it is valid is dependent upon the version actions implementation
|
@@ -169,4 +169,25 @@ export declare abstract class VersionActions {
|
|
169
169
|
*/
|
170
170
|
abstract updateProjectDependencies(tree: Tree, projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
|
171
171
|
}
|
172
|
+
export declare class NOOP_VERSION_ACTIONS extends VersionActions {
|
173
|
+
validManifestFilenames: any;
|
174
|
+
readCurrentVersionFromRegistry(tree: Tree, currentVersionResolverMetadata: NxReleaseVersionConfiguration['currentVersionResolverMetadata']): Promise<{
|
175
|
+
currentVersion: string | null;
|
176
|
+
logText: string;
|
177
|
+
} | null>;
|
178
|
+
readCurrentVersionFromSourceManifest(tree: Tree): Promise<{
|
179
|
+
currentVersion: string;
|
180
|
+
manifestPath: string;
|
181
|
+
} | null>;
|
182
|
+
readCurrentVersionOfDependency(tree: Tree, projectGraph: ProjectGraph, dependencyProjectName: string): Promise<{
|
183
|
+
currentVersion: string | null;
|
184
|
+
dependencyCollection: string | null;
|
185
|
+
}>;
|
186
|
+
calculateNewVersion(currentVersion: string | null, newVersionInput: string, newVersionInputReason: string, newVersionInputReasonData: Record<string, unknown>, preid: string): Promise<{
|
187
|
+
newVersion: string;
|
188
|
+
logText: string;
|
189
|
+
}>;
|
190
|
+
updateProjectDependencies(tree: Tree, projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
|
191
|
+
updateProjectVersion(tree: Tree, newVersion: string): Promise<string[]>;
|
192
|
+
}
|
172
193
|
//# sourceMappingURL=version-actions.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"version-actions.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/version-actions.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"version-actions.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/version-actions.ts"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.VersionActions = void 0;
|
3
|
+
exports.NOOP_VERSION_ACTIONS = exports.VersionActions = void 0;
|
4
4
|
exports.resolveVersionActionsForProject = resolveVersionActionsForProject;
|
5
5
|
const node_path_1 = require("node:path");
|
6
6
|
const register_1 = require("../../../plugins/js/utils/register");
|
@@ -199,3 +199,34 @@ It is also possible that the project is being processed because of a dependency
|
|
199
199
|
}
|
200
200
|
}
|
201
201
|
exports.VersionActions = VersionActions;
|
202
|
+
class NOOP_VERSION_ACTIONS extends VersionActions {
|
203
|
+
constructor() {
|
204
|
+
super(...arguments);
|
205
|
+
this.validManifestFilenames = null;
|
206
|
+
}
|
207
|
+
readCurrentVersionFromRegistry(tree, currentVersionResolverMetadata) {
|
208
|
+
return Promise.resolve(null);
|
209
|
+
}
|
210
|
+
readCurrentVersionFromSourceManifest(tree) {
|
211
|
+
return Promise.resolve(null);
|
212
|
+
}
|
213
|
+
readCurrentVersionOfDependency(tree, projectGraph, dependencyProjectName) {
|
214
|
+
return Promise.resolve({
|
215
|
+
currentVersion: null,
|
216
|
+
dependencyCollection: null,
|
217
|
+
});
|
218
|
+
}
|
219
|
+
async calculateNewVersion(currentVersion, newVersionInput, newVersionInputReason, newVersionInputReasonData, preid) {
|
220
|
+
return Promise.resolve({
|
221
|
+
newVersion: '0.0.0',
|
222
|
+
logText: 'Skipped default versioning as no-op.',
|
223
|
+
});
|
224
|
+
}
|
225
|
+
updateProjectDependencies(tree, projectGraph, dependenciesToUpdate) {
|
226
|
+
return Promise.resolve([]);
|
227
|
+
}
|
228
|
+
updateProjectVersion(tree, newVersion) {
|
229
|
+
return Promise.resolve([]);
|
230
|
+
}
|
231
|
+
}
|
232
|
+
exports.NOOP_VERSION_ACTIONS = NOOP_VERSION_ACTIONS;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/version.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAGvB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAkBlD,OAAO,EACL,WAAW,EAKZ,MAAM,gBAAgB,CAAC;AAUxB,eAAO,MAAM,2BAA2B,sCAAuC,CAAC;AAEhF,MAAM,WAAW,sBAAsB;IACrC;;;;;;;;;OASG;IACH,gBAAgB,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IAC9C,mBAAmB,EAAE,WAAW,CAAC;CAClC;AAED,eAAO,MAAM,wBAAwB,GAAI,MAAM,cAAc,oBACN,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,cAAc,KACnB,OAAO,CAAC,sBAAsB,CAAC,
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/version.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EAGvB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAkBlD,OAAO,EACL,WAAW,EAKZ,MAAM,gBAAgB,CAAC;AAUxB,eAAO,MAAM,2BAA2B,sCAAuC,CAAC;AAEhF,MAAM,WAAW,sBAAsB;IACrC;;;;;;;;;OASG;IACH,gBAAgB,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;IAC9C,mBAAmB,EAAE,WAAW,CAAC;CAClC;AAED,eAAO,MAAM,wBAAwB,GAAI,MAAM,cAAc,oBACN,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,cAAc,KACnB,OAAO,CAAC,sBAAsB,CAAC,CA6UnC"}
|
@@ -102,7 +102,7 @@ function createAPI(overrideReleaseConfig) {
|
|
102
102
|
/**
|
103
103
|
* Run any configured top level pre-version command
|
104
104
|
*/
|
105
|
-
runPreVersionCommand(nxReleaseConfig.version
|
105
|
+
runPreVersionCommand(nxReleaseConfig.version?.preVersionCommand, {
|
106
106
|
dryRun: args.dryRun,
|
107
107
|
verbose: args.verbose,
|
108
108
|
});
|
@@ -110,7 +110,7 @@ function createAPI(overrideReleaseConfig) {
|
|
110
110
|
* Run any configured pre-version command for the selected release groups
|
111
111
|
*/
|
112
112
|
for (const releaseGroup of releaseGroups) {
|
113
|
-
runPreVersionCommand(releaseGroup.version
|
113
|
+
runPreVersionCommand(releaseGroup.version?.groupPreVersionCommand, {
|
114
114
|
dryRun: args.dryRun,
|
115
115
|
verbose: args.verbose,
|
116
116
|
}, releaseGroup);
|
@@ -154,12 +154,6 @@ function createAPI(overrideReleaseConfig) {
|
|
154
154
|
* within the context of the user's workspace.
|
155
155
|
*/
|
156
156
|
await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, { silent: true });
|
157
|
-
const versionData = processor.getVersionData();
|
158
|
-
// 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
|
159
|
-
const gitTagValues = args.gitTag ?? nxReleaseConfig.version.git.tag
|
160
|
-
? (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, versionData)
|
161
|
-
: [];
|
162
|
-
(0, shared_1.handleDuplicateGitTags)(gitTagValues);
|
163
157
|
printAndFlushChanges(tree, !!args.dryRun);
|
164
158
|
const { changedFiles: changed, deletedFiles: deleted } = await processor.afterAllProjectsVersioned({
|
165
159
|
...nxReleaseConfig.version
|
@@ -168,6 +162,43 @@ function createAPI(overrideReleaseConfig) {
|
|
168
162
|
});
|
169
163
|
changed.forEach((f) => additionalChangedFiles.add(f));
|
170
164
|
deleted.forEach((f) => additionalDeletedFiles.add(f));
|
165
|
+
// After all version actions have run, process docker projects as a layer above
|
166
|
+
if (nxReleaseConfig.docker?.preVersionCommand) {
|
167
|
+
/**
|
168
|
+
* Run any configured top level docker pre-version command
|
169
|
+
*/
|
170
|
+
runPreVersionCommand(nxReleaseConfig.docker.preVersionCommand, {
|
171
|
+
dryRun: args.dryRun,
|
172
|
+
verbose: args.verbose,
|
173
|
+
}, undefined, true);
|
174
|
+
}
|
175
|
+
/**
|
176
|
+
* Run any configured docker pre-version command for the selected release groups
|
177
|
+
*/
|
178
|
+
for (const releaseGroup of releaseGroups) {
|
179
|
+
if (releaseGroup.docker?.groupPreVersionCommand) {
|
180
|
+
runPreVersionCommand(releaseGroup.docker.groupPreVersionCommand, {
|
181
|
+
dryRun: args.dryRun,
|
182
|
+
verbose: args.verbose,
|
183
|
+
}, releaseGroup, true);
|
184
|
+
}
|
185
|
+
}
|
186
|
+
// TODO(colum): Remove when Docker support is no longer experimental
|
187
|
+
if (nxReleaseConfig.docker || releaseGroups.some((rg) => rg.docker)) {
|
188
|
+
output_1.output.warn({
|
189
|
+
title: 'Warning',
|
190
|
+
bodyLines: [
|
191
|
+
`Docker support is experimental. Breaking changes may occur and not adhere to semver versioning.`,
|
192
|
+
],
|
193
|
+
});
|
194
|
+
}
|
195
|
+
await processor.processDockerProjects(args.dockerVersionScheme);
|
196
|
+
const versionData = processor.getVersionData();
|
197
|
+
// 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
|
198
|
+
const gitTagValues = args.gitTag ?? nxReleaseConfig.version.git.tag
|
199
|
+
? (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, versionData)
|
200
|
+
: [];
|
201
|
+
(0, shared_1.handleDuplicateGitTags)(gitTagValues);
|
171
202
|
// Only applicable when there is a single release group with a fixed relationship
|
172
203
|
let workspaceVersion = undefined;
|
173
204
|
if (releaseGroups.length === 1) {
|
@@ -265,13 +296,13 @@ function printAndFlushChanges(tree, isDryRun) {
|
|
265
296
|
(0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, changes);
|
266
297
|
}
|
267
298
|
}
|
268
|
-
function runPreVersionCommand(preVersionCommand, { dryRun, verbose }, releaseGroup) {
|
299
|
+
function runPreVersionCommand(preVersionCommand, { dryRun, verbose }, releaseGroup, dockerPreVersionCommand = false) {
|
269
300
|
if (!preVersionCommand) {
|
270
301
|
return;
|
271
302
|
}
|
272
303
|
output_1.output.logSingleLine(releaseGroup
|
273
|
-
? `Executing release group pre-version command for "${releaseGroup.name}"`
|
274
|
-
: `Executing pre-version command`);
|
304
|
+
? `Executing${dockerPreVersionCommand ? ` docker` : ` release group`} pre-version command for "${releaseGroup.name}"`
|
305
|
+
: `Executing${dockerPreVersionCommand ? ` docker` : ``} pre-version command`);
|
275
306
|
if (verbose) {
|
276
307
|
console.log(`Executing the following pre-version command:`);
|
277
308
|
console.log(preVersionCommand);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/sync/sync.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGjD,UAAU,WAAY,SAAQ,QAAQ;IACpC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/sync/sync.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGjD,UAAU,WAAY,SAAQ,QAAQ;IACpC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAyJjE"}
|
@@ -44,11 +44,17 @@ function syncHandler(options) {
|
|
44
44
|
});
|
45
45
|
return 1;
|
46
46
|
}
|
47
|
-
const resultBodyLines = (0, sync_generators_1.getSyncGeneratorSuccessResultsMessageLines)(results
|
47
|
+
const resultBodyLines = (0, sync_generators_1.getSyncGeneratorSuccessResultsMessageLines)(results,
|
48
|
+
// log the out of sync details if the user is running `nx sync --check`
|
49
|
+
options.check);
|
48
50
|
if (options.check) {
|
49
51
|
output_1.output.error({
|
50
52
|
title: 'The workspace is out of sync',
|
51
|
-
bodyLines:
|
53
|
+
bodyLines: [
|
54
|
+
...resultBodyLines,
|
55
|
+
'',
|
56
|
+
'Run `nx sync` to sync the workspace.',
|
57
|
+
],
|
52
58
|
});
|
53
59
|
if (anySyncGeneratorsFailed) {
|
54
60
|
output_1.output.error({
|
package/src/config/nx-json.d.ts
CHANGED
@@ -61,6 +61,46 @@ export type ManifestRootToUpdate = string | {
|
|
61
61
|
path: string;
|
62
62
|
preserveLocalDependencyProtocols: boolean;
|
63
63
|
};
|
64
|
+
export interface NxReleaseDockerConfiguration {
|
65
|
+
/**
|
66
|
+
* A command to run after validation of nx release configuration, but before docker versioning begins.
|
67
|
+
* Useful for preparing docker build artifacts. If --dry-run is passed, the command is still executed,
|
68
|
+
* but with the NX_DRY_RUN environment variable set to 'true'.
|
69
|
+
*/
|
70
|
+
preVersionCommand?: string;
|
71
|
+
/**
|
72
|
+
* Projects which should use a no-op VersionActions implementation rather than any potentially inferred by default or via Inference Plugins.
|
73
|
+
* Can be an array of project names (subset of projects in the release setup/release group) or a boolean (true means all projects).
|
74
|
+
* e.g.
|
75
|
+
* Consider a node application called `api` that does not require its `package.json` file to be versioned yet builds versioned docker images.
|
76
|
+
* To ensure that JS Versioning does not take place, the following would be set in the `docker` config in `nx.release`
|
77
|
+
* ```
|
78
|
+
* "docker": {
|
79
|
+
* "skipVersionActions": ["api"]
|
80
|
+
* }
|
81
|
+
* ```
|
82
|
+
*/
|
83
|
+
skipVersionActions?: string[] | boolean;
|
84
|
+
/**
|
85
|
+
* Record of named version patterns to choose between when versioning docker projects.
|
86
|
+
*
|
87
|
+
* e.g.
|
88
|
+
* ```
|
89
|
+
* "production": "{currentDate|YYMM.DD}.{shortCommitSha}",
|
90
|
+
* "hotfix": "{currentDate|YYMM.DD}-hotfix"
|
91
|
+
* ```
|
92
|
+
*/
|
93
|
+
versionSchemes?: Record<string, string>;
|
94
|
+
/**
|
95
|
+
* Repository name for the image on the configured registry
|
96
|
+
*/
|
97
|
+
repositoryName?: string;
|
98
|
+
/**
|
99
|
+
* Url of the Docker Image/Container Registry to push images to.
|
100
|
+
* Defaults to Docker Hub.
|
101
|
+
*/
|
102
|
+
registryUrl?: string;
|
103
|
+
}
|
64
104
|
export interface NxReleaseVersionConfiguration {
|
65
105
|
/**
|
66
106
|
* Whether to use the legacy versioning strategy. This value was true in Nx v20 and became false in Nx v21.
|
@@ -287,6 +327,11 @@ export interface NxReleaseConfiguration {
|
|
287
327
|
* @note Only one of `projects` or `groups` can be specified, the cannot be used together.
|
288
328
|
*/
|
289
329
|
projects?: string[] | string;
|
330
|
+
/**
|
331
|
+
* Configure options to handle versioning docker projects. Docker projects will be identified via the presence of a Dockerfile.
|
332
|
+
* Set to `true` to enable with default settings, or provide a configuration object for custom settings.
|
333
|
+
*/
|
334
|
+
docker?: NxReleaseDockerConfiguration | true;
|
290
335
|
/**
|
291
336
|
* @note When no projects or groups are configured at all (the default), all projects in the workspace are treated as
|
292
337
|
* if they were in a release group together with a fixed relationship.
|
@@ -303,6 +348,19 @@ export interface NxReleaseConfiguration {
|
|
303
348
|
* only be used in a maximum of one release group.
|
304
349
|
*/
|
305
350
|
projects: string[] | string;
|
351
|
+
/**
|
352
|
+
* Configure options to handle versioning docker projects for this group.
|
353
|
+
* Set to `true` to enable with default settings, or provide a configuration object for custom settings.
|
354
|
+
*/
|
355
|
+
docker?: (NxReleaseDockerConfiguration & {
|
356
|
+
/**
|
357
|
+
* A command to run after validation of nx release configuration, but before docker versioning begins.
|
358
|
+
* Used for preparing docker build artifacts. If --dry-run is passed, the command is still executed, but
|
359
|
+
* with the NX_DRY_RUN environment variable set to 'true'.
|
360
|
+
* It will run in addition to the global `preVersionCommand`
|
361
|
+
*/
|
362
|
+
groupPreVersionCommand?: string;
|
363
|
+
}) | true;
|
306
364
|
/**
|
307
365
|
* Optionally override version configuration for this group.
|
308
366
|
*
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"nx-json.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/config/nx-json.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAEnF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,MAAM,uBAAuB,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,EAAE,IAAI;IACxD,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,4BAA4B,CAAC,CAAC,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,WAAW,4BAA4B,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,EAAE;IAC9D,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,4BAA4B,CAAC,CAAC,CAAC,CAAC;CACpD;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;AAE1E,MAAM,MAAM,kBAAkB,GAAG,MAAM,CACrC,MAAM,EACN,CAAC,sBAAsB,GAAG,MAAM,CAAC,EAAE,CACpC,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mCAAmC,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;CACjE;AAED,UAAU,2BAA2B;IACnC;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;;;;GAKG;AACH,MAAM,WAAW,mCAAmC;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C;;;;;;;;;OASG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,MAAM,oBAAoB,GAC5B,MAAM,GACN;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,gCAAgC,EAAE,OAAO,CAAA;CAAE,CAAC;
|
1
|
+
{"version":3,"file":"nx-json.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/config/nx-json.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import type { PackageJson } from '../utils/package-json';
|
2
|
-
import type { LegacyNxReleaseVersionConfiguration, NxJsonConfiguration, NxReleaseVersionConfiguration } from './nx-json';
|
2
|
+
import type { LegacyNxReleaseVersionConfiguration, NxJsonConfiguration, NxReleaseDockerConfiguration, NxReleaseVersionConfiguration } from './nx-json';
|
3
3
|
/**
|
4
4
|
* @deprecated use ProjectsConfigurations or NxJsonConfiguration
|
5
5
|
*/
|
@@ -99,6 +99,7 @@ export interface ProjectConfiguration {
|
|
99
99
|
*/
|
100
100
|
release?: {
|
101
101
|
version?: Pick<LegacyNxReleaseVersionConfiguration, 'generator' | 'generatorOptions'> | Pick<NxReleaseVersionConfiguration, 'versionActions' | 'versionActionsOptions' | 'manifestRootsToUpdate' | 'currentVersionResolver' | 'currentVersionResolverMetadata' | 'fallbackCurrentVersionResolver' | 'versionPrefix' | 'preserveLocalDependencyProtocols'>;
|
102
|
+
docker?: NxReleaseDockerConfiguration | true;
|
102
103
|
};
|
103
104
|
/**
|
104
105
|
* Metadata about the project
|