nx 14.1.2 → 14.1.5
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/bin/run-executor.js +5 -5
- package/bin/run-executor.js.map +1 -1
- package/migrations.json +6 -0
- package/package.json +4 -4
- package/schemas/nx-schema.json +127 -0
- package/schemas/project-schema.json +68 -0
- package/schemas/workspace-schema.json +134 -0
- package/src/command-line/affected.js +1 -1
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/format.js +1 -1
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/migrate.js +14 -5
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +18 -6
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/run-many.js +1 -1
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +1 -1
- package/src/command-line/run-one.js.map +1 -1
- package/src/generators/utils/project-configuration.d.ts +2 -1
- package/src/generators/utils/project-configuration.js +11 -4
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/git-hasher.d.ts +1 -0
- package/src/hasher/git-hasher.js +23 -24
- package/src/hasher/git-hasher.js.map +1 -1
- package/src/migrations/update-14-0-6/remove-roots.js +4 -1
- package/src/migrations/update-14-0-6/remove-roots.js.map +1 -1
- package/src/migrations/update-14-2-0/add-json-schema.d.ts +2 -0
- package/src/migrations/update-14-2-0/add-json-schema.js +38 -0
- package/src/migrations/update-14-2-0/add-json-schema.js.map +1 -0
- package/src/tasks-runner/forked-process-task-runner.d.ts +4 -4
- package/src/tasks-runner/forked-process-task-runner.js +24 -17
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +1 -1
- package/src/tasks-runner/run-command.js +36 -34
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +3 -3
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/utils.d.ts +1 -1
- package/src/tasks-runner/utils.js +7 -6
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +2 -2
- package/src/utils/command-line-utils.js +1 -1
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/bin/run-executor.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const fs_1 = require("fs");
|
|
4
4
|
if (process.env.NX_TERMINAL_OUTPUT_PATH) {
|
|
5
|
-
setUpOutputWatching(process.env.NX_TERMINAL_CAPTURE_STDERR === 'true', process.env.
|
|
5
|
+
setUpOutputWatching(process.env.NX_TERMINAL_CAPTURE_STDERR === 'true', process.env.NX_STREAM_OUTPUT === 'true');
|
|
6
6
|
}
|
|
7
7
|
if (!process.env.NX_WORKSPACE_ROOT) {
|
|
8
8
|
console.error('Invalid Nx command invocation');
|
|
@@ -34,13 +34,13 @@ function requireCli() {
|
|
|
34
34
|
* We need to collect all stdout and stderr and store it, so the caching mechanism
|
|
35
35
|
* could store it.
|
|
36
36
|
*
|
|
37
|
-
* Writing stdout and stderr into different
|
|
37
|
+
* Writing stdout and stderr into different streams is too risky when using TTY.
|
|
38
38
|
*
|
|
39
39
|
* So we are simply monkey-patching the Javascript object. In this case the actual output will always be correct.
|
|
40
40
|
* And the cached output should be correct unless the CLI bypasses process.stdout or console.log and uses some
|
|
41
41
|
* C-binary to write to stdout.
|
|
42
42
|
*/
|
|
43
|
-
function setUpOutputWatching(captureStderr,
|
|
43
|
+
function setUpOutputWatching(captureStderr, streamOutput) {
|
|
44
44
|
const stdoutWrite = process.stdout._write;
|
|
45
45
|
const stderrWrite = process.stderr._write;
|
|
46
46
|
// The terminal output file gets out and err
|
|
@@ -50,7 +50,7 @@ function setUpOutputWatching(captureStderr, forwardOutput) {
|
|
|
50
50
|
process.stdout._write = (chunk, encoding, callback) => {
|
|
51
51
|
onlyStdout.push(chunk);
|
|
52
52
|
(0, fs_1.appendFileSync)(stdoutAndStderrLogFileHandle, chunk);
|
|
53
|
-
if (
|
|
53
|
+
if (streamOutput) {
|
|
54
54
|
stdoutWrite.apply(process.stdout, [chunk, encoding, callback]);
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
@@ -59,7 +59,7 @@ function setUpOutputWatching(captureStderr, forwardOutput) {
|
|
|
59
59
|
};
|
|
60
60
|
process.stderr._write = (chunk, encoding, callback) => {
|
|
61
61
|
(0, fs_1.appendFileSync)(stdoutAndStderrLogFileHandle, chunk);
|
|
62
|
-
if (
|
|
62
|
+
if (streamOutput) {
|
|
63
63
|
stderrWrite.apply(process.stderr, [chunk, encoding, callback]);
|
|
64
64
|
}
|
|
65
65
|
else {
|
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;AAE7D,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;IACvC,mBAAmB,CACjB,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,MAAM,EACjD,OAAO,CAAC,GAAG,CAAC,
|
|
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
|
@@ -5,6 +5,12 @@
|
|
|
5
5
|
"version": "14.0.6",
|
|
6
6
|
"description": "Remove root property from project.json files",
|
|
7
7
|
"factory": "./src/migrations/update-14-0-6/remove-roots"
|
|
8
|
+
},
|
|
9
|
+
"14-2-0-add-json-schema": {
|
|
10
|
+
"cli": "nx",
|
|
11
|
+
"version": "14.2.0-beta.0",
|
|
12
|
+
"description": "Add JSON Schema to Nx configuration files",
|
|
13
|
+
"factory": "./src/migrations/update-14-2-0/add-json-schema"
|
|
8
14
|
}
|
|
9
15
|
}
|
|
10
16
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.1.
|
|
3
|
+
"version": "14.1.5",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"chokidar": "^3.5.1",
|
|
43
43
|
"cli-cursor": "3.1.0",
|
|
44
44
|
"cli-spinners": "2.6.1",
|
|
45
|
-
"fs-extra": "^
|
|
45
|
+
"fs-extra": "^10.1.0",
|
|
46
46
|
"dotenv": "~10.0.0",
|
|
47
47
|
"figures": "3.2.0",
|
|
48
48
|
"glob": "7.1.4",
|
|
@@ -62,8 +62,8 @@
|
|
|
62
62
|
"minimatch": "3.0.4",
|
|
63
63
|
"enquirer": "~2.3.6",
|
|
64
64
|
"tslib": "^2.3.0",
|
|
65
|
-
"@nrwl/cli": "14.1.
|
|
66
|
-
"@nrwl/tao": "14.1.
|
|
65
|
+
"@nrwl/cli": "14.1.5",
|
|
66
|
+
"@nrwl/tao": "14.1.5"
|
|
67
67
|
},
|
|
68
68
|
"nx-migrations": {
|
|
69
69
|
"migrations": "./migrations.json",
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/draft-07/schema",
|
|
3
|
+
"$id": "https://nx.dev/core-concepts/configuration#nxjson",
|
|
4
|
+
"title": "JSON schema for Nx configuration",
|
|
5
|
+
"type": "object",
|
|
6
|
+
"properties": {
|
|
7
|
+
"implicitDependencies": {
|
|
8
|
+
"type": "object",
|
|
9
|
+
"description": "Map of files to projects that implicitly depend on them."
|
|
10
|
+
},
|
|
11
|
+
"affected": {
|
|
12
|
+
"type": "object",
|
|
13
|
+
"description": "Default options for `nx affected`.",
|
|
14
|
+
"properties": {
|
|
15
|
+
"defaultBase": {
|
|
16
|
+
"type": "string",
|
|
17
|
+
"description": "Default based branch used by affected commands."
|
|
18
|
+
}
|
|
19
|
+
},
|
|
20
|
+
"additionalProperties": false
|
|
21
|
+
},
|
|
22
|
+
"npmScope": {
|
|
23
|
+
"type": "string",
|
|
24
|
+
"description": "NPM Scope that the workspace uses."
|
|
25
|
+
},
|
|
26
|
+
"tasksRunnerOptions": {
|
|
27
|
+
"type": "object",
|
|
28
|
+
"additionalProperties": {
|
|
29
|
+
"$ref": "#/definitions/tasksRunnerOptions"
|
|
30
|
+
}
|
|
31
|
+
},
|
|
32
|
+
"targetDependencies": {
|
|
33
|
+
"type": "object",
|
|
34
|
+
"description": "Dependencies between different target names across all projects.",
|
|
35
|
+
"additionalProperties": {
|
|
36
|
+
"$ref": "#/definitions/targetDependencyConfig"
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
"workspaceLayout": {
|
|
40
|
+
"type": "object",
|
|
41
|
+
"description": "Where new apps + libs should be placed.",
|
|
42
|
+
"properties": {
|
|
43
|
+
"libsDir": {
|
|
44
|
+
"type": "string",
|
|
45
|
+
"description": "Default folder name for libs."
|
|
46
|
+
},
|
|
47
|
+
"appsDir": {
|
|
48
|
+
"type": "string",
|
|
49
|
+
"description": "Default folder name for apps."
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
"additionalProperties": false
|
|
53
|
+
},
|
|
54
|
+
"cli": {
|
|
55
|
+
"$ref": "#/definitions/cliOptions"
|
|
56
|
+
},
|
|
57
|
+
"generators": {
|
|
58
|
+
"$ref": "#/definitions/generatorOptions"
|
|
59
|
+
},
|
|
60
|
+
"plugins": {
|
|
61
|
+
"type": "array",
|
|
62
|
+
"description": "Plugins for extending the project graph.",
|
|
63
|
+
"items": {
|
|
64
|
+
"type": "string"
|
|
65
|
+
}
|
|
66
|
+
},
|
|
67
|
+
"defaultProject": {
|
|
68
|
+
"type": "string",
|
|
69
|
+
"description": "Default project. When project isn't provided, the default project will be used."
|
|
70
|
+
}
|
|
71
|
+
},
|
|
72
|
+
"definitions": {
|
|
73
|
+
"cliOptions": {
|
|
74
|
+
"type": "object",
|
|
75
|
+
"description": "Default generator collection.",
|
|
76
|
+
"properties": {
|
|
77
|
+
"packageManager": {
|
|
78
|
+
"type": "string",
|
|
79
|
+
"description": "The default package manager to use.",
|
|
80
|
+
"enum": ["yarn", "pnpm", "npm"]
|
|
81
|
+
},
|
|
82
|
+
"defaultCollection": {
|
|
83
|
+
"type": "string",
|
|
84
|
+
"description": "The default schematics collection to use."
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
},
|
|
88
|
+
"generatorOptions": {
|
|
89
|
+
"type": "object",
|
|
90
|
+
"description": "List of default values used by generators."
|
|
91
|
+
},
|
|
92
|
+
"tasksRunnerOptions": {
|
|
93
|
+
"type": "object",
|
|
94
|
+
"description": "Available Task Runners.",
|
|
95
|
+
"properties": {
|
|
96
|
+
"runner": {
|
|
97
|
+
"type": "string",
|
|
98
|
+
"description": "Path to resolve the runner."
|
|
99
|
+
},
|
|
100
|
+
"options": {
|
|
101
|
+
"type": "object",
|
|
102
|
+
"description": "Default options for the runner."
|
|
103
|
+
}
|
|
104
|
+
},
|
|
105
|
+
"additionalProperties": false
|
|
106
|
+
},
|
|
107
|
+
"targetDependencyConfig": {
|
|
108
|
+
"type": "array",
|
|
109
|
+
"description": "Target dependency.",
|
|
110
|
+
"items": {
|
|
111
|
+
"type": "object",
|
|
112
|
+
"properties": {
|
|
113
|
+
"projects": {
|
|
114
|
+
"type": "string",
|
|
115
|
+
"description": "The projects that the targets belong to.",
|
|
116
|
+
"enum": ["self", "dependencies"]
|
|
117
|
+
},
|
|
118
|
+
"target": {
|
|
119
|
+
"type": "string",
|
|
120
|
+
"description": "The name of the target."
|
|
121
|
+
}
|
|
122
|
+
},
|
|
123
|
+
"additionalProperties": false
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/draft-07/schema",
|
|
3
|
+
"$id": "https://nx.dev/project-schema",
|
|
4
|
+
"title": "JSON schema for Nx projects",
|
|
5
|
+
"type": "object",
|
|
6
|
+
"properties": {
|
|
7
|
+
"targets": {
|
|
8
|
+
"type": "object",
|
|
9
|
+
"description": "Configures all the targets which define what tasks you can run against the project",
|
|
10
|
+
"additionalProperties": {
|
|
11
|
+
"type": "object",
|
|
12
|
+
"properties": {
|
|
13
|
+
"executor": {
|
|
14
|
+
"description": "The function that Nx will invoke when you run this target",
|
|
15
|
+
"type": "string"
|
|
16
|
+
},
|
|
17
|
+
"options": {
|
|
18
|
+
"type": "object"
|
|
19
|
+
},
|
|
20
|
+
"outputs": {
|
|
21
|
+
"type": "array",
|
|
22
|
+
"items": {
|
|
23
|
+
"type": "string"
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
"configurations": {
|
|
27
|
+
"type": "object",
|
|
28
|
+
"description": "provides extra sets of values that will be merged into the options map",
|
|
29
|
+
"additionalProperties": {
|
|
30
|
+
"type": "object"
|
|
31
|
+
}
|
|
32
|
+
},
|
|
33
|
+
"dependsOn": {
|
|
34
|
+
"type": "array",
|
|
35
|
+
"description": "Target dependency.",
|
|
36
|
+
"items": {
|
|
37
|
+
"type": "object",
|
|
38
|
+
"properties": {
|
|
39
|
+
"projects": {
|
|
40
|
+
"type": "string",
|
|
41
|
+
"description": "The projects that the targets belong to.",
|
|
42
|
+
"enum": ["self", "dependencies"]
|
|
43
|
+
},
|
|
44
|
+
"target": {
|
|
45
|
+
"type": "string",
|
|
46
|
+
"description": "The name of the target."
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
"additionalProperties": false
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
"tags": {
|
|
56
|
+
"type": "array",
|
|
57
|
+
"items": {
|
|
58
|
+
"type": "string"
|
|
59
|
+
}
|
|
60
|
+
},
|
|
61
|
+
"implicitDependencies": {
|
|
62
|
+
"type": "array",
|
|
63
|
+
"items": {
|
|
64
|
+
"type": "string"
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/draft-07/schema",
|
|
3
|
+
"$id": "https://nx.dev",
|
|
4
|
+
"title": "JSON schema for Nx workspaces",
|
|
5
|
+
"type": "object",
|
|
6
|
+
"properties": {
|
|
7
|
+
"version": {
|
|
8
|
+
"type": "number",
|
|
9
|
+
"enum": [1, 2]
|
|
10
|
+
}
|
|
11
|
+
},
|
|
12
|
+
"allOf": [
|
|
13
|
+
{
|
|
14
|
+
"if": {
|
|
15
|
+
"properties": { "version": { "const": 2 } },
|
|
16
|
+
"required": ["version"]
|
|
17
|
+
},
|
|
18
|
+
"then": {
|
|
19
|
+
"properties": {
|
|
20
|
+
"projects": {
|
|
21
|
+
"type": "object",
|
|
22
|
+
"additionalProperties": {
|
|
23
|
+
"oneOf": [
|
|
24
|
+
{
|
|
25
|
+
"type": "string"
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
"type": "object",
|
|
29
|
+
"properties": {
|
|
30
|
+
"targets": {
|
|
31
|
+
"type": "object",
|
|
32
|
+
"description": "Configures all the targets which define what tasks you can run against the project",
|
|
33
|
+
"additionalProperties": {
|
|
34
|
+
"type": "object",
|
|
35
|
+
"properties": {
|
|
36
|
+
"executor": {
|
|
37
|
+
"description": "The function that Nx will invoke when you run this target",
|
|
38
|
+
"type": "string"
|
|
39
|
+
},
|
|
40
|
+
"options": {
|
|
41
|
+
"type": "object"
|
|
42
|
+
},
|
|
43
|
+
"outputs": {
|
|
44
|
+
"type": "array",
|
|
45
|
+
"items": {
|
|
46
|
+
"type": "string"
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
"configurations": {
|
|
50
|
+
"type": "object",
|
|
51
|
+
"description": "provides extra sets of values that will be merged into the options map",
|
|
52
|
+
"additionalProperties": {
|
|
53
|
+
"type": "object"
|
|
54
|
+
}
|
|
55
|
+
},
|
|
56
|
+
"dependsOn": {
|
|
57
|
+
"type": "array",
|
|
58
|
+
"description": "Target dependency.",
|
|
59
|
+
"items": {
|
|
60
|
+
"type": "object",
|
|
61
|
+
"properties": {
|
|
62
|
+
"projects": {
|
|
63
|
+
"type": "string",
|
|
64
|
+
"description": "The projects that the targets belong to.",
|
|
65
|
+
"enum": ["self", "dependencies"]
|
|
66
|
+
},
|
|
67
|
+
"target": {
|
|
68
|
+
"type": "string",
|
|
69
|
+
"description": "The name of the target."
|
|
70
|
+
}
|
|
71
|
+
},
|
|
72
|
+
"additionalProperties": false
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
},
|
|
78
|
+
"tags": {
|
|
79
|
+
"type": "array",
|
|
80
|
+
"items": {
|
|
81
|
+
"type": "string"
|
|
82
|
+
}
|
|
83
|
+
},
|
|
84
|
+
"implicitDependencies": {
|
|
85
|
+
"type": "array",
|
|
86
|
+
"items": {
|
|
87
|
+
"type": "string"
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
]
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
},
|
|
97
|
+
"else": {
|
|
98
|
+
"properties": {
|
|
99
|
+
"projects": {
|
|
100
|
+
"type": "object",
|
|
101
|
+
"additionalProperties": {
|
|
102
|
+
"type": "object",
|
|
103
|
+
"properties": {
|
|
104
|
+
"architect": {
|
|
105
|
+
"type": "object",
|
|
106
|
+
"description": "Configures all the targets which define what tasks you can run against the project",
|
|
107
|
+
"additionalProperties": {
|
|
108
|
+
"type": "object",
|
|
109
|
+
"properties": {
|
|
110
|
+
"builder": {
|
|
111
|
+
"description": "The function that Nx will invoke when you run this architect",
|
|
112
|
+
"type": "string"
|
|
113
|
+
},
|
|
114
|
+
"options": {
|
|
115
|
+
"type": "object"
|
|
116
|
+
},
|
|
117
|
+
"configurations": {
|
|
118
|
+
"type": "object",
|
|
119
|
+
"description": "provides extra sets of values that will be merged into the options map",
|
|
120
|
+
"additionalProperties": {
|
|
121
|
+
"type": "object"
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
]
|
|
134
|
+
}
|
|
@@ -74,7 +74,7 @@ function affected(command, parsedArgs) {
|
|
|
74
74
|
break;
|
|
75
75
|
case 'affected': {
|
|
76
76
|
const projectsWithTarget = allProjectsWithTarget(projects, nxArgs);
|
|
77
|
-
yield (0, run_command_1.runCommand)(projectsWithTarget, projectGraph, env, nxArgs, overrides,
|
|
77
|
+
yield (0, run_command_1.runCommand)(projectsWithTarget, projectGraph, env, nxArgs, overrides, null);
|
|
78
78
|
break;
|
|
79
79
|
}
|
|
80
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/affected.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/affected.ts"],"names":[],"mappings":"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"}
|
|
@@ -110,7 +110,7 @@ function chunkify(target, size) {
|
|
|
110
110
|
}
|
|
111
111
|
function write(patterns) {
|
|
112
112
|
if (patterns.length > 0) {
|
|
113
|
-
(0, child_process_1.execSync)(`node "${PRETTIER_PATH}" --write ${patterns.join(' ')}`, {
|
|
113
|
+
(0, child_process_1.execSync)(`node "${PRETTIER_PATH}" --write --list-different ${patterns.join(' ')}`, {
|
|
114
114
|
stdio: [0, 1, 2],
|
|
115
115
|
});
|
|
116
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,oEAKqC;AACrC,kDAAgD;AAChD,4DAA6E;AAE7E,qDAG8B;AAC9B,gDAAkD;AAClD,qCAAqC;AACrC,sDAAwD;AACxD,oDAG6B;AAC7B,kDAAiE;AAEjE,kEAAyE;AACzE,6FAAkF;AAMlF,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAE/D,SAAsB,MAAM,CAC1B,OAA0B,EAC1B,IAAqB;;QAErB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,oDAA+B,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACrE,MAAM,QAAQ,GAAG,CAAC,MAAM,WAAW,CAAC,gCAAK,IAAI,GAAK,MAAM,CAAS,CAAC,CAAC,CAAC,GAAG,CACrE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAChB,CAAC;QAEF,uEAAuE;QACvE,MAAM,SAAS,GAAe,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAErD,QAAQ,OAAO,EAAE;YACf,KAAK,OAAO;gBACV,MAAM,iBAAiB,GAAG,IAAA,gCAAmB,EAAC,wBAAa,CAAC,CAAC;gBAC7D,IAAI,iBAAiB,EAAE;oBACrB,uCAAuC,CAAC,iBAAiB,CAAC,CAAC;oBAC3D,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;oBACrC,4BAA4B,CAAC,iBAAiB,CAAC,CAAC;iBACjD;gBACD,YAAY,EAAE,CAAC;gBACf,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBACzD,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC3C,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAC3B,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,EACrC,IAAI,CACL,CAAC;gBACF,IAAI,CAAC,IAAI,EAAE;oBACT,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;gBACD,MAAM;SACT;IACH,CAAC;CAAA;AAlCD,wBAkCC;AAED,SAAe,WAAW,CACxB,IAAoD;;QAEpD,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,eAAe,GAAG,CAAC,GAAG,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,OAAO,eAAe,CAAC;SACxB;QAED,IAAI;YACF,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,OAAO,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC/C;YAED,MAAM,CAAC,GAAG,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC;YAC3B,MAAM,mBAAmB,GAAG,QAAQ;iBACjC,cAAc,EAAE;iBAChB,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;iBACpD,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,sBAAU,EAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CACtE,CAAC;YAEF,OAAO,IAAI,CAAC,WAAW;gBACrB,CAAC,CAAC,MAAM,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC;gBAC9D,CAAC,CAAC,QAAQ,CAAC;SACd;QAAC,WAAM;YACN,OAAO,eAAe,CAAC;SACxB;IACH,CAAC;CAAA;AAED,SAAe,mBAAmB,CAChC,aAAuB,EACvB,iBAA6B;;QAE7B,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,IAAA,uCAAc,EAClC,KAAK,EACL,IAAA,iCAAoB,EAAC,aAAa,EAAE,iBAAiB,CAAC,CACvD,CAAC;QACF,OAAO,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC;CAAA;AAED,SAAS,kBAAkB,CACzB,SAAqB,EACrB,MAAc,EACd,iBAAgC;IAEhC,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,OAAO;KACR;IACD,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE;QAC1C,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,EAAE;YACpD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;IACH,CAAC,CAAC;IACF,IAAI,iBAAiB,EAAE;QACrB,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;KACvC;IACD,CAAC,SAAS,EAAE,IAAA,oCAAuB,GAAE,CAAC;SACnC,MAAM,CAAC,OAAO,CAAC;SACf,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAE/B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACvB;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,QAAkB;IACjD,OAAO,IAAA,oCAAe,EAAC,QAAQ,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,QAAQ,CAAC,MAAgB,EAAE,IAAY;IAC9C,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,OAAmB,EAAE,KAAa,EAAE,KAAa,EAAE,EAAE;QACzE,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC;YAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,KAAK,CAAC,QAAkB;IAC/B,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,IAAA,wBAAQ,EACN,SAAS,aAAa,8BAA8B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EACxE;YACE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,KAAK,CAAC,QAAkB;IAC/B,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IACD,IAAI;QACF,IAAA,wBAAQ,EAAC,SAAS,aAAa,sBAAsB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YACzE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,uCAAuC,CAAC,iBAAyB;IACxE,IAAI;QACF,MAAM,aAAa,GAAG,IAAA,wBAAY,EAAC,iBAAiB,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,IAAA,2CAA8B,EAAC,aAAa,CAAC,CAAC;QAClE,IAAI,WAAW,EAAE;YACf,IAAA,yBAAa,EAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;SAC/C;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,sCAAsC,iBAAiB,EAAE,CAAC,CAAC;QACzE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,iBAAyB;IAClD,IAAI;QACF,MAAM,aAAa,GAAG,IAAA,wBAAY,EAAC,iBAAiB,CAAC,CAAC;QACtD,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACvD,MAAM,cAAc,GAAG,IAAA,8BAAgB,EAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAChE,aAAa,CAAC,QAAQ,GAAG,cAAc,CAAC;YACxC,IAAA,yBAAa,EAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;SACjD;KACF;IAAC,OAAO,CAAC,EAAE;QACV,aAAa;KACd;AACH,CAAC;AAED,SAAS,YAAY;IACnB,IAAI;QACF,MAAM,YAAY,GAAG,IAAA,gCAAmB,GAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAA,wBAAY,EAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,IAAA,8BAAgB,EAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACrE,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG,WAAW,CAAC;QAC7C,IAAA,yBAAa,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;KACvC;IAAC,OAAO,CAAC,EAAE;QACV,aAAa;KACd;AACH,CAAC;AAED,SAAS,4BAA4B,CAAC,iBAAyB;;IAC7D,IAAI;QACF,MAAM,aAAa,GAAG,IAAA,wBAAY,EAEhC,iBAAiB,CAAC,CAAC;QACrB,MAAM,MAAM,GAAG,IAAA,wBAAY,EAEzB,SAAS,CAAC,CAAC;QACb,IACE,aAAa,CAAC,GAAG;YACjB,aAAa,CAAC,UAAU;YACxB,MAAM,CAAC,QAAQ;YACf,MAAM,CAAC,cAAc,EACrB;YACA,MAAA,MAAM,CAAC,GAAG,oCAAV,MAAM,CAAC,GAAG,GAAK,aAAa,CAAC,GAAG,EAAC;YACjC,MAAA,MAAM,CAAC,UAAU,oCAAjB,MAAM,CAAC,UAAU,GACf,MAAA,aAAa,CAAC,UAAU,mCAAK,aAAqB,CAAC,UAAU,EAAC;YAChE,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,aAAa,CAAC,cAAc,EAAC;YACvD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO,aAAa,CAAC,YAAY,CAAC,CAAC;YACnC,OAAO,aAAa,CAAC,gBAAgB,CAAC,CAAC;YACvC,gDAAgD,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YACxE,IAAA,yBAAa,EAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;YAChD,IAAA,yBAAa,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAClC;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CACX,6CAA6C,iBAAiB,EAAE,CACjE,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC;AAED,SAAgB,gDAAgD,CAC9D,aAAyC,EACzC,MAKC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,OAAO;KACR;IACD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE;QAC5D,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,mCAC1B,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,GAC/B,MAAM,CACV,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,QAAQ,CAAC;AACzB,CAAC;AAnBD,4GAmBC"}
|
|
@@ -543,16 +543,25 @@ function isMigratingToNewMajor(from, to) {
|
|
|
543
543
|
return (0, semver_1.major)(from) < (0, semver_1.major)(to);
|
|
544
544
|
});
|
|
545
545
|
}
|
|
546
|
+
function readNxVersion(packageJson) {
|
|
547
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
548
|
+
return ((_f = (_d = (_b = (_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) === null || _a === void 0 ? void 0 : _a['nx']) !== null && _b !== void 0 ? _b : (_c = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _c === void 0 ? void 0 : _c['nx']) !== null && _d !== void 0 ? _d : (_e = packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) === null || _e === void 0 ? void 0 : _e['@nrwl/workspace']) !== null && _f !== void 0 ? _f : (_g = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _g === void 0 ? void 0 : _g['@nrwl/workspace']);
|
|
549
|
+
}
|
|
546
550
|
function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
|
|
547
|
-
var _a, _b, _c;
|
|
548
551
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
549
552
|
const pmc = (0, package_manager_1.getPackageManagerCommand)();
|
|
550
553
|
try {
|
|
551
554
|
let originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
555
|
+
try {
|
|
556
|
+
if (['nx', '@nrwl/workspace'].includes(opts.targetPackage) &&
|
|
557
|
+
(yield isMigratingToNewMajor(readNxVersion(originalPackageJson), opts.targetVersion))) {
|
|
558
|
+
yield (0, connect_to_nx_cloud_1.connectToNxCloudCommand)('We noticed you are migrating to a new major version, but are not taking advantage of Nx Cloud. Nx Cloud can make your CI up to 10 times faster. Learn more about it here: nx.app. Would you like to add it?');
|
|
559
|
+
originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
|
|
560
|
+
}
|
|
561
|
+
}
|
|
562
|
+
catch (_a) {
|
|
563
|
+
// The above code is to remind folks when updating to a new major and not currently using Nx cloud.
|
|
564
|
+
// If for some reason it fails, it shouldn't affect the overall migration process
|
|
556
565
|
}
|
|
557
566
|
logger_1.logger.info(`Fetching meta data about packages.`);
|
|
558
567
|
logger_1.logger.info(`It may take a few minutes.`);
|