nx 22.3.3 → 22.4.0-canary.20251219-137ab45
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/src/command-line/graph/graph.d.ts.map +1 -1
- package/src/command-line/graph/graph.js +90 -57
- 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 +5 -0
- package/src/config/nx-json.d.ts.map +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 +20 -3
- package/src/daemon/client/client.d.ts.map +1 -1
- package/src/daemon/client/client.js +410 -81
- 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-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/native/nx.wasm32-wasi.wasm +0 -0
- 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-canary.20251219-137ab45",
|
|
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-canary.20251219-137ab45",
|
|
87
|
+
"@nx/nx-darwin-x64": "22.4.0-canary.20251219-137ab45",
|
|
88
|
+
"@nx/nx-freebsd-x64": "22.4.0-canary.20251219-137ab45",
|
|
89
|
+
"@nx/nx-linux-arm-gnueabihf": "22.4.0-canary.20251219-137ab45",
|
|
90
|
+
"@nx/nx-linux-arm64-gnu": "22.4.0-canary.20251219-137ab45",
|
|
91
|
+
"@nx/nx-linux-arm64-musl": "22.4.0-canary.20251219-137ab45",
|
|
92
|
+
"@nx/nx-linux-x64-gnu": "22.4.0-canary.20251219-137ab45",
|
|
93
|
+
"@nx/nx-linux-x64-musl": "22.4.0-canary.20251219-137ab45",
|
|
94
|
+
"@nx/nx-win32-arm64-msvc": "22.4.0-canary.20251219-137ab45",
|
|
95
|
+
"@nx/nx-win32-x64-msvc": "22.4.0-canary.20251219-137ab45"
|
|
96
96
|
},
|
|
97
97
|
"nx-migrations": {
|
|
98
98
|
"migrations": "./migrations.json",
|
|
@@ -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":"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
|
}
|
package/src/config/nx-json.d.ts
CHANGED
|
@@ -309,6 +309,11 @@ export interface NxReleaseVersionPlansConfiguration {
|
|
|
309
309
|
/**
|
|
310
310
|
* Changes to files matching any of these optional patterns will be excluded from the affected project logic within the `nx release plan:check`
|
|
311
311
|
* command. This is useful for ignoring files that are not relevant to the versioning process, such as documentation or configuration files.
|
|
312
|
+
*
|
|
313
|
+
* These patterns follow gitignore semantics. When using negation patterns (to "un-ignore" certain files), use specific file extension patterns
|
|
314
|
+
* rather than wildcards like `*` or `**`. For example:
|
|
315
|
+
* - Works: ["**\/*.ts", "!**\/src\/**"] - ignores all .ts files except those in src/ directories
|
|
316
|
+
* - Does NOT work as expected: ["*", "!src/"] - negation won't properly un-ignore nested paths
|
|
312
317
|
*/
|
|
313
318
|
ignorePatternsForPlanCheck?: string[];
|
|
314
319
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-json.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/config/nx-json.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"nx-json.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/config/nx-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/cache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/cache.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,qBAAqB,QAGjC,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,iBAAiB,GAAG,IAAI,CAiBrE;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAMnD;AAED,wBAAsB,2BAA2B,CAC/C,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAIf;AAGD,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,IAAI,CAUtD"}
|
package/src/daemon/cache.js
CHANGED
|
@@ -10,17 +10,23 @@ const path_1 = require("path");
|
|
|
10
10
|
const tmp_dir_1 = require("./tmp-dir");
|
|
11
11
|
const fileutils_1 = require("../utils/fileutils");
|
|
12
12
|
const versions_1 = require("../utils/versions");
|
|
13
|
+
const logger_1 = require("./logger");
|
|
14
|
+
const daemon_socket_messenger_1 = require("./client/daemon-socket-messenger");
|
|
13
15
|
exports.serverProcessJsonPath = (0, path_1.join)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'server-process.json');
|
|
14
16
|
function readDaemonProcessJsonCache() {
|
|
15
17
|
try {
|
|
16
18
|
const daemonJson = (0, fileutils_1.readJsonFile)(exports.serverProcessJsonPath);
|
|
17
|
-
// If the daemon version doesn't match the client version,
|
|
19
|
+
// If the daemon version doesn't match the client version, throw error
|
|
18
20
|
if (daemonJson.nxVersion !== versions_1.nxVersion) {
|
|
19
|
-
|
|
21
|
+
logger_1.clientLogger.log(`[Cache] Version mismatch: daemon=${daemonJson.nxVersion}, client=${versions_1.nxVersion}`);
|
|
22
|
+
throw new daemon_socket_messenger_1.VersionMismatchError();
|
|
20
23
|
}
|
|
21
24
|
return daemonJson;
|
|
22
25
|
}
|
|
23
|
-
catch {
|
|
26
|
+
catch (e) {
|
|
27
|
+
if (e instanceof daemon_socket_messenger_1.VersionMismatchError) {
|
|
28
|
+
throw e; // Let version mismatch bubble up
|
|
29
|
+
}
|
|
24
30
|
return null;
|
|
25
31
|
}
|
|
26
32
|
}
|
|
@@ -26,9 +26,17 @@ export declare class DaemonClient {
|
|
|
26
26
|
private _daemonReady;
|
|
27
27
|
private _out;
|
|
28
28
|
private _err;
|
|
29
|
+
private fileWatcherMessenger;
|
|
30
|
+
private fileWatcherReconnecting;
|
|
31
|
+
private fileWatcherCallbacks;
|
|
32
|
+
private fileWatcherConfigs;
|
|
33
|
+
private projectGraphListenerMessenger;
|
|
34
|
+
private projectGraphListenerReconnecting;
|
|
35
|
+
private projectGraphListenerCallbacks;
|
|
29
36
|
enabled(): boolean;
|
|
30
37
|
reset(): void;
|
|
31
38
|
private getSocketPath;
|
|
39
|
+
private parseMessage;
|
|
32
40
|
requestShutdown(): Promise<void>;
|
|
33
41
|
getProjectGraphAndSourceMaps(): Promise<{
|
|
34
42
|
projectGraph: ProjectGraph;
|
|
@@ -41,14 +49,17 @@ export declare class DaemonClient {
|
|
|
41
49
|
includeGlobalWorkspaceFiles?: boolean;
|
|
42
50
|
includeDependentProjects?: boolean;
|
|
43
51
|
allowPartialGraph?: boolean;
|
|
44
|
-
}, callback: (error: Error | null | 'closed', data: {
|
|
52
|
+
}, callback: (error: Error | null | 'reconnecting' | 'reconnected' | 'closed', data: {
|
|
45
53
|
changedProjects: string[];
|
|
46
54
|
changedFiles: ChangedFile[];
|
|
47
55
|
} | null) => void): Promise<UnregisterCallback>;
|
|
48
|
-
|
|
56
|
+
private reconnectFileWatcher;
|
|
57
|
+
registerProjectGraphRecomputationListener(callback: (error: Error | null | 'reconnecting' | 'reconnected' | 'closed', data: {
|
|
49
58
|
projectGraph: ProjectGraph;
|
|
50
59
|
sourceMaps: ConfigurationSourceMaps;
|
|
60
|
+
error: Error | null;
|
|
51
61
|
} | null) => void): Promise<UnregisterCallback>;
|
|
62
|
+
private reconnectProjectGraphListener;
|
|
52
63
|
processInBackground(requirePath: string, data: any): Promise<any>;
|
|
53
64
|
recordOutputsHash(outputs: string[], hash: string): Promise<any>;
|
|
54
65
|
outputsHashesMatch(outputs: string[], hash: string): Promise<any>;
|
|
@@ -77,9 +88,15 @@ export declare class DaemonClient {
|
|
|
77
88
|
private startDaemonIfNecessary;
|
|
78
89
|
private sendToDaemonViaQueue;
|
|
79
90
|
private setUpConnection;
|
|
91
|
+
private handleConnectionError;
|
|
92
|
+
private establishConnection;
|
|
93
|
+
/**
|
|
94
|
+
* Wait for daemon server to be available.
|
|
95
|
+
* Used for reconnection - throws VersionMismatchError if daemon version differs.
|
|
96
|
+
*/
|
|
97
|
+
private waitForServerToBeAvailable;
|
|
80
98
|
private sendMessageToDaemon;
|
|
81
99
|
private registerDaemonProcessWithMetricsService;
|
|
82
|
-
private retryMessageAfterNewDaemonStarts;
|
|
83
100
|
private handleMessage;
|
|
84
101
|
startInBackground(): Promise<ChildProcess['pid']>;
|
|
85
102
|
stop(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAS,MAAM,eAAe,CAAC;AAmBpD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
|