nx 14.0.3 → 14.0.4
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/migrations.json +8 -1
- package/package.json +4 -4
- package/src/adapter/ngcli-adapter.d.ts +1 -1
- package/src/adapter/ngcli-adapter.js +4 -2
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/generate.js +1 -1
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/migrate.js +12 -18
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.d.ts +1 -0
- package/src/command-line/nx-commands.js +7 -12
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/workspace-generators.js +2 -0
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/config/nx-json.d.ts +0 -7
- package/src/config/project-graph.d.ts +1 -1
- package/src/config/workspaces.js +11 -3
- 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 -0
- package/src/daemon/client/client.js.map +1 -1
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts +6 -0
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js +46 -0
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js.map +1 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.d.ts +5 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js +35 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js.map +1 -0
- package/src/generators/testing-utils/create-tree.d.ts +5 -0
- package/src/generators/testing-utils/create-tree.js +12 -0
- package/src/generators/testing-utils/create-tree.js.map +1 -0
- package/src/{config → generators}/tree.d.ts +0 -0
- package/src/{config → generators}/tree.js +0 -0
- package/src/generators/tree.js.map +1 -0
- package/src/generators/utils/json.d.ts +28 -0
- package/src/generators/utils/json.js +49 -0
- package/src/generators/utils/json.js.map +1 -0
- package/src/generators/utils/project-configuration.d.ts +77 -0
- package/src/generators/utils/project-configuration.js +383 -0
- package/src/generators/utils/project-configuration.js.map +1 -0
- package/src/migrations/update-14-0-4/remove-roots.d.ts +2 -0
- package/src/migrations/update-14-0-4/remove-roots.js +16 -0
- package/src/migrations/update-14-0-4/remove-roots.js.map +1 -0
- package/src/project-graph/build-project-graph.js +20 -17
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/operators.d.ts +0 -8
- package/src/project-graph/operators.js +1 -12
- package/src/project-graph/operators.js.map +1 -1
- package/src/tasks-runner/run-command.js +5 -24
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/utils/nx-plugin.js +12 -3
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/package-manager.d.ts +4 -1
- package/src/utils/package-manager.js +14 -10
- package/src/utils/package-manager.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/config/tree.js.map +0 -1
|
@@ -0,0 +1,383 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getWorkspacePath = exports.shouldDefaultToUsingStandaloneConfigs = exports.readWorkspace = exports.isStandaloneProject = exports.readNxJson = exports.readProjectConfiguration = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.removeProjectConfiguration = exports.updateProjectConfiguration = exports.addProjectConfiguration = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const workspaces_1 = require("../../config/workspaces");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const json_1 = require("./json");
|
|
8
|
+
const path_2 = require("../../utils/path");
|
|
9
|
+
/**
|
|
10
|
+
* Adds project configuration to the Nx workspace.
|
|
11
|
+
*
|
|
12
|
+
* The project configuration is stored in workspace.json or the associated project.json file.
|
|
13
|
+
* The utility will update either files.
|
|
14
|
+
*
|
|
15
|
+
* @param tree - the file system tree
|
|
16
|
+
* @param projectName - unique name. Often directories are part of the name (e.g., mydir-mylib)
|
|
17
|
+
* @param projectConfiguration - project configuration
|
|
18
|
+
* @param standalone - should the project use package.json? If false, the project config is inside workspace.json
|
|
19
|
+
*/
|
|
20
|
+
function addProjectConfiguration(tree, projectName, projectConfiguration, standalone) {
|
|
21
|
+
standalone = standalone !== null && standalone !== void 0 ? standalone : shouldDefaultToUsingStandaloneConfigs(tree);
|
|
22
|
+
setProjectConfiguration(tree, projectName, projectConfiguration, 'create', standalone);
|
|
23
|
+
}
|
|
24
|
+
exports.addProjectConfiguration = addProjectConfiguration;
|
|
25
|
+
/**
|
|
26
|
+
* Updates the configuration of an existing project.
|
|
27
|
+
*
|
|
28
|
+
* The project configuration is stored in workspace.json or the associated project.json file.
|
|
29
|
+
* The utility will update either files.
|
|
30
|
+
*
|
|
31
|
+
* @param tree - the file system tree
|
|
32
|
+
* @param projectName - unique name. Often directories are part of the name (e.g., mydir-mylib)
|
|
33
|
+
* @param projectConfiguration - project configuration
|
|
34
|
+
*/
|
|
35
|
+
function updateProjectConfiguration(tree, projectName, projectConfiguration) {
|
|
36
|
+
setProjectConfiguration(tree, projectName, projectConfiguration, 'update');
|
|
37
|
+
}
|
|
38
|
+
exports.updateProjectConfiguration = updateProjectConfiguration;
|
|
39
|
+
/**
|
|
40
|
+
* Removes the configuration of an existing project.
|
|
41
|
+
*
|
|
42
|
+
* The project configuration is stored in workspace.json or the associated project.json file.
|
|
43
|
+
* The utility will update either file.
|
|
44
|
+
*/
|
|
45
|
+
function removeProjectConfiguration(tree, projectName) {
|
|
46
|
+
setProjectConfiguration(tree, projectName, undefined, 'delete');
|
|
47
|
+
}
|
|
48
|
+
exports.removeProjectConfiguration = removeProjectConfiguration;
|
|
49
|
+
/**
|
|
50
|
+
* Get a map of all projects in a workspace.
|
|
51
|
+
*
|
|
52
|
+
* Use {@link readProjectConfiguration} if only one project is needed.
|
|
53
|
+
*/
|
|
54
|
+
function getProjects(tree) {
|
|
55
|
+
const workspace = readWorkspace(tree);
|
|
56
|
+
return new Map(Object.keys(workspace.projects || {}).map((projectName) => {
|
|
57
|
+
return [projectName, getProjectConfiguration(projectName, workspace)];
|
|
58
|
+
}));
|
|
59
|
+
}
|
|
60
|
+
exports.getProjects = getProjects;
|
|
61
|
+
/**
|
|
62
|
+
* Read general workspace configuration such as the default project or cli settings
|
|
63
|
+
*
|
|
64
|
+
* This does _not_ provide projects configuration, use {@link readProjectConfiguration} instead.
|
|
65
|
+
*/
|
|
66
|
+
function readWorkspaceConfiguration(tree) {
|
|
67
|
+
const _a = readRawWorkspaceJson(tree), { projects } = _a, workspace = tslib_1.__rest(_a, ["projects"]); // Create a new object, without projects
|
|
68
|
+
let nxJson = readNxJson(tree);
|
|
69
|
+
if (nxJson === null) {
|
|
70
|
+
return workspace;
|
|
71
|
+
}
|
|
72
|
+
return Object.assign(Object.assign({}, workspace), nxJson);
|
|
73
|
+
}
|
|
74
|
+
exports.readWorkspaceConfiguration = readWorkspaceConfiguration;
|
|
75
|
+
/**
|
|
76
|
+
* Update general workspace configuration such as the default project or cli settings.
|
|
77
|
+
*
|
|
78
|
+
* This does _not_ update projects configuration, use {@link updateProjectConfiguration} or {@link addProjectConfiguration} instead.
|
|
79
|
+
*/
|
|
80
|
+
function updateWorkspaceConfiguration(tree, workspaceConfig) {
|
|
81
|
+
const {
|
|
82
|
+
// Nx Json Properties
|
|
83
|
+
cli, defaultProject, generators, implicitDependencies, plugins, pluginsConfig, npmScope, targetDependencies, workspaceLayout, tasksRunnerOptions, affected, extends: ext, } = workspaceConfig;
|
|
84
|
+
const nxJson = {
|
|
85
|
+
implicitDependencies,
|
|
86
|
+
plugins,
|
|
87
|
+
pluginsConfig,
|
|
88
|
+
npmScope,
|
|
89
|
+
targetDependencies,
|
|
90
|
+
workspaceLayout,
|
|
91
|
+
tasksRunnerOptions,
|
|
92
|
+
affected,
|
|
93
|
+
cli,
|
|
94
|
+
generators,
|
|
95
|
+
defaultProject,
|
|
96
|
+
extends: ext,
|
|
97
|
+
};
|
|
98
|
+
if (tree.exists('nx.json')) {
|
|
99
|
+
(0, json_1.updateJson)(tree, 'nx.json', (json) => {
|
|
100
|
+
if (json.extends) {
|
|
101
|
+
const nxJsonExtends = readNxJsonExtends(tree, json.extends);
|
|
102
|
+
const changedPropsOfNxJson = {};
|
|
103
|
+
Object.keys(nxJson).forEach((prop) => {
|
|
104
|
+
if (JSON.stringify(nxJson[prop], null, 2) !=
|
|
105
|
+
JSON.stringify(nxJsonExtends[prop], null, 2)) {
|
|
106
|
+
changedPropsOfNxJson[prop] = nxJson[prop];
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
return Object.assign(Object.assign({}, json), changedPropsOfNxJson);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
return Object.assign(Object.assign({}, json), nxJson);
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
// Only prop in workspace.json is version. If there is no
|
|
117
|
+
// workspace.json file, this f(x) doesn't update anything
|
|
118
|
+
// in project config.
|
|
119
|
+
const workspacePath = getWorkspacePath(tree);
|
|
120
|
+
if (workspacePath) {
|
|
121
|
+
(0, json_1.updateJson)(tree, workspacePath, (json) => {
|
|
122
|
+
const config = Object.assign(Object.assign({}, json), { version: workspaceConfig.version });
|
|
123
|
+
if (!workspaceConfig.newProjectRoot) {
|
|
124
|
+
delete config.newProjectRoot;
|
|
125
|
+
}
|
|
126
|
+
return config;
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
exports.updateWorkspaceConfiguration = updateWorkspaceConfiguration;
|
|
131
|
+
function readNxJsonExtends(tree, extendsPath) {
|
|
132
|
+
try {
|
|
133
|
+
return (0, json_1.readJson)(tree, (0, path_1.relative)(tree.root, require.resolve(extendsPath, {
|
|
134
|
+
paths: [tree.root],
|
|
135
|
+
})));
|
|
136
|
+
}
|
|
137
|
+
catch (e) {
|
|
138
|
+
throw new Error(`Unable to resolve nx.json extends. Error: ${e.message}`);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Reads a project configuration.
|
|
143
|
+
*
|
|
144
|
+
* The project configuration is stored in workspace.json or the associated project.json file.
|
|
145
|
+
* The utility will read from either file.
|
|
146
|
+
*
|
|
147
|
+
* @param tree - the file system tree
|
|
148
|
+
* @param projectName - unique name. Often directories are part of the name (e.g., mydir-mylib)
|
|
149
|
+
* @throws If supplied projectName cannot be found
|
|
150
|
+
*/
|
|
151
|
+
function readProjectConfiguration(tree, projectName) {
|
|
152
|
+
const workspace = readWorkspace(tree);
|
|
153
|
+
if (!workspace.projects[projectName]) {
|
|
154
|
+
throw new Error(`Cannot find configuration for '${projectName}' in ${getWorkspacePath(tree)}.`);
|
|
155
|
+
}
|
|
156
|
+
return getProjectConfiguration(projectName, workspace);
|
|
157
|
+
}
|
|
158
|
+
exports.readProjectConfiguration = readProjectConfiguration;
|
|
159
|
+
function readNxJson(tree) {
|
|
160
|
+
if (!tree.exists('nx.json')) {
|
|
161
|
+
return null;
|
|
162
|
+
}
|
|
163
|
+
let nxJson = (0, json_1.readJson)(tree, 'nx.json');
|
|
164
|
+
if (nxJson.extends) {
|
|
165
|
+
nxJson = Object.assign(Object.assign({}, readNxJsonExtends(tree, nxJson.extends)), nxJson);
|
|
166
|
+
}
|
|
167
|
+
return nxJson;
|
|
168
|
+
}
|
|
169
|
+
exports.readNxJson = readNxJson;
|
|
170
|
+
/**
|
|
171
|
+
* Returns if a project has a standalone configuration (project.json).
|
|
172
|
+
*
|
|
173
|
+
* @param tree - the file system tree
|
|
174
|
+
* @param project - the project name
|
|
175
|
+
*/
|
|
176
|
+
function isStandaloneProject(tree, project) {
|
|
177
|
+
var _a;
|
|
178
|
+
const path = getWorkspacePath(tree);
|
|
179
|
+
const rawWorkspace = path && tree.exists(path)
|
|
180
|
+
? (0, json_1.readJson)(tree, path)
|
|
181
|
+
: null;
|
|
182
|
+
if (rawWorkspace) {
|
|
183
|
+
const projectConfig = (_a = rawWorkspace.projects) === null || _a === void 0 ? void 0 : _a[project];
|
|
184
|
+
return typeof projectConfig === 'string';
|
|
185
|
+
}
|
|
186
|
+
return true;
|
|
187
|
+
}
|
|
188
|
+
exports.isStandaloneProject = isStandaloneProject;
|
|
189
|
+
function getProjectConfiguration(projectName, workspace) {
|
|
190
|
+
return Object.assign({}, readWorkspaceSection(workspace, projectName));
|
|
191
|
+
}
|
|
192
|
+
function readWorkspaceSection(workspace, projectName) {
|
|
193
|
+
return workspace.projects[projectName];
|
|
194
|
+
}
|
|
195
|
+
function setProjectConfiguration(tree, projectName, projectConfiguration, mode, standalone = false) {
|
|
196
|
+
if (mode === 'delete') {
|
|
197
|
+
addProjectToWorkspaceJson(tree, projectName, readProjectConfiguration(tree, projectName), mode);
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
if (!projectConfiguration) {
|
|
201
|
+
throw new Error(`Cannot ${mode} "${projectName}" with value ${projectConfiguration}`);
|
|
202
|
+
}
|
|
203
|
+
addProjectToWorkspaceJson(tree, projectName, projectConfiguration, mode, standalone);
|
|
204
|
+
}
|
|
205
|
+
function addProjectToWorkspaceJson(tree, projectName, project, mode, standalone = false) {
|
|
206
|
+
var _a;
|
|
207
|
+
const workspaceConfigPath = getWorkspacePath(tree);
|
|
208
|
+
const workspaceJson = readRawWorkspaceJson(tree);
|
|
209
|
+
if (workspaceConfigPath) {
|
|
210
|
+
validateProjectConfigurationOperationsGivenWorkspaceJson(mode, workspaceJson, projectName);
|
|
211
|
+
}
|
|
212
|
+
else {
|
|
213
|
+
validateProjectConfigurationOperationsWithoutWorkspaceJson(mode, projectName, project.root, tree);
|
|
214
|
+
}
|
|
215
|
+
const configFile = (mode === 'create' && standalone) || !workspaceConfigPath
|
|
216
|
+
? (0, path_2.joinPathFragments)(project.root, 'project.json')
|
|
217
|
+
: getProjectFileLocation(tree, projectName);
|
|
218
|
+
if (configFile) {
|
|
219
|
+
if (mode === 'delete') {
|
|
220
|
+
tree.delete(configFile);
|
|
221
|
+
delete workspaceJson.projects[projectName];
|
|
222
|
+
}
|
|
223
|
+
else {
|
|
224
|
+
// keep real workspace up to date
|
|
225
|
+
if (workspaceConfigPath && mode === 'create') {
|
|
226
|
+
workspaceJson.projects[projectName] = project.root;
|
|
227
|
+
}
|
|
228
|
+
// update the project.json file
|
|
229
|
+
(0, json_1.writeJson)(tree, configFile, Object.assign(Object.assign({}, project), { root: undefined }));
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
else if (mode === 'delete') {
|
|
233
|
+
delete workspaceJson.projects[projectName];
|
|
234
|
+
}
|
|
235
|
+
else {
|
|
236
|
+
workspaceJson.projects[projectName] = project;
|
|
237
|
+
}
|
|
238
|
+
if (workspaceConfigPath && tree.exists(workspaceConfigPath)) {
|
|
239
|
+
(0, json_1.writeJson)(tree, workspaceConfigPath, (_a = (0, workspaces_1.reformattedWorkspaceJsonOrNull)(workspaceJson)) !== null && _a !== void 0 ? _a : workspaceJson);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
/**
|
|
243
|
+
* Read the workspace configuration, including projects.
|
|
244
|
+
*/
|
|
245
|
+
function readWorkspace(tree) {
|
|
246
|
+
const workspaceJson = inlineProjectConfigurationsWithTree(tree);
|
|
247
|
+
const originalVersion = workspaceJson.version;
|
|
248
|
+
return Object.assign(Object.assign({}, (0, workspaces_1.toNewFormat)(workspaceJson)), { version: originalVersion });
|
|
249
|
+
}
|
|
250
|
+
exports.readWorkspace = readWorkspace;
|
|
251
|
+
/**
|
|
252
|
+
* This has to be separate from the inline functionality inside nx,
|
|
253
|
+
* as the functionality in nx does not use a Tree. Changes made during
|
|
254
|
+
* a generator would not be present during runtime execution.
|
|
255
|
+
* @returns
|
|
256
|
+
*/
|
|
257
|
+
function inlineProjectConfigurationsWithTree(tree) {
|
|
258
|
+
const workspaceJson = readRawWorkspaceJson(tree);
|
|
259
|
+
Object.entries(workspaceJson.projects || {}).forEach(([project, config]) => {
|
|
260
|
+
if (typeof config === 'string') {
|
|
261
|
+
const configFileLocation = (0, path_2.joinPathFragments)(config, 'project.json');
|
|
262
|
+
workspaceJson.projects[project] = Object.assign({ root: config }, (0, json_1.readJson)(tree, configFileLocation));
|
|
263
|
+
}
|
|
264
|
+
});
|
|
265
|
+
return workspaceJson;
|
|
266
|
+
}
|
|
267
|
+
/**
|
|
268
|
+
* Used to ensure that projects created during
|
|
269
|
+
* the same devkit generator run show up when
|
|
270
|
+
* there is no workspace.json file, as `glob`
|
|
271
|
+
* cannot find them.
|
|
272
|
+
*/
|
|
273
|
+
function findCreatedProjects(tree) {
|
|
274
|
+
const files = tree
|
|
275
|
+
.listChanges()
|
|
276
|
+
.filter((f) => {
|
|
277
|
+
const fileName = (0, path_1.basename)(f.path);
|
|
278
|
+
return (f.type === 'CREATE' &&
|
|
279
|
+
(fileName === 'project.json' || fileName === 'package.json'));
|
|
280
|
+
})
|
|
281
|
+
.map((x) => x.path);
|
|
282
|
+
return (0, workspaces_1.deduplicateProjectFiles)(files);
|
|
283
|
+
}
|
|
284
|
+
/**
|
|
285
|
+
* Used to ensure that projects created during
|
|
286
|
+
* the same devkit generator run show up when
|
|
287
|
+
* there is no workspace.json file, as `glob`
|
|
288
|
+
* cannot find them.
|
|
289
|
+
*/
|
|
290
|
+
function findDeletedProjects(tree) {
|
|
291
|
+
return tree.listChanges().filter((f) => {
|
|
292
|
+
const fileName = (0, path_1.basename)(f.path);
|
|
293
|
+
return (f.type === 'DELETE' &&
|
|
294
|
+
(fileName === 'project.json' || fileName === 'package.json'));
|
|
295
|
+
});
|
|
296
|
+
}
|
|
297
|
+
let staticFSWorkspace;
|
|
298
|
+
function readRawWorkspaceJson(tree) {
|
|
299
|
+
const path = getWorkspacePath(tree);
|
|
300
|
+
if (path && tree.exists(path)) {
|
|
301
|
+
// `workspace.json` exists, use it.
|
|
302
|
+
return (0, json_1.readJson)(tree, path);
|
|
303
|
+
}
|
|
304
|
+
else {
|
|
305
|
+
const nxJson = readNxJson(tree);
|
|
306
|
+
const createdProjects = (0, workspaces_1.buildWorkspaceConfigurationFromGlobs)(nxJson, findCreatedProjects(tree), (file) => (0, json_1.readJson)(tree, file)).projects;
|
|
307
|
+
// We already have built a cache
|
|
308
|
+
if (!staticFSWorkspace) {
|
|
309
|
+
staticFSWorkspace = (0, workspaces_1.buildWorkspaceConfigurationFromGlobs)(nxJson, [...(0, workspaces_1.globForProjectFiles)(tree.root, nxJson)], (file) => (0, json_1.readJson)(tree, file));
|
|
310
|
+
}
|
|
311
|
+
const projects = Object.assign(Object.assign({}, staticFSWorkspace.projects), createdProjects);
|
|
312
|
+
findDeletedProjects(tree).forEach((file) => {
|
|
313
|
+
const matchingStaticProject = Object.entries(projects).find(([, config]) => typeof config === 'string'
|
|
314
|
+
? config === (0, path_1.dirname)(file.path)
|
|
315
|
+
: config.root === (0, path_1.dirname)(file.path));
|
|
316
|
+
if (matchingStaticProject) {
|
|
317
|
+
delete projects[matchingStaticProject[0]];
|
|
318
|
+
}
|
|
319
|
+
});
|
|
320
|
+
return Object.assign(Object.assign({}, staticFSWorkspace), { projects });
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
/**
|
|
324
|
+
* @description Determine where a project's configuration is located.
|
|
325
|
+
* @returns file path if separate from root config, null otherwise.
|
|
326
|
+
*/
|
|
327
|
+
function getProjectFileLocation(tree, project) {
|
|
328
|
+
var _a;
|
|
329
|
+
const rawWorkspace = readRawWorkspaceJson(tree);
|
|
330
|
+
const projectConfig = (_a = rawWorkspace.projects) === null || _a === void 0 ? void 0 : _a[project];
|
|
331
|
+
return typeof projectConfig === 'string'
|
|
332
|
+
? (0, path_2.joinPathFragments)(projectConfig, 'project.json')
|
|
333
|
+
: null;
|
|
334
|
+
}
|
|
335
|
+
function validateProjectConfigurationOperationsGivenWorkspaceJson(mode, workspaceJson, projectName) {
|
|
336
|
+
if (mode == 'create' && workspaceJson.projects[projectName]) {
|
|
337
|
+
throw new Error(`Cannot create Project '${projectName}'. It already exists.`);
|
|
338
|
+
}
|
|
339
|
+
if (mode == 'update' && !workspaceJson.projects[projectName]) {
|
|
340
|
+
throw new Error(`Cannot update Project '${projectName}'. It does not exist.`);
|
|
341
|
+
}
|
|
342
|
+
if (mode == 'delete' && !workspaceJson.projects[projectName]) {
|
|
343
|
+
throw new Error(`Cannot delete Project '${projectName}'. It does not exist.`);
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
function validateProjectConfigurationOperationsWithoutWorkspaceJson(mode, projectName, projectRoot, tree) {
|
|
347
|
+
if (mode == 'create' &&
|
|
348
|
+
tree.exists((0, path_2.joinPathFragments)(projectRoot, 'project.json'))) {
|
|
349
|
+
throw new Error(`Cannot create a new project at ${projectRoot}. It already exists.`);
|
|
350
|
+
}
|
|
351
|
+
if (mode == 'update' &&
|
|
352
|
+
!tree.exists((0, path_2.joinPathFragments)(projectRoot, 'project.json'))) {
|
|
353
|
+
throw new Error(`Cannot update Project ${projectName} at ${projectRoot}. It doesn't exist or uses package.json configuration.`);
|
|
354
|
+
}
|
|
355
|
+
if (mode == 'delete' && !tree.exists((0, path_2.joinPathFragments)(projectRoot))) {
|
|
356
|
+
throw new Error(`Cannot delete Project ${projectName}. It doesn't exist or uses package.json configuration.`);
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
function shouldDefaultToUsingStandaloneConfigs(tree) {
|
|
360
|
+
const workspacePath = getWorkspacePath(tree);
|
|
361
|
+
const rawWorkspace = workspacePath && tree.exists(workspacePath)
|
|
362
|
+
? (0, json_1.readJson)(tree, workspacePath)
|
|
363
|
+
: null;
|
|
364
|
+
return !rawWorkspace
|
|
365
|
+
? true // if workspace.json doesn't exist, all projects **must** be standalone
|
|
366
|
+
: Object.values(rawWorkspace.projects).reduce(
|
|
367
|
+
// default for second, third... projects should be based on all projects being defined as a path
|
|
368
|
+
// for configuration read from ng schematics, this is determined by configFilePath's presence
|
|
369
|
+
(allStandalone, next) => allStandalone &&
|
|
370
|
+
(typeof next === 'string' || 'configFilePath' in next),
|
|
371
|
+
// default for first project should be true if using Nx Schema
|
|
372
|
+
rawWorkspace.version > 1);
|
|
373
|
+
}
|
|
374
|
+
exports.shouldDefaultToUsingStandaloneConfigs = shouldDefaultToUsingStandaloneConfigs;
|
|
375
|
+
function getWorkspacePath(tree) {
|
|
376
|
+
const possibleFiles = [
|
|
377
|
+
'/angular.json',
|
|
378
|
+
'/workspace.json',
|
|
379
|
+
];
|
|
380
|
+
return possibleFiles.filter((path) => tree.exists(path))[0];
|
|
381
|
+
}
|
|
382
|
+
exports.getWorkspacePath = getWorkspacePath;
|
|
383
|
+
//# sourceMappingURL=project-configuration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project-configuration.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/utils/project-configuration.ts"],"names":[],"mappings":";;;;AAAA,wDAMiC;AACjC,+BAAmD;AAEnD,iCAAyD;AAIzD,2CAAqD;AAarD;;;;;;;;;;GAUG;AACH,SAAgB,uBAAuB,CACrC,IAAU,EACV,WAAmB,EACnB,oBAA0C,EAC1C,UAAoB;IAEpB,UAAU,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,qCAAqC,CAAC,IAAI,CAAC,CAAC;IACvE,uBAAuB,CACrB,IAAI,EACJ,WAAW,EACX,oBAAoB,EACpB,QAAQ,EACR,UAAU,CACX,CAAC;AACJ,CAAC;AAdD,0DAcC;AAED;;;;;;;;;GASG;AACH,SAAgB,0BAA0B,CACxC,IAAU,EACV,WAAmB,EACnB,oBAA0C;IAE1C,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;AAC7E,CAAC;AAND,gEAMC;AAED;;;;;GAKG;AACH,SAAgB,0BAA0B,CACxC,IAAU,EACV,WAAmB;IAEnB,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClE,CAAC;AALD,gEAKC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,IAAU;IACpC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEtC,OAAO,IAAI,GAAG,CACZ,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;QACxD,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;IACxE,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AARD,kCAQC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CAAC,IAAU;IACnD,MAAM,KAA6B,oBAAoB,CAAC,IAAI,CAAC,EAAvD,EAAE,QAAQ,OAA6C,EAAxC,SAAS,sBAAxB,YAA0B,CAA6B,CAAC,CAAC,wCAAwC;IAEvG,IAAI,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,OAAO,SAAS,CAAC;KAClB;IAED,uCACK,SAAS,GACT,MAAM,EACT;AACJ,CAAC;AAZD,gEAYC;AAED;;;;GAIG;AACH,SAAgB,4BAA4B,CAC1C,IAAU,EACV,eAAuC;IAEvC,MAAM;IACJ,qBAAqB;IACrB,GAAG,EACH,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,aAAa,EACb,QAAQ,EACR,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,QAAQ,EACR,OAAO,EAAE,GAAG,GACb,GAAG,eAAe,CAAC;IAEpB,MAAM,MAAM,GAAkC;QAC5C,oBAAoB;QACpB,OAAO;QACP,aAAa;QACb,QAAQ;QACR,kBAAkB;QAClB,eAAe;QACf,kBAAkB;QAClB,QAAQ;QACR,GAAG;QACH,UAAU;QACV,cAAc;QACd,OAAO,EAAE,GAAG;KACb,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,IAAA,iBAAU,EAAsB,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YACxD,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5D,MAAM,oBAAoB,GAAG,EAAE,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACnC,IACE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;wBACrC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAC5C;wBACA,oBAAoB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;qBAC3C;gBACH,CAAC,CAAC,CAAC;gBACH,uCAAY,IAAI,GAAK,oBAAoB,EAAG;aAC7C;iBAAM;gBACL,uCAAY,IAAI,GAAK,MAAM,EAAG;aAC/B;QACH,CAAC,CAAC,CAAC;KACJ;IAED,yDAAyD;IACzD,yDAAyD;IACzD,qBAAqB;IACrB,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,aAAa,EAAE;QACjB,IAAA,iBAAU,EAA6B,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;YACnE,MAAM,MAAM,mCACP,IAAI,KACP,OAAO,EAAE,eAAe,CAAC,OAAO,GACjC,CAAC;YACF,IAAI,CAAE,eAAuB,CAAC,cAAc,EAAE;gBAC5C,OAAQ,MAAc,CAAC,cAAc,CAAC;aACvC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAvED,oEAuEC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,WAAmB;IACxD,IAAI;QACF,OAAO,IAAA,eAAQ,EACb,IAAI,EACJ,IAAA,eAAQ,EACN,IAAI,CAAC,IAAI,EACT,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;YAC3B,KAAK,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACnB,CAAC,CACH,CACF,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KAC3E;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,wBAAwB,CACtC,IAAU,EACV,WAAmB;IAEnB,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CACb,kCAAkC,WAAW,QAAQ,gBAAgB,CACnE,IAAI,CACL,GAAG,CACL,CAAC;KACH;IAED,OAAO,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;AACzD,CAAC;AAdD,4DAcC;AAED,SAAgB,UAAU,CAAC,IAAU;IACnC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAM,GAAG,IAAA,eAAQ,EAAsB,IAAI,EAAE,SAAS,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,MAAM,mCAAQ,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAK,MAAM,CAAE,CAAC;KACpE;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AATD,gCASC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAe;;IAC7D,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,YAAY,GAChB,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACvB,CAAC,CAAC,IAAA,eAAQ,EAAgC,IAAI,EAAE,IAAI,CAAC;QACrD,CAAC,CAAC,IAAI,CAAC;IACX,IAAI,YAAY,EAAE;QAChB,MAAM,aAAa,GAAG,MAAA,YAAY,CAAC,QAAQ,0CAAG,OAAO,CAAC,CAAC;QACvD,OAAO,OAAO,aAAa,KAAK,QAAQ,CAAC;KAC1C;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAXD,kDAWC;AAED,SAAS,uBAAuB,CAC9B,WAAmB,EACnB,SAAqC;IAErC,yBACK,oBAAoB,CAAC,SAAS,EAAE,WAAW,CAAC,EAC/C;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,SAAqC,EACrC,WAAmB;IAEnB,OAAO,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,uBAAuB,CAC9B,IAAU,EACV,WAAmB,EACnB,oBAA0C,EAC1C,IAAoC,EACpC,aAAsB,KAAK;IAE3B,IAAI,IAAI,KAAK,QAAQ,EAAE;QACrB,yBAAyB,CACvB,IAAI,EACJ,WAAW,EACX,wBAAwB,CAAC,IAAI,EAAE,WAAW,CAAC,EAC3C,IAAI,CACL,CAAC;QACF,OAAO;KACR;IAED,IAAI,CAAC,oBAAoB,EAAE;QACzB,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,KAAK,WAAW,gBAAgB,oBAAoB,EAAE,CACrE,CAAC;KACH;IAED,yBAAyB,CACvB,IAAI,EACJ,WAAW,EACX,oBAAoB,EACpB,IAAI,EACJ,UAAU,CACX,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAChC,IAAU,EACV,WAAmB,EACnB,OAA6B,EAC7B,IAAoC,EACpC,aAAsB,KAAK;;IAE3B,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,mBAAmB,EAAE;QACvB,wDAAwD,CACtD,IAAI,EACJ,aAAa,EACb,WAAW,CACZ,CAAC;KACH;SAAM;QACL,0DAA0D,CACxD,IAAI,EACJ,WAAW,EACX,OAAO,CAAC,IAAI,EACZ,IAAI,CACL,CAAC;KACH;IAED,MAAM,UAAU,GACd,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC,mBAAmB;QACvD,CAAC,CAAC,IAAA,wBAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC;QACjD,CAAC,CAAC,sBAAsB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAEhD,IAAI,UAAU,EAAE;QACd,IAAI,IAAI,KAAK,QAAQ,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACxB,OAAO,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;SAC5C;aAAM;YACL,iCAAiC;YACjC,IAAI,mBAAmB,IAAI,IAAI,KAAK,QAAQ,EAAE;gBAC5C,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;aACpD;YACD,+BAA+B;YAC/B,IAAA,gBAAS,EAAC,IAAI,EAAE,UAAU,kCAAO,OAAO,KAAE,IAAI,EAAE,SAAS,IAAG,CAAC;SAC9D;KACF;SAAM,IAAI,IAAI,KAAK,QAAQ,EAAE;QAC5B,OAAO,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;KAC5C;SAAM;QACL,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;KAC/C;IACD,IAAI,mBAAmB,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QAC3D,IAAA,gBAAS,EACP,IAAI,EACJ,mBAAmB,EACnB,MAAA,IAAA,2CAA8B,EAAC,aAAa,CAAC,mCAAI,aAAa,CAC/D,CAAC;KACH;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAU;IACtC,MAAM,aAAa,GAAG,mCAAmC,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAC;IAC9C,uCACK,IAAA,wBAAW,EAAC,aAAa,CAAC,KAC7B,OAAO,EAAE,eAAe,IACxB;AACJ,CAAC;AAPD,sCAOC;AAED;;;;;GAKG;AACH,SAAS,mCAAmC,CAC1C,IAAU;IAEV,MAAM,aAAa,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE;QACzE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,MAAM,kBAAkB,GAAG,IAAA,wBAAiB,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YACrE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAC7B,IAAI,EAAE,MAAM,IACT,IAAA,eAAQ,EAAuB,IAAI,EAAE,kBAAkB,CAAC,CAC5D,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IACH,OAAO,aAA2C,CAAC;AACrD,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,IAAU;IACrC,MAAM,KAAK,GAAG,IAAI;SACf,WAAW,EAAE;SACb,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACZ,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,CACL,CAAC,CAAC,IAAI,KAAK,QAAQ;YACnB,CAAC,QAAQ,KAAK,cAAc,IAAI,QAAQ,KAAK,cAAc,CAAC,CAC7D,CAAC;IACJ,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtB,OAAO,IAAA,oCAAuB,EAAC,KAAK,CAAC,CAAC;AACxC,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,IAAU;IACrC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACrC,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,CACL,CAAC,CAAC,IAAI,KAAK,QAAQ;YACnB,CAAC,QAAQ,KAAK,cAAc,IAAI,QAAQ,KAAK,cAAc,CAAC,CAC7D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,IAAI,iBAAgD,CAAC;AACrD,SAAS,oBAAoB,CAAC,IAAU;IACtC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC7B,mCAAmC;QACnC,OAAO,IAAA,eAAQ,EAAgC,IAAI,EAAE,IAAI,CAAC,CAAC;KAC5D;SAAM;QACL,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,eAAe,GAAG,IAAA,iDAAoC,EAC1D,MAAM,EACN,mBAAmB,CAAC,IAAI,CAAC,EACzB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,CAC/B,CAAC,QAAQ,CAAC;QACX,gCAAgC;QAChC,IAAI,CAAC,iBAAiB,EAAE;YACtB,iBAAiB,GAAG,IAAA,iDAAoC,EACtD,MAAM,EACN,CAAC,GAAG,IAAA,gCAAmB,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAC3C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,CAC/B,CAAC;SACH;QACD,MAAM,QAAQ,mCAAQ,iBAAiB,CAAC,QAAQ,GAAK,eAAe,CAAE,CAAC;QACvE,mBAAmB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzC,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CACzD,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CACb,OAAO,MAAM,KAAK,QAAQ;gBACxB,CAAC,CAAC,MAAM,KAAK,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,CAAC;gBAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CACzC,CAAC;YAEF,IAAI,qBAAqB,EAAE;gBACzB,OAAO,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;QACH,uCACK,iBAAiB,KACpB,QAAQ,IACR;KACH;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAe;;IACzD,MAAM,YAAY,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,MAAA,YAAY,CAAC,QAAQ,0CAAG,OAAO,CAAC,CAAC;IACvD,OAAO,OAAO,aAAa,KAAK,QAAQ;QACtC,CAAC,CAAC,IAAA,wBAAiB,EAAC,aAAa,EAAE,cAAc,CAAC;QAClD,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,SAAS,wDAAwD,CAC/D,IAAoC,EACpC,aAGQ,EACR,WAAmB;IAEnB,IAAI,IAAI,IAAI,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC3D,MAAM,IAAI,KAAK,CACb,0BAA0B,WAAW,uBAAuB,CAC7D,CAAC;KACH;IACD,IAAI,IAAI,IAAI,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC5D,MAAM,IAAI,KAAK,CACb,0BAA0B,WAAW,uBAAuB,CAC7D,CAAC;KACH;IACD,IAAI,IAAI,IAAI,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC5D,MAAM,IAAI,KAAK,CACb,0BAA0B,WAAW,uBAAuB,CAC7D,CAAC;KACH;AACH,CAAC;AAED,SAAS,0DAA0D,CACjE,IAAoC,EACpC,WAAmB,EACnB,WAAmB,EACnB,IAAU;IAEV,IACE,IAAI,IAAI,QAAQ;QAChB,IAAI,CAAC,MAAM,CAAC,IAAA,wBAAiB,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAC3D;QACA,MAAM,IAAI,KAAK,CACb,kCAAkC,WAAW,sBAAsB,CACpE,CAAC;KACH;IACD,IACE,IAAI,IAAI,QAAQ;QAChB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,wBAAiB,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAC5D;QACA,MAAM,IAAI,KAAK,CACb,yBAAyB,WAAW,OAAO,WAAW,wDAAwD,CAC/G,CAAC;KACH;IACD,IAAI,IAAI,IAAI,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,wBAAiB,EAAC,WAAW,CAAC,CAAC,EAAE;QACpE,MAAM,IAAI,KAAK,CACb,yBAAyB,WAAW,wDAAwD,CAC7F,CAAC;KACH;AACH,CAAC;AAED,SAAgB,qCAAqC,CAAC,IAAU;IAC9D,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,YAAY,GAChB,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;QACzC,CAAC,CAAC,IAAA,eAAQ,EAAgC,IAAI,EAAE,aAAa,CAAC;QAC9D,CAAC,CAAC,IAAI,CAAC;IACX,OAAO,CAAC,YAAY;QAClB,CAAC,CAAC,IAAI,CAAC,uEAAuE;QAC9E,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,MAAM;QACzC,gGAAgG;QAChG,6FAA6F;QAC7F,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,CACtB,aAAa;YACb,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,gBAAgB,IAAI,IAAI,CAAC;QAExD,8DAA8D;QAC9D,YAAY,CAAC,OAAO,GAAG,CAAC,CACzB,CAAC;AACR,CAAC;AAlBD,sFAkBC;AAED,SAAgB,gBAAgB,CAC9B,IAAU;IAEV,MAAM,aAAa,GAA4C;QAC7D,eAAe;QACf,iBAAiB;KAClB,CAAC;IACF,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC;AARD,4CAQC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const project_configuration_1 = require("../../generators/utils/project-configuration");
|
|
5
|
+
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
6
|
+
function default_1(tree) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
// This looks like it does nothing, but this will actually effectively migrate over all the configs that need to be moved over, but won't touch configs that don't need to be moved
|
|
9
|
+
for (const [projName, projConfig] of (0, project_configuration_1.getProjects)(tree)) {
|
|
10
|
+
(0, project_configuration_1.updateProjectConfiguration)(tree, projName, projConfig);
|
|
11
|
+
}
|
|
12
|
+
yield (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
|
|
13
|
+
});
|
|
14
|
+
}
|
|
15
|
+
exports.default = default_1;
|
|
16
|
+
//# sourceMappingURL=remove-roots.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-roots.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-0-4/remove-roots.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;AAE5I,mBAA+B,IAAU;;QACvC,mLAAmL;QACnL,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SACxD;QAED,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;IACxD,CAAC;CAAA;AAPD,4BAOC"}
|
|
@@ -86,7 +86,7 @@ function buildProjectGraphUsingContext(nxJson, ctx, cachedFileData, projectGraph
|
|
|
86
86
|
(0, build_dependencies_1.buildImplicitProjectDependencies)(ctx, builder);
|
|
87
87
|
builder.setVersion(projectGraphVersion);
|
|
88
88
|
const initProjectGraph = builder.getUpdatedProjectGraph();
|
|
89
|
-
const r = updateProjectGraphWithPlugins(ctx, initProjectGraph);
|
|
89
|
+
const r = yield updateProjectGraphWithPlugins(ctx, initProjectGraph);
|
|
90
90
|
perf_hooks_1.performance.mark('build project graph:end');
|
|
91
91
|
perf_hooks_1.performance.measure('build project graph', 'build project graph:start', 'build project graph:end');
|
|
92
92
|
return r;
|
|
@@ -204,25 +204,28 @@ function createContext(workspaceJson, nxJson, fileMap, filesToProcess) {
|
|
|
204
204
|
};
|
|
205
205
|
}
|
|
206
206
|
function updateProjectGraphWithPlugins(context, initProjectGraph) {
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
const message = `Failed to process the project graph with "${plugin.name}". This will error in the future!`;
|
|
214
|
-
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
215
|
-
console.error(e);
|
|
216
|
-
logger_1.logger.error(message);
|
|
217
|
-
return graph;
|
|
207
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
208
|
+
const plugins = (0, nx_plugin_1.loadNxPlugins)(context.workspace.plugins).filter((x) => !!x.processProjectGraph);
|
|
209
|
+
let graph = initProjectGraph;
|
|
210
|
+
for (const plugin of plugins) {
|
|
211
|
+
try {
|
|
212
|
+
graph = yield plugin.processProjectGraph(graph, context);
|
|
218
213
|
}
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
214
|
+
catch (e) {
|
|
215
|
+
const message = `Failed to process the project graph with "${plugin.name}". This will error in the future!`;
|
|
216
|
+
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
217
|
+
console.error(e);
|
|
218
|
+
logger_1.logger.error(message);
|
|
219
|
+
return graph;
|
|
220
|
+
}
|
|
221
|
+
else {
|
|
222
|
+
logger_1.logger.warn(message);
|
|
223
|
+
logger_1.logger.warn(`Run with NX_VERBOSE_LOGGING=true to see the error.`);
|
|
224
|
+
}
|
|
222
225
|
}
|
|
223
|
-
return graph;
|
|
224
226
|
}
|
|
225
|
-
|
|
227
|
+
return graph;
|
|
228
|
+
});
|
|
226
229
|
}
|
|
227
230
|
function readRootTsConfig() {
|
|
228
231
|
const tsConfigPath = (0, typescript_1.getRootTsConfigPath)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":";;;;AAAA,gDAAkD;AAClD,+BAA4B;AAC5B,2CAAyC;AACzC,kFAA6E;AAC7E,6CAAuE;AACvE,2DAAsD;AACtD,mDAOyB;AACzB,6DAAwE;AACxE,+CAGuB;AACvB,yBAAyB;AACzB,0JAAiJ;AACjJ,kDAAmD;AACnD,uDAA0D;AAC1D,qDAAwD;AACxD,oDAA0D;AAM1D,kDAAkD;
|
|
1
|
+
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/build-project-graph.ts"],"names":[],"mappings":";;;;AAAA,gDAAkD;AAClD,+BAA4B;AAC5B,2CAAyC;AACzC,kFAA6E;AAC7E,6CAAuE;AACvE,2DAAsD;AACtD,mDAOyB;AACzB,6DAAwE;AACxE,+CAGuB;AACvB,yBAAyB;AACzB,0JAAiJ;AACjJ,kDAAmD;AACnD,uDAA0D;AAC1D,qDAAwD;AACxD,oDAA0D;AAM1D,kDAAkD;AAElD,4CAAyC;AACzC,mEAA8D;AAM9D,SAAsB,iBAAiB;;QACrC,MAAM,aAAa,GAAG,IAAA,8BAAiB,GAAE,CAAC;QAC1C,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,GAAG,IAAA,qCAAoB,EAChE,aAAa,EACb,+BAAiB,CAAC,WAAW,EAAE,CAChC,CAAC;QAEF,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,OAAO,CAAC;QACpE,IAAI,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,IAAA,yBAAS,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9C,OAAO,CACL,MAAM,oCAAoC,CACxC,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,KAAK,EACL,YAAY,CACb,CACF,CAAC,YAAY,CAAC;IACjB,CAAC;CAAA;AAlBD,8CAkBC;AAED,SAAsB,oCAAoC,CACxD,aAAyC,EACzC,cAA8B,EAC9B,iBAA6B,EAC7B,KAA+B,EAC/B,gBAAyB;;QAKzB,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,mBAAmB,GAAG,KAAK,CAAC;QAClC,IAAA,mDAAuB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,gBAAgB,GAAG,IAAA,mCAAe,EACtC,MAAM,EACN,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CACpC,CAAC;QACF,MAAM,eAAe,GAAG,gBAAgB,EAAE,CAAC;QAC3C,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;QAExC,IAAI,cAAc,CAAC;QACnB,IAAI,cAAc,CAAC;QACnB,IACE,KAAK;YACL,CAAC,IAAA,yCAAyB,EACxB,KAAK,EACL,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,YAAY,CACb,EACD;YACA,MAAM,SAAS,GAAG,IAAA,qCAAqB,EAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YAC/D,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;YAC1C,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;SAC3C;aAAM;YACL,cAAc,GAAG,cAAc,CAAC;YAChC,cAAc,GAAG,EAAE,CAAC;SACrB;QACD,MAAM,OAAO,GAAG,aAAa,CAC3B,aAAa,EACb,gBAAgB,EAChB,cAAc,EACd,cAAc,CACf,CAAC;QACF,IAAI,YAAY,GAAG,MAAM,6BAA6B,CACpD,MAAM,EACN,OAAO,EACP,cAAc,EACd,mBAAmB,CACpB,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAA,2BAAW,EACnC,MAAM,EACN,eAAe,EACf,YAAY,EACZ,YAAY,CACb,CAAC;QACF,IAAI,gBAAgB,EAAE;YACpB,IAAA,0BAAU,EAAC,iBAAiB,CAAC,CAAC;SAC/B;QACD,YAAY,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QACnD,OAAO;YACL,YAAY;YACZ,iBAAiB;SAClB,CAAC;IACJ,CAAC;CAAA;AAjED,oFAiEC;AAED,SAAS,gBAAgB;IACvB,MAAM,IAAI,GAAG,IAAA,wBAAY,EAAC,IAAA,WAAI,EAAC,wBAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAC/D,uCAAY,IAAI,CAAC,YAAY,GAAK,IAAI,CAAC,eAAe,EAAG;AAC3D,CAAC;AAED,SAAe,6BAA6B,CAC1C,MAA2B,EAC3B,GAAiC,EACjC,cAAmE,EACnE,mBAA2B;;QAE3B,wBAAW,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAE9C,MAAM,OAAO,GAAG,IAAI,2CAAmB,EAAE,CAAC;QAE1C,IAAA,wCAA0B,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACzC,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAC;QAC9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YAC9C,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE;gBACpD,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC5C,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE;oBACzB,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;iBAC3B;aACF;SACF;QAED,MAAM,yBAAyB,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAEtE,IAAA,qDAAgC,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;QACxC,MAAM,gBAAgB,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;QAE1D,MAAM,CAAC,GAAG,MAAM,6BAA6B,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAErE,wBAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC5C,wBAAW,CAAC,OAAO,CACjB,qBAAqB,EACrB,2BAA2B,EAC3B,yBAAyB,CAC1B,CAAC;QAEF,OAAO,CAAC,CAAC;IACX,CAAC;CAAA;AAOD,SAAS,cAAc,CAAC,MAA2B;;IACjD,OAAO,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,0CAAG,UAAU,CAAC,mCAAI,EAAE,CAAC;AACnD,CAAC;AAED,SAAS,yBAAyB,CAChC,cAGC,EACD,GAAiC,EACjC,OAA4B;IAE5B,IAAI,wBAAwB,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;IAChE,qEAAqE;IACrE,oEAAoE;IACpE,6DAA6D;IAC7D,6BAA6B;IAC7B,IAAI,wBAAwB,GAAG,GAAG,IAAI,kBAAkB,EAAE,IAAI,CAAC,EAAE;QAC/D,OAAO,uCAAuC,CAC5C,cAAc,EACd,GAAG,EACH,OAAO,CACR,CAAC;KACH;SAAM;QACL,OAAO,qCAAqC,CAC1C,cAAc,EACd,GAAG,EACH,wBAAwB,EACxB,OAAO,CACR,CAAC;KACH;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,GAAiC;IACpE,IAAI,wBAAwB,GAAG,CAAC,CAAC;IACjC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,OAAO,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,wBAAwB,IAAI,CAAC,CAAC,MAAM,CAAC,CAC9C,CAAC;IACF,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAED,SAAS,kBAAkB,CACzB,GAAiC,EACjC,wBAAgC,EAChC,eAAuB;IAEvB,2CAA2C;IAC3C,MAAM,WAAW,GACf,IAAI,CAAC,KAAK,CAAC,wBAAwB,GAAG,eAAe,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACjE,MAAM,IAAI,GAAqB,EAAE,CAAC;IAClC,IAAI,qBAAqB,GAAG,EAAE,CAAC;IAC/B,IAAI,oBAAoB,GAAG,CAAC,CAAC;IAC7B,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;QACpD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE;YACzD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC;gBAAE,qBAAqB,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YACvE,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACtC,oBAAoB,EAAE,CAAC;YAEvB,IAAI,oBAAoB,IAAI,WAAW,EAAE;gBACvC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACjC,qBAAqB,GAAG,EAAE,CAAC;gBAC3B,oBAAoB,GAAG,CAAC,CAAC;aAC1B;SACF;KACF;IACD,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,gBAAgB,CAAC,eAAuB;IAC/C,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,EAAE,CAAC,EAAE;QACxC,GAAG,CAAC,IAAI,CACN,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CACpC,IAAA,WAAI,EAAC,SAAS,EAAE,2BAA2B,CAAC,EAC5C;YACE,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CACF,CACF,CAAC;KACH;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,uCAAuC,CAC9C,cAGC,EACD,GAAiC,EACjC,OAA4B;IAE5B,IAAA,2GAAiD,EAC/C,cAAc,EACd,GAAG,CAAC,SAAS,EACb,OAAO,CAAC,KAAK,EACb,GAAG,CAAC,cAAc,CACnB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACd,OAAO,CAAC,qBAAqB,CAC3B,CAAC,CAAC,iBAAiB,EACnB,CAAC,CAAC,iBAAiB,EACnB,CAAC,CAAC,iBAAiB,CACpB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,qCAAqC,CAC5C,cAGC,EACD,GAAiC,EACjC,wBAAgC,EAChC,OAA4B;IAE5B,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAC9B,wBAAwB,EACxB,kBAAkB,EAAE,CACrB,CAAC;IACF,MAAM,IAAI,GAAG,kBAAkB,CAC7B,GAAG,EACH,wBAAwB,EACxB,eAAe,CAChB,CAAC;IACF,MAAM,OAAO,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAClD,IAAI,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC;IAE5C,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACjC,KAAK,IAAI,CAAC,IAAI,OAAO,EAAE;YACrB,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,oBAAoB,EAAE,EAAE;gBACvC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACjC,OAAO,CAAC,qBAAqB,CAC3B,CAAC,CAAC,iBAAiB,EACnB,CAAC,CAAC,iBAAiB,EACnB,CAAC,CAAC,iBAAiB,CACpB,CAAC;gBACJ,CAAC,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBACnB,CAAC,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;iBACjD;gBACD,4BAA4B;gBAC5B,IAAI,EAAE,yBAAyB,KAAK,CAAC,EAAE;oBACrC,KAAK,IAAI,CAAC,IAAI,OAAO,EAAE;wBACrB,CAAC,CAAC,SAAS,EAAE,CAAC;qBACf;oBACD,GAAG,CAAC,IAAI,CAAC,CAAC;iBACX;YACH,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACpB,IAAI,IAAI,KAAK,CAAC,EAAE;oBACd,MAAM,CACJ,IAAI,KAAK,CACP,6EAA6E,IAAI,EAAE,CACpF,CACF,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,WAAW,CAAC;gBACZ,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,YAAY,EAAE,OAAO,CAAC,KAAK;gBAC3B,cAAc;aACf,CAAC,CAAC;YACH,CAAC,CAAC,WAAW,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;SACjD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB;IACzB,OAAO,OAAO,CAAC,GAAG,CAAC,4BAA4B;QAC7C,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B;QAC3C,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,aAAa,CACpB,aAAyC,EACzC,MAA2B,EAC3B,OAAuB,EACvB,cAA8B;IAE9B,MAAM,QAAQ,GAAyC,MAAM,CAAC,IAAI,CAChE,aAAa,CAAC,QAAQ,CACvB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE;QAC5B,GAAG,CAAC,WAAW,CAAC,qBACX,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CACvC,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO;QACL,SAAS,gDACJ,aAAa,GACb,MAAM,KACT,QAAQ,GACT;QACD,OAAO;QACP,cAAc;KACf,CAAC;AACJ,CAAC;AAED,SAAe,6BAA6B,CAC1C,OAAqC,EACrC,gBAA8B;;QAE9B,MAAM,OAAO,GAAG,IAAA,yBAAa,EAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,CAC7D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAC/B,CAAC;QACF,IAAI,KAAK,GAAG,gBAAgB,CAAC;QAC7B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI;gBACF,KAAK,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;aAC1D;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,OAAO,GAAG,6CAA6C,MAAM,CAAC,IAAI,mCAAmC,CAAC;gBAC5G,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;oBAC7C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACjB,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACtB,OAAO,KAAK,CAAC;iBACd;qBAAM;oBACL,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACrB,eAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;iBACnE;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAED,SAAS,gBAAgB;IACvB,MAAM,YAAY,GAAG,IAAA,gCAAmB,GAAE,CAAC;IAC3C,IAAI,YAAY,EAAE;QAChB,OAAO,IAAA,wBAAY,EAAC,YAAY,CAAC,CAAC;KACnC;AACH,CAAC"}
|
|
@@ -7,14 +7,6 @@ import { ProjectGraph, ProjectGraphExternalNode, ProjectGraphNode, ProjectGraphP
|
|
|
7
7
|
*/
|
|
8
8
|
export declare function reverse(graph: ProjectGraph): ProjectGraph;
|
|
9
9
|
export declare function filterNodes(predicate?: (n: ProjectGraphNode) => boolean): (p: ProjectGraph) => ProjectGraph;
|
|
10
|
-
/**
|
|
11
|
-
* @deprecated will be removed in v14. All projects in ProjectGraph's `nodes` are workspace projects
|
|
12
|
-
*/
|
|
13
|
-
export declare function isWorkspaceProject(project: ProjectGraphNode): project is ProjectGraphProjectNode;
|
|
14
10
|
export declare function isNpmProject(project: ProjectGraphNode): project is ProjectGraphExternalNode;
|
|
15
|
-
/**
|
|
16
|
-
* @deprecated will be removed in v14. All projects in ProjectGraph's `nodes` are workspace projects. Use {@link pruneExternalNodes}
|
|
17
|
-
*/
|
|
18
|
-
export declare const onlyWorkspaceProjects: (p: ProjectGraph) => ProjectGraph;
|
|
19
11
|
export declare const pruneExternalNodes: (p: ProjectGraph) => ProjectGraph;
|
|
20
12
|
export declare function withDeps(original: ProjectGraph, subsetNodes: ProjectGraphProjectNode[]): ProjectGraph;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.withDeps = exports.pruneExternalNodes = exports.
|
|
3
|
+
exports.withDeps = exports.pruneExternalNodes = exports.isNpmProject = exports.filterNodes = exports.reverse = void 0;
|
|
4
4
|
const reverseMemo = new Map();
|
|
5
5
|
/**
|
|
6
6
|
* Returns a new project graph where all the edges are reversed.
|
|
@@ -62,21 +62,10 @@ function filterNodes(predicate) {
|
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
64
|
exports.filterNodes = filterNodes;
|
|
65
|
-
/**
|
|
66
|
-
* @deprecated will be removed in v14. All projects in ProjectGraph's `nodes` are workspace projects
|
|
67
|
-
*/
|
|
68
|
-
function isWorkspaceProject(project) {
|
|
69
|
-
return (project.type === 'app' || project.type === 'lib' || project.type === 'e2e');
|
|
70
|
-
}
|
|
71
|
-
exports.isWorkspaceProject = isWorkspaceProject;
|
|
72
65
|
function isNpmProject(project) {
|
|
73
66
|
return (project === null || project === void 0 ? void 0 : project.type) === 'npm';
|
|
74
67
|
}
|
|
75
68
|
exports.isNpmProject = isNpmProject;
|
|
76
|
-
/**
|
|
77
|
-
* @deprecated will be removed in v14. All projects in ProjectGraph's `nodes` are workspace projects. Use {@link pruneExternalNodes}
|
|
78
|
-
*/
|
|
79
|
-
exports.onlyWorkspaceProjects = filterNodes(isWorkspaceProject);
|
|
80
69
|
exports.pruneExternalNodes = filterNodes();
|
|
81
70
|
function withDeps(original, subsetNodes) {
|
|
82
71
|
const res = { nodes: {}, dependencies: {} };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/operators.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/operators.ts"],"names":[],"mappings":"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"}
|