nx 22.6.0-beta.12 → 22.6.0-beta.14
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/bin/nx.d.ts +1 -1
- package/bin/nx.d.ts.map +1 -1
- package/bin/nx.js +2 -1
- package/package.json +11 -11
- package/src/analytics/analytics.d.ts +4 -1
- package/src/analytics/analytics.d.ts.map +1 -1
- package/src/analytics/analytics.js +10 -9
- package/src/analytics/index.d.ts +1 -1
- package/src/analytics/index.d.ts.map +1 -1
- package/src/analytics/index.js +3 -2
- package/src/command-line/release/changelog.d.ts.map +1 -1
- package/src/command-line/release/changelog.js +2 -2
- package/src/command-line/release/utils/semver.d.ts.map +1 -1
- package/src/command-line/release/utils/semver.js +6 -0
- package/src/command-line/release/utils/shared.d.ts.map +1 -1
- package/src/command-line/release/utils/shared.js +14 -4
- package/src/core/graph/main.js +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.d.ts +1 -0
- package/src/daemon/server/project-graph-incremental-recomputation.d.ts.map +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js +3 -1
- package/src/daemon/server/server.d.ts +1 -0
- package/src/daemon/server/server.d.ts.map +1 -1
- package/src/daemon/server/server.js +1 -9
- package/src/executors/run-commands/running-tasks.d.ts.map +1 -1
- package/src/executors/run-commands/running-tasks.js +0 -4
- package/src/hasher/hash-task.d.ts +1 -1
- package/src/hasher/hash-task.d.ts.map +1 -1
- package/src/hasher/hash-task.js +2 -2
- package/src/native/index.d.ts +610 -0
- package/src/native/nx.wasm32-wasi.debug.wasm +0 -0
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/project-graph/build-project-graph.js +5 -1
- package/src/project-graph/plugins/isolation/plugin-worker.d.ts +1 -1
- package/src/project-graph/plugins/isolation/plugin-worker.d.ts.map +1 -1
- package/src/project-graph/plugins/isolation/plugin-worker.js +3 -3
- package/src/project-graph/plugins/loaded-nx-plugin.d.ts.map +1 -1
- package/src/project-graph/plugins/loaded-nx-plugin.js +17 -2
- package/src/project-graph/project-graph.d.ts.map +1 -1
- package/src/project-graph/project-graph.js +51 -12
- package/src/tasks-runner/life-cycles/task-telemetry-life-cycle.d.ts +10 -0
- package/src/tasks-runner/life-cycles/task-telemetry-life-cycle.d.ts.map +1 -0
- package/src/tasks-runner/life-cycles/task-telemetry-life-cycle.js +42 -0
- package/src/tasks-runner/run-command.d.ts.map +1 -1
- package/src/tasks-runner/run-command.js +2 -0
- package/src/tasks-runner/task-graph-utils.d.ts +5 -0
- package/src/tasks-runner/task-graph-utils.d.ts.map +1 -1
- package/src/tasks-runner/task-graph-utils.js +28 -0
- package/src/tasks-runner/task-orchestrator.d.ts +3 -2
- package/src/tasks-runner/task-orchestrator.d.ts.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +79 -44
- package/src/tasks-runner/utils.d.ts.map +1 -1
- package/src/tasks-runner/utils.js +1 -2
- package/src/utils/analytics-prompt.d.ts.map +1 -1
- package/src/utils/analytics-prompt.js +8 -0
- package/src/utils/perf-hooks.d.ts +19 -0
- package/src/utils/perf-logging.js +34 -2
package/bin/nx.d.ts
CHANGED
package/bin/nx.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.d.ts","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"nx.d.ts","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":";AAiCA,OAAO,2BAA2B,CAAC"}
|
package/bin/nx.js
CHANGED
|
@@ -25,6 +25,7 @@ const client_1 = require("../src/daemon/client/client");
|
|
|
25
25
|
const db_connection_1 = require("../src/utils/db-connection");
|
|
26
26
|
const analytics_prompt_1 = require("../src/utils/analytics-prompt");
|
|
27
27
|
const analytics_1 = require("../src/analytics");
|
|
28
|
+
require("../src/utils/perf-logging");
|
|
28
29
|
async function main() {
|
|
29
30
|
if (process.argv[2] !== 'report' &&
|
|
30
31
|
process.argv[2] !== '--version' &&
|
|
@@ -32,7 +33,6 @@ async function main() {
|
|
|
32
33
|
process.argv[2] !== 'reset') {
|
|
33
34
|
(0, assert_supported_platform_1.assertSupportedPlatform)();
|
|
34
35
|
}
|
|
35
|
-
require('nx/src/utils/perf-logging');
|
|
36
36
|
const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
|
|
37
37
|
if (workspace) {
|
|
38
38
|
perf_hooks_1.performance.mark('loading dotenv files:start');
|
|
@@ -165,6 +165,7 @@ function isNxCloudCommand(command) {
|
|
|
165
165
|
'fix-ci',
|
|
166
166
|
'record',
|
|
167
167
|
'polygraph',
|
|
168
|
+
'download-cloud-client',
|
|
168
169
|
];
|
|
169
170
|
return nxCloudCommands.includes(command);
|
|
170
171
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "22.6.0-beta.
|
|
3
|
+
"version": "22.6.0-beta.14",
|
|
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": {
|
|
@@ -85,16 +85,16 @@
|
|
|
85
85
|
}
|
|
86
86
|
},
|
|
87
87
|
"optionalDependencies": {
|
|
88
|
-
"@nx/nx-darwin-arm64": "22.6.0-beta.
|
|
89
|
-
"@nx/nx-darwin-x64": "22.6.0-beta.
|
|
90
|
-
"@nx/nx-freebsd-x64": "22.6.0-beta.
|
|
91
|
-
"@nx/nx-linux-arm-gnueabihf": "22.6.0-beta.
|
|
92
|
-
"@nx/nx-linux-arm64-gnu": "22.6.0-beta.
|
|
93
|
-
"@nx/nx-linux-arm64-musl": "22.6.0-beta.
|
|
94
|
-
"@nx/nx-linux-x64-gnu": "22.6.0-beta.
|
|
95
|
-
"@nx/nx-linux-x64-musl": "22.6.0-beta.
|
|
96
|
-
"@nx/nx-win32-arm64-msvc": "22.6.0-beta.
|
|
97
|
-
"@nx/nx-win32-x64-msvc": "22.6.0-beta.
|
|
88
|
+
"@nx/nx-darwin-arm64": "22.6.0-beta.14",
|
|
89
|
+
"@nx/nx-darwin-x64": "22.6.0-beta.14",
|
|
90
|
+
"@nx/nx-freebsd-x64": "22.6.0-beta.14",
|
|
91
|
+
"@nx/nx-linux-arm-gnueabihf": "22.6.0-beta.14",
|
|
92
|
+
"@nx/nx-linux-arm64-gnu": "22.6.0-beta.14",
|
|
93
|
+
"@nx/nx-linux-arm64-musl": "22.6.0-beta.14",
|
|
94
|
+
"@nx/nx-linux-x64-gnu": "22.6.0-beta.14",
|
|
95
|
+
"@nx/nx-linux-x64-musl": "22.6.0-beta.14",
|
|
96
|
+
"@nx/nx-win32-arm64-msvc": "22.6.0-beta.14",
|
|
97
|
+
"@nx/nx-win32-x64-msvc": "22.6.0-beta.14"
|
|
98
98
|
},
|
|
99
99
|
"nx-migrations": {
|
|
100
100
|
"migrations": "./migrations.json",
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import type { EventDimensions } from '../native';
|
|
2
|
+
export declare const customDimensions: EventDimensions;
|
|
3
|
+
export type EventParameters = Partial<Record<EventDimensions[keyof EventDimensions], string | number | boolean>>;
|
|
1
4
|
export declare function startAnalytics(): Promise<void>;
|
|
2
5
|
export declare function reportNxAddCommand(packageName: string, version: string): void;
|
|
3
6
|
export declare function reportNxGenerateCommand(generator: string): void;
|
|
4
7
|
export declare function reportCommandRunEvent(command: string, parameters?: Record<string, any>, args?: Record<string, any>): void;
|
|
5
|
-
export declare function
|
|
8
|
+
export declare function reportEvent(name: string, eventParameters?: EventParameters): void;
|
|
6
9
|
export declare function argsToQueryString(args: Record<string, any>): string;
|
|
7
10
|
export declare function flushAnalytics(): void;
|
|
8
11
|
//# sourceMappingURL=analytics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/analytics/analytics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/analytics/analytics.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAMV,eAAe,EAChB,MAAM,WAAW,CAAC;AA6BnB,eAAO,MAAM,gBAAgB,iBAEO,CAAC;AAErC,MAAM,MAAM,eAAe,GAAG,OAAO,CACnC,MAAM,CAAC,eAAe,CAAC,MAAM,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAC1E,CAAC;AAIF,wBAAsB,cAAc,kBAuDnC;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAKtE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,QAIxD;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAW3B;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,eAAe,QAE1E;AAsBD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAcnE;AAmDD,wBAAgB,cAAc,SAW7B"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.customDimensions = void 0;
|
|
3
4
|
exports.startAnalytics = startAnalytics;
|
|
4
5
|
exports.reportNxAddCommand = reportNxAddCommand;
|
|
5
6
|
exports.reportNxGenerateCommand = reportNxGenerateCommand;
|
|
6
7
|
exports.reportCommandRunEvent = reportCommandRunEvent;
|
|
7
|
-
exports.
|
|
8
|
+
exports.reportEvent = reportEvent;
|
|
8
9
|
exports.argsToQueryString = argsToQueryString;
|
|
9
10
|
exports.flushAnalytics = flushAnalytics;
|
|
10
11
|
const nx_json_1 = require("../config/nx-json");
|
|
@@ -32,7 +33,9 @@ if (!native_1.IS_WASM) {
|
|
|
32
33
|
trackPageViewNative = nativeModule.trackPageView;
|
|
33
34
|
getEventDimensions = nativeModule.getEventDimensions;
|
|
34
35
|
}
|
|
35
|
-
|
|
36
|
+
exports.customDimensions = native_1.IS_WASM
|
|
37
|
+
? null
|
|
38
|
+
: (getEventDimensions?.() ?? null);
|
|
36
39
|
let _telemetryInitialized = false;
|
|
37
40
|
async function startAnalytics() {
|
|
38
41
|
// Analytics not supported on WASM
|
|
@@ -74,13 +77,13 @@ async function startAnalytics() {
|
|
|
74
77
|
}
|
|
75
78
|
function reportNxAddCommand(packageName, version) {
|
|
76
79
|
reportCommandRunEvent('add', {
|
|
77
|
-
[customDimensions.packageName]: packageName,
|
|
78
|
-
[customDimensions.packageVersion]: version,
|
|
80
|
+
[exports.customDimensions.packageName]: packageName,
|
|
81
|
+
[exports.customDimensions.packageVersion]: version,
|
|
79
82
|
});
|
|
80
83
|
}
|
|
81
84
|
function reportNxGenerateCommand(generator) {
|
|
82
85
|
reportCommandRunEvent('generate', {
|
|
83
|
-
[customDimensions.generatorName]: generator,
|
|
86
|
+
[exports.customDimensions.generatorName]: generator,
|
|
84
87
|
});
|
|
85
88
|
}
|
|
86
89
|
function reportCommandRunEvent(command, parameters, args) {
|
|
@@ -94,10 +97,8 @@ function reportCommandRunEvent(command, parameters, args) {
|
|
|
94
97
|
}
|
|
95
98
|
trackPageView(command, pageLocation, parameters);
|
|
96
99
|
}
|
|
97
|
-
function
|
|
98
|
-
trackEvent(
|
|
99
|
-
[customDimensions.duration]: duration,
|
|
100
|
-
});
|
|
100
|
+
function reportEvent(name, eventParameters) {
|
|
101
|
+
trackEvent(name, eventParameters);
|
|
101
102
|
}
|
|
102
103
|
const SKIP_ARGS_KEYS = new Set([
|
|
103
104
|
'$0',
|
package/src/analytics/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { startAnalytics, reportNxAddCommand, reportNxGenerateCommand, reportCommandRunEvent,
|
|
1
|
+
export { customDimensions, EventParameters, startAnalytics, reportNxAddCommand, reportNxGenerateCommand, reportCommandRunEvent, reportEvent, flushAnalytics, } from './analytics';
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/analytics/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,uBAAuB,EACvB,qBAAqB,EACrB
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/analytics/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,uBAAuB,EACvB,qBAAqB,EACrB,WAAW,EACX,cAAc,GACf,MAAM,aAAa,CAAC"}
|
package/src/analytics/index.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.flushAnalytics = exports.
|
|
3
|
+
exports.flushAnalytics = exports.reportEvent = exports.reportCommandRunEvent = exports.reportNxGenerateCommand = exports.reportNxAddCommand = exports.startAnalytics = exports.customDimensions = void 0;
|
|
4
4
|
var analytics_1 = require("./analytics");
|
|
5
|
+
Object.defineProperty(exports, "customDimensions", { enumerable: true, get: function () { return analytics_1.customDimensions; } });
|
|
5
6
|
Object.defineProperty(exports, "startAnalytics", { enumerable: true, get: function () { return analytics_1.startAnalytics; } });
|
|
6
7
|
Object.defineProperty(exports, "reportNxAddCommand", { enumerable: true, get: function () { return analytics_1.reportNxAddCommand; } });
|
|
7
8
|
Object.defineProperty(exports, "reportNxGenerateCommand", { enumerable: true, get: function () { return analytics_1.reportNxGenerateCommand; } });
|
|
8
9
|
Object.defineProperty(exports, "reportCommandRunEvent", { enumerable: true, get: function () { return analytics_1.reportCommandRunEvent; } });
|
|
9
|
-
Object.defineProperty(exports, "
|
|
10
|
+
Object.defineProperty(exports, "reportEvent", { enumerable: true, get: function () { return analytics_1.reportEvent; } });
|
|
10
11
|
Object.defineProperty(exports, "flushAnalytics", { enumerable: true, get: function () { return analytics_1.flushAnalytics; } });
|
|
@@ -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;AA8B1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiCpD,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;AAGD,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,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,
|
|
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;AA8B1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiCpD,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;AAGD,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,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,CAwhBrC"}
|
|
@@ -275,12 +275,12 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
|
|
|
275
275
|
}
|
|
276
276
|
const projects = args.projects?.length
|
|
277
277
|
? // If the user has passed a list of projects, we need to use the filtered list of projects within the release group, plus any dependents
|
|
278
|
-
Array.from(releaseGraph.releaseGroupToFilteredProjects.get(releaseGroup)).flatMap((project) => {
|
|
278
|
+
Array.from(new Set(Array.from(releaseGraph.releaseGroupToFilteredProjects.get(releaseGroup)).flatMap((project) => {
|
|
279
279
|
return [
|
|
280
280
|
project,
|
|
281
281
|
...(projectsVersionData[project]?.dependentProjects.map((dep) => dep.source) || []),
|
|
282
282
|
];
|
|
283
|
-
})
|
|
283
|
+
})))
|
|
284
284
|
: // Otherwise, we use the full list of projects within the release group
|
|
285
285
|
releaseGroup.projects;
|
|
286
286
|
const projectNodes = projects.map((name) => projectGraph.nodes[name]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semver.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/semver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAwB,WAAW,EAAc,MAAM,QAAQ,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,0BAAkB,eAAe;IAC/B,KAAK,IAAI;IACT,KAAK,IAAI;IACT,KAAK,IAAI;CACV;AAED,eAAO,MAAM,mBAAmB;;;;CAI/B,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,WAAW,CAExE;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAIjE;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,GAAG,CAClB,MAAM,EACN;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAE,EAAE,CACxD,EACD,MAAM,EAAE,eAAe,CAAC,qBAAqB,CAAC,GAC7C,GAAG,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"semver.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/semver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAwB,WAAW,EAAc,MAAM,QAAQ,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,0BAAkB,eAAe;IAC/B,KAAK,IAAI;IACT,KAAK,IAAI;IACT,KAAK,IAAI;CACV;AAED,eAAO,MAAM,mBAAmB;;;;CAI/B,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,WAAW,CAExE;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAIjE;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE,GAAG,CAClB,MAAM,EACN;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAE,EAAE,CACxD,EACD,MAAM,EAAE,eAAe,CAAC,qBAAqB,CAAC,GAC7C,GAAG,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAAC,CAgCrC;AAsCD,wBAAgB,sBAAsB,CACpC,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,MAAM,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAE,oCAAoC,CAAC,EAAE,OAAO,CAAA;CAAE,UAsC7D"}
|
|
@@ -28,6 +28,12 @@ function determineSemverChange(relevantCommits, config) {
|
|
|
28
28
|
for (const { commit, isProjectScopedCommit } of relevantCommit) {
|
|
29
29
|
if (config.useCommitScope && !isProjectScopedCommit) {
|
|
30
30
|
// commit is relevant to the project, but not directly, report patch change to match side-effectful bump behavior in update dependents in release-group-processor
|
|
31
|
+
const indirectSemverType = config.types[commit.type]?.semverBump;
|
|
32
|
+
// If the commit type has semverBump 'none' and the commit is not breaking,
|
|
33
|
+
// skip the indirect patch bump as the dependency itself won't be bumped
|
|
34
|
+
if (indirectSemverType === 'none' && !commit.isBreaking) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
31
37
|
highestChange = Math.max(1 /* SemverSpecifier.PATCH */, highestChange ?? 0);
|
|
32
38
|
continue;
|
|
33
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/shared.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAM7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAEL,SAAS,EAGV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,eAAO,MAAM,wBAAwB,QAEpC,CAAC;AAGF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B;;OAEG;IACH,iBAAiB,EAAE;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,oBAAoB,EAAE,MAAM,CAAC;QAC7B,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED,qBAAa,cAAc;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;gBAEV,EACV,OAAO,EAAE,qEAAqE;IAC9E,iBAAiB,EAAE,8EAA8E;IACjG,WAAW,EAAE,kEAAkE;IAC/E,gBAAgB,GACjB,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B;CAWF;AAED,wBAAsB,aAAa,CAAC,EAClC,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,iBAAiB,EACjB,aAAa,GACd,EAAE;IACD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACnC,iBAsBA;AAED,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,oBAAoB,EAAE,EACrC,8BAA8B,EAAE,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtE,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,GACpB,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -124,10 +124,13 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
|
|
|
124
124
|
'{projectName}',
|
|
125
125
|
]);
|
|
126
126
|
for (const releaseGroup of releaseGroups) {
|
|
127
|
-
const releaseGroupProjectNames = Array.from(releaseGroupToFilteredProjects.get(releaseGroup));
|
|
128
127
|
// One entry per project for independent groups
|
|
129
128
|
if (releaseGroup.projectsRelationship === 'independent') {
|
|
130
|
-
|
|
129
|
+
// Include all projects in the release group that were actually versioned,
|
|
130
|
+
// not just the explicitly filtered ones. This ensures dependent projects
|
|
131
|
+
// that received side-effect bumps are included in the commit message.
|
|
132
|
+
const versionedProjects = releaseGroup.projects.filter((p) => versionData[p] != null && versionData[p].newVersion !== null);
|
|
133
|
+
for (const project of versionedProjects) {
|
|
131
134
|
const projectVersionData = versionData[project];
|
|
132
135
|
if (projectVersionData.newVersion !== null) {
|
|
133
136
|
const releaseVersion = new ReleaseVersion({
|
|
@@ -142,6 +145,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
|
|
|
142
145
|
continue;
|
|
143
146
|
}
|
|
144
147
|
// One entry for the whole group for fixed groups
|
|
148
|
+
const releaseGroupProjectNames = Array.from(releaseGroupToFilteredProjects.get(releaseGroup));
|
|
145
149
|
const projectVersionData = versionData[releaseGroupProjectNames[0]]; // all at the same version, so we can just pick the first one
|
|
146
150
|
if (projectVersionData.newVersion !== null) {
|
|
147
151
|
const releaseVersion = new ReleaseVersion({
|
|
@@ -177,10 +181,15 @@ function shouldSkipVersionActions(dockerOptions, projectName) {
|
|
|
177
181
|
function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versionData) {
|
|
178
182
|
const tags = [];
|
|
179
183
|
for (const releaseGroup of releaseGroups) {
|
|
180
|
-
const releaseGroupProjectNames = Array.from(releaseGroupToFilteredProjects.get(releaseGroup));
|
|
181
184
|
// For independent groups we want one tag per project, not one for the overall group
|
|
182
185
|
if (releaseGroup.projectsRelationship === 'independent') {
|
|
183
|
-
|
|
186
|
+
// Include all projects in the release group that were actually versioned,
|
|
187
|
+
// not just the explicitly filtered ones. This ensures dependent projects
|
|
188
|
+
// that received side-effect bumps get their own tags.
|
|
189
|
+
const versionedProjects = releaseGroup.projects.filter((p) => versionData[p] != null &&
|
|
190
|
+
(versionData[p].newVersion !== null ||
|
|
191
|
+
versionData[p].dockerVersion !== null));
|
|
192
|
+
for (const project of versionedProjects) {
|
|
184
193
|
const projectVersionData = versionData[project];
|
|
185
194
|
if (projectVersionData.newVersion !== null ||
|
|
186
195
|
projectVersionData.dockerVersion !== null) {
|
|
@@ -222,6 +231,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
|
|
|
222
231
|
continue;
|
|
223
232
|
}
|
|
224
233
|
// For fixed groups we want one tag for the overall group
|
|
234
|
+
const releaseGroupProjectNames = Array.from(releaseGroupToFilteredProjects.get(releaseGroup));
|
|
225
235
|
const projectVersionData = versionData[releaseGroupProjectNames[0]]; // all at the same version, so we can just pick the first one
|
|
226
236
|
if (projectVersionData.newVersion !== null ||
|
|
227
237
|
projectVersionData.dockerVersion !== null) {
|