nx 14.1.9 → 14.2.0-beta.2
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/CHANGELOG.md +1 -1
- package/bin/{init.d.ts → compute-project-graph.d.ts} +0 -0
- package/bin/{init.js → compute-project-graph.js} +1 -1
- package/bin/compute-project-graph.js.map +1 -0
- package/bin/nx.js +9 -1
- package/bin/nx.js.map +1 -1
- package/bin/run-executor.js +15 -2
- package/bin/run-executor.js.map +1 -1
- package/migrations.json +6 -0
- package/package.json +18 -8
- package/presets/core.json +13 -8
- package/presets/npm.json +13 -7
- package/src/adapter/compat.js +4 -4
- package/src/adapter/compat.js.map +1 -1
- package/src/adapter/ngcli-adapter.d.ts +4 -4
- package/src/adapter/ngcli-adapter.js +3 -0
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/affected.js +8 -2
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/connect-to-nx-cloud.js +3 -3
- package/src/command-line/connect-to-nx-cloud.js.map +1 -1
- package/src/command-line/dep-graph.js +7 -7
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/format.d.ts +2 -2
- package/src/command-line/format.js +4 -3
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/generate.js +137 -45
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/init.d.ts +1 -0
- package/src/command-line/init.js +39 -0
- package/src/command-line/init.js.map +1 -0
- package/src/command-line/lint.js +2 -2
- package/src/command-line/lint.js.map +1 -1
- package/src/command-line/list.js +2 -2
- package/src/command-line/list.js.map +1 -1
- package/src/command-line/migrate.js +9 -0
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +60 -9
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/print-affected.js +10 -10
- package/src/command-line/print-affected.js.map +1 -1
- package/src/command-line/read-environment.js +3 -3
- package/src/command-line/read-environment.js.map +1 -1
- package/src/command-line/report.js +3 -3
- package/src/command-line/report.js.map +1 -1
- package/src/command-line/run-many.js +2 -2
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +4 -6
- package/src/command-line/run-one.js.map +1 -1
- package/src/command-line/run.d.ts +2 -2
- package/src/command-line/run.js.map +1 -1
- package/src/command-line/workspace-generators.js +2 -2
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/config/configuration.d.ts +11 -0
- package/src/config/configuration.js +26 -0
- package/src/config/configuration.js.map +1 -0
- package/src/config/misc-interfaces.d.ts +3 -3
- package/src/config/workspace-json-project-json.d.ts +8 -4
- package/src/config/workspaces.d.ts +11 -7
- package/src/config/workspaces.js +29 -23
- package/src/config/workspaces.js.map +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/daemon/client/client.js +3 -3
- package/src/daemon/client/client.js.map +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js +3 -3
- package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/daemon/server/server.js +7 -7
- package/src/daemon/server/server.js.map +1 -1
- package/src/daemon/server/shutdown-utils.js +2 -2
- package/src/daemon/server/shutdown-utils.js.map +1 -1
- package/src/daemon/server/watcher.js +10 -10
- package/src/daemon/server/watcher.js.map +1 -1
- package/src/generators/utils/project-configuration.d.ts +3 -3
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/file-hasher-base.js +4 -4
- package/src/hasher/file-hasher-base.js.map +1 -1
- package/src/hasher/file-hasher.js +2 -2
- package/src/hasher/file-hasher.js.map +1 -1
- package/src/hasher/git-based-file-hasher.js +5 -5
- package/src/hasher/git-based-file-hasher.js.map +1 -1
- package/src/hasher/hasher.js +4 -4
- package/src/hasher/hasher.js.map +1 -1
- package/src/hasher/node-based-file-hasher.js +6 -6
- package/src/hasher/node-based-file-hasher.js.map +1 -1
- package/src/migrations/update-14-2-0/remove-default-collection.d.ts +2 -0
- package/src/migrations/update-14-2-0/remove-default-collection.js +19 -0
- package/src/migrations/update-14-2-0/remove-default-collection.js.map +1 -0
- package/src/project-graph/affected/affected-project-graph.d.ts +2 -2
- package/src/project-graph/affected/affected-project-graph.js +2 -1
- package/src/project-graph/affected/affected-project-graph.js.map +1 -1
- package/src/project-graph/build-nodes/npm-packages.js +2 -2
- package/src/project-graph/build-nodes/npm-packages.js.map +1 -1
- package/src/project-graph/build-nodes/workspace-projects.js +2 -2
- package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/project-graph/build-project-graph.d.ts +2 -2
- package/src/project-graph/build-project-graph.js +5 -5
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +1 -17
- package/src/project-graph/file-utils.js +8 -48
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/nx-deps-cache.d.ts +2 -2
- package/src/project-graph/nx-deps-cache.js.map +1 -1
- package/src/project-graph/project-graph.js +2 -1
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/batch/run-batch.js +6 -6
- package/src/tasks-runner/batch/run-batch.js.map +1 -1
- package/src/tasks-runner/cache.js +2 -2
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/create-task-graph.d.ts +21 -0
- package/src/tasks-runner/create-task-graph.js +138 -0
- package/src/tasks-runner/create-task-graph.js.map +1 -0
- package/src/tasks-runner/default-tasks-runner.js +2 -5
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +10 -4
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +12 -12
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +1 -1
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +0 -12
- package/src/tasks-runner/run-command.js +30 -193
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-graph-utils.d.ts +3 -0
- package/src/tasks-runner/task-graph-utils.js +56 -0
- package/src/tasks-runner/task-graph-utils.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.d.ts +3 -1
- package/src/tasks-runner/task-orchestrator.js +23 -11
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-runner-v2.d.ts +2 -0
- package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +4 -1
- package/src/tasks-runner/tasks-schedule.js +0 -4
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/tasks-runner/utils.js +2 -2
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/add-command-prefix.d.ts +5 -0
- package/src/utils/add-command-prefix.js +59 -0
- package/src/utils/add-command-prefix.js.map +1 -0
- package/src/utils/cache-directory.js +2 -2
- package/src/utils/cache-directory.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +6 -8
- package/src/utils/command-line-utils.js +9 -13
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/find-workspace-root.js +9 -7
- package/src/utils/find-workspace-root.js.map +1 -1
- package/src/utils/nx-plugin.js +10 -10
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/output.d.ts +1 -1
- package/src/utils/output.js +2 -2
- package/src/utils/output.js.map +1 -1
- package/src/utils/params.d.ts +2 -2
- package/src/utils/params.js.map +1 -1
- package/src/utils/plugins/models.d.ts +3 -14
- package/src/utils/plugins/plugin-capabilities.js +2 -2
- package/src/utils/plugins/plugin-capabilities.js.map +1 -1
- package/src/utils/register.d.ts +8 -1
- package/src/utils/register.js +81 -10
- package/src/utils/register.js.map +1 -1
- package/src/utils/target-project-locator.js +2 -2
- package/src/utils/target-project-locator.js.map +1 -1
- package/src/utils/typescript.js +5 -5
- package/src/utils/typescript.js.map +1 -1
- package/src/utils/versions.d.ts +6 -4
- package/src/utils/versions.js +7 -5
- package/src/utils/versions.js.map +1 -1
- package/src/utils/{app-root.d.ts → workspace-root.d.ts} +5 -4
- package/src/utils/workspace-root.js +41 -0
- package/src/utils/workspace-root.js.map +1 -0
- package/bin/init.js.map +0 -1
- package/src/tasks-runner/task-graph-creator.d.ts +0 -13
- package/src/tasks-runner/task-graph-creator.js +0 -71
- package/src/tasks-runner/task-graph-creator.js.map +0 -1
- package/src/utils/app-root.js +0 -39
- package/src/utils/app-root.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,4CAAyC;AAEzC,sEAA0E;AAC1E,2BAAgC;AAChC,+BAA4B;AAC5B,kDAG4B;AAE5B,8DAAoE;AAGpE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addPrefixToLines = exports.addCommandPrefixIfNeeded = void 0;
|
|
4
|
+
const chalk = require("chalk");
|
|
5
|
+
function addCommandPrefixIfNeeded(projectName, chunk, encoding) {
|
|
6
|
+
if (process.env.NX_PREFIX_OUTPUT === 'true') {
|
|
7
|
+
const lines = (typeof chunk === 'string' ? chunk : chunk.toString('utf-8')).split('\n');
|
|
8
|
+
return {
|
|
9
|
+
content: addPrefixToLines(projectName, lines).join('\n'),
|
|
10
|
+
encoding: 'utf-8',
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
return { content: chunk, encoding: encoding };
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
exports.addCommandPrefixIfNeeded = addCommandPrefixIfNeeded;
|
|
18
|
+
function addPrefixToLines(projectName, lines) {
|
|
19
|
+
const updatedLines = [];
|
|
20
|
+
for (let i = 0; i < lines.length; ++i) {
|
|
21
|
+
if (i === lines.length - 1 && lines[i] === '') {
|
|
22
|
+
updatedLines.push('');
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
updatedLines.push(`${projectNamePrefix(projectName)} ${lines[i]}`);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return updatedLines;
|
|
29
|
+
}
|
|
30
|
+
exports.addPrefixToLines = addPrefixToLines;
|
|
31
|
+
const colors = [
|
|
32
|
+
chalk.green,
|
|
33
|
+
chalk.greenBright,
|
|
34
|
+
chalk.red,
|
|
35
|
+
chalk.redBright,
|
|
36
|
+
chalk.cyan,
|
|
37
|
+
chalk.cyanBright,
|
|
38
|
+
chalk.yellow,
|
|
39
|
+
chalk.yellowBright,
|
|
40
|
+
chalk.magenta,
|
|
41
|
+
chalk.magentaBright,
|
|
42
|
+
];
|
|
43
|
+
function projectNamePrefix(projectName) {
|
|
44
|
+
const n = normalizeProjectName(projectName);
|
|
45
|
+
return colors[projectNameToIndex(projectName)](`[${n}]`);
|
|
46
|
+
}
|
|
47
|
+
function projectNameToIndex(projectName) {
|
|
48
|
+
let code = 0;
|
|
49
|
+
for (let i = 0; i < projectName.length; ++i) {
|
|
50
|
+
code += projectName.charCodeAt(i);
|
|
51
|
+
}
|
|
52
|
+
return code % colors.length;
|
|
53
|
+
}
|
|
54
|
+
function normalizeProjectName(projectName) {
|
|
55
|
+
return projectName.length > 15
|
|
56
|
+
? `...${projectName.substring(projectName.length - 12)}`
|
|
57
|
+
: `${projectName} `.substring(0, 15);
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=add-command-prefix.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-command-prefix.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/add-command-prefix.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAE/B,SAAgB,wBAAwB,CACtC,WAAmB,EACnB,KAAU,EACV,QAAgB;IAEhB,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM,EAAE;QAC3C,MAAM,KAAK,GAAG,CACZ,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAC5D,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACd,OAAO;YACL,OAAO,EAAE,gBAAgB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACxD,QAAQ,EAAE,OAAO;SAClB,CAAC;KACH;SAAM;QACL,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;KAC/C;AACH,CAAC;AAhBD,4DAgBC;AAED,SAAgB,gBAAgB,CAAC,WAAmB,EAAE,KAAe;IACnE,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACrC,IAAI,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;YAC7C,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACvB;aAAM;YACL,YAAY,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACpE;KACF;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAVD,4CAUC;AAED,MAAM,MAAM,GAAG;IACb,KAAK,CAAC,KAAK;IACX,KAAK,CAAC,WAAW;IACjB,KAAK,CAAC,GAAG;IACT,KAAK,CAAC,SAAS;IACf,KAAK,CAAC,IAAI;IACV,KAAK,CAAC,UAAU;IAChB,KAAK,CAAC,MAAM;IACZ,KAAK,CAAC,YAAY;IAClB,KAAK,CAAC,OAAO;IACb,KAAK,CAAC,aAAa;CACpB,CAAC;AAEF,SAAS,iBAAiB,CAAC,WAAmB;IAC5C,MAAM,CAAC,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAC5C,OAAO,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB;IAC7C,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QAC3C,IAAI,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KACnC;IACD,OAAO,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;AAC9B,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAmB;IAC/C,OAAO,WAAW,CAAC,MAAM,GAAG,EAAE;QAC5B,CAAC,CAAC,MAAM,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,GAAG,EAAE,CAAC,EAAE;QACxD,CAAC,CAAC,GAAG,WAAW,uBAAuB,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cacheDir = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
|
-
const
|
|
5
|
+
const workspace_root_1 = require("./workspace-root");
|
|
6
6
|
const fileutils_1 = require("./fileutils");
|
|
7
7
|
function readCacheDirectoryProperty(root) {
|
|
8
8
|
try {
|
|
@@ -33,5 +33,5 @@ function cacheDirectory(root, cacheDirectory) {
|
|
|
33
33
|
/**
|
|
34
34
|
* Path to the directory where Nx stores its cache and daemon-related files.
|
|
35
35
|
*/
|
|
36
|
-
exports.cacheDir = cacheDirectory(
|
|
36
|
+
exports.cacheDir = cacheDirectory(workspace_root_1.workspaceRoot, readCacheDirectoryProperty(workspace_root_1.workspaceRoot));
|
|
37
37
|
//# sourceMappingURL=cache-directory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/cache-directory.ts"],"names":[],"mappings":";;;AAAA,+BAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/cache-directory.ts"],"names":[],"mappings":";;;AAAA,+BAAwC;AACxC,qDAAiD;AACjD,2CAA2C;AAG3C,SAAS,0BAA0B,CAAC,IAAY;IAC9C,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAsB,IAAA,WAAI,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;KACjE;IAAC,WAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,cAAsB;IAC1D,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACvD,IAAI,eAAe,EAAE;QACnB,cAAc,GAAG,eAAe,CAAC;KAClC;IACD,IAAI,cAAc,EAAE;QAClB,IAAI,IAAA,iBAAU,EAAC,cAAc,CAAC,EAAE;YAC9B,OAAO,cAAc,CAAC;SACvB;aAAM;YACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACnC;KACF;SAAM;QACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnD;AACH,CAAC;AAED;;GAEG;AACU,QAAA,QAAQ,GAAG,cAAc,CACpC,8BAAa,EACb,0BAA0B,CAAC,8BAAa,CAAC,CAC1C,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as yargs from 'yargs';
|
|
2
|
-
import {
|
|
2
|
+
import { NxJsonConfiguration } from '../config/nx-json';
|
|
3
3
|
export declare function names(name: string): {
|
|
4
4
|
name: string;
|
|
5
5
|
className: string;
|
|
@@ -23,28 +23,26 @@ export interface NxArgs {
|
|
|
23
23
|
exclude?: string[];
|
|
24
24
|
files?: string[];
|
|
25
25
|
onlyFailed?: boolean;
|
|
26
|
-
'only-failed'?: boolean;
|
|
27
26
|
verbose?: boolean;
|
|
28
27
|
help?: boolean;
|
|
29
28
|
version?: boolean;
|
|
30
29
|
plain?: boolean;
|
|
31
30
|
withDeps?: boolean;
|
|
32
|
-
'with-deps'?: boolean;
|
|
33
31
|
projects?: string[];
|
|
34
32
|
select?: string;
|
|
35
33
|
skipNxCache?: boolean;
|
|
36
|
-
'skip-nx-cache'?: boolean;
|
|
37
|
-
'output-style'?: string;
|
|
38
34
|
outputStyle?: string;
|
|
39
35
|
scan?: boolean;
|
|
36
|
+
nxBail?: boolean;
|
|
37
|
+
nxIgnoreCycles?: boolean;
|
|
38
|
+
type?: string;
|
|
40
39
|
}
|
|
41
|
-
export declare function splitArgsIntoNxArgsAndOverrides(args: yargs.Arguments, mode: 'run-one' | 'run-many' | 'affected' | 'print-affected', options
|
|
40
|
+
export declare function splitArgsIntoNxArgsAndOverrides(args: yargs.Arguments, mode: 'run-one' | 'run-many' | 'affected' | 'print-affected', options: {
|
|
42
41
|
printWarnings: boolean;
|
|
43
|
-
}): {
|
|
42
|
+
}, nxJson: NxJsonConfiguration): {
|
|
44
43
|
nxArgs: NxArgs;
|
|
45
44
|
overrides: yargs.Arguments;
|
|
46
45
|
};
|
|
47
|
-
export declare function getAffectedConfig(): NxAffectedConfig;
|
|
48
46
|
export declare function parseFiles(options: NxArgs): {
|
|
49
47
|
files: string[];
|
|
50
48
|
};
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getProjectRoots = exports.parseFiles = exports.
|
|
3
|
+
exports.getProjectRoots = exports.parseFiles = exports.splitArgsIntoNxArgsAndOverrides = exports.names = void 0;
|
|
4
4
|
const yargsParser = require("yargs-parser");
|
|
5
5
|
const file_utils_1 = require("../project-graph/file-utils");
|
|
6
6
|
const output_1 = require("./output");
|
|
7
7
|
const child_process_1 = require("child_process");
|
|
8
|
+
const configuration_1 = require("../config/configuration");
|
|
8
9
|
function names(name) {
|
|
9
10
|
return {
|
|
10
11
|
name,
|
|
@@ -65,6 +66,8 @@ const runOne = [
|
|
|
65
66
|
'skipNxCache',
|
|
66
67
|
'scan',
|
|
67
68
|
'outputStyle',
|
|
69
|
+
'nxBail',
|
|
70
|
+
'nxIgnoreCycles',
|
|
68
71
|
];
|
|
69
72
|
const runMany = [...runOne, 'projects', 'all'];
|
|
70
73
|
const runAffected = [
|
|
@@ -77,9 +80,11 @@ const runAffected = [
|
|
|
77
80
|
'files',
|
|
78
81
|
'plain',
|
|
79
82
|
'select',
|
|
83
|
+
'type',
|
|
80
84
|
];
|
|
81
85
|
const ignoreArgs = ['$0', '_'];
|
|
82
|
-
function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings: true }) {
|
|
86
|
+
function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings: true }, nxJson) {
|
|
87
|
+
var _a;
|
|
83
88
|
const nxSpecific = mode === 'run-one' ? runOne : mode === 'run-many' ? runMany : runAffected;
|
|
84
89
|
const nxArgs = {};
|
|
85
90
|
const overrides = yargsParser(args._, {
|
|
@@ -160,8 +165,7 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
|
|
|
160
165
|
}
|
|
161
166
|
}
|
|
162
167
|
if (!nxArgs.base) {
|
|
163
|
-
|
|
164
|
-
nxArgs.base = affectedConfig.defaultBase;
|
|
168
|
+
nxArgs.base = ((_a = nxJson.affected) === null || _a === void 0 ? void 0 : _a.defaultBase) || 'main';
|
|
165
169
|
// No user-provided arguments to set the affected criteria, so inform the user of the defaults being used
|
|
166
170
|
if (options.printWarnings &&
|
|
167
171
|
!nxArgs.head &&
|
|
@@ -192,14 +196,6 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
|
|
|
192
196
|
return { nxArgs, overrides };
|
|
193
197
|
}
|
|
194
198
|
exports.splitArgsIntoNxArgsAndOverrides = splitArgsIntoNxArgsAndOverrides;
|
|
195
|
-
function getAffectedConfig() {
|
|
196
|
-
var _a;
|
|
197
|
-
const config = (0, file_utils_1.readNxJson)();
|
|
198
|
-
return {
|
|
199
|
-
defaultBase: ((_a = config.affected) === null || _a === void 0 ? void 0 : _a.defaultBase) || 'main',
|
|
200
|
-
};
|
|
201
|
-
}
|
|
202
|
-
exports.getAffectedConfig = getAffectedConfig;
|
|
203
199
|
function parseFiles(options) {
|
|
204
200
|
const { files, uncommitted, untracked, base, head } = options;
|
|
205
201
|
if (files) {
|
|
@@ -265,7 +261,7 @@ function parseGitOutput(command) {
|
|
|
265
261
|
.filter((a) => a.length > 0);
|
|
266
262
|
}
|
|
267
263
|
function getProjectRoots(projectNames) {
|
|
268
|
-
const { projects } = (0,
|
|
264
|
+
const { projects } = (0, configuration_1.readAllWorkspaceConfiguration)();
|
|
269
265
|
return projectNames.map((name) => projects[name].root);
|
|
270
266
|
}
|
|
271
267
|
exports.getProjectRoots = getProjectRoots;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.findWorkspaceRoot = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path = require("path");
|
|
6
|
+
const workspace_root_1 = require("./workspace-root");
|
|
6
7
|
/**
|
|
7
8
|
* Recursive function that walks back up the directory
|
|
8
9
|
* tree to try and find a workspace file.
|
|
@@ -10,16 +11,17 @@ const path = require("path");
|
|
|
10
11
|
* @param dir Directory to start searching with
|
|
11
12
|
*/
|
|
12
13
|
function findWorkspaceRoot(dir) {
|
|
13
|
-
|
|
14
|
-
|
|
14
|
+
const r = (0, workspace_root_1.workspaceRootInner)(dir, null);
|
|
15
|
+
if ((0, fs_1.existsSync)(path.join(r, 'angular.json'))) {
|
|
16
|
+
return { type: 'angular', dir: r };
|
|
15
17
|
}
|
|
16
|
-
if ((0, fs_1.existsSync)(path.join(
|
|
17
|
-
return { type: 'nx', dir };
|
|
18
|
+
if ((0, fs_1.existsSync)(path.join(r, 'nx.json'))) {
|
|
19
|
+
return { type: 'nx', dir: r };
|
|
18
20
|
}
|
|
19
|
-
if (path.
|
|
20
|
-
return
|
|
21
|
+
if ((0, fs_1.existsSync)(path.join(r, 'node_modules', 'nx', 'package.json'))) {
|
|
22
|
+
return { type: 'nx', dir: r };
|
|
21
23
|
}
|
|
22
|
-
return
|
|
24
|
+
return null;
|
|
23
25
|
}
|
|
24
26
|
exports.findWorkspaceRoot = findWorkspaceRoot;
|
|
25
27
|
//# sourceMappingURL=find-workspace-root.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-workspace-root.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/find-workspace-root.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,6BAA6B;
|
|
1
|
+
{"version":3,"file":"find-workspace-root.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/find-workspace-root.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,6BAA6B;AAC7B,qDAAsD;AAEtD;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,MAAM,CAAC,GAAG,IAAA,mCAAkB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAExC,IAAI,IAAA,eAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE;QAC5C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;KACpC;IAED,IAAI,IAAA,eAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,EAAE;QACvC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;KAC/B;IAED,IAAI,IAAA,eAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;QAClE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;KAC/B;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAhBD,8CAgBC"}
|
package/src/utils/nx-plugin.js
CHANGED
|
@@ -5,7 +5,7 @@ const fast_glob_1 = require("fast-glob");
|
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const workspaces_1 = require("../config/workspaces");
|
|
8
|
-
const
|
|
8
|
+
const workspace_root_1 = require("./workspace-root");
|
|
9
9
|
const fileutils_1 = require("../utils/fileutils");
|
|
10
10
|
const register_1 = require("./register");
|
|
11
11
|
const target_project_locator_1 = require("./target-project-locator");
|
|
@@ -15,7 +15,7 @@ const logger_1 = require("./logger");
|
|
|
15
15
|
// Allows loadNxPlugins to be called multiple times w/o
|
|
16
16
|
// executing resolution mulitple times.
|
|
17
17
|
let nxPluginCache = null;
|
|
18
|
-
function loadNxPlugins(plugins, paths = [
|
|
18
|
+
function loadNxPlugins(plugins, paths = [workspace_root_1.workspaceRoot]) {
|
|
19
19
|
return (plugins === null || plugins === void 0 ? void 0 : plugins.length)
|
|
20
20
|
? nxPluginCache ||
|
|
21
21
|
(nxPluginCache = plugins.map((moduleName) => {
|
|
@@ -31,7 +31,7 @@ function loadNxPlugins(plugins, paths = [app_root_1.workspaceRoot]) {
|
|
|
31
31
|
if (plugin) {
|
|
32
32
|
const main = readPluginMainFromProjectConfiguration(plugin.projectConfig);
|
|
33
33
|
pluginPath = main
|
|
34
|
-
? path.join(
|
|
34
|
+
? path.join(workspace_root_1.workspaceRoot, main)
|
|
35
35
|
: plugin.path;
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
@@ -63,7 +63,7 @@ function mergePluginTargetsWithNxTargets(projectRoot, targets, plugins) {
|
|
|
63
63
|
continue;
|
|
64
64
|
}
|
|
65
65
|
const projectFiles = (0, fast_glob_1.sync)(`+(${plugin.projectFilePatterns.join('|')})`, {
|
|
66
|
-
cwd: path.join(
|
|
66
|
+
cwd: path.join(workspace_root_1.workspaceRoot, projectRoot),
|
|
67
67
|
});
|
|
68
68
|
for (const projectFile of projectFiles) {
|
|
69
69
|
newTargets = Object.assign(Object.assign({}, newTargets), plugin.registerProjectTargets(path.join(projectRoot, projectFile)));
|
|
@@ -72,7 +72,7 @@ function mergePluginTargetsWithNxTargets(projectRoot, targets, plugins) {
|
|
|
72
72
|
return Object.assign(Object.assign({}, newTargets), targets);
|
|
73
73
|
}
|
|
74
74
|
exports.mergePluginTargetsWithNxTargets = mergePluginTargetsWithNxTargets;
|
|
75
|
-
function readPluginPackageJson(pluginName, paths = [
|
|
75
|
+
function readPluginPackageJson(pluginName, paths = [workspace_root_1.workspaceRoot]) {
|
|
76
76
|
let packageJsonPath;
|
|
77
77
|
try {
|
|
78
78
|
packageJsonPath = require.resolve(`${pluginName}/package.json`, {
|
|
@@ -101,7 +101,7 @@ exports.readPluginPackageJson = readPluginPackageJson;
|
|
|
101
101
|
* @returns The path to the built plugin, or null if it doesn't exist
|
|
102
102
|
*/
|
|
103
103
|
const localPluginCache = {};
|
|
104
|
-
function resolveLocalNxPlugin(importPath, root =
|
|
104
|
+
function resolveLocalNxPlugin(importPath, root = workspace_root_1.workspaceRoot) {
|
|
105
105
|
var _a;
|
|
106
106
|
(_a = localPluginCache[importPath]) !== null && _a !== void 0 ? _a : (localPluginCache[importPath] = lookupLocalPlugin(importPath, root));
|
|
107
107
|
return localPluginCache[importPath];
|
|
@@ -110,11 +110,11 @@ exports.resolveLocalNxPlugin = resolveLocalNxPlugin;
|
|
|
110
110
|
let tsNodeAndPathsRegistered = false;
|
|
111
111
|
function registerTSTranspiler() {
|
|
112
112
|
if (!tsNodeAndPathsRegistered) {
|
|
113
|
-
(0, register_1.registerTsProject)(
|
|
113
|
+
(0, register_1.registerTsProject)(workspace_root_1.workspaceRoot, 'tsconfig.base.json');
|
|
114
114
|
}
|
|
115
115
|
tsNodeAndPathsRegistered = true;
|
|
116
116
|
}
|
|
117
|
-
function lookupLocalPlugin(importPath, root =
|
|
117
|
+
function lookupLocalPlugin(importPath, root = workspace_root_1.workspaceRoot) {
|
|
118
118
|
const workspace = new workspaces_1.Workspaces(root).readWorkspaceConfiguration({
|
|
119
119
|
_ignorePluginInference: true,
|
|
120
120
|
});
|
|
@@ -128,7 +128,7 @@ function lookupLocalPlugin(importPath, root = app_root_1.workspaceRoot) {
|
|
|
128
128
|
const projectConfig = workspace.projects[plugin];
|
|
129
129
|
return { path: path.join(root, projectConfig.root), projectConfig };
|
|
130
130
|
}
|
|
131
|
-
function findNxProjectForImportPath(importPath, workspace, root =
|
|
131
|
+
function findNxProjectForImportPath(importPath, workspace, root = workspace_root_1.workspaceRoot) {
|
|
132
132
|
var _a;
|
|
133
133
|
const tsConfigPaths = readTsConfigPaths(root);
|
|
134
134
|
const possiblePaths = (_a = tsConfigPaths[importPath]) === null || _a === void 0 ? void 0 : _a.map((p) => path.resolve(root, p));
|
|
@@ -153,7 +153,7 @@ function buildProjectRootMap(projects, root) {
|
|
|
153
153
|
}, new Map());
|
|
154
154
|
}
|
|
155
155
|
let tsconfigPaths;
|
|
156
|
-
function readTsConfigPaths(root =
|
|
156
|
+
function readTsConfigPaths(root = workspace_root_1.workspaceRoot) {
|
|
157
157
|
if (!tsconfigPaths) {
|
|
158
158
|
const tsconfigPath = ['tsconfig.base.json', 'tsconfig.json']
|
|
159
159
|
.map((x) => path.join(root, x))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-plugin.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AACjC,2BAAgC;AAChC,6BAA6B;AAE7B,qDAAkD;AAElD,
|
|
1
|
+
{"version":3,"file":"nx-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-plugin.ts"],"names":[],"mappings":"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"}
|
package/src/utils/output.d.ts
CHANGED
|
@@ -21,7 +21,7 @@ export interface CLISuccessMessageConfig {
|
|
|
21
21
|
declare class CLIOutput {
|
|
22
22
|
readonly X_PADDING = " ";
|
|
23
23
|
cliName: string;
|
|
24
|
-
formatCommand: (
|
|
24
|
+
formatCommand: (taskId: string) => string;
|
|
25
25
|
/**
|
|
26
26
|
* Longer dash character which forms more of a continuous line when place side to side
|
|
27
27
|
* with itself, unlike the standard dash character
|
package/src/utils/output.js
CHANGED
|
@@ -15,7 +15,7 @@ class CLIOutput {
|
|
|
15
15
|
constructor() {
|
|
16
16
|
this.X_PADDING = ' ';
|
|
17
17
|
this.cliName = 'NX';
|
|
18
|
-
this.formatCommand = (
|
|
18
|
+
this.formatCommand = (taskId) => `${chalk.dim('nx run')} ${taskId}`;
|
|
19
19
|
/**
|
|
20
20
|
* Expose some color and other utility functions so that other parts of the codebase that need
|
|
21
21
|
* more fine-grained control of message bodies are still using a centralized
|
|
@@ -137,7 +137,7 @@ class CLIOutput {
|
|
|
137
137
|
}
|
|
138
138
|
logCommand(message, taskStatus) {
|
|
139
139
|
this.addNewline();
|
|
140
|
-
const commandOutput = this.formatCommand(this.normalizeMessage(message));
|
|
140
|
+
const commandOutput = chalk.dim('> ') + this.formatCommand(this.normalizeMessage(message));
|
|
141
141
|
const commandOutputWithStatus = this.addTaskStatus(taskStatus, commandOutput);
|
|
142
142
|
this.writeToStdOut(commandOutputWithStatus);
|
|
143
143
|
this.addNewline();
|
package/src/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/output.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAAyB;AACzB,mCAA+B;AAyB/B;;GAEG;AACH,MAAM,UAAU,GACd,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;AACvE,IAAI,IAAA,YAAI,GAAE,IAAI,CAAC,UAAU,EAAE;IACxB,KAAa,CAAC,KAAK,GAAG,CAAC,CAAC;CAC1B;AAED,MAAM,SAAS;IAAf;QACW,cAAS,GAAG,GAAG,CAAC;QACzB,YAAO,GAAG,IAAI,CAAC;QACf,kBAAa,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/output.ts"],"names":[],"mappings":"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"}
|
package/src/utils/params.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { NxJsonConfiguration } from '../config/nx-json';
|
|
2
|
-
import { TargetConfiguration,
|
|
2
|
+
import { TargetConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
3
3
|
declare type PropertyDescription = {
|
|
4
4
|
type?: string | string[];
|
|
5
5
|
required?: string[];
|
|
@@ -100,7 +100,7 @@ export declare function setDefaults(opts: {
|
|
|
100
100
|
};
|
|
101
101
|
export declare function applyVerbosity(options: Record<string, unknown>, schema: Schema, isVerbose: boolean): void;
|
|
102
102
|
export declare function combineOptionsForExecutor(commandLineOpts: Options, config: string, target: TargetConfiguration, schema: Schema, defaultProjectName: string | null, relativeCwd: string | null, isVerbose?: boolean): any;
|
|
103
|
-
export declare function combineOptionsForGenerator(commandLineOpts: Options, collectionName: string, generatorName: string, wc: (
|
|
103
|
+
export declare function combineOptionsForGenerator(commandLineOpts: Options, collectionName: string, generatorName: string, wc: (ProjectsConfigurations & NxJsonConfiguration) | null, schema: Schema, isInteractive: boolean, defaultProjectName: string | null, relativeCwd: string | null, isVerbose?: boolean): Promise<Options>;
|
|
104
104
|
export declare function warnDeprecations(opts: {
|
|
105
105
|
[k: string]: any;
|
|
106
106
|
}, schema: Schema): void;
|
package/src/utils/params.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/params.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"params.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/params.ts"],"names":[],"mappings":"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"}
|