nx 22.1.0-rc.5 → 22.2.0-canary.20251120-aa38b25
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 +25 -16
- package/src/command-line/release/utils/shared.d.ts.map +1 -1
- package/src/command-line/release/utils/shared.js +5 -5
- package/src/core/graph/main.js +1 -1
- package/src/daemon/server/server.js +9 -9
- package/src/hasher/task-hasher.js +1 -1
- package/src/native/nx.wasi-browser.js +45 -53
- package/src/native/nx.wasm32-wasi.wasm +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "22.
|
|
3
|
+
"version": "22.2.0-canary.20251120-aa38b25",
|
|
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.2.0-canary.20251120-aa38b25",
|
|
87
|
+
"@nx/nx-darwin-x64": "22.2.0-canary.20251120-aa38b25",
|
|
88
|
+
"@nx/nx-freebsd-x64": "22.2.0-canary.20251120-aa38b25",
|
|
89
|
+
"@nx/nx-linux-arm-gnueabihf": "22.2.0-canary.20251120-aa38b25",
|
|
90
|
+
"@nx/nx-linux-arm64-gnu": "22.2.0-canary.20251120-aa38b25",
|
|
91
|
+
"@nx/nx-linux-arm64-musl": "22.2.0-canary.20251120-aa38b25",
|
|
92
|
+
"@nx/nx-linux-x64-gnu": "22.2.0-canary.20251120-aa38b25",
|
|
93
|
+
"@nx/nx-linux-x64-musl": "22.2.0-canary.20251120-aa38b25",
|
|
94
|
+
"@nx/nx-win32-arm64-msvc": "22.2.0-canary.20251120-aa38b25",
|
|
95
|
+
"@nx/nx-win32-x64-msvc": "22.2.0-canary.20251120-aa38b25"
|
|
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":"AA0BA,OAAO,EAEL,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/graph/graph.ts"],"names":[],"mappings":"AA0BA,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;AAiJD,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,CA4Tf;AAuvBD;;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"}
|
|
@@ -27,6 +27,7 @@ const transform_objects_1 = require("../../native/transform-objects");
|
|
|
27
27
|
const affected_1 = require("../affected/affected");
|
|
28
28
|
const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
|
|
29
29
|
const task_hasher_1 = require("../../hasher/task-hasher");
|
|
30
|
+
const find_matching_projects_1 = require("../../utils/find-matching-projects");
|
|
30
31
|
const create_task_hasher_1 = require("../../hasher/create-task-hasher");
|
|
31
32
|
const error_types_1 = require("../../project-graph/error-types");
|
|
32
33
|
const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
|
|
@@ -203,23 +204,29 @@ async function generateGraph(args, affectedProjects) {
|
|
|
203
204
|
// and the operation might fail (i.e: in e2e tests), we fallback to empty array
|
|
204
205
|
affectedProjects = [];
|
|
205
206
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
207
|
+
let excludePatterns = [];
|
|
208
|
+
if (args.exclude && args.exclude.length > 0) {
|
|
209
|
+
try {
|
|
210
|
+
// Use findMatchingProjects to expand patterns (supports globs, tags, directories, etc.)
|
|
211
|
+
excludePatterns = (0, find_matching_projects_1.findMatchingProjects)(args.exclude, prunedGraph.nodes);
|
|
212
|
+
// If no projects matched any of the exclude patterns, show a warning
|
|
213
|
+
if (excludePatterns.length === 0) {
|
|
214
|
+
output_1.output.warn({
|
|
215
|
+
title: `No projects matched the following exclude patterns:`,
|
|
216
|
+
bodyLines: args.exclude,
|
|
217
|
+
});
|
|
211
218
|
}
|
|
212
|
-
}
|
|
213
|
-
|
|
219
|
+
}
|
|
220
|
+
catch (e) {
|
|
214
221
|
output_1.output.error({
|
|
215
|
-
title: `
|
|
216
|
-
bodyLines:
|
|
222
|
+
title: `Invalid exclude pattern:`,
|
|
223
|
+
bodyLines: [e.message],
|
|
217
224
|
});
|
|
218
225
|
process.exit(1);
|
|
219
226
|
}
|
|
220
227
|
}
|
|
221
228
|
let html = (0, node_fs_1.readFileSync)((0, node_path_1.join)(__dirname, '../../core/graph/index.html'), 'utf-8');
|
|
222
|
-
prunedGraph = filterGraph(prunedGraph, args.focus || null,
|
|
229
|
+
prunedGraph = filterGraph(prunedGraph, args.focus || null, excludePatterns);
|
|
223
230
|
if (args.print || args.file === 'stdout') {
|
|
224
231
|
console.log(JSON.stringify(await createJsonOutput(prunedGraph, rawGraph, args.projects, args.targets), null, 2));
|
|
225
232
|
await output_1.output.drain();
|
|
@@ -250,7 +257,7 @@ async function generateGraph(args, affectedProjects) {
|
|
|
250
257
|
? await createTaskGraphForTargetsAndProjects(args.targets, args.projects)
|
|
251
258
|
: await createTaskGraphClientResponse();
|
|
252
259
|
const taskInputsReponse = await createExpandedTaskInputResponse(taskGraphClientResponse, projectGraphClientResponse);
|
|
253
|
-
const environmentJs = buildEnvironmentJs(
|
|
260
|
+
const environmentJs = buildEnvironmentJs(excludePatterns, args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve', projectGraphClientResponse, taskGraphClientResponse, taskInputsReponse, sourceMaps);
|
|
254
261
|
html = html.replace(/src="/g, 'src="static/');
|
|
255
262
|
html = html.replace(/href="styles/g, 'href="static/styles');
|
|
256
263
|
html = html.replace(/<base href="\/".*>/g, '');
|
|
@@ -281,11 +288,11 @@ async function generateGraph(args, affectedProjects) {
|
|
|
281
288
|
process.exit(0);
|
|
282
289
|
}
|
|
283
290
|
else {
|
|
284
|
-
const environmentJs = buildEnvironmentJs(
|
|
291
|
+
const environmentJs = buildEnvironmentJs(excludePatterns, args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve');
|
|
285
292
|
let app;
|
|
286
293
|
let url;
|
|
287
294
|
try {
|
|
288
|
-
const result = await startServer(html, environmentJs, args.host || '127.0.0.1', args.port || 4211, args.watch, affectedProjects, args.focus, args.groupByFolder,
|
|
295
|
+
const result = await startServer(html, environmentJs, args.host || '127.0.0.1', args.port || 4211, args.watch, affectedProjects, args.focus, args.groupByFolder, excludePatterns);
|
|
289
296
|
app = result.app;
|
|
290
297
|
url = result.url;
|
|
291
298
|
}
|
|
@@ -377,7 +384,7 @@ async function startServer(html, environmentJs, host, port = 4211, watchForChang
|
|
|
377
384
|
if (watchForChanges && client_1.daemonClient.enabled()) {
|
|
378
385
|
unregisterFileWatcher = await createFileWatcher();
|
|
379
386
|
}
|
|
380
|
-
const { projectGraphClientResponse, sourceMapResponse } = await createProjectGraphAndSourceMapClientResponse(affected);
|
|
387
|
+
const { projectGraphClientResponse, sourceMapResponse } = await createProjectGraphAndSourceMapClientResponse(affected, focus, exclude);
|
|
381
388
|
currentProjectGraphClientResponse = projectGraphClientResponse;
|
|
382
389
|
currentProjectGraphClientResponse.focus = focus;
|
|
383
390
|
currentProjectGraphClientResponse.groupByFolder = groupByFolder;
|
|
@@ -534,7 +541,7 @@ function createFileWatcher() {
|
|
|
534
541
|
}
|
|
535
542
|
else if (changes !== null && changes.changedFiles.length > 0) {
|
|
536
543
|
output_1.output.note({ title: 'Recalculating project graph...' });
|
|
537
|
-
const { projectGraphClientResponse, sourceMapResponse } = await createProjectGraphAndSourceMapClientResponse();
|
|
544
|
+
const { projectGraphClientResponse, sourceMapResponse } = await createProjectGraphAndSourceMapClientResponse([], currentProjectGraphClientResponse.focus, currentProjectGraphClientResponse.exclude);
|
|
538
545
|
if (projectGraphClientResponse.hash !==
|
|
539
546
|
currentProjectGraphClientResponse.hash &&
|
|
540
547
|
sourceMapResponse) {
|
|
@@ -563,7 +570,7 @@ function createFileWatcher() {
|
|
|
563
570
|
}
|
|
564
571
|
}, 500));
|
|
565
572
|
}
|
|
566
|
-
async function createProjectGraphAndSourceMapClientResponse(affected = []) {
|
|
573
|
+
async function createProjectGraphAndSourceMapClientResponse(affected = [], focus = null, exclude = []) {
|
|
567
574
|
node_perf_hooks_1.performance.mark('project graph watch calculation:start');
|
|
568
575
|
let projectGraph;
|
|
569
576
|
let sourceMaps;
|
|
@@ -598,6 +605,8 @@ async function createProjectGraphAndSourceMapClientResponse(affected = []) {
|
|
|
598
605
|
}
|
|
599
606
|
}
|
|
600
607
|
let graph = (0, operators_1.pruneExternalNodes)(projectGraph);
|
|
608
|
+
// Apply focus and exclude filters
|
|
609
|
+
graph = filterGraph(graph, focus, exclude);
|
|
601
610
|
const fileMap = (0, nx_deps_cache_1.readFileMapCache)()?.fileMap.projectFileMap || {};
|
|
602
611
|
node_perf_hooks_1.performance.mark('project graph watch calculation:end');
|
|
603
612
|
node_perf_hooks_1.performance.mark('project graph response generation:start');
|
|
@@ -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;
|
|
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;AAW7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAqB,MAAM,OAAO,CAAC;AAErD,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,CAAC;IACvB;;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,GACZ,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;CAQF;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,CA0GV;AAcD,wBAAgB,wCAAwC,CACtD,YAAY,EAAE,oBAAoB,GACjC,OAAO,GAAG,MAAM,CAElB;AAED,wBAAgB,wBAAwB,CACtC,aAAa,EAAE;IAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;CAAE,EAC1D,WAAW,EAAE,MAAM,GAClB,OAAO,CAOT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,oBAAoB,EAAE,EACrC,8BAA8B,EAAE,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtE,WAAW,EAAE,WAAW,GACvB,MAAM,EAAE,CA6FV;AAeD,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAcnE;AAED,wBAAsB,4BAA4B,CAChD,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,SAAS,EAAE,EACpB,QAAQ,EAAE,MAAM,EAAE,GAEpB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAAC,CAwC5E"}
|
|
@@ -272,11 +272,11 @@ async function getCommitsRelevantToProjects(projectGraph, commits, projects) {
|
|
|
272
272
|
const projectSet = new Set(projects);
|
|
273
273
|
const relevantCommits = new Map();
|
|
274
274
|
for (const commit of commits) {
|
|
275
|
-
// Convert affectedFiles to FileChange[] format
|
|
276
|
-
const touchedFiles = commit.affectedFiles
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
})
|
|
275
|
+
// Convert affectedFiles to FileChange[] format with proper diff computation
|
|
276
|
+
const touchedFiles = (0, file_utils_1.calculateFileChanges)(commit.affectedFiles, {
|
|
277
|
+
base: `${commit.shortHash}^`,
|
|
278
|
+
head: commit.shortHash,
|
|
279
|
+
});
|
|
280
280
|
// Use the same affected detection logic as `nx affected`
|
|
281
281
|
const affectedGraph = await (0, affected_project_graph_1.filterAffected)(projectGraph, touchedFiles);
|
|
282
282
|
for (const projectName of Object.keys(affectedGraph.nodes)) {
|