nx 14.4.0-beta.0 → 14.4.0-beta.1
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/package.json +4 -4
- package/schemas/nx-schema.json +15 -5
- package/schemas/project-schema.json +15 -5
- package/src/adapter/compat.js +7 -2
- package/src/adapter/compat.js.map +1 -1
- package/src/command-line/affected.js +6 -6
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/format.js +6 -6
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/generate.js +7 -3
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/print-affected.d.ts +4 -2
- package/src/command-line/print-affected.js.map +1 -1
- package/src/command-line/read-environment.d.ts +3 -0
- package/src/command-line/read-environment.js +3 -0
- package/src/command-line/read-environment.js.map +1 -1
- package/src/command-line/run-many.js +4 -4
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +7 -7
- package/src/command-line/run-one.js.map +1 -1
- package/src/command-line/run.d.ts +2 -1
- package/src/command-line/run.js +4 -3
- package/src/command-line/run.js.map +1 -1
- package/src/config/configuration.d.ts +3 -0
- package/src/config/configuration.js +3 -0
- package/src/config/configuration.js.map +1 -1
- package/src/config/nx-json.d.ts +5 -5
- package/src/config/project-graph.d.ts +4 -3
- package/src/config/project-graph.js.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +6 -13
- package/src/config/workspaces.js +4 -2
- package/src/config/workspaces.js.map +1 -1
- package/src/daemon/client/client.js +1 -1
- package/src/daemon/client/client.js.map +1 -1
- package/src/generators/utils/project-configuration.js +2 -2
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/hasher.d.ts +16 -0
- package/src/hasher/hasher.js +88 -73
- package/src/hasher/hasher.js.map +1 -1
- package/src/project-graph/affected/affected-project-graph-models.d.ts +4 -3
- package/src/project-graph/affected/affected-project-graph.d.ts +2 -2
- package/src/project-graph/affected/affected-project-graph.js +4 -4
- package/src/project-graph/affected/affected-project-graph.js.map +1 -1
- package/src/project-graph/affected/locators/workspace-json-changes.js +3 -3
- package/src/project-graph/affected/locators/workspace-json-changes.js.map +1 -1
- package/src/project-graph/affected/locators/workspace-projects.js +4 -4
- package/src/project-graph/affected/locators/workspace-projects.js.map +1 -1
- package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js +2 -1
- package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/project-graph/build-project-graph.d.ts +1 -1
- package/src/project-graph/build-project-graph.js +12 -12
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +7 -2
- package/src/project-graph/file-utils.js +17 -5
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/project-graph.d.ts +4 -1
- package/src/project-graph/project-graph.js +17 -1
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/batch/run-batch.js +3 -2
- package/src/tasks-runner/batch/run-batch.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.d.ts +1 -0
- package/src/tasks-runner/task-orchestrator.js +5 -3
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-schedule.d.ts +3 -1
- package/src/tasks-runner/tasks-schedule.js +8 -6
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/tasks-runner/utils.d.ts +4 -3
- package/src/tasks-runner/utils.js +7 -8
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/command-line-utils.d.ts +2 -1
- package/src/utils/command-line-utils.js +2 -4
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/package-json.d.ts +1 -1
- package/src/utils/params.js +6 -1
- package/src/utils/params.js.map +1 -1
- package/src/utils/path.d.ts +10 -0
- package/src/utils/path.js +19 -1
- package/src/utils/path.js.map +1 -1
- package/src/utils/project-graph-utils.d.ts +2 -2
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
|
-
# [14.4.0-beta.
|
|
6
|
+
# [14.4.0-beta.1](https://github.com/nrwl/nx/compare/14.3.6...14.4.0-beta.1) (2022-06-24)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.4.0-beta.
|
|
3
|
+
"version": "14.4.0-beta.1",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://nx.dev",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/cli": "14.4.0-beta.
|
|
35
|
-
"@nrwl/tao": "14.4.0-beta.
|
|
34
|
+
"@nrwl/cli": "14.4.0-beta.1",
|
|
35
|
+
"@nrwl/tao": "14.4.0-beta.1",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
37
|
"chalk": "4.1.0",
|
|
38
38
|
"chokidar": "^3.5.1",
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"executors": "./executors.json",
|
|
107
107
|
"main": "./bin/nx.js",
|
|
108
108
|
"typings": "./bin/nx.d.ts",
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "5b905140089128a21e5e77081958ae7fe6ba14bf"
|
|
110
110
|
}
|
package/schemas/nx-schema.json
CHANGED
|
@@ -111,9 +111,9 @@
|
|
|
111
111
|
},
|
|
112
112
|
"additionalProperties": false
|
|
113
113
|
},
|
|
114
|
-
"
|
|
114
|
+
"namedInputs": {
|
|
115
115
|
"type": "object",
|
|
116
|
-
"description": "
|
|
116
|
+
"description": "Named inputs used by inputs defined in targets",
|
|
117
117
|
"additionalProperties": true
|
|
118
118
|
},
|
|
119
119
|
"targetDependencyConfig": {
|
|
@@ -145,13 +145,23 @@
|
|
|
145
145
|
"type": "object",
|
|
146
146
|
"description": "Target defaults",
|
|
147
147
|
"properties": {
|
|
148
|
-
"
|
|
148
|
+
"inputs": {
|
|
149
149
|
"type": "array",
|
|
150
150
|
"items": {
|
|
151
151
|
"oneOf": [
|
|
152
152
|
{
|
|
153
153
|
"type": "string"
|
|
154
154
|
},
|
|
155
|
+
{
|
|
156
|
+
"type": "object",
|
|
157
|
+
"properties": {
|
|
158
|
+
"fileset": {
|
|
159
|
+
"type": "string",
|
|
160
|
+
"description": "The name of the target."
|
|
161
|
+
}
|
|
162
|
+
},
|
|
163
|
+
"additionalProperties": false
|
|
164
|
+
},
|
|
155
165
|
{
|
|
156
166
|
"type": "object",
|
|
157
167
|
"properties": {
|
|
@@ -160,9 +170,9 @@
|
|
|
160
170
|
"description": "The projects that the targets belong to.",
|
|
161
171
|
"enum": ["self", "dependencies"]
|
|
162
172
|
},
|
|
163
|
-
"
|
|
173
|
+
"input": {
|
|
164
174
|
"type": "string",
|
|
165
|
-
"description": "The name of the
|
|
175
|
+
"description": "The name of the input."
|
|
166
176
|
}
|
|
167
177
|
},
|
|
168
178
|
"additionalProperties": false
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
"title": "JSON schema for Nx projects",
|
|
5
5
|
"type": "object",
|
|
6
6
|
"properties": {
|
|
7
|
-
"
|
|
7
|
+
"namedInputs": {
|
|
8
8
|
"type": "object",
|
|
9
|
-
"description": "
|
|
9
|
+
"description": "Named inputs used by inputs defined in targets",
|
|
10
10
|
"additionalProperties": true
|
|
11
11
|
},
|
|
12
12
|
"targets": {
|
|
@@ -35,13 +35,23 @@
|
|
|
35
35
|
"type": "object"
|
|
36
36
|
}
|
|
37
37
|
},
|
|
38
|
-
"
|
|
38
|
+
"inputs": {
|
|
39
39
|
"type": "array",
|
|
40
40
|
"items": {
|
|
41
41
|
"oneOf": [
|
|
42
42
|
{
|
|
43
43
|
"type": "string"
|
|
44
44
|
},
|
|
45
|
+
{
|
|
46
|
+
"type": "object",
|
|
47
|
+
"properties": {
|
|
48
|
+
"fileset": {
|
|
49
|
+
"type": "string",
|
|
50
|
+
"description": "The name of the target."
|
|
51
|
+
}
|
|
52
|
+
},
|
|
53
|
+
"additionalProperties": false
|
|
54
|
+
},
|
|
45
55
|
{
|
|
46
56
|
"type": "object",
|
|
47
57
|
"properties": {
|
|
@@ -50,9 +60,9 @@
|
|
|
50
60
|
"description": "The projects that the targets belong to.",
|
|
51
61
|
"enum": ["self", "dependencies"]
|
|
52
62
|
},
|
|
53
|
-
"
|
|
63
|
+
"input": {
|
|
54
64
|
"type": "string",
|
|
55
|
-
"description": "The name of the
|
|
65
|
+
"description": "The name of the input."
|
|
56
66
|
}
|
|
57
67
|
},
|
|
58
68
|
"additionalProperties": false
|
package/src/adapter/compat.js
CHANGED
|
@@ -4,6 +4,8 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const logger_1 = require("../utils/logger");
|
|
5
5
|
const workspaces_1 = require("../config/workspaces");
|
|
6
6
|
const workspace_root_1 = require("../utils/workspace-root");
|
|
7
|
+
const project_graph_1 = require("../project-graph/project-graph");
|
|
8
|
+
const configuration_1 = require("../config/configuration");
|
|
7
9
|
/* eslint-disable */
|
|
8
10
|
const Module = require('module');
|
|
9
11
|
const originalRequire = Module.prototype.require;
|
|
@@ -54,9 +56,12 @@ if (!patched) {
|
|
|
54
56
|
}
|
|
55
57
|
catch (_a) {
|
|
56
58
|
logger_1.logger.debug('[NX] Angular devkit readJsonWorkspace fell back to Nx workspaces logic');
|
|
57
|
-
const
|
|
59
|
+
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
60
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
61
|
+
// Construct old workspace.json format from project graph
|
|
62
|
+
const w = Object.assign(Object.assign({}, nxJson), (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
|
|
58
63
|
// Read our v1 workspace schema
|
|
59
|
-
const workspaceConfiguration = (0, workspaces_1.resolveOldFormatWithInlineProjects)(w
|
|
64
|
+
const workspaceConfiguration = (0, workspaces_1.resolveOldFormatWithInlineProjects)(w);
|
|
60
65
|
// readJsonWorkspace actually has AST parsing + more, so we
|
|
61
66
|
// still need to call it rather than just return our file
|
|
62
67
|
return originalReadJsonWorkspace.apply(this, [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AACzC,qDAI8B;AAC9B,4DAAwD;
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,14 @@ const project_graph_1 = require("../project-graph/project-graph");
|
|
|
14
14
|
const operators_1 = require("../project-graph/operators");
|
|
15
15
|
const project_graph_utils_1 = require("../utils/project-graph-utils");
|
|
16
16
|
const affected_project_graph_1 = require("../project-graph/affected/affected-project-graph");
|
|
17
|
-
const
|
|
17
|
+
const configuration_1 = require("../config/configuration");
|
|
18
18
|
function affected(command, args, extraTargetDependencies = {}) {
|
|
19
19
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
perf_hooks_1.performance.mark('command-execution-begins');
|
|
21
|
-
const
|
|
21
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
22
22
|
const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', {
|
|
23
23
|
printWarnings: command !== 'print-affected' && !args.plain,
|
|
24
|
-
},
|
|
24
|
+
}, nxJson);
|
|
25
25
|
yield (0, connect_to_nx_cloud_1.connectToNxCloudUsingScan)(nxArgs.scan);
|
|
26
26
|
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
27
27
|
const projects = projectsToRun(nxArgs, projectGraph);
|
|
@@ -72,15 +72,15 @@ function affected(command, args, extraTargetDependencies = {}) {
|
|
|
72
72
|
case 'print-affected':
|
|
73
73
|
if (nxArgs.target) {
|
|
74
74
|
const projectsWithTarget = allProjectsWithTarget(projects, nxArgs);
|
|
75
|
-
yield (0, print_affected_1.printAffected)(projectsWithTarget, projects, projectGraph,
|
|
75
|
+
yield (0, print_affected_1.printAffected)(projectsWithTarget, projects, projectGraph, { nxJson }, nxArgs, overrides);
|
|
76
76
|
}
|
|
77
77
|
else {
|
|
78
|
-
yield (0, print_affected_1.printAffected)([], projects, projectGraph,
|
|
78
|
+
yield (0, print_affected_1.printAffected)([], projects, projectGraph, { nxJson }, nxArgs, overrides);
|
|
79
79
|
}
|
|
80
80
|
break;
|
|
81
81
|
case 'affected': {
|
|
82
82
|
const projectsWithTarget = allProjectsWithTarget(projects, nxArgs);
|
|
83
|
-
yield (0, run_command_1.runCommand)(projectsWithTarget, projectGraph,
|
|
83
|
+
yield (0, run_command_1.runCommand)(projectsWithTarget, projectGraph, { nxJson }, nxArgs, overrides, null, extraTargetDependencies);
|
|
84
84
|
break;
|
|
85
85
|
}
|
|
86
86
|
}
|
|
@@ -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;
|
|
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;AAElF,2DAAqD;AAErD,SAAsB,QAAQ,CAC5B,OAAkE,EAClE,IAA0B,EAC1B,0BAGI,EAAE;;QAEN,wBAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC5B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,oDAA+B,EAC3D,IAAI,EACJ,UAAU,EACV;YACE,aAAa,EAAE,OAAO,KAAK,gBAAgB,IAAI,CAAC,IAAI,CAAC,KAAK;SAC3D,EACD,MAAM,CACP,CAAC;QAEF,MAAM,IAAA,+CAAyB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAErD,IAAI;YACF,QAAQ,OAAO,EAAE;gBACf,KAAK,MAAM;oBACT,MAAM,IAAI,GAAG,QAAQ;yBAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;yBAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACtB,IAAI,IAAI,CAAC,KAAK,EAAE;wBACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;qBAC7B;yBAAM;wBACL,IAAI,IAAI,CAAC,MAAM,EAAE;4BACf,eAAM,CAAC,IAAI,CAAC;gCACV,KAAK,EACH,gHAAgH;6BACnH,CAAC,CAAC;4BACH,eAAM,CAAC,GAAG,CAAC;gCACT,KAAK,EAAE,gBAAgB;gCACvB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,eAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;6BAC1D,CAAC,CAAC;yBACJ;qBACF;oBACD,MAAM;gBAER,KAAK,MAAM;oBACT,MAAM,IAAI,GAAG,QAAQ;yBAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC;yBAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACtB,IAAI,IAAI,CAAC,KAAK,EAAE;wBACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;qBAC7B;yBAAM;wBACL,IAAI,IAAI,CAAC,MAAM,EAAE;4BACf,eAAM,CAAC,IAAI,CAAC;gCACV,KAAK,EACH,gHAAgH;6BACnH,CAAC,CAAC;4BACH,eAAM,CAAC,GAAG,CAAC;gCACT,KAAK,EAAE,gBAAgB;gCACvB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,eAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;6BAC1D,CAAC,CAAC;yBACJ;qBACF;oBACD,MAAM;gBAER,KAAK,OAAO;oBACV,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACjD,MAAM,IAAA,yBAAa,EAAC,IAAW,EAAE,YAAY,CAAC,CAAC;oBAC/C,MAAM;gBAER,KAAK,gBAAgB;oBACnB,IAAI,MAAM,CAAC,MAAM,EAAE;wBACjB,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;wBACnE,MAAM,IAAA,8BAAa,EACjB,kBAAkB,EAClB,QAAQ,EACR,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,CACV,CAAC;qBACH;yBAAM;wBACL,MAAM,IAAA,8BAAa,EACjB,EAAE,EACF,QAAQ,EACR,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,CACV,CAAC;qBACH;oBACD,MAAM;gBAER,KAAK,UAAU,CAAC,CAAC;oBACf,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;oBACnE,MAAM,IAAA,wBAAU,EACd,kBAAkB,EAClB,YAAY,EACZ,EAAE,MAAM,EAAE,EACV,MAAM,EACN,SAAS,EACT,IAAI,EACJ,uBAAuB,CACxB,CAAC;oBACF,MAAM;iBACP;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAhHD,4BAgHC;AAED,SAAS,aAAa,CACpB,MAAc,EACd,YAA0B;IAE1B,IAAI,aAAa,GAAG,MAAM,CAAC,GAAG;QAC5B,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,IAAA,uCAAc,EACZ,YAAY,EACZ,IAAA,iCAAoB,EAClB,IAAA,+BAAU,EAAC,MAAM,CAAC,CAAC,KAAK,EACxB,YAAY,CAAC,iBAAiB,EAC9B,MAAM,CACP,CACF,CAAC;IACN,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE;QAClC,aAAa,GAAG,IAAA,oBAAQ,EACtB,YAAY,EACZ,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAA8B,CAChE,CAAC;KACH;IAED,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;aACvC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;aAC7D,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;KAClC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAA8B,CAAC;AACzE,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAmC,EACnC,MAAc;IAEd,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,sCAAgB,EAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,UAAU,CAAC,CAAM,EAAE,OAAiB;IAC3C,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC9B,IAAI,OAAO,IAAI,CAAC,CAAC,KAAK,EAAE;QACtB,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KACzB;IACD,eAAM,CAAC,KAAK,CAAC;QACX,KAAK,EAAE,sDAAsD;QAC7D,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -54,7 +54,7 @@ function getPatterns(args) {
|
|
|
54
54
|
}
|
|
55
55
|
try {
|
|
56
56
|
if (args.projects && args.projects.length > 0) {
|
|
57
|
-
return getPatternsFromProjects(args.projects);
|
|
57
|
+
return getPatternsFromProjects(args.projects, graph);
|
|
58
58
|
}
|
|
59
59
|
const p = (0, command_line_utils_1.parseFiles)(args);
|
|
60
60
|
const supportedExtensions = prettier
|
|
@@ -67,7 +67,7 @@ function getPatterns(args) {
|
|
|
67
67
|
.concat('.swcrc');
|
|
68
68
|
const patterns = p.files.filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.includes(path.extname(f)));
|
|
69
69
|
return args.libsAndApps
|
|
70
|
-
? yield getPatternsFromApps(patterns, graph.allWorkspaceFiles)
|
|
70
|
+
? yield getPatternsFromApps(patterns, graph.allWorkspaceFiles, graph)
|
|
71
71
|
: patterns;
|
|
72
72
|
}
|
|
73
73
|
catch (_a) {
|
|
@@ -75,11 +75,11 @@ function getPatterns(args) {
|
|
|
75
75
|
}
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
|
-
function getPatternsFromApps(affectedFiles, allWorkspaceFiles) {
|
|
78
|
+
function getPatternsFromApps(affectedFiles, allWorkspaceFiles, projectGraph) {
|
|
79
79
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
80
80
|
const graph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
81
81
|
const affectedGraph = (0, affected_project_graph_1.filterAffected)(graph, (0, file_utils_1.calculateFileChanges)(affectedFiles, allWorkspaceFiles));
|
|
82
|
-
return getPatternsFromProjects(Object.keys(affectedGraph.nodes));
|
|
82
|
+
return getPatternsFromProjects(Object.keys(affectedGraph.nodes), projectGraph);
|
|
83
83
|
});
|
|
84
84
|
}
|
|
85
85
|
function addRootConfigFiles(chunkList, nxArgs, workspaceJsonPath) {
|
|
@@ -102,8 +102,8 @@ function addRootConfigFiles(chunkList, nxArgs, workspaceJsonPath) {
|
|
|
102
102
|
chunkList.push(chunk);
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
|
-
function getPatternsFromProjects(projects) {
|
|
106
|
-
return (0, command_line_utils_1.getProjectRoots)(projects);
|
|
105
|
+
function getPatternsFromProjects(projects, projectGraph) {
|
|
106
|
+
return (0, command_line_utils_1.getProjectRoots)(projects, projectGraph);
|
|
107
107
|
}
|
|
108
108
|
function chunkify(target, size) {
|
|
109
109
|
return target.reduce((current, value, index) => {
|
|
@@ -1 +1 @@
|
|
|
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,4DAAwD;AACxD,qCAAqC;AACrC,sDAAwD;AACxD,oDAG6B;AAC7B,kDAAiE;AAEjE,kEAAyE;AACzE,6FAAkF;AAKlF,2DAAqD;
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,8 @@ const workspace_root_1 = require("../utils/workspace-root");
|
|
|
11
11
|
const print_help_1 = require("../utils/print-help");
|
|
12
12
|
const enquirer_1 = require("enquirer");
|
|
13
13
|
const fileutils_1 = require("nx/src/utils/fileutils");
|
|
14
|
+
const project_graph_1 = require("../project-graph/project-graph");
|
|
15
|
+
const configuration_1 = require("../config/configuration");
|
|
14
16
|
function printChanges(fileChanges) {
|
|
15
17
|
fileChanges.forEach((f) => {
|
|
16
18
|
if (f.type === 'CREATE') {
|
|
@@ -204,17 +206,19 @@ exports.newWorkspace = newWorkspace;
|
|
|
204
206
|
function generate(cwd, args) {
|
|
205
207
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
206
208
|
const ws = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
|
|
209
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
210
|
+
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
211
|
+
const workspaceConfiguration = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
|
|
207
212
|
const isVerbose = args['verbose'];
|
|
208
213
|
return (0, params_1.handleErrors)(isVerbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
209
|
-
const
|
|
210
|
-
const opts = yield convertToGenerateOptions(args, ws, readDefaultCollection(workspaceDefinition), 'generate');
|
|
214
|
+
const opts = yield convertToGenerateOptions(args, ws, readDefaultCollection(nxJson), 'generate');
|
|
211
215
|
const { normalizedGeneratorName, schema, implementationFactory, aliases } = ws.readGenerator(opts.collectionName, opts.generatorName);
|
|
212
216
|
logger_1.logger.info(`NX Generating ${opts.collectionName}:${normalizedGeneratorName}`);
|
|
213
217
|
if (opts.help) {
|
|
214
218
|
printGenHelp(opts, schema, normalizedGeneratorName, aliases);
|
|
215
219
|
return 0;
|
|
216
220
|
}
|
|
217
|
-
const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName,
|
|
221
|
+
const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, workspaceConfiguration, schema, opts.interactive, ws.calculateDefaultProjectName(cwd, workspaceConfiguration), ws.relativeCwd(cwd), isVerbose);
|
|
218
222
|
if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {
|
|
219
223
|
const host = new tree_1.FsTree(workspace_root_1.workspaceRoot, isVerbose);
|
|
220
224
|
const implementation = implementationFactory();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":";;;;AAAA,4CAKyB;AACzB,qDAAkD;AAClD,6CAAsE;AACtE,4CAAyC;AACzC,+BAA+B;AAC/B,4DAAwD;AAExD,oDAAgD;AAChD,uCAAkC;AAClC,sDAAsD;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import * as yargs from 'yargs';
|
|
2
2
|
import type { NxArgs } from '../utils/command-line-utils';
|
|
3
3
|
import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
|
|
4
|
-
import {
|
|
5
|
-
export declare function printAffected(affectedProjectsWithTargetAndConfig: ProjectGraphProjectNode[], affectedProjects: ProjectGraphProjectNode[], projectGraph: ProjectGraph, { nxJson }:
|
|
4
|
+
import { NxJsonConfiguration } from '../config/nx-json';
|
|
5
|
+
export declare function printAffected(affectedProjectsWithTargetAndConfig: ProjectGraphProjectNode[], affectedProjects: ProjectGraphProjectNode[], projectGraph: ProjectGraph, { nxJson }: {
|
|
6
|
+
nxJson: NxJsonConfiguration;
|
|
7
|
+
}, nxArgs: NxArgs, overrides: yargs.Arguments): Promise<void>;
|
|
6
8
|
export declare function selectPrintAffected(wholeJson: any, wholeSelect: string): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"print-affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/print-affected.ts"],"names":[],"mappings":";;;;AAAA,iDAAuE;
|
|
1
|
+
{"version":3,"file":"print-affected.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/print-affected.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.readEnvironment = void 0;
|
|
4
4
|
const configuration_1 = require("../config/configuration");
|
|
5
|
+
/**
|
|
6
|
+
* @deprecated Read workspaceJson from projectGraph, and use readNxJson on its own.
|
|
7
|
+
*/
|
|
5
8
|
function readEnvironment() {
|
|
6
9
|
const nxJson = (0, configuration_1.readNxJson)();
|
|
7
10
|
const workspaceJson = (0, configuration_1.readAllWorkspaceConfiguration)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-environment.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/read-environment.ts"],"names":[],"mappings":";;;AACA,2DAGiC;AAajC,SAAgB,eAAe;IAC7B,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;IAC5B,MAAM,aAAa,GAAG,IAAA,6CAA6B,GAAE,CAAC;IACtD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,IAAI,EAAS,CAAC;AAClE,CAAC;AAJD,0CAIC"}
|
|
1
|
+
{"version":3,"file":"read-environment.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/read-environment.ts"],"names":[],"mappings":";;;AACA,2DAGiC;AAajC;;GAEG;AACH,SAAgB,eAAe;IAC7B,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;IAC5B,MAAM,aAAa,GAAG,IAAA,6CAA6B,GAAE,CAAC;IACtD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,IAAI,EAAS,CAAC;AAClE,CAAC;AAJD,0CAIC"}
|
|
@@ -9,16 +9,16 @@ const output_1 = require("../utils/output");
|
|
|
9
9
|
const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
|
|
10
10
|
const perf_hooks_1 = require("perf_hooks");
|
|
11
11
|
const project_graph_1 = require("../project-graph/project-graph");
|
|
12
|
-
const
|
|
12
|
+
const configuration_1 = require("../config/configuration");
|
|
13
13
|
function runMany(args, extraTargetDependencies = {}) {
|
|
14
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
15
|
perf_hooks_1.performance.mark('command-execution-begins');
|
|
16
|
-
const
|
|
17
|
-
const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'run-many', { printWarnings: true },
|
|
16
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
17
|
+
const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'run-many', { printWarnings: true }, nxJson);
|
|
18
18
|
yield (0, connect_to_nx_cloud_1.connectToNxCloudUsingScan)(nxArgs.scan);
|
|
19
19
|
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
20
20
|
const projects = projectsToRun(nxArgs, projectGraph);
|
|
21
|
-
yield (0, run_command_1.runCommand)(projects, projectGraph,
|
|
21
|
+
yield (0, run_command_1.runCommand)(projects, projectGraph, { nxJson }, nxArgs, overrides, null, extraTargetDependencies);
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
exports.runMany = runMany;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-many.ts"],"names":[],"mappings":";;;;AACA,6DAAyD;AAEzD,oEAA8E;AAC9E,sEAAgE;AAChE,4CAAyC;AACzC,+DAAkE;AAClE,2CAAyC;AAEzC,kEAAyE;
|
|
1
|
+
{"version":3,"file":"run-many.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-many.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,22 +10,22 @@ const project_graph_1 = require("../project-graph/project-graph");
|
|
|
10
10
|
const workspace_root_1 = require("../utils/workspace-root");
|
|
11
11
|
const split_target_1 = require("../utils/split-target");
|
|
12
12
|
const output_1 = require("../utils/output");
|
|
13
|
-
const
|
|
13
|
+
const configuration_1 = require("../config/configuration");
|
|
14
14
|
function runOne(cwd, args, extraTargetDependencies = {}) {
|
|
15
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
perf_hooks_1.performance.mark('command-execution-begins');
|
|
17
17
|
perf_hooks_1.performance.measure('code-loading', 'init-local', 'command-execution-begins');
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
const
|
|
18
|
+
const nxJson = (0, configuration_1.readNxJson)();
|
|
19
|
+
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
20
|
+
const opts = parseRunOneOptions(cwd, args, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
|
|
21
|
+
const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(Object.assign(Object.assign({}, opts.parsedArgs), { configuration: opts.configuration, target: opts.target }), 'run-one', { printWarnings: true }, nxJson);
|
|
21
22
|
if (nxArgs.help) {
|
|
22
|
-
yield (yield Promise.resolve().then(() => require('./run'))).run(cwd, workspace_root_1.workspaceRoot, opts, {}, false, true);
|
|
23
|
+
yield (yield Promise.resolve().then(() => require('./run'))).run(cwd, workspace_root_1.workspaceRoot, opts, {}, false, true, projectGraph);
|
|
23
24
|
process.exit(0);
|
|
24
25
|
}
|
|
25
|
-
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
26
26
|
yield (0, connect_to_nx_cloud_1.connectToNxCloudUsingScan)(nxArgs.scan);
|
|
27
27
|
const { projects } = getProjects(projectGraph, opts.project);
|
|
28
|
-
yield (0, run_command_1.runCommand)(projects, projectGraph,
|
|
28
|
+
yield (0, run_command_1.runCommand)(projects, projectGraph, { nxJson }, nxArgs, overrides, opts.project, extraTargetDependencies);
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
exports.runOne = runOne;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-one.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-one.ts"],"names":[],"mappings":";;;;AAAA,6DAAyD;AACzD,oEAA8E;AAC9E,+DAAkE;AAClE,2CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"run-one.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run-one.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Schema } from '../utils/params';
|
|
2
2
|
import { ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
3
3
|
import { ExecutorContext } from '../config/misc-interfaces';
|
|
4
|
+
import { ProjectGraph } from '../config/project-graph';
|
|
4
5
|
export interface Target {
|
|
5
6
|
project: string;
|
|
6
7
|
target: string;
|
|
@@ -54,4 +55,4 @@ export declare function run(cwd: string, root: string, targetDescription: {
|
|
|
54
55
|
configuration?: string;
|
|
55
56
|
}, overrides: {
|
|
56
57
|
[k: string]: any;
|
|
57
|
-
}, isVerbose: boolean, isHelp: boolean): Promise<any>;
|
|
58
|
+
}, isVerbose: boolean, isHelp: boolean, projectGraph?: ProjectGraph): Promise<any>;
|
package/src/command-line/run.js
CHANGED
|
@@ -11,6 +11,7 @@ const path_1 = require("path");
|
|
|
11
11
|
const fs_1 = require("fs");
|
|
12
12
|
const nx_plugin_1 = require("../utils/nx-plugin");
|
|
13
13
|
const serialize_overrides_into_command_line_1 = require("nx/src/utils/serialize-overrides-into-command-line");
|
|
14
|
+
const project_graph_1 = require("../project-graph/project-graph");
|
|
14
15
|
function printRunHelp(opts, schema, plugin) {
|
|
15
16
|
(0, print_help_1.printHelp)(`run ${opts.project}:${opts.target}`, schema, Object.assign({ mode: 'run' }, plugin));
|
|
16
17
|
}
|
|
@@ -162,11 +163,11 @@ function runExecutor(targetDescription, overrides, context) {
|
|
|
162
163
|
});
|
|
163
164
|
}
|
|
164
165
|
exports.runExecutor = runExecutor;
|
|
165
|
-
function run(cwd, root, targetDescription, overrides, isVerbose, isHelp) {
|
|
166
|
+
function run(cwd, root, targetDescription, overrides, isVerbose, isHelp, projectGraph) {
|
|
166
167
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
167
|
-
|
|
168
|
+
projectGraph !== null && projectGraph !== void 0 ? projectGraph : (projectGraph = yield (0, project_graph_1.createProjectGraphAsync)());
|
|
168
169
|
return (0, params_1.handleErrors)(isVerbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
169
|
-
const workspace =
|
|
170
|
+
const workspace = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
|
|
170
171
|
return iteratorToProcessStatusCode(yield runExecutorInternal(targetDescription, overrides, root, cwd, workspace, isVerbose, isHelp));
|
|
171
172
|
}));
|
|
172
173
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run.ts"],"names":[],"mappings":";;;;AAAA,4CAIyB;AACzB,oDAAgD;AAChD,qDAAkD;AAElD,kDAAkD;AAClD,wDAA2E;AAC3E,+BAA4B;AAC5B,2BAAgC;AAChC,kDAG4B;AAO5B,8GAAuG;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/run.ts"],"names":[],"mappings":"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"}
|