nx 21.7.0-canary.20250930-e144408 → 21.7.0
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.
Potentially problematic release.
This version of nx might be problematic. Click here for more details.
- package/README.md +1 -1
- package/bin/nx.js +0 -1
- package/generators.json +0 -6
- package/package.json +12 -12
- package/schemas/nx-schema.json +1 -15
- package/src/adapter/ngcli-adapter.d.ts.map +1 -1
- package/src/adapter/ngcli-adapter.js +8 -21
- package/src/command-line/format/format.js +1 -5
- package/src/command-line/graph/graph.d.ts.map +1 -1
- package/src/command-line/graph/graph.js +14 -37
- package/src/command-line/init/command-object.js +0 -6
- package/src/command-line/init/init-v2.d.ts +0 -2
- package/src/command-line/init/init-v2.d.ts.map +1 -1
- package/src/command-line/init/init-v2.js +0 -20
- package/src/command-line/migrate/command-object.js +1 -1
- package/src/command-line/migrate/migrate.d.ts +2 -3
- package/src/command-line/migrate/migrate.d.ts.map +1 -1
- package/src/command-line/migrate/migrate.js +7 -37
- package/src/command-line/nx-cloud/fix-ci/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/fix-ci/command-object.js +1 -4
- package/src/command-line/nx-cloud/login/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/login/command-object.js +1 -4
- package/src/command-line/nx-cloud/logout/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/logout/command-object.js +1 -4
- package/src/command-line/nx-cloud/record/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/record/command-object.js +1 -4
- package/src/command-line/nx-cloud/start-ci-run/command-object.d.ts.map +1 -1
- package/src/command-line/nx-cloud/start-ci-run/command-object.js +1 -4
- package/src/command-line/nx-commands.d.ts.map +1 -1
- package/src/command-line/nx-commands.js +15 -17
- package/src/command-line/release/config/config.d.ts.map +1 -1
- package/src/command-line/release/config/config.js +0 -3
- package/src/command-line/release/publish.d.ts.map +1 -1
- package/src/command-line/release/publish.js +0 -8
- package/src/command-line/release/version/release-group-processor.d.ts +2 -1
- package/src/command-line/release/version/release-group-processor.d.ts.map +1 -1
- package/src/command-line/release/version/release-group-processor.js +50 -13
- package/src/command-line/run/run-one.d.ts.map +1 -1
- package/src/command-line/run/run-one.js +9 -9
- package/src/config/misc-interfaces.d.ts +0 -1
- package/src/config/misc-interfaces.d.ts.map +1 -1
- package/src/config/nx-json.d.ts +0 -9
- package/src/config/nx-json.d.ts.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +1 -7
- package/src/config/workspace-json-project-json.d.ts.map +1 -1
- package/src/core/graph/index.html +2 -4
- package/src/core/graph/main.js +1 -1
- package/src/core/graph/styles.css +1 -1
- package/src/core/graph/styles.js +1 -1
- package/src/daemon/client/client.d.ts.map +1 -1
- package/src/daemon/client/client.js +5 -8
- package/src/daemon/server/server.js +1 -1
- package/src/daemon/server/shutdown-utils.d.ts.map +1 -1
- package/src/daemon/server/shutdown-utils.js +2 -6
- package/src/devkit-internals.d.ts +1 -1
- package/src/devkit-internals.d.ts.map +1 -1
- package/src/devkit-internals.js +1 -2
- package/src/executors/run-script/run-script.impl.d.ts.map +1 -1
- package/src/executors/run-script/run-script.impl.js +8 -33
- package/src/hasher/hash-task.js +1 -1
- package/src/native/index.d.ts +0 -15
- package/src/native/native-bindings.js +0 -4
- package/src/native/nx.wasi.cjs +45 -53
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.d.ts.map +1 -1
- package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js +4 -5
- package/src/plugins/js/lock-file/npm-parser.d.ts.map +1 -1
- package/src/plugins/js/lock-file/npm-parser.js +1 -4
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js +7 -7
- package/src/plugins/js/project-graph/build-dependencies/target-project-locator.d.ts +1 -1
- 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 +2 -33
- package/src/plugins/js/versions.d.ts +1 -1
- package/src/plugins/js/versions.js +1 -1
- package/src/plugins/package-json/create-nodes.d.ts.map +1 -1
- package/src/plugins/package-json/create-nodes.js +3 -2
- package/src/project-graph/build-project-graph.d.ts.map +1 -1
- package/src/project-graph/build-project-graph.js +21 -28
- package/src/project-graph/nx-deps-cache.d.ts +3 -4
- package/src/project-graph/nx-deps-cache.d.ts.map +1 -1
- package/src/project-graph/nx-deps-cache.js +2 -7
- package/src/project-graph/plugins/loaded-nx-plugin.d.ts.map +1 -1
- package/src/project-graph/plugins/public-api.d.ts +0 -4
- package/src/project-graph/plugins/public-api.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration-utils.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration-utils.js +6 -5
- package/src/tasks-runner/create-task-graph.d.ts.map +1 -1
- package/src/tasks-runner/create-task-graph.js +3 -17
- package/src/tasks-runner/fork.js +5 -31
- package/src/tasks-runner/life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle.js +4 -3
- package/src/tasks-runner/run-command.d.ts.map +1 -1
- package/src/tasks-runner/run-command.js +9 -19
- package/src/tasks-runner/task-orchestrator.d.ts.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +5 -8
- package/src/tasks-runner/utils.d.ts.map +1 -1
- package/src/tasks-runner/utils.js +1 -3
- package/src/utils/nx-console-prompt.d.ts.map +1 -1
- package/src/utils/nx-console-prompt.js +0 -8
- package/src/utils/package-json.d.ts +0 -4
- package/src/utils/package-json.d.ts.map +1 -1
- package/src/utils/package-json.js +1 -52
- package/src/utils/package-manager.d.ts +1 -6
- package/src/utils/package-manager.d.ts.map +1 -1
- package/src/utils/package-manager.js +4 -15
- package/src/utils/split-target.d.ts.map +1 -1
- package/src/utils/split-target.js +6 -46
- package/src/utils/task-history.js +1 -1
- package/telemetry.js +198 -0
- package/src/ai/constants.d.ts +0 -15
- package/src/ai/constants.d.ts.map +0 -1
- package/src/ai/constants.js +0 -53
- package/src/ai/set-up-ai-agents/get-agent-rules.d.ts +0 -2
- package/src/ai/set-up-ai-agents/get-agent-rules.d.ts.map +0 -1
- package/src/ai/set-up-ai-agents/get-agent-rules.js +0 -26
- package/src/ai/set-up-ai-agents/schema.d.ts +0 -9
- package/src/ai/set-up-ai-agents/schema.json +0 -34
- package/src/ai/set-up-ai-agents/set-up-ai-agents.d.ts +0 -11
- package/src/ai/set-up-ai-agents/set-up-ai-agents.d.ts.map +0 -1
- package/src/ai/set-up-ai-agents/set-up-ai-agents.js +0 -213
- package/src/ai/utils.d.ts +0 -20
- package/src/ai/utils.d.ts.map +0 -1
- package/src/ai/utils.js +0 -187
- package/src/command-line/configure-ai-agents/command-object.d.ts +0 -9
- package/src/command-line/configure-ai-agents/command-object.d.ts.map +0 -1
- package/src/command-line/configure-ai-agents/command-object.js +0 -32
- package/src/command-line/configure-ai-agents/configure-ai-agents.d.ts +0 -4
- package/src/command-line/configure-ai-agents/configure-ai-agents.d.ts.map +0 -1
- package/src/command-line/configure-ai-agents/configure-ai-agents.js +0 -231
- package/src/command-line/init/ai-agent-prompts.d.ts +0 -3
- package/src/command-line/init/ai-agent-prompts.d.ts.map +0 -1
- package/src/command-line/init/ai-agent-prompts.js +0 -28
- package/src/utils/provenance.d.ts +0 -48
- package/src/utils/provenance.d.ts.map +0 -1
- package/src/utils/provenance.js +0 -84
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"create-task-graph.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/create-task-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAMhF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAOvE,qBAAa,YAAY;IAQrB,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAR/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;IAC1C,QAAQ,CAAC,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAM;IAC5C,QAAQ,CAAC,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAM;IACtD,QAAQ,CAAC,sBAAsB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAM;IAChE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAW;gBAGvB,uBAAuB,EAAE,kBAAkB,EAC3C,YAAY,EAAE,YAAY;IAY7C,YAAY,CACV,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,MAAM,EAAE,EACjB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,uBAAuB,EAAE,OAAO,GAC/B,MAAM,EAAE;IAoFX,WAAW,CACT,IAAI,EAAE,IAAI,EACV,+BAA+B,EAAE,MAAM,EACvC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,GAChB,IAAI;
|
1
|
+
{"version":3,"file":"create-task-graph.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/create-task-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAMhF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAOvE,qBAAa,YAAY;IAQrB,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAR/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAqB;IAC1C,QAAQ,CAAC,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAM;IAC5C,QAAQ,CAAC,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAM;IACtD,QAAQ,CAAC,sBAAsB,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAM;IAChE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAW;gBAGvB,uBAAuB,EAAE,kBAAkB,EAC3C,YAAY,EAAE,YAAY;IAY7C,YAAY,CACV,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,MAAM,EAAE,EACjB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,uBAAuB,EAAE,OAAO,GAC/B,MAAM,EAAE;IAoFX,WAAW,CACT,IAAI,EAAE,IAAI,EACV,+BAA+B,EAAE,MAAM,EACvC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,GAChB,IAAI;IAgDP,OAAO,CAAC,+BAA+B;IA2BvC,OAAO,CAAC,4BAA4B;IAmDpC,OAAO,CAAC,2BAA2B;IAyFnC,OAAO,CAAC,eAAe;IAOvB,UAAU,CACR,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,uBAAuB,EAChC,MAAM,EAAE,MAAM,EACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,EACzC,SAAS,EAAE,MAAM,GAChB,IAAI;IAyCP,oBAAoB,CAClB,OAAO,EAAE,uBAAuB,EAChC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,GAAG,SAAS;CASpC;AAED,wBAAgB,eAAe,CAC7B,YAAY,EAAE,YAAY,EAC1B,uBAAuB,EAAE,kBAAkB,EAC3C,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,EAAE,MAAM,EAAE,EACjB,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,EACjB,uBAAuB,GAAE,OAAe,GACvC,SAAS,CAgBX;AAED,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,cAAc,GAAG,SAAS,GACnC,kBAAkB,CAOpB;AAsBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,QAoBvE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,EACvC,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,IAAI,GAAE,GAAG,CAAC,MAAM,CAAa,GAC5B,MAAM,EAAE,CAkBV"}
|
@@ -89,7 +89,9 @@ class ProcessTasks {
|
|
89
89
|
this.seen.add(seenKey);
|
90
90
|
const dependencyConfigs = (0, utils_1.getDependencyConfigs)({ project: task.target.project, target: task.target.target }, this.extraTargetDependencies, this.projectGraph, this.allTargetNames);
|
91
91
|
for (const dependencyConfig of dependencyConfigs) {
|
92
|
-
const taskOverrides =
|
92
|
+
const taskOverrides = dependencyConfig.params === 'forward'
|
93
|
+
? overrides
|
94
|
+
: { __overrides_unparsed__: [] };
|
93
95
|
if (dependencyConfig.projects) {
|
94
96
|
this.processTasksForMultipleProjects(dependencyConfig, configuration, task, taskOverrides, overrides);
|
95
97
|
}
|
@@ -291,22 +293,6 @@ function getNonDummyDeps(currentTask, dependencies, cycles, seen = new Set()) {
|
|
291
293
|
return [currentTask];
|
292
294
|
}
|
293
295
|
}
|
294
|
-
function createTaskOverrides(dependencyConfig, cliOverrides, sourceTask, projectGraph) {
|
295
|
-
const optionsToForward = {};
|
296
|
-
if (dependencyConfig.options === 'forward') {
|
297
|
-
const sourceTargetConfig = projectGraph.nodes[sourceTask.target.project].data.targets?.[sourceTask.target.target];
|
298
|
-
if (sourceTargetConfig?.options) {
|
299
|
-
Object.assign(optionsToForward, sourceTargetConfig.options);
|
300
|
-
}
|
301
|
-
if (sourceTask.target.configuration &&
|
302
|
-
sourceTargetConfig?.configurations?.[sourceTask.target.configuration]) {
|
303
|
-
Object.assign(optionsToForward, sourceTargetConfig.configurations[sourceTask.target.configuration]);
|
304
|
-
}
|
305
|
-
}
|
306
|
-
return dependencyConfig.params === 'forward'
|
307
|
-
? { ...optionsToForward, ...cliOverrides }
|
308
|
-
: { ...optionsToForward, __overrides_unparsed__: [] };
|
309
|
-
}
|
310
296
|
function createTaskId(project, target, configuration) {
|
311
297
|
let id = `${project}:${target}`;
|
312
298
|
if (configuration) {
|
package/src/tasks-runner/fork.js
CHANGED
@@ -20,52 +20,26 @@ const childProcess = (0, child_process_1.fork)(script, {
|
|
20
20
|
const pseudoIPC = new pseudo_ipc_1.PseudoIPCClient(pseudoIPCPath);
|
21
21
|
pseudoIPC.onMessageFromParent(forkId, (message) => {
|
22
22
|
childProcess.send(message);
|
23
|
-
}, () => {
|
24
|
-
// IPC connection closed
|
25
|
-
cleanup();
|
26
|
-
process.exit(0);
|
27
|
-
}, () => {
|
28
|
-
// IPC connection error
|
29
|
-
cleanup();
|
30
|
-
process.exit(0);
|
31
23
|
});
|
32
24
|
pseudoIPC.notifyChildIsReady(forkId);
|
33
25
|
process.on('message', (message) => {
|
34
26
|
pseudoIPC.sendMessageToParent(message);
|
35
27
|
});
|
36
28
|
childProcess.on('exit', (code) => {
|
37
|
-
|
29
|
+
pseudoIPC.close();
|
38
30
|
process.exit(code);
|
39
31
|
});
|
40
|
-
let isCleaningUp = false;
|
41
|
-
function cleanup() {
|
42
|
-
if (isCleaningUp) {
|
43
|
-
return;
|
44
|
-
}
|
45
|
-
isCleaningUp = true;
|
46
|
-
// Kill child process if still running
|
47
|
-
if (childProcess && !childProcess.killed) {
|
48
|
-
childProcess.kill('SIGTERM');
|
49
|
-
}
|
50
|
-
// Close IPC connection
|
51
|
-
try {
|
52
|
-
pseudoIPC.close();
|
53
|
-
}
|
54
|
-
catch {
|
55
|
-
// Ignore errors when closing, connection might already be broken
|
56
|
-
}
|
57
|
-
}
|
58
32
|
// Terminate the child process when exiting
|
59
33
|
process.on('exit', () => {
|
60
|
-
|
34
|
+
childProcess.kill();
|
61
35
|
});
|
62
36
|
process.on('SIGINT', () => {
|
63
|
-
|
37
|
+
childProcess.kill('SIGTERM');
|
64
38
|
process.exit((0, exit_codes_1.signalToCode)('SIGINT'));
|
65
39
|
});
|
66
40
|
process.on('SIGTERM', () => {
|
67
|
-
|
41
|
+
childProcess.kill('SIGTERM');
|
68
42
|
});
|
69
43
|
process.on('SIGHUP', () => {
|
70
|
-
|
44
|
+
childProcess.kill('SIGTERM');
|
71
45
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"life-cycle.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE3E,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAErD,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB;
|
1
|
+
{"version":3,"file":"life-cycle.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/life-cycle.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"task-history-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/task-history-life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAM/C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAQ3E,wBAAgB,wBAAwB,IACpC,oBAAoB,GACpB,0BAA0B,
|
1
|
+
{"version":3,"file":"task-history-life-cycle.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/tasks-runner/life-cycles/task-history-life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAM/C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAQ3E,wBAAgB,wBAAwB,IACpC,oBAAoB,GACpB,0BAA0B,CAS7B;AAED,qBAAa,oBAAqB,YAAW,SAAS;IACpD,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,QAAQ,CAA8B;IAC9C,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,UAAU,CAAW;;IAW7B,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI;IAMzB,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE;IAgBlC,UAAU;IAgBhB,sBAAsB;CAsBvB"}
|
@@ -11,9 +11,10 @@ const task_history_life_cycle_old_1 = require("./task-history-life-cycle-old");
|
|
11
11
|
let tasksHistoryLifeCycle;
|
12
12
|
function getTasksHistoryLifeCycle() {
|
13
13
|
if (!tasksHistoryLifeCycle) {
|
14
|
-
tasksHistoryLifeCycle =
|
15
|
-
|
16
|
-
|
14
|
+
tasksHistoryLifeCycle =
|
15
|
+
process.env.NX_DISABLE_DB !== 'true' && !native_1.IS_WASM
|
16
|
+
? new TaskHistoryLifeCycle()
|
17
|
+
: new task_history_life_cycle_old_1.LegacyTaskHistoryLifeCycle();
|
17
18
|
}
|
18
19
|
return tasksHistoryLifeCycle;
|
19
20
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAGpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAa/E,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAkBrD,OAAO,EAEL,SAAS,EACT,UAAU,EACV,WAAW,EACZ,MAAM,cAAc,CAAC;AAkBtB,OAAO,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;
|
1
|
+
{"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
@@ -79,6 +79,8 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
|
|
79
79
|
let appLifeCycle;
|
80
80
|
const isRunOne = initiatingProject != null;
|
81
81
|
const pinnedTasks = [];
|
82
|
+
const taskText = tasks.length === 1 ? 'task' : 'tasks';
|
83
|
+
const projectText = projectNames.length === 1 ? 'project' : 'projects';
|
82
84
|
let titleText = '';
|
83
85
|
if (isRunOne) {
|
84
86
|
const mainTaskId = initiatingTasks[0].id;
|
@@ -87,23 +89,18 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
|
|
87
89
|
if (mainContinuousDependencies.length > 0) {
|
88
90
|
pinnedTasks.push(mainContinuousDependencies[0]);
|
89
91
|
}
|
90
|
-
const [, target] = mainTaskId.split(':');
|
91
|
-
titleText =
|
92
|
+
const [project, target] = mainTaskId.split(':');
|
93
|
+
titleText = `${target} ${project}`;
|
92
94
|
if (tasks.length > 1) {
|
93
|
-
|
94
|
-
const dependentTaskText = dependentTasksCount === 1 ? 'other' : 'others';
|
95
|
-
titleText += `, and ${dependentTasksCount} ${dependentTaskText} they depend on`;
|
95
|
+
titleText += `, and ${tasks.length - 1} requisite ${taskText}`;
|
96
96
|
}
|
97
97
|
}
|
98
98
|
else {
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
titleText = `Running ${mainTasksCount} ${targetText} ${mainTaskText}`;
|
99
|
+
titleText =
|
100
|
+
nxArgs.targets.join(', ') +
|
101
|
+
` for ${projectNames.length} ${projectText}`;
|
103
102
|
if (tasks.length > projectNames.length) {
|
104
|
-
|
105
|
-
const dependentTaskText = dependentTasksCount === 1 ? 'other' : 'others';
|
106
|
-
titleText += `, and ${dependentTasksCount} ${dependentTaskText} they depend on`;
|
103
|
+
titleText += `, and ${tasks.length - projectNames.length} requisite ${taskText}`;
|
107
104
|
}
|
108
105
|
}
|
109
106
|
let resolveRenderIsDonePromise;
|
@@ -289,34 +286,27 @@ function createTaskGraphAndRunValidations(projectGraph, extraTargetDependencies,
|
|
289
286
|
}
|
290
287
|
async function runCommand(projectsToRun, currentProjectGraph, { nxJson }, nxArgs, overrides, initiatingProject, extraTargetDependencies, extraOptions) {
|
291
288
|
const status = await (0, handle_errors_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
|
292
|
-
const id = (0, native_1.hashArray)([...process.argv, Date.now().toString()]);
|
293
289
|
await (0, tasks_execution_hooks_1.runPreTasksExecution)({
|
294
|
-
id,
|
295
290
|
workspaceRoot: workspace_root_1.workspaceRoot,
|
296
291
|
nxJsonConfiguration: nxJson,
|
297
292
|
argv: process.argv,
|
298
293
|
});
|
299
|
-
const startTime = Date.now();
|
300
294
|
const { taskResults, completed } = await runCommandForTasks(projectsToRun, currentProjectGraph, { nxJson }, {
|
301
295
|
...nxArgs,
|
302
296
|
skipNxCache: nxArgs.skipNxCache ||
|
303
297
|
process.env.NX_SKIP_NX_CACHE === 'true' ||
|
304
298
|
process.env.NX_DISABLE_NX_CACHE === 'true',
|
305
299
|
}, overrides, initiatingProject, extraTargetDependencies, extraOptions);
|
306
|
-
const endTime = Date.now();
|
307
300
|
const exitCode = !completed
|
308
301
|
? (0, exit_codes_1.signalToCode)('SIGINT')
|
309
302
|
: Object.values(taskResults).some((taskResult) => taskResult.status === 'failure' || taskResult.status === 'skipped')
|
310
303
|
? 1
|
311
304
|
: 0;
|
312
305
|
await (0, tasks_execution_hooks_1.runPostTasksExecution)({
|
313
|
-
id,
|
314
306
|
taskResults,
|
315
307
|
workspaceRoot: workspace_root_1.workspaceRoot,
|
316
308
|
nxJsonConfiguration: nxJson,
|
317
309
|
argv: process.argv,
|
318
|
-
startTime,
|
319
|
-
endTime,
|
320
310
|
});
|
321
311
|
return exitCode;
|
322
312
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"task-orchestrator.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"task-orchestrator.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
@@ -505,9 +505,8 @@ class TaskOrchestrator {
|
|
505
505
|
if (this.tuiEnabled) {
|
506
506
|
this.options.lifeCycle.setTaskStatus(task.id, 9 /* NativeTaskStatus.Stopped */);
|
507
507
|
}
|
508
|
-
|
509
|
-
|
510
|
-
}
|
508
|
+
this.runningTasksService.removeRunningTask(task.id);
|
509
|
+
this.runningContinuousTasks.delete(task.id);
|
511
510
|
});
|
512
511
|
await this.scheduleNextTasksAndReleaseThreads();
|
513
512
|
if (this.initializingTaskIds.has(task.id)) {
|
@@ -668,15 +667,13 @@ class TaskOrchestrator {
|
|
668
667
|
...Array.from(this.runningContinuousTasks).map(async ([taskId, t]) => {
|
669
668
|
try {
|
670
669
|
await t.kill();
|
671
|
-
this.options.lifeCycle.setTaskStatus
|
670
|
+
this.options.lifeCycle.setTaskStatus(taskId, 9 /* NativeTaskStatus.Stopped */);
|
672
671
|
}
|
673
672
|
catch (e) {
|
674
673
|
console.error(`Unable to terminate ${taskId}\nError:`, e);
|
675
674
|
}
|
676
675
|
finally {
|
677
|
-
|
678
|
-
this.runningTasksService.removeRunningTask(taskId);
|
679
|
-
}
|
676
|
+
this.runningTasksService.removeRunningTask(taskId);
|
680
677
|
}
|
681
678
|
}),
|
682
679
|
...Array.from(this.runningRunCommandsTasks).map(async ([taskId, t]) => {
|
@@ -703,7 +700,7 @@ class TaskOrchestrator {
|
|
703
700
|
const runningTask = this.runningContinuousTasks.get(taskId);
|
704
701
|
if (runningTask) {
|
705
702
|
runningTask.kill();
|
706
|
-
this.options.lifeCycle.setTaskStatus
|
703
|
+
this.options.lifeCycle.setTaskStatus(taskId, 9 /* NativeTaskStatus.Stopped */);
|
707
704
|
}
|
708
705
|
}
|
709
706
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,uCAAuC,CAAC;AAe/C,MAAM,MAAM,gCAAgC,GAAG,sBAAsB,GAAG;IACtE,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACxD,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAAC,EAC5E,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,MAAM,EAAE,GACvB,gCAAgC,EAAE,GAAG,SAAS,CAehD;AAED,wBAAgB,mCAAmC,CACjD,UAAU,EAAE,MAAM,GAAG,sBAAsB,EAC3C,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,YAAY,EACnB,cAAc,EAAE,MAAM,EAAE,GACvB,gCAAgC,EAAE,CASpC;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,sBAAsB,EACxC,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,YAAY,GAClB,gCAAgC,CAalC;AAED,wBAAgB,iCAAiC,CAC/C,sBAAsB,EAAE,MAAM,GAAG,sBAAsB,EACvD,KAAK,EAAE,YAAY,GAClB,sBAAsB,CAwBxB;AA4BD,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,gCAAgC,EAClD,cAAc,EAAE,MAAM,EAAE,GACvB,gCAAgC,EAAE,CAepC;AAED,wBAAgB,oCAAoC,CAClD,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAChD;IAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
@@ -106,9 +106,7 @@ function expandWildcardTargetConfiguration(dependencyConfig, allTargetNames) {
|
|
106
106
|
}
|
107
107
|
function readProjectAndTargetFromTargetString(targetString, projects) {
|
108
108
|
// Support for both `project:target` and `target:with:colons` syntax
|
109
|
-
const [maybeProject, ...segments] = (0, split_target_1.
|
110
|
-
nodes: projects,
|
111
|
-
});
|
109
|
+
const [maybeProject, ...segments] = (0, split_target_1.splitByColons)(targetString);
|
112
110
|
if (!segments.length) {
|
113
111
|
// if no additional segments are provided, then the string references
|
114
112
|
// a target of the same project
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"nx-console-prompt.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-console-prompt.ts"],"names":[],"mappings":"AASA,wBAAsB,wBAAwB,
|
1
|
+
{"version":3,"file":"nx-console-prompt.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-console-prompt.ts"],"names":[],"mappings":"AASA,wBAAsB,wBAAwB,kBAmB7C"}
|
@@ -9,14 +9,6 @@ async function ensureNxConsoleInstalled() {
|
|
9
9
|
const preferences = new native_1.NxConsolePreferences((0, os_1.homedir)());
|
10
10
|
let setting = preferences.getAutoInstallPreference();
|
11
11
|
const canInstallConsole = (0, native_1.canInstallNxConsole)();
|
12
|
-
// If user previously opted in but extension is not installed,
|
13
|
-
// they must have manually uninstalled it - respect that choice
|
14
|
-
if (setting === true && canInstallConsole) {
|
15
|
-
// User had auto-install enabled but extension is missing
|
16
|
-
// This means they manually uninstalled it
|
17
|
-
preferences.setAutoInstallPreference(false);
|
18
|
-
return;
|
19
|
-
}
|
20
12
|
// Noop
|
21
13
|
if (!canInstallConsole) {
|
22
14
|
return;
|
@@ -104,9 +104,5 @@ export declare function readModulePackageJson(moduleSpecifier: string, requirePa
|
|
104
104
|
packageJson: PackageJson;
|
105
105
|
path: string;
|
106
106
|
};
|
107
|
-
export declare function installPackageToTmp(pkg: string, requiredVersion: string): {
|
108
|
-
tempDir: string;
|
109
|
-
cleanup: () => void;
|
110
|
-
};
|
111
107
|
export {};
|
112
108
|
//# sourceMappingURL=package-json.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACpB,MAAM,uCAAuC,CAAC;AAI/C,OAAO,
|
1
|
+
{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":"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"}
|
@@ -8,15 +8,12 @@ exports.getTagsFromPackageJson = getTagsFromPackageJson;
|
|
8
8
|
exports.readTargetsFromPackageJson = readTargetsFromPackageJson;
|
9
9
|
exports.readModulePackageJsonWithoutFallbacks = readModulePackageJsonWithoutFallbacks;
|
10
10
|
exports.readModulePackageJson = readModulePackageJson;
|
11
|
-
exports.installPackageToTmp = installPackageToTmp;
|
12
11
|
const fs_1 = require("fs");
|
13
12
|
const path_1 = require("path");
|
14
13
|
const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
|
15
14
|
const fileutils_1 = require("./fileutils");
|
16
15
|
const installation_directory_1 = require("./installation-directory");
|
17
16
|
const package_manager_1 = require("./package-manager");
|
18
|
-
const tmp_1 = require("tmp");
|
19
|
-
const child_process_1 = require("child_process");
|
20
17
|
function normalizePackageGroup(packageGroup) {
|
21
18
|
return Array.isArray(packageGroup)
|
22
19
|
? packageGroup.map((x) => typeof x === 'string' ? { package: x, version: '*' } : x)
|
@@ -61,7 +58,7 @@ function buildTargetFromScript(script, scripts = {}, packageManagerCommand) {
|
|
61
58
|
}
|
62
59
|
let packageManagerCommand;
|
63
60
|
function getMetadataFromPackageJson(packageJson, isInPackageManagerWorkspaces) {
|
64
|
-
const { scripts, nx, description, name, exports, main
|
61
|
+
const { scripts, nx, description, name, exports, main } = packageJson;
|
65
62
|
const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
|
66
63
|
return {
|
67
64
|
targetGroups: {
|
@@ -70,7 +67,6 @@ function getMetadataFromPackageJson(packageJson, isInPackageManagerWorkspaces) {
|
|
70
67
|
description,
|
71
68
|
js: {
|
72
69
|
packageName: name,
|
73
|
-
packageVersion: version,
|
74
70
|
packageExports: exports,
|
75
71
|
packageMain: main,
|
76
72
|
isInPackageManagerWorkspaces,
|
@@ -195,50 +191,3 @@ function readModulePackageJson(moduleSpecifier, requirePaths = (0, installation_
|
|
195
191
|
path: packageJsonPath,
|
196
192
|
};
|
197
193
|
}
|
198
|
-
function installPackageToTmp(pkg, requiredVersion) {
|
199
|
-
const { dir: tempDir, cleanup } = (0, package_manager_1.createTempNpmDirectory)?.() ?? {
|
200
|
-
dir: (0, tmp_1.dirSync)().name,
|
201
|
-
cleanup: () => { },
|
202
|
-
};
|
203
|
-
console.log(`Fetching ${pkg}...`);
|
204
|
-
const packageManager = (0, package_manager_1.detectPackageManager)();
|
205
|
-
const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
|
206
|
-
generatePackageManagerFiles(tempDir, packageManager);
|
207
|
-
const preInstallCommand = (0, package_manager_1.getPackageManagerCommand)(packageManager).preInstall;
|
208
|
-
if (preInstallCommand) {
|
209
|
-
// ensure package.json and repo in tmp folder is set to a proper package manager state
|
210
|
-
(0, child_process_1.execSync)(preInstallCommand, {
|
211
|
-
cwd: tempDir,
|
212
|
-
stdio: isVerbose ? 'inherit' : 'ignore',
|
213
|
-
windowsHide: false,
|
214
|
-
});
|
215
|
-
}
|
216
|
-
const pmCommands = (0, package_manager_1.getPackageManagerCommand)(packageManager);
|
217
|
-
let addCommand = pmCommands.addDev;
|
218
|
-
if (packageManager === 'pnpm') {
|
219
|
-
addCommand = 'pnpm add -D'; // we need to ensure that we are not using workspace command
|
220
|
-
}
|
221
|
-
(0, child_process_1.execSync)(`${addCommand} ${pkg}@${requiredVersion} ${pmCommands.ignoreScriptsFlag ?? ''}`, {
|
222
|
-
cwd: tempDir,
|
223
|
-
stdio: isVerbose ? 'inherit' : 'ignore',
|
224
|
-
windowsHide: false,
|
225
|
-
});
|
226
|
-
return {
|
227
|
-
tempDir,
|
228
|
-
cleanup,
|
229
|
-
};
|
230
|
-
}
|
231
|
-
/**
|
232
|
-
* Generates necessary files needed for the package manager to work
|
233
|
-
* and for the node_modules to be accessible.
|
234
|
-
*/
|
235
|
-
function generatePackageManagerFiles(root, packageManager = (0, package_manager_1.detectPackageManager)()) {
|
236
|
-
const [pmMajor] = (0, package_manager_1.getPackageManagerVersion)(packageManager).split('.');
|
237
|
-
switch (packageManager) {
|
238
|
-
case 'yarn':
|
239
|
-
if (+pmMajor >= 2) {
|
240
|
-
(0, fs_1.writeFileSync)((0, path_1.join)(root, '.yarnrc.yml'), 'nodeLinker: node-modules\nenableScripts: false');
|
241
|
-
}
|
242
|
-
break;
|
243
|
-
}
|
244
|
-
}
|
@@ -13,7 +13,6 @@ export interface PackageManagerCommands {
|
|
13
13
|
run: (script: string, args?: string) => string;
|
14
14
|
getRegistryUrl?: string;
|
15
15
|
publish: (packageRoot: string, registry: string, registryConfigKey: string, tag: string) => string;
|
16
|
-
ignoreScriptsFlag?: string;
|
17
16
|
}
|
18
17
|
/**
|
19
18
|
* Detects which package manager is used in the workspace based on the lock file.
|
@@ -81,12 +80,8 @@ export declare function copyPackageManagerConfigurationFiles(root: string, desti
|
|
81
80
|
* For cases where you'd want to install packages that require an `.npmrc` set up,
|
82
81
|
* this function looks up for the nearest `.npmrc` (if exists) and copies it over to the
|
83
82
|
* temp directory.
|
84
|
-
*
|
85
|
-
* @param skipCopy - If true, skips copying package manager configuration files to the temporary directory.
|
86
|
-
* This is useful when creating a workspace from scratch (e.g., in create-nx-workspace)
|
87
|
-
* where no existing configuration files are available to copy.
|
88
83
|
*/
|
89
|
-
export declare function createTempNpmDirectory(
|
84
|
+
export declare function createTempNpmDirectory(): {
|
90
85
|
dir: string;
|
91
86
|
cleanup: () => Promise<void>;
|
92
87
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"AA+BA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;AAE7D,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAE/C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,CACP,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,MAAM,KACR,MAAM,CAAC;
|
1
|
+
{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-manager.ts"],"names":[],"mappings":"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"}
|
@@ -95,7 +95,6 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
|
|
95
95
|
yarnVersion = 'latest';
|
96
96
|
useBerry = true;
|
97
97
|
}
|
98
|
-
// new versions of yarn only support ignoring scripts via .yarnrc.yml
|
99
98
|
return {
|
100
99
|
preInstall: `yarn set version ${yarnVersion}`,
|
101
100
|
install: 'yarn',
|
@@ -109,14 +108,13 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
|
|
109
108
|
addDev: useBerry ? 'yarn add -D' : 'yarn add -D -W',
|
110
109
|
rm: 'yarn remove',
|
111
110
|
exec: 'yarn',
|
112
|
-
dlx: useBerry ? 'yarn dlx' : '
|
111
|
+
dlx: useBerry ? 'yarn dlx' : 'yarn',
|
113
112
|
run: (script, args) => `yarn ${script}${args ? ` ${args}` : ''}`,
|
114
113
|
list: useBerry ? 'yarn info --name-only' : 'yarn list',
|
115
114
|
getRegistryUrl: useBerry
|
116
115
|
? 'yarn config get npmRegistryServer'
|
117
116
|
: 'yarn config get registry',
|
118
117
|
publish: (packageRoot, registry, registryConfigKey, tag) => `npm publish "${packageRoot}" --json --"${registryConfigKey}=${registry}" --tag=${tag}`,
|
119
|
-
ignoreScriptsFlag: useBerry ? undefined : `--ignore-scripts`,
|
120
118
|
};
|
121
119
|
},
|
122
120
|
pnpm: () => {
|
@@ -152,7 +150,6 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
|
|
152
150
|
list: 'pnpm ls --depth 100',
|
153
151
|
getRegistryUrl: 'pnpm config get registry',
|
154
152
|
publish: (packageRoot, registry, registryConfigKey, tag) => `pnpm publish "${packageRoot}" --json --"${allowRegistryConfigKey ? registryConfigKey : 'registry'}=${registry}" --tag=${tag} --no-git-checks`,
|
155
|
-
ignoreScriptsFlag: '--ignore-scripts',
|
156
153
|
};
|
157
154
|
},
|
158
155
|
npm: () => {
|
@@ -171,7 +168,6 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
|
|
171
168
|
list: 'npm ls',
|
172
169
|
getRegistryUrl: 'npm config get registry',
|
173
170
|
publish: (packageRoot, registry, registryConfigKey, tag) => `npm publish "${packageRoot}" --json --"${registryConfigKey}=${registry}" --tag=${tag}`,
|
174
|
-
ignoreScriptsFlag: '--ignore-scripts',
|
175
171
|
};
|
176
172
|
},
|
177
173
|
bun: () => {
|
@@ -189,7 +185,6 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
|
|
189
185
|
list: 'bun pm ls',
|
190
186
|
// Unlike npm, bun publish does not support a custom registryConfigKey option
|
191
187
|
publish: (packageRoot, registry, registryConfigKey, tag) => `bun publish --cwd="${packageRoot}" --json --registry="${registry}" --tag=${tag}`,
|
192
|
-
ignoreScriptsFlag: '--ignore-scripts',
|
193
188
|
};
|
194
189
|
},
|
195
190
|
};
|
@@ -339,19 +334,13 @@ function copyPackageManagerConfigurationFiles(root, destination) {
|
|
339
334
|
* For cases where you'd want to install packages that require an `.npmrc` set up,
|
340
335
|
* this function looks up for the nearest `.npmrc` (if exists) and copies it over to the
|
341
336
|
* temp directory.
|
342
|
-
*
|
343
|
-
* @param skipCopy - If true, skips copying package manager configuration files to the temporary directory.
|
344
|
-
* This is useful when creating a workspace from scratch (e.g., in create-nx-workspace)
|
345
|
-
* where no existing configuration files are available to copy.
|
346
337
|
*/
|
347
|
-
function createTempNpmDirectory(
|
338
|
+
function createTempNpmDirectory() {
|
348
339
|
const dir = (0, tmp_1.dirSync)().name;
|
349
340
|
// A package.json is needed for pnpm pack and for .npmrc to resolve
|
350
341
|
(0, fileutils_1.writeJsonFile)(`${dir}/package.json`, {});
|
351
|
-
|
352
|
-
|
353
|
-
copyPackageManagerConfigurationFiles(isNonJs ? (0, installation_directory_1.getNxInstallationPath)(workspace_root_1.workspaceRoot) : workspace_root_1.workspaceRoot, dir);
|
354
|
-
}
|
342
|
+
const isNonJs = !(0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package.json'));
|
343
|
+
copyPackageManagerConfigurationFiles(isNonJs ? (0, installation_directory_1.getNxInstallationPath)(workspace_root_1.workspaceRoot) : workspace_root_1.workspaceRoot, dir);
|
355
344
|
const cleanup = async () => {
|
356
345
|
try {
|
357
346
|
await (0, promises_1.rm)(dir, { recursive: true, force: true });
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"split-target.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/split-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
1
|
+
{"version":3,"file":"split-target.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/split-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,wBAAgB,WAAW,CACzB,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,YAAY,GACzB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAY5D;AAuBD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAiBrB,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CACtC"}
|
@@ -2,53 +2,13 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.splitTarget = splitTarget;
|
4
4
|
exports.splitByColons = splitByColons;
|
5
|
-
function findMatchingSegments(s, projectGraph) {
|
6
|
-
const projectNames = Object.keys(projectGraph.nodes);
|
7
|
-
// return project if matching
|
8
|
-
if (projectNames.includes(s)) {
|
9
|
-
return [s];
|
10
|
-
}
|
11
|
-
if (!s.includes(':')) {
|
12
|
-
return;
|
13
|
-
}
|
14
|
-
for (const projectName of projectNames) {
|
15
|
-
for (const [targetName, targetConfig] of Object.entries(projectGraph.nodes[projectName].data.targets || {})) {
|
16
|
-
if (s === `${projectName}:${targetName}`) {
|
17
|
-
return [projectName, targetName];
|
18
|
-
}
|
19
|
-
if (targetConfig.configurations) {
|
20
|
-
for (const configurationName of Object.keys(targetConfig.configurations)) {
|
21
|
-
if (s === `${projectName}:${targetName}:${configurationName}`) {
|
22
|
-
return [projectName, targetName, configurationName];
|
23
|
-
}
|
24
|
-
}
|
25
|
-
}
|
26
|
-
}
|
27
|
-
}
|
28
|
-
}
|
29
5
|
function splitTarget(s, projectGraph) {
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
// if only configuration cannot be matched, try to match project and target
|
37
|
-
const configuration = segments[segments.length - 1];
|
38
|
-
const rest = s.slice(0, -(configuration.length + 1));
|
39
|
-
const matchingSegments = findMatchingSegments(rest, projectGraph);
|
40
|
-
if (matchingSegments && matchingSegments.length === 2) {
|
41
|
-
return [...matchingSegments, configuration];
|
42
|
-
}
|
43
|
-
// no project-target pair found, do the naive matching
|
44
|
-
const validTargets = projectGraph.nodes[project]
|
45
|
-
? projectGraph.nodes[project].data.targets
|
46
|
-
: {};
|
47
|
-
const validTargetNames = new Set(Object.keys(validTargets ?? {}));
|
48
|
-
return [project, ...groupJointSegments(segments, validTargetNames)];
|
49
|
-
}
|
50
|
-
// we don't know what to do with the string, return as is
|
51
|
-
return [s];
|
6
|
+
let [project, ...segments] = splitByColons(s);
|
7
|
+
const validTargets = projectGraph.nodes[project]
|
8
|
+
? projectGraph.nodes[project].data.targets
|
9
|
+
: {};
|
10
|
+
const validTargetNames = new Set(Object.keys(validTargets ?? {}));
|
11
|
+
return [project, ...groupJointSegments(segments, validTargetNames)];
|
52
12
|
}
|
53
13
|
function groupJointSegments(segments, validTargetNames) {
|
54
14
|
for (let endingSegmentIdx = segments.length; endingSegmentIdx > 0; endingSegmentIdx--) {
|