nx 22.3.3 → 22.4.0-beta.1
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/plugins/package-json.d.ts.map +1 -1
- package/plugins/package-json.js +2 -1
- package/schemas/nx-schema.json +14 -0
- package/src/command-line/graph/graph.d.ts.map +1 -1
- package/src/command-line/graph/graph.js +90 -57
- package/src/command-line/release/config/config.d.ts.map +1 -1
- package/src/command-line/release/config/config.js +2 -0
- package/src/command-line/release/config/conventional-commits.d.ts.map +1 -1
- package/src/command-line/release/config/conventional-commits.js +1 -0
- package/src/command-line/release/utils/release-graph.d.ts +1 -0
- package/src/command-line/release/utils/release-graph.d.ts.map +1 -1
- package/src/command-line/release/utils/release-graph.js +10 -0
- package/src/command-line/release/utils/semver.d.ts +3 -1
- package/src/command-line/release/utils/semver.d.ts.map +1 -1
- package/src/command-line/release/utils/semver.js +39 -4
- package/src/command-line/release/utils/test/test-utils.d.ts +1 -0
- package/src/command-line/release/utils/test/test-utils.d.ts.map +1 -1
- package/src/command-line/release/utils/test/test-utils.js +1 -0
- package/src/command-line/release/version/version-actions.d.ts.map +1 -1
- package/src/command-line/release/version/version-actions.js +3 -1
- package/src/command-line/watch/watch.d.ts.map +1 -1
- package/src/command-line/watch/watch.js +22 -6
- package/src/config/nx-json.d.ts +28 -0
- package/src/config/nx-json.d.ts.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +2 -0
- package/src/config/workspace-json-project-json.d.ts.map +1 -1
- package/src/core/graph/main.js +1 -1
- package/src/core/graph/styles.js +1 -1
- package/src/daemon/cache.d.ts.map +1 -1
- package/src/daemon/cache.js +9 -3
- package/src/daemon/client/client.d.ts +21 -4
- package/src/daemon/client/client.d.ts.map +1 -1
- package/src/daemon/client/client.js +412 -82
- package/src/daemon/client/daemon-socket-messenger.d.ts +5 -2
- package/src/daemon/client/daemon-socket-messenger.d.ts.map +1 -1
- package/src/daemon/client/daemon-socket-messenger.js +28 -6
- package/src/daemon/logger.d.ts +26 -0
- package/src/daemon/logger.d.ts.map +1 -0
- package/src/daemon/logger.js +65 -0
- package/src/daemon/server/file-watching/file-change-events.js +1 -1
- package/src/daemon/server/handle-hash-tasks.d.ts +1 -0
- package/src/daemon/server/handle-hash-tasks.d.ts.map +1 -1
- package/src/daemon/server/handle-hash-tasks.js +1 -1
- package/src/daemon/server/handle-process-in-background.js +1 -1
- package/src/daemon/server/handle-request-project-graph.js +1 -1
- package/src/daemon/server/nx-console-operations.js +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.d.ts +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.d.ts.map +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js +7 -7
- package/src/daemon/server/project-graph-listener-sockets.d.ts +1 -1
- package/src/daemon/server/project-graph-listener-sockets.d.ts.map +1 -1
- package/src/daemon/server/project-graph-listener-sockets.js +2 -2
- package/src/daemon/server/server.d.ts.map +1 -1
- package/src/daemon/server/server.js +34 -18
- package/src/daemon/server/shutdown-utils.d.ts +1 -0
- package/src/daemon/server/shutdown-utils.d.ts.map +1 -1
- package/src/daemon/server/shutdown-utils.js +52 -1
- package/src/daemon/server/sync-generators.js +1 -1
- package/src/hasher/native-task-hasher-impl.d.ts +2 -2
- package/src/hasher/native-task-hasher-impl.d.ts.map +1 -1
- package/src/hasher/native-task-hasher-impl.js +4 -4
- package/src/hasher/task-hasher.d.ts +6 -6
- package/src/hasher/task-hasher.d.ts.map +1 -1
- package/src/hasher/task-hasher.js +8 -7
- package/src/native/index.d.ts +5 -1
- package/src/native/nx.wasi.cjs +13 -12
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/js/project-graph/build-dependencies/target-project-locator.d.ts.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js +5 -0
- package/src/plugins/package-json/create-nodes.d.ts +9 -1
- package/src/plugins/package-json/create-nodes.d.ts.map +1 -1
- package/src/plugins/package-json/create-nodes.js +38 -10
- package/src/project-graph/nx-deps-cache.js +1 -1
- package/src/daemon/server/logger.d.ts +0 -19
- package/src/daemon/server/logger.d.ts.map +0 -1
- package/src/daemon/server/logger.js +0 -38
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "22.
|
|
3
|
+
"version": "22.4.0-beta.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -83,16 +83,16 @@
|
|
|
83
83
|
}
|
|
84
84
|
},
|
|
85
85
|
"optionalDependencies": {
|
|
86
|
-
"@nx/nx-darwin-arm64": "22.
|
|
87
|
-
"@nx/nx-darwin-x64": "22.
|
|
88
|
-
"@nx/nx-freebsd-x64": "22.
|
|
89
|
-
"@nx/nx-linux-arm-gnueabihf": "22.
|
|
90
|
-
"@nx/nx-linux-arm64-gnu": "22.
|
|
91
|
-
"@nx/nx-linux-arm64-musl": "22.
|
|
92
|
-
"@nx/nx-linux-x64-gnu": "22.
|
|
93
|
-
"@nx/nx-linux-x64-musl": "22.
|
|
94
|
-
"@nx/nx-win32-arm64-msvc": "22.
|
|
95
|
-
"@nx/nx-win32-x64-msvc": "22.
|
|
86
|
+
"@nx/nx-darwin-arm64": "22.4.0-beta.1",
|
|
87
|
+
"@nx/nx-darwin-x64": "22.4.0-beta.1",
|
|
88
|
+
"@nx/nx-freebsd-x64": "22.4.0-beta.1",
|
|
89
|
+
"@nx/nx-linux-arm-gnueabihf": "22.4.0-beta.1",
|
|
90
|
+
"@nx/nx-linux-arm64-gnu": "22.4.0-beta.1",
|
|
91
|
+
"@nx/nx-linux-arm64-musl": "22.4.0-beta.1",
|
|
92
|
+
"@nx/nx-linux-x64-gnu": "22.4.0-beta.1",
|
|
93
|
+
"@nx/nx-linux-x64-musl": "22.4.0-beta.1",
|
|
94
|
+
"@nx/nx-win32-arm64-msvc": "22.4.0-beta.1",
|
|
95
|
+
"@nx/nx-win32-x64-msvc": "22.4.0-beta.1"
|
|
96
96
|
},
|
|
97
97
|
"nx-migrations": {
|
|
98
98
|
"migrations": "./migrations.json",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../packages/nx/plugins/package-json.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../packages/nx/plugins/package-json.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAGjF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACtC,CAAC;AAIF,wBAAgB,iCAAiC,kCAMhD"}
|
package/plugins/package-json.js
CHANGED
|
@@ -25,7 +25,8 @@ const plugin = {
|
|
|
25
25
|
'*/**/package.json',
|
|
26
26
|
(configFiles, options, context) => {
|
|
27
27
|
const cache = readPackageJsonConfigurationCache();
|
|
28
|
-
const
|
|
28
|
+
const patterns = (0, package_json_1.buildPackageJsonPatterns)(context.workspaceRoot, (f) => (0, fileutils_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, f)));
|
|
29
|
+
const isInPackageJsonWorkspaces = (0, package_json_1.buildPackageJsonWorkspacesMatcher)(patterns);
|
|
29
30
|
const result = (0, plugins_1.createNodesFromFiles)((packageJsonPath) => (0, package_json_1.createNodeFromPackageJson)(packageJsonPath, workspace_root_1.workspaceRoot, cache, isInPackageJsonWorkspaces(packageJsonPath)), configFiles, options, context);
|
|
30
31
|
writeCache(cache);
|
|
31
32
|
return result;
|
package/schemas/nx-schema.json
CHANGED
|
@@ -1034,6 +1034,11 @@
|
|
|
1034
1034
|
]
|
|
1035
1035
|
}
|
|
1036
1036
|
},
|
|
1037
|
+
"adjustSemverBumpsForZeroMajorVersion": {
|
|
1038
|
+
"type": "boolean",
|
|
1039
|
+
"description": "Whether to strictly follow SemVer V2 spec for 0.x versions where breaking changes bump the minor version (instead of major), and new features bump the patch version (instead of minor). When enabled: 'major' bumps become 'minor' bumps for 0.x versions, 'minor' bumps become 'patch' bumps for 0.x versions. Versions 1.0.0 and above are unaffected. This is false by default for backward compatibility.",
|
|
1040
|
+
"default": false
|
|
1041
|
+
},
|
|
1037
1042
|
"versionActions": {
|
|
1038
1043
|
"type": "string",
|
|
1039
1044
|
"description": "The path to the version actions implementation to use for releasing all projects by default. This can also be overridden on the release group and project levels.",
|
|
@@ -1151,6 +1156,11 @@
|
|
|
1151
1156
|
]
|
|
1152
1157
|
}
|
|
1153
1158
|
},
|
|
1159
|
+
"adjustSemverBumpsForZeroMajorVersion": {
|
|
1160
|
+
"type": "boolean",
|
|
1161
|
+
"description": "Whether to apply the common convention for 0.x versions where breaking changes bump the minor version (instead of major), and new features bump the patch version (instead of minor). When enabled: 'major' bumps become 'minor' bumps for 0.x versions, 'minor' bumps become 'patch' bumps for 0.x versions. Versions 1.0.0 and above are unaffected. This is false by default for backward compatibility.",
|
|
1162
|
+
"default": false
|
|
1163
|
+
},
|
|
1154
1164
|
"versionActions": {
|
|
1155
1165
|
"type": "string",
|
|
1156
1166
|
"description": "The path to the version actions implementation to use for releasing all projects by default. This can also be overridden on the release group and project levels.",
|
|
@@ -1253,6 +1263,10 @@
|
|
|
1253
1263
|
"NxReleaseConventionalCommitsConfiguration": {
|
|
1254
1264
|
"type": "object",
|
|
1255
1265
|
"properties": {
|
|
1266
|
+
"useCommitScope": {
|
|
1267
|
+
"type": "boolean",
|
|
1268
|
+
"description": "Whether or not to rely on commit scope to resolve version specifier.\nIf set to 'true', then only commits with scope matching projectName and commits without scope affects version determined, rest are assumed as patch change.\nIf set to 'false', then all commits that affected project used to determine semver change.\nIf not set, this will default to 'true'"
|
|
1269
|
+
},
|
|
1256
1270
|
"types": {
|
|
1257
1271
|
"type": "object",
|
|
1258
1272
|
"description": "A map of commit types to their configuration. If a type is set to 'true', then it will be enabled with the default 'semverBump' of 'patch' and will appear in the changelog. If a type is set to 'false', then it will not trigger a version bump and will be hidden from the changelog.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/graph/graph.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/graph/graph.ts"],"names":[],"mappings":"AA2BA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAwBpD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,uBAAuB,EAAE,CAAC;IACpC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,0BAA0B,CAAC,EAAE,MAAM,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,yBAAyB;IACxC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC5C;AAkJD,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,iBAAiB,CAAC;IAC/C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,gBAAgB,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,IAAI,CAAC,CA2Tf;AAw0BD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;CACrB"}
|
|
@@ -4,6 +4,7 @@ exports.generateGraph = generateGraph;
|
|
|
4
4
|
const crypto_1 = require("crypto");
|
|
5
5
|
const node_child_process_1 = require("node:child_process");
|
|
6
6
|
const node_fs_1 = require("node:fs");
|
|
7
|
+
const daemon_socket_messenger_1 = require("../../daemon/client/daemon-socket-messenger");
|
|
7
8
|
const http = require("node:http");
|
|
8
9
|
const minimatch_1 = require("minimatch");
|
|
9
10
|
const node_url_1 = require("node:url");
|
|
@@ -148,7 +149,6 @@ async function generateGraph(args, affectedProjects) {
|
|
|
148
149
|
}
|
|
149
150
|
let rawGraph;
|
|
150
151
|
let sourceMaps;
|
|
151
|
-
let isPartial = false;
|
|
152
152
|
try {
|
|
153
153
|
const projectGraphAndSourceMaps = await (0, project_graph_1.createProjectGraphAndSourceMapsAsync)({ exitOnError: false });
|
|
154
154
|
rawGraph = projectGraphAndSourceMaps.projectGraph;
|
|
@@ -158,7 +158,6 @@ async function generateGraph(args, affectedProjects) {
|
|
|
158
158
|
if (e instanceof error_types_1.ProjectGraphError) {
|
|
159
159
|
rawGraph = e.getPartialProjectGraph();
|
|
160
160
|
sourceMaps = e.getPartialSourcemaps();
|
|
161
|
-
isPartial = true;
|
|
162
161
|
}
|
|
163
162
|
if (!rawGraph) {
|
|
164
163
|
(0, project_graph_1.handleProjectGraphError)({ exitOnError: true }, e);
|
|
@@ -385,7 +384,7 @@ async function startServer(html, environmentJs, host, port = 4211, watchForChang
|
|
|
385
384
|
});
|
|
386
385
|
}
|
|
387
386
|
if (watchForChanges && client_1.daemonClient.enabled()) {
|
|
388
|
-
unregisterFileWatcher = await
|
|
387
|
+
unregisterFileWatcher = await createProjectGraphListener();
|
|
389
388
|
}
|
|
390
389
|
const { projectGraphClientResponse, sourceMapResponse } = await createProjectGraphAndSourceMapClientResponse(affected, focus, exclude);
|
|
391
390
|
currentProjectGraphClientResponse = projectGraphClientResponse;
|
|
@@ -535,29 +534,58 @@ let currentSourceMapsClientResponse = {};
|
|
|
535
534
|
let isFilteredGraph = false;
|
|
536
535
|
function debounce(fn, time) {
|
|
537
536
|
let timeout;
|
|
538
|
-
return (...args) => {
|
|
537
|
+
return ((...args) => {
|
|
539
538
|
if (timeout) {
|
|
540
539
|
clearTimeout(timeout);
|
|
541
540
|
}
|
|
542
541
|
timeout = setTimeout(() => fn(...args), time);
|
|
543
|
-
};
|
|
542
|
+
});
|
|
544
543
|
}
|
|
545
|
-
function
|
|
546
|
-
return client_1.daemonClient.
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
if (error === '
|
|
552
|
-
output_1.output.
|
|
544
|
+
function createProjectGraphListener() {
|
|
545
|
+
return client_1.daemonClient.registerProjectGraphRecomputationListener(debounce(async (error, data) => {
|
|
546
|
+
if (error === 'reconnecting') {
|
|
547
|
+
output_1.output.note({ title: 'Daemon restarting, reconnecting...' });
|
|
548
|
+
return;
|
|
549
|
+
}
|
|
550
|
+
else if (error === 'reconnected') {
|
|
551
|
+
output_1.output.note({ title: 'Reconnected to daemon' });
|
|
552
|
+
return;
|
|
553
|
+
}
|
|
554
|
+
else if (error === 'closed') {
|
|
555
|
+
output_1.output.error({
|
|
556
|
+
title: `Failed to reconnect to daemon after multiple attempts`,
|
|
557
|
+
});
|
|
558
|
+
process.exit(1);
|
|
559
|
+
}
|
|
560
|
+
else if (error instanceof daemon_socket_messenger_1.VersionMismatchError) {
|
|
561
|
+
output_1.output.error({
|
|
562
|
+
title: 'Nx version changed. Please restart your command.',
|
|
563
|
+
});
|
|
553
564
|
process.exit(1);
|
|
554
565
|
}
|
|
555
566
|
else if (error) {
|
|
556
|
-
output_1.output.error({
|
|
567
|
+
output_1.output.error({
|
|
568
|
+
title: `Watch error: ${error?.message ?? 'Unknown'}`,
|
|
569
|
+
});
|
|
557
570
|
}
|
|
558
|
-
else if (
|
|
559
|
-
output_1.output.note({ title: '
|
|
560
|
-
|
|
571
|
+
else if (data !== null) {
|
|
572
|
+
output_1.output.note({ title: 'Project graph recomputed, updating...' });
|
|
573
|
+
let projectGraph = data.projectGraph;
|
|
574
|
+
let sourceMaps = data.sourceMaps;
|
|
575
|
+
let errors;
|
|
576
|
+
if (data.error instanceof error_types_1.ProjectGraphError) {
|
|
577
|
+
projectGraph = data.error.getPartialProjectGraph();
|
|
578
|
+
sourceMaps = data.error.getPartialSourcemaps();
|
|
579
|
+
errors = data.error.getErrors().map((e) => ({
|
|
580
|
+
message: e.message,
|
|
581
|
+
stack: e.stack,
|
|
582
|
+
cause: e.cause,
|
|
583
|
+
name: e.name,
|
|
584
|
+
pluginName: e.pluginName,
|
|
585
|
+
fileName: e.file ?? e.cause?.errors?.[0]?.location?.file,
|
|
586
|
+
}));
|
|
587
|
+
}
|
|
588
|
+
const { projectGraphClientResponse, sourceMapResponse } = transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, currentProjectGraphClientResponse.affected, isFilteredGraph ? currentProjectGraphClientResponse.focus : null, isFilteredGraph ? currentProjectGraphClientResponse.exclude : []);
|
|
561
589
|
if (projectGraphClientResponse.hash !==
|
|
562
590
|
currentProjectGraphClientResponse.hash &&
|
|
563
591
|
sourceMapResponse) {
|
|
@@ -571,7 +599,7 @@ function createFileWatcher() {
|
|
|
571
599
|
output_1.output.warn({
|
|
572
600
|
title: `${projectGraphClientResponse.errors.length > 1
|
|
573
601
|
? `${projectGraphClientResponse.errors.length} errors`
|
|
574
|
-
: `An error`}
|
|
602
|
+
: `An error`} occurred while processing the project graph. Showing partial graph.`,
|
|
575
603
|
});
|
|
576
604
|
}
|
|
577
605
|
output_1.output.note({ title: 'Graph changes updated.' });
|
|
@@ -586,21 +614,56 @@ function createFileWatcher() {
|
|
|
586
614
|
}
|
|
587
615
|
}, 500));
|
|
588
616
|
}
|
|
617
|
+
function transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, affected = [], focus = null, exclude = []) {
|
|
618
|
+
node_perf_hooks_1.performance.mark('project graph transform:start');
|
|
619
|
+
let graph = (0, operators_1.pruneExternalNodes)(projectGraph);
|
|
620
|
+
// Apply focus and exclude filters
|
|
621
|
+
graph = filterGraph(graph, focus, exclude);
|
|
622
|
+
const fileMap = (0, nx_deps_cache_1.readFileMapCache)()?.fileMap.projectFileMap || {};
|
|
623
|
+
const layout = (0, configuration_1.workspaceLayout)();
|
|
624
|
+
const projects = Object.values(graph.nodes);
|
|
625
|
+
const dependencies = graph.dependencies;
|
|
626
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
627
|
+
const connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)(nxJson);
|
|
628
|
+
const disabledTaskSyncGenerators = nxJson.sync?.disabledTaskSyncGenerators;
|
|
629
|
+
const hasher = (0, crypto_1.createHash)('sha256');
|
|
630
|
+
hasher.update(JSON.stringify({
|
|
631
|
+
layout,
|
|
632
|
+
projects,
|
|
633
|
+
dependencies,
|
|
634
|
+
sourceMaps,
|
|
635
|
+
connectedToCloud,
|
|
636
|
+
disabledTaskSyncGenerators,
|
|
637
|
+
}));
|
|
638
|
+
const hash = hasher.digest('hex');
|
|
639
|
+
node_perf_hooks_1.performance.mark('project graph transform:end');
|
|
640
|
+
node_perf_hooks_1.performance.measure('project graph transform', 'project graph transform:start', 'project graph transform:end');
|
|
641
|
+
return {
|
|
642
|
+
projectGraphClientResponse: {
|
|
643
|
+
...currentProjectGraphClientResponse,
|
|
644
|
+
hash,
|
|
645
|
+
layout,
|
|
646
|
+
projects,
|
|
647
|
+
dependencies,
|
|
648
|
+
affected,
|
|
649
|
+
fileMap,
|
|
650
|
+
isPartial: false,
|
|
651
|
+
errors,
|
|
652
|
+
connectedToCloud,
|
|
653
|
+
disabledTaskSyncGenerators,
|
|
654
|
+
},
|
|
655
|
+
sourceMapResponse: sourceMaps,
|
|
656
|
+
};
|
|
657
|
+
}
|
|
589
658
|
async function createProjectGraphAndSourceMapClientResponse(affected = [], focus = null, exclude = []) {
|
|
590
659
|
node_perf_hooks_1.performance.mark('project graph watch calculation:start');
|
|
591
660
|
let projectGraph;
|
|
592
661
|
let sourceMaps;
|
|
593
|
-
let isPartial = false;
|
|
594
662
|
let errors;
|
|
595
|
-
let connectedToCloud;
|
|
596
|
-
let disabledTaskSyncGenerators;
|
|
597
663
|
try {
|
|
598
664
|
const projectGraphAndSourceMaps = await (0, project_graph_1.createProjectGraphAndSourceMapsAsync)({ exitOnError: false });
|
|
599
665
|
projectGraph = projectGraphAndSourceMaps.projectGraph;
|
|
600
666
|
sourceMaps = projectGraphAndSourceMaps.sourceMaps;
|
|
601
|
-
const nxJson = (0, configuration_1.readNxJson)();
|
|
602
|
-
connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)(nxJson);
|
|
603
|
-
disabledTaskSyncGenerators = nxJson.sync?.disabledTaskSyncGenerators;
|
|
604
667
|
}
|
|
605
668
|
catch (e) {
|
|
606
669
|
if (e instanceof error_types_1.ProjectGraphError) {
|
|
@@ -614,50 +677,20 @@ async function createProjectGraphAndSourceMapClientResponse(affected = [], focus
|
|
|
614
677
|
pluginName: e.pluginName,
|
|
615
678
|
fileName: e.file ?? e.cause?.errors?.[0]?.location?.file,
|
|
616
679
|
}));
|
|
617
|
-
isPartial = true;
|
|
618
680
|
}
|
|
619
681
|
if (!projectGraph) {
|
|
620
682
|
(0, project_graph_1.handleProjectGraphError)({ exitOnError: true }, e);
|
|
621
683
|
}
|
|
622
684
|
}
|
|
623
|
-
let graph = (0, operators_1.pruneExternalNodes)(projectGraph);
|
|
624
|
-
// Apply focus and exclude filters
|
|
625
|
-
graph = filterGraph(graph, focus, exclude);
|
|
626
|
-
const fileMap = (0, nx_deps_cache_1.readFileMapCache)()?.fileMap.projectFileMap || {};
|
|
627
685
|
node_perf_hooks_1.performance.mark('project graph watch calculation:end');
|
|
628
686
|
node_perf_hooks_1.performance.mark('project graph response generation:start');
|
|
629
|
-
|
|
630
|
-
const projects = Object.values(graph.nodes);
|
|
631
|
-
const dependencies = graph.dependencies;
|
|
632
|
-
const hasher = (0, crypto_1.createHash)('sha256');
|
|
633
|
-
hasher.update(JSON.stringify({
|
|
634
|
-
layout,
|
|
635
|
-
projects,
|
|
636
|
-
dependencies,
|
|
637
|
-
sourceMaps,
|
|
638
|
-
errors,
|
|
639
|
-
connectedToCloud,
|
|
640
|
-
disabledTaskSyncGenerators,
|
|
641
|
-
}));
|
|
642
|
-
const hash = hasher.digest('hex');
|
|
687
|
+
let { projectGraphClientResponse, sourceMapResponse } = transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, affected, focus, exclude);
|
|
643
688
|
node_perf_hooks_1.performance.mark('project graph response generation:end');
|
|
644
689
|
node_perf_hooks_1.performance.measure('project graph watch calculation', 'project graph watch calculation:start', 'project graph watch calculation:end');
|
|
645
690
|
node_perf_hooks_1.performance.measure('project graph response generation', 'project graph response generation:start', 'project graph response generation:end');
|
|
646
691
|
return {
|
|
647
|
-
projectGraphClientResponse
|
|
648
|
-
|
|
649
|
-
hash,
|
|
650
|
-
layout,
|
|
651
|
-
projects,
|
|
652
|
-
dependencies,
|
|
653
|
-
affected,
|
|
654
|
-
fileMap,
|
|
655
|
-
isPartial,
|
|
656
|
-
errors,
|
|
657
|
-
connectedToCloud,
|
|
658
|
-
disabledTaskSyncGenerators,
|
|
659
|
-
},
|
|
660
|
-
sourceMapResponse: sourceMaps,
|
|
692
|
+
projectGraphClientResponse,
|
|
693
|
+
sourceMapResponse,
|
|
661
694
|
};
|
|
662
695
|
}
|
|
663
696
|
async function createTaskGraphClientResponse(pruneExternal = false) {
|
|
@@ -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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"}
|
|
@@ -194,6 +194,8 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
|
|
|
194
194
|
preserveMatchingDependencyRanges: userConfig.version?.preserveMatchingDependencyRanges ?? true,
|
|
195
195
|
logUnchangedProjects: userConfig.version?.logUnchangedProjects ?? true,
|
|
196
196
|
updateDependents: userConfig.version?.updateDependents ?? 'always',
|
|
197
|
+
// TODO(v23): change the default value of this to true
|
|
198
|
+
adjustSemverBumpsForZeroMajorVersion: userConfig.version?.adjustSemverBumpsForZeroMajorVersion ?? false,
|
|
197
199
|
},
|
|
198
200
|
changelog: {
|
|
199
201
|
git: changelogGitDefaults,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conventional-commits.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/conventional-commits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,mCAAmC,EAAE,eAAe,CAAC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"conventional-commits.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/conventional-commits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,mCAAmC,EAAE,eAAe,CAAC,qBAAqB,CAuGpF,CAAC"}
|
|
@@ -16,6 +16,7 @@ export interface FinalConfigForProject {
|
|
|
16
16
|
versionPrefix: NxReleaseVersionConfiguration['versionPrefix'];
|
|
17
17
|
preserveLocalDependencyProtocols: NxReleaseVersionConfiguration['preserveLocalDependencyProtocols'];
|
|
18
18
|
preserveMatchingDependencyRanges: NxReleaseVersionConfiguration['preserveMatchingDependencyRanges'];
|
|
19
|
+
adjustSemverBumpsForZeroMajorVersion: NxReleaseVersionConfiguration['adjustSemverBumpsForZeroMajorVersion'];
|
|
19
20
|
versionActionsOptions: NxReleaseVersionConfiguration['versionActionsOptions'];
|
|
20
21
|
manifestRootsToUpdate: Array<Exclude<NxReleaseVersionConfiguration['manifestRootsToUpdate'][number], string>>;
|
|
21
22
|
dockerOptions: NxReleaseDockerConfiguration & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-graph.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/release-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,4BAA4B,EAC5B,6BAA6B,EAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG1D,OAAO,EAGL,KAAK,yBAAyB,EAC9B,KAAK,cAAc,EACpB,MAAM,4BAA4B,CAAC;AAIpC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,eAAe,EAAE,6BAA6B,CAAC,iBAAiB,CAAC,CAAC;IAClE,sBAAsB,EAAE,6BAA6B,CAAC,wBAAwB,CAAC,CAAC;IAChF,8BAA8B,EAAE,6BAA6B,CAAC,gCAAgC,CAAC,CAAC;IAChG,8BAA8B,EAAE,6BAA6B,CAAC,gCAAgC,CAAC,CAAC;IAChG,aAAa,EAAE,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAC9D,gCAAgC,EAAE,6BAA6B,CAAC,kCAAkC,CAAC,CAAC;IACpG,gCAAgC,EAAE,6BAA6B,CAAC,kCAAkC,CAAC,CAAC;IACpG,qBAAqB,EAAE,6BAA6B,CAAC,uBAAuB,CAAC,CAAC;IAC9E,qBAAqB,EAAE,KAAK,CAC1B,OAAO,CACL,6BAA6B,CAAC,uBAAuB,CAAC,CAAC,MAAM,CAAC,EAC9D,MAAM,CACP,CACF,CAAC;IACF,aAAa,EAAE,4BAA4B,GAAG;QAC5C,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH;AAED,UAAU,SAAS;IACjB,KAAK,EAAE,oBAAoB,CAAC;IAC5B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,IAAI,CAAC;IACX,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;IACF,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,8BAA8B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1D;AAED,eAAO,MAAM,2BAA2B,sCAAuC,CAAC;AAEhF;;;;;;GAMG;AACH,qBAAa,YAAY;IAkDd,aAAa,EAAE,oBAAoB,EAAE;aAC5B,OAAO,EAAE;QACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB;IArDH,QAAQ,CAAC,qBAAqB,oCAA2C;IACzE,QAAQ,CAAC,mBAAmB,2BAAkC;IAC9D,QAAQ,CAAC,qBAAqB,2BAAkC;IAChE,QAAQ,CAAC,gCAAgC,2CAGrC;IACJ,QAAQ,CAAC,UAAU,yBAAgC;IACnD,mBAAmB,EAAE,MAAM,EAAE,CAAM;IACnC,QAAQ,CAAC,cAAc,wBAA+B;IACtD,QAAQ,CAAC,iCAAiC,cAAqB;IAC/D,oBAAoB,cAAqB;IACzC,QAAQ,CAAC,qBAAqB,qCAA4C;IAC1E,QAAQ,CAAC,wBAAwB,8BAAqC;IACtE,QAAQ,CAAC,+BAA+B,yCAGpC;IACJ,QAAQ,CAAC,cAAc,6BAAoC;IAC3D,QAAQ,CAAC,qBAAqB,sBAAoC;IAClE,QAAQ,CAAC,0BAA0B,gDAG/B;IACJ,QAAQ,CAAC,mCAAmC;wBAGxB,MAAM;gCACE,MAAM;iBACrB,MAAM;OAEf;IACJ,QAAQ,CAAC,mCAAmC;;;;;;SAGxC;IACJ,QAAQ,CAAC,8BAA8B,yCAGnC;IACJ,OAAO,CAAC,wBAAwB,CAAqB;IAErD;;;OAGG;IACH,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAQ;gBAGvD,aAAa,EAAE,oBAAoB,EAAE,EAC5B,OAAO,EAAE;QACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB;IAGH;;;OAGG;IACG,IAAI,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD7D;;OAEG;IACH,OAAO,CAAC,+BAA+B;IAavC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAsD7B;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;OAEG;YACW,sBAAsB;IA0FpC;;OAEG;YACW,iCAAiC;IA4B/C;;;OAGG;IACH,OAAO,CAAC,6BAA6B;IAmBrC;;OAEG;IACH,OAAO,CAAC,gCAAgC;IA6BxC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAqG/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAuBzB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAahC;;OAEG;YACW,iCAAiC;IA2D/C;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAqBjC;;OAEG;IACH,OAAO,CAAC,8BAA8B;IActC;;OAEG;IACH,OAAO,CAAC,yBAAyB;YAmBnB,6BAA6B;IAqC3C;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAMnC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,4BAA4B;
|
|
1
|
+
{"version":3,"file":"release-graph.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/release-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,4BAA4B,EAC5B,6BAA6B,EAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAG1D,OAAO,EAGL,KAAK,yBAAyB,EAC9B,KAAK,cAAc,EACpB,MAAM,4BAA4B,CAAC;AAIpC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,eAAe,EAAE,6BAA6B,CAAC,iBAAiB,CAAC,CAAC;IAClE,sBAAsB,EAAE,6BAA6B,CAAC,wBAAwB,CAAC,CAAC;IAChF,8BAA8B,EAAE,6BAA6B,CAAC,gCAAgC,CAAC,CAAC;IAChG,8BAA8B,EAAE,6BAA6B,CAAC,gCAAgC,CAAC,CAAC;IAChG,aAAa,EAAE,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAC9D,gCAAgC,EAAE,6BAA6B,CAAC,kCAAkC,CAAC,CAAC;IACpG,gCAAgC,EAAE,6BAA6B,CAAC,kCAAkC,CAAC,CAAC;IACpG,oCAAoC,EAAE,6BAA6B,CAAC,sCAAsC,CAAC,CAAC;IAC5G,qBAAqB,EAAE,6BAA6B,CAAC,uBAAuB,CAAC,CAAC;IAC9E,qBAAqB,EAAE,KAAK,CAC1B,OAAO,CACL,6BAA6B,CAAC,uBAAuB,CAAC,CAAC,MAAM,CAAC,EAC9D,MAAM,CACP,CACF,CAAC;IACF,aAAa,EAAE,4BAA4B,GAAG;QAC5C,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH;AAED,UAAU,SAAS;IACjB,KAAK,EAAE,oBAAoB,CAAC;IAC5B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,IAAI,CAAC;IACX,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;IACF,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,8BAA8B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1D;AAED,eAAO,MAAM,2BAA2B,sCAAuC,CAAC;AAEhF;;;;;;GAMG;AACH,qBAAa,YAAY;IAkDd,aAAa,EAAE,oBAAoB,EAAE;aAC5B,OAAO,EAAE;QACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB;IArDH,QAAQ,CAAC,qBAAqB,oCAA2C;IACzE,QAAQ,CAAC,mBAAmB,2BAAkC;IAC9D,QAAQ,CAAC,qBAAqB,2BAAkC;IAChE,QAAQ,CAAC,gCAAgC,2CAGrC;IACJ,QAAQ,CAAC,UAAU,yBAAgC;IACnD,mBAAmB,EAAE,MAAM,EAAE,CAAM;IACnC,QAAQ,CAAC,cAAc,wBAA+B;IACtD,QAAQ,CAAC,iCAAiC,cAAqB;IAC/D,oBAAoB,cAAqB;IACzC,QAAQ,CAAC,qBAAqB,qCAA4C;IAC1E,QAAQ,CAAC,wBAAwB,8BAAqC;IACtE,QAAQ,CAAC,+BAA+B,yCAGpC;IACJ,QAAQ,CAAC,cAAc,6BAAoC;IAC3D,QAAQ,CAAC,qBAAqB,sBAAoC;IAClE,QAAQ,CAAC,0BAA0B,gDAG/B;IACJ,QAAQ,CAAC,mCAAmC;wBAGxB,MAAM;gCACE,MAAM;iBACrB,MAAM;OAEf;IACJ,QAAQ,CAAC,mCAAmC;;;;;;SAGxC;IACJ,QAAQ,CAAC,8BAA8B,yCAGnC;IACJ,OAAO,CAAC,wBAAwB,CAAqB;IAErD;;;OAGG;IACH,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAQ;gBAGvD,aAAa,EAAE,oBAAoB,EAAE,EAC5B,OAAO,EAAE;QACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB;IAGH;;;OAGG;IACG,IAAI,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD7D;;OAEG;IACH,OAAO,CAAC,+BAA+B;IAavC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAsD7B;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;OAEG;YACW,sBAAsB;IA0FpC;;OAEG;YACW,iCAAiC;IA4B/C;;;OAGG;IACH,OAAO,CAAC,6BAA6B;IAmBrC;;OAEG;IACH,OAAO,CAAC,gCAAgC;IA6BxC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAqG/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAuBzB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAahC;;OAEG;YACW,iCAAiC;IA2D/C;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAqBjC;;OAEG;IACH,OAAO,CAAC,8BAA8B;IActC;;OAEG;IACH,OAAO,CAAC,yBAAyB;YAmBnB,6BAA6B;IAqC3C;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAMnC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,4BAA4B;IA6K3C;;OAEG;IACH,yBAAyB,CACvB,WAAW,EAAE,MAAM,GAClB,oBAAoB,GAAG,SAAS;IAInC;;OAEG;IACH,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKjE;;OAEG;IACH,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAIxD;;OAEG;IACH,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAItD;;OAEG;IACH,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAI5E;;OAEG;IACH,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAIhD;;;OAGG;IACG,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CAa1C;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,YAAY,CAAC,CAgBvB"}
|
|
@@ -540,6 +540,15 @@ Valid values are: ${exports.validReleaseVersionPrefixes
|
|
|
540
540
|
const preserveMatchingDependencyRanges = projectVersionConfig?.preserveMatchingDependencyRanges ??
|
|
541
541
|
releaseGroupVersionConfig?.preserveMatchingDependencyRanges ??
|
|
542
542
|
true;
|
|
543
|
+
/**
|
|
544
|
+
* adjustSemverBumpsForZeroMajorVersion
|
|
545
|
+
*
|
|
546
|
+
* TODO(v23): change the default value of this to true
|
|
547
|
+
* This is false by default for backward compatibility.
|
|
548
|
+
*/
|
|
549
|
+
const adjustSemverBumpsForZeroMajorVersion = projectVersionConfig?.adjustSemverBumpsForZeroMajorVersion ??
|
|
550
|
+
releaseGroupVersionConfig?.adjustSemverBumpsForZeroMajorVersion ??
|
|
551
|
+
false;
|
|
543
552
|
/**
|
|
544
553
|
* fallbackCurrentVersionResolver, defaults to disk when performing a first release, otherwise undefined
|
|
545
554
|
*/
|
|
@@ -577,6 +586,7 @@ Valid values are: ${exports.validReleaseVersionPrefixes
|
|
|
577
586
|
versionPrefix,
|
|
578
587
|
preserveLocalDependencyProtocols,
|
|
579
588
|
preserveMatchingDependencyRanges,
|
|
589
|
+
adjustSemverBumpsForZeroMajorVersion,
|
|
580
590
|
versionActionsOptions,
|
|
581
591
|
manifestRootsToUpdate,
|
|
582
592
|
dockerOptions,
|
|
@@ -21,5 +21,7 @@ export declare function determineSemverChange(relevantCommits: Map<string, {
|
|
|
21
21
|
commit: GitCommit;
|
|
22
22
|
isProjectScopedCommit: boolean;
|
|
23
23
|
}[]>, config: NxReleaseConfig['conventionalCommits']): Map<string, SemverSpecifier | null>;
|
|
24
|
-
export declare function deriveNewSemverVersion(currentSemverVersion: string, semverSpecifier: string, preid?: string
|
|
24
|
+
export declare function deriveNewSemverVersion(currentSemverVersion: string, semverSpecifier: string, preid?: string, options?: {
|
|
25
|
+
adjustSemverBumpsForZeroMajorVersion?: boolean;
|
|
26
|
+
}): string;
|
|
25
27
|
//# sourceMappingURL=semver.d.ts.map
|
|
@@ -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,
|
|
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,CA0BrC;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"}
|
|
@@ -26,7 +26,7 @@ function determineSemverChange(relevantCommits, config) {
|
|
|
26
26
|
for (const [projectName, relevantCommit] of relevantCommits) {
|
|
27
27
|
let highestChange = null;
|
|
28
28
|
for (const { commit, isProjectScopedCommit } of relevantCommit) {
|
|
29
|
-
if (!isProjectScopedCommit) {
|
|
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
31
|
highestChange = Math.max(1 /* SemverSpecifier.PATCH */, highestChange ?? 0);
|
|
32
32
|
continue;
|
|
@@ -47,14 +47,49 @@ function determineSemverChange(relevantCommits, config) {
|
|
|
47
47
|
}
|
|
48
48
|
return semverChangePerProject;
|
|
49
49
|
}
|
|
50
|
-
|
|
50
|
+
/**
|
|
51
|
+
* For 0.x versions, shifts semver bump types down to follow
|
|
52
|
+
* the common convention where breaking changes bump minor, and
|
|
53
|
+
* new features bump patch.
|
|
54
|
+
*
|
|
55
|
+
* - 'major' -> 'minor'
|
|
56
|
+
* - 'premajor' -> 'preminor'
|
|
57
|
+
* - 'minor' -> 'patch'
|
|
58
|
+
* - 'preminor' -> 'prepatch'
|
|
59
|
+
* - 'patch' -> 'patch' (unchanged)
|
|
60
|
+
* - 'prepatch' -> 'prepatch' (unchanged)
|
|
61
|
+
* - 'prerelease' -> 'prerelease' (unchanged)
|
|
62
|
+
*/
|
|
63
|
+
function adjustSpecifierForZeroMajorVersion(specifier, currentVersion) {
|
|
64
|
+
// Only adjust for 0.x versions
|
|
65
|
+
if ((0, semver_1.major)(currentVersion) !== 0) {
|
|
66
|
+
return specifier;
|
|
67
|
+
}
|
|
68
|
+
switch (specifier) {
|
|
69
|
+
case 'major':
|
|
70
|
+
return 'minor';
|
|
71
|
+
case 'premajor':
|
|
72
|
+
return 'preminor';
|
|
73
|
+
case 'minor':
|
|
74
|
+
return 'patch';
|
|
75
|
+
case 'preminor':
|
|
76
|
+
return 'prepatch';
|
|
77
|
+
default:
|
|
78
|
+
return specifier;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
function deriveNewSemverVersion(currentSemverVersion, semverSpecifier, preid, options) {
|
|
51
82
|
if (!(0, semver_1.valid)(currentSemverVersion)) {
|
|
52
83
|
throw new Error(`Invalid semver version "${currentSemverVersion}" provided.`);
|
|
53
84
|
}
|
|
54
85
|
let newVersion = semverSpecifier;
|
|
55
86
|
if (isRelativeVersionKeyword(semverSpecifier)) {
|
|
56
|
-
//
|
|
57
|
-
const
|
|
87
|
+
// Adjust for 0.x versions if explicitly enabled
|
|
88
|
+
const adjustedSpecifier = options?.adjustSemverBumpsForZeroMajorVersion
|
|
89
|
+
? adjustSpecifierForZeroMajorVersion(semverSpecifier, currentSemverVersion)
|
|
90
|
+
: semverSpecifier;
|
|
91
|
+
// Derive the new version from the current version combined with the adjusted version specifier.
|
|
92
|
+
const derivedVersion = (0, semver_1.inc)(currentSemverVersion, adjustedSpecifier, preid);
|
|
58
93
|
if (!derivedVersion) {
|
|
59
94
|
throw new Error(`Unable to derive new version from current version "${currentSemverVersion}" and version specifier "${semverSpecifier}"`);
|
|
60
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/release/utils/test/test-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,mBAAmB
|
|
1
|
+
{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/release/utils/test/test-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,mBAAmB;;;;;;;;;;;;;;;;;;;EAqBlC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-actions.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/version-actions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EACV,YAAY,EACZ,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAMrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAOpE,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,MAAM,CAAC;AA6BlD;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,yBAAyB,GAAG,CACtC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,yBAAyB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrD,KACE,OAAO,CAAC;IACX,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC,CAAC;AAkBH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,oBAAoB,EAClC,gBAAgB,EAAE,uBAAuB,EACzC,qBAAqB,EAAE,qBAAqB,GAC3C,OAAO,CAAC;IACT,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,yBAAyB,EAAE,yBAAyB,CAAC;CACtD,CAAC,CA4ED;AAED,8BAAsB,cAAc;IAwBzB,YAAY,EAAE,oBAAoB;IAClC,gBAAgB,EAAE,uBAAuB;IACzC,qBAAqB,EAAE,qBAAqB;IAzBrD;;;;;;;OAOG;IACH,QAAQ,CAAC,sBAAsB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjD;;;;;;;OAOG;IACH,iBAAiB,EAAE;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,gCAAgC,EAAE,OAAO,CAAC;KAC3C,EAAE,CAAM;gBAGA,YAAY,EAAE,oBAAoB,EAClC,gBAAgB,EAAE,uBAAuB,EACzC,qBAAqB,EAAE,qBAAqB;IAGrD;;;OAGG;IACG,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrC;;;OAGG;IACG,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BzC;;;;;;;;;OASG;IACG,mBAAmB,CACvB,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,eAAe,EAAE,MAAM,EACvB,qBAAqB,EAAE,MAAM,EAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClD,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QACT,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;
|
|
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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"}
|
|
@@ -185,7 +185,9 @@ It is also possible that the project is being processed because of a dependency
|
|
|
185
185
|
if (isSemverRelativeBump && !currentVersion) {
|
|
186
186
|
throw new Error(`There was no current version resolved for project "${this.projectGraphNode.name}", but it was configured to be bumped via a semver relative keyword "${newVersionInput}"${interpolatedNewVersionInputReasonText}. This is not a valid combination, please review your release configuration and CLI arguments`);
|
|
187
187
|
}
|
|
188
|
-
const newVersion = (0, semver_1.deriveNewSemverVersion)(currentVersion, newVersionInput, preid
|
|
188
|
+
const newVersion = (0, semver_1.deriveNewSemverVersion)(currentVersion, newVersionInput, preid, {
|
|
189
|
+
adjustSemverBumpsForZeroMajorVersion: this.finalConfigForProject.adjustSemverBumpsForZeroMajorVersion,
|
|
190
|
+
});
|
|
189
191
|
const newVersionInputText = (0, semver_1.isRelativeVersionKeyword)(newVersionInput)
|
|
190
192
|
? `semver relative bump "${newVersionInput}"`
|
|
191
193
|
: `explicit semver value "${newVersionInput}"`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/watch/watch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAgB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/watch/watch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAgB,MAAM,4BAA4B,CAAC;AAIvE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAKD,qBAAa,mBAAmB;IAe5B,OAAO,CAAC,QAAQ;IAdlB,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,eAAe,CAAqB;IAC5C,OAAO,CAAC,YAAY,CAAqB;IAEzC,SAAS,KAAK,QAAQ,YAErB;IAED,OAAO,KAAK,UAAU,GAErB;gBAGS,QAAQ,EAAE,CAChB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EACrB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,KACf,OAAO,CAAC,OAAO,CAAC;IAGvB,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE;YAW5C,OAAO;CA0BtB;AA2ED,wBAAsB,KAAK,CAAC,IAAI,EAAE,cAAc,iBAoG/C"}
|
|
@@ -4,6 +4,7 @@ exports.BatchFunctionRunner = void 0;
|
|
|
4
4
|
exports.watch = watch;
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
6
|
const client_1 = require("../../daemon/client/client");
|
|
7
|
+
const daemon_socket_messenger_1 = require("../../daemon/client/daemon-socket-messenger");
|
|
7
8
|
const output_1 = require("../../utils/output");
|
|
8
9
|
const DEFAULT_PROJECT_NAME_ENV = 'NX_PROJECT_NAME';
|
|
9
10
|
const DEFAULT_FILE_CHANGES_ENV = 'NX_FILE_CHANGES';
|
|
@@ -151,13 +152,24 @@ async function watch(args) {
|
|
|
151
152
|
includeDependentProjects: args.includeDependentProjects,
|
|
152
153
|
includeGlobalWorkspaceFiles: args.includeGlobalWorkspaceFiles,
|
|
153
154
|
}, async (err, data) => {
|
|
154
|
-
if (err === '
|
|
155
|
+
if (err === 'reconnecting') {
|
|
156
|
+
// Silent - daemon restarts automatically on lockfile changes
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
else if (err === 'reconnected') {
|
|
160
|
+
// Silent - reconnection succeeded
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
else if (err === 'closed') {
|
|
155
164
|
output_1.output.error({
|
|
156
|
-
title: '
|
|
157
|
-
bodyLines: [
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
165
|
+
title: 'Failed to reconnect to daemon after multiple attempts',
|
|
166
|
+
bodyLines: ['Please restart your watch command.'],
|
|
167
|
+
});
|
|
168
|
+
process.exit(1);
|
|
169
|
+
}
|
|
170
|
+
else if (err instanceof daemon_socket_messenger_1.VersionMismatchError) {
|
|
171
|
+
output_1.output.error({
|
|
172
|
+
title: 'Nx version changed. Please restart your command.',
|
|
161
173
|
});
|
|
162
174
|
process.exit(1);
|
|
163
175
|
}
|
|
@@ -179,4 +191,8 @@ async function watch(args) {
|
|
|
179
191
|
}
|
|
180
192
|
});
|
|
181
193
|
args.verbose && output_1.output.logSingleLine('watch process waiting...');
|
|
194
|
+
// Keep the process alive while watching for file changes
|
|
195
|
+
// The file watcher callbacks will handle incoming events
|
|
196
|
+
// The process will exit when Ctrl+C is pressed or if the connection closes
|
|
197
|
+
await new Promise(() => { });
|
|
182
198
|
}
|