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
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
# [14.2.0-beta.2](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-beta.2) (2022-05-31)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compute-project-graph.js","sourceRoot":"","sources":["../../../../packages/nx/bin/compute-project-graph.ts"],"names":[],"mappings":";;;AAAA,sEAA6E;AAE7E,CAAC,GAAS,EAAE;IACV,IAAI;QACF,MAAM,IAAA,uCAAuB,GAAE,CAAC;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,gDAAgD;KACjD;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
|
package/bin/nx.js
CHANGED
|
@@ -7,7 +7,9 @@ const init_local_1 = require("./init-local");
|
|
|
7
7
|
const package_manager_1 = require("../src/utils/package-manager");
|
|
8
8
|
const output_1 = require("../src/utils/output");
|
|
9
9
|
// new is a special case because there is no local workspace to load
|
|
10
|
-
if (process.argv[2] === 'new' ||
|
|
10
|
+
if (process.argv[2] === 'new' ||
|
|
11
|
+
process.argv[2] === '_migrate' ||
|
|
12
|
+
process.argv[2] === 'init') {
|
|
11
13
|
require('nx/src/command-line/nx-commands').commandsObject.argv;
|
|
12
14
|
}
|
|
13
15
|
else {
|
|
@@ -25,6 +27,12 @@ else {
|
|
|
25
27
|
bodyLines: [
|
|
26
28
|
`To create a workspace run:`,
|
|
27
29
|
chalk.bold.white(`npx create-nx-workspace@latest <workspace name>`),
|
|
30
|
+
'',
|
|
31
|
+
`To add Nx to existing workspace run with a workspace-specific nx.json:`,
|
|
32
|
+
chalk.bold.white(`npx add-nx-to-monorepo@latest`),
|
|
33
|
+
'',
|
|
34
|
+
`To add the default nx.json file run:`,
|
|
35
|
+
chalk.bold.white(`nx init`),
|
|
28
36
|
],
|
|
29
37
|
});
|
|
30
38
|
output_1.output.note({
|
package/bin/nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":";;;AACA,0EAG0C;AAC1C,+BAA+B;AAC/B,6CAAyC;AACzC,kEAAoE;AACpE,gDAA6C;AAE7C,oEAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":"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"}
|
package/bin/run-executor.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const fs_1 = require("fs");
|
|
4
4
|
const run_1 = require("../src/command-line/run");
|
|
5
|
+
const add_command_prefix_1 = require("../src/utils/add-command-prefix");
|
|
5
6
|
if (process.env.NX_TERMINAL_OUTPUT_PATH) {
|
|
6
7
|
setUpOutputWatching(process.env.NX_TERMINAL_CAPTURE_STDERR === 'true', process.env.NX_STREAM_OUTPUT === 'true');
|
|
7
8
|
}
|
|
@@ -9,11 +10,13 @@ if (!process.env.NX_WORKSPACE_ROOT) {
|
|
|
9
10
|
console.error('Invalid Nx command invocation');
|
|
10
11
|
process.exit(1);
|
|
11
12
|
}
|
|
13
|
+
let projectName;
|
|
12
14
|
requireCli();
|
|
13
15
|
function requireCli() {
|
|
14
16
|
process.env.NX_CLI_SET = 'true';
|
|
15
17
|
try {
|
|
16
18
|
const args = JSON.parse(process.argv[2]);
|
|
19
|
+
projectName = args.targetDescription.project;
|
|
17
20
|
(0, run_1.run)(process.cwd(), process.env.NX_WORKSPACE_ROOT, args.targetDescription, args.overrides, args.isVerbose, false)
|
|
18
21
|
.then((statusCode) => {
|
|
19
22
|
process.exit(statusCode);
|
|
@@ -49,7 +52,12 @@ function setUpOutputWatching(captureStderr, streamOutput) {
|
|
|
49
52
|
onlyStdout.push(chunk);
|
|
50
53
|
(0, fs_1.appendFileSync)(stdoutAndStderrLogFileHandle, chunk);
|
|
51
54
|
if (streamOutput) {
|
|
52
|
-
|
|
55
|
+
const updatedChunk = (0, add_command_prefix_1.addCommandPrefixIfNeeded)(projectName, chunk, encoding);
|
|
56
|
+
stdoutWrite.apply(process.stdout, [
|
|
57
|
+
updatedChunk.content,
|
|
58
|
+
updatedChunk.encoding,
|
|
59
|
+
callback,
|
|
60
|
+
]);
|
|
53
61
|
}
|
|
54
62
|
else {
|
|
55
63
|
callback();
|
|
@@ -58,7 +66,12 @@ function setUpOutputWatching(captureStderr, streamOutput) {
|
|
|
58
66
|
process.stderr._write = (chunk, encoding, callback) => {
|
|
59
67
|
(0, fs_1.appendFileSync)(stdoutAndStderrLogFileHandle, chunk);
|
|
60
68
|
if (streamOutput) {
|
|
61
|
-
|
|
69
|
+
const updatedChunk = (0, add_command_prefix_1.addCommandPrefixIfNeeded)(projectName, chunk, encoding);
|
|
70
|
+
stderrWrite.apply(process.stderr, [
|
|
71
|
+
updatedChunk.content,
|
|
72
|
+
updatedChunk.encoding,
|
|
73
|
+
callback,
|
|
74
|
+
]);
|
|
62
75
|
}
|
|
63
76
|
else {
|
|
64
77
|
callback();
|
package/bin/run-executor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-executor.js","sourceRoot":"","sources":["../../../../packages/nx/bin/run-executor.ts"],"names":[],"mappings":";;AAAA,2BAA6D;AAC7D,iDAA8C;
|
|
1
|
+
{"version":3,"file":"run-executor.js","sourceRoot":"","sources":["../../../../packages/nx/bin/run-executor.ts"],"names":[],"mappings":"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"}
|
package/migrations.json
CHANGED
|
@@ -11,6 +11,12 @@
|
|
|
11
11
|
"version": "14.2.0-beta.0",
|
|
12
12
|
"description": "Add JSON Schema to Nx configuration files",
|
|
13
13
|
"factory": "./src/migrations/update-14-2-0/add-json-schema"
|
|
14
|
+
},
|
|
15
|
+
"14-2-0-remove-default-collection": {
|
|
16
|
+
"cli": "nx",
|
|
17
|
+
"version": "14.2.0-beta.0",
|
|
18
|
+
"description": "Remove default collection from configuration to switch to prompts for collection",
|
|
19
|
+
"factory": "./src/migrations/update-14-2-0/remove-default-collection"
|
|
14
20
|
}
|
|
15
21
|
}
|
|
16
22
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.2.0-beta.2",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"directory": "packages/nx"
|
|
9
9
|
},
|
|
10
10
|
"scripts": {
|
|
11
|
-
"postinstall": "node ./bin/
|
|
11
|
+
"postinstall": "node ./bin/compute-project-graph"
|
|
12
12
|
},
|
|
13
13
|
"keywords": [
|
|
14
14
|
"Monorepo",
|
|
@@ -31,11 +31,9 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://nx.dev",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/cli": "14.
|
|
35
|
-
"@nrwl/tao": "14.
|
|
34
|
+
"@nrwl/cli": "14.2.0-beta.2",
|
|
35
|
+
"@nrwl/tao": "14.2.0-beta.2",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
|
-
"@swc-node/register": "^1.4.2",
|
|
38
|
-
"@swc/core": "^1.2.173",
|
|
39
37
|
"chalk": "4.1.0",
|
|
40
38
|
"chokidar": "^3.5.1",
|
|
41
39
|
"cli-cursor": "3.1.0",
|
|
@@ -50,7 +48,7 @@
|
|
|
50
48
|
"glob": "7.1.4",
|
|
51
49
|
"ignore": "^5.0.4",
|
|
52
50
|
"jsonc-parser": "3.0.0",
|
|
53
|
-
"minimatch": "3.0.
|
|
51
|
+
"minimatch": "3.0.5",
|
|
54
52
|
"npm-run-path": "^4.0.1",
|
|
55
53
|
"open": "^8.4.0",
|
|
56
54
|
"semver": "7.3.4",
|
|
@@ -63,6 +61,18 @@
|
|
|
63
61
|
"yargs": "^17.4.0",
|
|
64
62
|
"yargs-parser": "21.0.1"
|
|
65
63
|
},
|
|
64
|
+
"peerDependencies": {
|
|
65
|
+
"@swc-node/register": "^1.4.2",
|
|
66
|
+
"@swc/core": "^1.2.173"
|
|
67
|
+
},
|
|
68
|
+
"peerDependenciesMeta": {
|
|
69
|
+
"@swc-node/register": {
|
|
70
|
+
"optional": true
|
|
71
|
+
},
|
|
72
|
+
"@swc/core": {
|
|
73
|
+
"optional": true
|
|
74
|
+
}
|
|
75
|
+
},
|
|
66
76
|
"nx-migrations": {
|
|
67
77
|
"migrations": "./migrations.json",
|
|
68
78
|
"packageGroup": [
|
|
@@ -95,5 +105,5 @@
|
|
|
95
105
|
"executors": "./executors.json",
|
|
96
106
|
"main": "./bin/nx.js",
|
|
97
107
|
"typings": "./bin/nx.d.ts",
|
|
98
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "e491c6f7382064fb1f17c0dcd2e642428ca822e4"
|
|
99
109
|
}
|
package/presets/core.json
CHANGED
|
@@ -6,16 +6,21 @@
|
|
|
6
6
|
},
|
|
7
7
|
".eslintrc.json": "*"
|
|
8
8
|
},
|
|
9
|
-
"
|
|
10
|
-
"
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
"
|
|
9
|
+
"tasksRunnerOptions": {
|
|
10
|
+
"default": {
|
|
11
|
+
"runner": "nx/tasks-runners/default",
|
|
12
|
+
"options": {
|
|
13
|
+
"cacheableOperations": []
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
}
|
|
16
16
|
},
|
|
17
17
|
"workspaceLayout": {
|
|
18
|
-
"
|
|
19
|
-
"
|
|
18
|
+
"libsDir": "packages",
|
|
19
|
+
"appsDir": "packages"
|
|
20
|
+
},
|
|
21
|
+
"pluginsConfig": {
|
|
22
|
+
"@nrwl/js": {
|
|
23
|
+
"analyzeSourceFiles": false
|
|
24
|
+
}
|
|
20
25
|
}
|
|
21
26
|
}
|
package/presets/npm.json
CHANGED
|
@@ -6,15 +6,21 @@
|
|
|
6
6
|
},
|
|
7
7
|
".eslintrc.json": "*"
|
|
8
8
|
},
|
|
9
|
-
"
|
|
10
|
-
"
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
"
|
|
9
|
+
"tasksRunnerOptions": {
|
|
10
|
+
"default": {
|
|
11
|
+
"runner": "nx/tasks-runners/default",
|
|
12
|
+
"options": {
|
|
13
|
+
"cacheableOperations": []
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
}
|
|
16
16
|
},
|
|
17
17
|
"workspaceLayout": {
|
|
18
|
-
"libsDir": "packages"
|
|
18
|
+
"libsDir": "packages",
|
|
19
|
+
"appsDir": "packages"
|
|
20
|
+
},
|
|
21
|
+
"pluginsConfig": {
|
|
22
|
+
"@nrwl/js": {
|
|
23
|
+
"analyzeSourceFiles": false
|
|
24
|
+
}
|
|
19
25
|
}
|
|
20
26
|
}
|
package/src/adapter/compat.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const logger_1 = require("../utils/logger");
|
|
5
5
|
const workspaces_1 = require("../config/workspaces");
|
|
6
|
-
const
|
|
6
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
7
7
|
/* eslint-disable */
|
|
8
8
|
const Module = require('module');
|
|
9
9
|
const originalRequire = Module.prototype.require;
|
|
@@ -20,7 +20,7 @@ if (!patched) {
|
|
|
20
20
|
core._test_addWorkspaceFile('workspace.json', core.WorkspaceFormat.JSON);
|
|
21
21
|
const originalReadWorkspace = core.readWorkspace;
|
|
22
22
|
core.readWorkspace = (path, ...rest) => {
|
|
23
|
-
const configFile = (0, workspaces_1.workspaceConfigName)(
|
|
23
|
+
const configFile = (0, workspaces_1.workspaceConfigName)(workspace_root_1.workspaceRoot);
|
|
24
24
|
if (!configFile) {
|
|
25
25
|
path = 'workspace.json';
|
|
26
26
|
}
|
|
@@ -28,7 +28,7 @@ if (!patched) {
|
|
|
28
28
|
};
|
|
29
29
|
const originalWriteWorkspace = core.writeWorkspace;
|
|
30
30
|
core.writeWorkspace = (...args) => {
|
|
31
|
-
const configFile = (0, workspaces_1.workspaceConfigName)(
|
|
31
|
+
const configFile = (0, workspaces_1.workspaceConfigName)(workspace_root_1.workspaceRoot);
|
|
32
32
|
if (!loggedWriteWorkspaceWarning) {
|
|
33
33
|
if (configFile) {
|
|
34
34
|
logger_1.logger.warn(`[NX] Angular devkit called \`writeWorkspace\`, this may have had unintended consequences in ${configFile}`);
|
|
@@ -54,7 +54,7 @@ if (!patched) {
|
|
|
54
54
|
}
|
|
55
55
|
catch (_a) {
|
|
56
56
|
logger_1.logger.debug('[NX] Angular devkit readJsonWorkspace fell back to Nx workspaces logic');
|
|
57
|
-
const w = new workspaces_1.Workspaces(
|
|
57
|
+
const w = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
|
|
58
58
|
// Read our v1 workspace schema
|
|
59
59
|
const workspaceConfiguration = (0, workspaces_1.resolveOldFormatWithInlineProjects)(w.readWorkspaceConfiguration());
|
|
60
60
|
// readJsonWorkspace actually has AST parsing + more, so we
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AACzC,qDAI8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { Tree } from '../generators/tree';
|
|
|
4
4
|
import { FileBuffer } from '@angular-devkit/core/src/virtual-fs/host/interface';
|
|
5
5
|
import { Observable } from 'rxjs';
|
|
6
6
|
import { NxJsonConfiguration } from '../config/nx-json';
|
|
7
|
-
import {
|
|
7
|
+
import { RawProjectsConfigurations, ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
8
8
|
export declare function scheduleTarget(root: string, opts: {
|
|
9
9
|
project: string;
|
|
10
10
|
target: string;
|
|
@@ -14,10 +14,10 @@ export declare function scheduleTarget(root: string, opts: {
|
|
|
14
14
|
}, verbose: boolean): Promise<Observable<import('@angular-devkit/architect').BuilderOutput>>;
|
|
15
15
|
export declare class NxScopedHost extends virtualFs.ScopedHost<any> {
|
|
16
16
|
private root;
|
|
17
|
-
protected __nxInMemoryWorkspace:
|
|
17
|
+
protected __nxInMemoryWorkspace: ProjectsConfigurations | null;
|
|
18
18
|
constructor(root: string);
|
|
19
19
|
protected __readWorkspaceConfiguration: (configFileName: ChangeContext['actualConfigFileName'], overrides?: {
|
|
20
|
-
workspace?: Observable<
|
|
20
|
+
workspace?: Observable<RawProjectsConfigurations>;
|
|
21
21
|
nx?: Observable<NxJsonConfiguration>;
|
|
22
22
|
}) => Observable<FileBuffer>;
|
|
23
23
|
read(path: Path): Observable<FileBuffer>;
|
|
@@ -29,7 +29,7 @@ export declare class NxScopedHost extends virtualFs.ScopedHost<any> {
|
|
|
29
29
|
private writeWorkspaceConfiguration;
|
|
30
30
|
private __saveNxJsonProps;
|
|
31
31
|
private writeWorkspaceConfigFiles;
|
|
32
|
-
protected resolveInlineProjectConfigurations(config:
|
|
32
|
+
protected resolveInlineProjectConfigurations(config: RawProjectsConfigurations): Observable<ProjectsConfigurations>;
|
|
33
33
|
}
|
|
34
34
|
declare type ConfigFilePath = ('/angular.json' | '/workspace.json') & {
|
|
35
35
|
__PRIVATE_DEVKIT_PATH: void;
|
|
@@ -296,12 +296,14 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
|
|
|
296
296
|
const formatted = (0, workspaces_1.toNewFormatOrNull)(w);
|
|
297
297
|
if (formatted) {
|
|
298
298
|
const { cli, generators, defaultProject } = formatted, workspaceJson = tslib_1.__rest(formatted, ["cli", "generators", "defaultProject"]);
|
|
299
|
+
delete cli.schematicCollections;
|
|
299
300
|
return (0, rxjs_1.merge)(this.writeWorkspaceConfigFiles(context, workspaceJson), cli || generators || defaultProject
|
|
300
301
|
? this.__saveNxJsonProps({ cli, generators, defaultProject })
|
|
301
302
|
: (0, rxjs_1.of)(null));
|
|
302
303
|
}
|
|
303
304
|
else {
|
|
304
305
|
const { cli, schematics, generators, defaultProject } = w, angularJson = tslib_1.__rest(w, ["cli", "schematics", "generators", "defaultProject"]);
|
|
306
|
+
delete cli.schematicCollections;
|
|
305
307
|
return (0, rxjs_1.merge)(this.writeWorkspaceConfigFiles(context, angularJson), cli || schematics
|
|
306
308
|
? this.__saveNxJsonProps({
|
|
307
309
|
cli,
|
|
@@ -314,6 +316,7 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
|
|
|
314
316
|
catch (e) { }
|
|
315
317
|
}
|
|
316
318
|
const { cli, schematics, generators, defaultProject } = config, angularJson = tslib_1.__rest(config, ["cli", "schematics", "generators", "defaultProject"]);
|
|
319
|
+
delete cli.schematicCollections;
|
|
317
320
|
return (0, rxjs_1.merge)(this.writeWorkspaceConfigFiles(context, angularJson), this.__saveNxJsonProps({
|
|
318
321
|
cli,
|
|
319
322
|
defaultProject,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ngcli-adapter.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ngcli-adapter.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,13 +18,13 @@ const read_environment_1 = require("./read-environment");
|
|
|
18
18
|
function affected(command, parsedArgs) {
|
|
19
19
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
perf_hooks_1.performance.mark('command-execution-begins');
|
|
21
|
+
const env = (0, read_environment_1.readEnvironment)();
|
|
21
22
|
const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(parsedArgs, 'affected', {
|
|
22
23
|
printWarnings: command !== 'print-affected' && !parsedArgs.plain,
|
|
23
|
-
});
|
|
24
|
+
}, env.nxJson);
|
|
24
25
|
yield (0, connect_to_nx_cloud_1.connectToNxCloudUsingScan)(nxArgs.scan);
|
|
25
26
|
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
26
27
|
const projects = projectsToRun(nxArgs, projectGraph);
|
|
27
|
-
const env = (0, read_environment_1.readEnvironment)();
|
|
28
28
|
try {
|
|
29
29
|
switch (command) {
|
|
30
30
|
case 'apps':
|
|
@@ -36,6 +36,9 @@ function affected(command, parsedArgs) {
|
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
38
|
if (apps.length) {
|
|
39
|
+
output_1.output.warn({
|
|
40
|
+
title: 'Deprecated: Use "nx print-affected --type=app --select=projects" instead. This command will be removed in v15.',
|
|
41
|
+
});
|
|
39
42
|
output_1.output.log({
|
|
40
43
|
title: 'Affected apps:',
|
|
41
44
|
bodyLines: apps.map((app) => `${output_1.output.dim('-')} ${app}`),
|
|
@@ -52,6 +55,9 @@ function affected(command, parsedArgs) {
|
|
|
52
55
|
}
|
|
53
56
|
else {
|
|
54
57
|
if (libs.length) {
|
|
58
|
+
output_1.output.warn({
|
|
59
|
+
title: 'Deprecated: Use "nx print-affected --type=lib --select=projects" instead. This command will be removed in v15.',
|
|
60
|
+
});
|
|
55
61
|
output_1.output.log({
|
|
56
62
|
title: 'Affected libs:',
|
|
57
63
|
bodyLines: libs.map((lib) => `${output_1.output.dim('-')} ${lib}`),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/affected.ts"],"names":[],"mappings":";;;;AACA,4DAAmE;AACnE,6DAAyD;AACzD,4CAAyC;AACzC,2CAA4C;AAC5C,qDAAiD;AACjD,+DAAkE;AAElE,oEAGqC;AACrC,2CAAyC;AACzC,kEAAyE;AACzE,0DAAsD;AAEtD,sEAAgE;AAChE,6FAAkF;AAClF,yDAAqD;AAErD,SAAsB,QAAQ,CAC5B,OAAkE,EAClE,UAAuC;;QAEvC,wBAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oDAA+B,EAC3D,UAAU,EACV,UAAU,EACV;YACE,aAAa,EAAE,OAAO,KAAK,gBAAgB,IAAI,CAAC,UAAU,CAAC,KAAK;SACjE,
|
|
1
|
+
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/affected.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.connectToNxCloudCommand = exports.connectToNxCloudUsingScan = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const file_utils_1 = require("../project-graph/file-utils");
|
|
6
5
|
const output_1 = require("../utils/output");
|
|
7
6
|
const package_manager_1 = require("../utils/package-manager");
|
|
8
7
|
const child_process_1 = require("child_process");
|
|
8
|
+
const configuration_1 = require("../config/configuration");
|
|
9
9
|
function connectToNxCloudUsingScan(scan) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
11
|
if (!scan)
|
|
12
12
|
return;
|
|
13
|
-
const nxJson = (0,
|
|
13
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
14
14
|
const defaultRunnerIsUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/workspace/tasks-runners/default' ||
|
|
15
15
|
r.runner == 'nx/tasks-runners/default');
|
|
16
16
|
if (!defaultRunnerIsUsed)
|
|
@@ -34,7 +34,7 @@ function connectToNxCloudUsingScan(scan) {
|
|
|
34
34
|
exports.connectToNxCloudUsingScan = connectToNxCloudUsingScan;
|
|
35
35
|
function connectToNxCloudCommand(promptOverride) {
|
|
36
36
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
37
|
-
const nxJson = (0,
|
|
37
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
38
38
|
const nxCloudUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/nx-cloud');
|
|
39
39
|
if (nxCloudUsed) {
|
|
40
40
|
output_1.output.log({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AACzC,2DAAqD;AAErD,SAAsB,yBAAyB,CAAC,IAAa;;QAC3D,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC5B,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACvE,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,IAAI,uCAAuC;YACnD,CAAC,CAAC,MAAM,IAAI,0BAA0B,CACzC,CAAC;QACF,IAAI,CAAC,mBAAmB;YAAE,OAAO;QAEjC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,4DAA4D;SACpE,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;YACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;YAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;gBAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;SACJ;aAAM;YACL,eAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC,CAAC;SAC/D;IACH,CAAC;CAAA;AAxBD,8DAwBC;AAED,SAAsB,uBAAuB,CAC3C,cAAuB;;QAEvB,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,kDAAkD;aAC1D,CAAC,CAAC;YACH,OAAO;SACR;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;QAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AArBD,0DAqBC;AAED,SAAe,sBAAsB,CAAC,MAAe;;QACnD,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EACL,MAAM,aAAN,MAAM,cAAN,MAAM,GACN,oEAAoE;gBACtE,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,8EAA8E;qBACrF;oBACD;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,OAAO,EAAE,KAAY;aACtB;SACF,CAAC;aACD,IAAI,CAAC,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IACjE,CAAC;CAAA"}
|