nx 20.2.2 → 20.3.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/package.json +13 -11
- package/src/adapter/ngcli-adapter.js +7 -7
- package/src/command-line/add/add.js +21 -45
- package/src/command-line/generate/generator-utils.js +2 -2
- package/src/command-line/import/import.js +60 -34
- package/src/command-line/init/configure-plugins.d.ts +35 -0
- package/src/command-line/init/configure-plugins.js +189 -0
- package/src/command-line/init/init-v2.d.ts +1 -2
- package/src/command-line/init/init-v2.js +4 -18
- package/src/command-line/run/executor-utils.js +4 -4
- package/src/config/schema-utils.d.ts +4 -3
- package/src/config/schema-utils.js +71 -4
- package/src/config/workspace-json-project-json.d.ts +5 -0
- package/src/core/graph/main.js +1 -1
- package/src/core/graph/styles.js +1 -1
- package/src/daemon/client/client.js +9 -0
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts +2 -2
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js +6 -20
- package/src/plugins/js/project-graph/build-dependencies/target-project-locator.d.ts +3 -1
- package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js +12 -1
- package/src/plugins/js/utils/packages.d.ts +3 -0
- package/src/plugins/js/utils/packages.js +25 -0
- package/src/plugins/package-json/create-nodes.js +6 -0
- package/src/project-graph/build-project-graph.js +57 -1
- package/src/project-graph/plugins/internal-api.d.ts +4 -3
- package/src/project-graph/plugins/internal-api.js +2 -2
- package/src/project-graph/plugins/isolation/messaging.d.ts +2 -2
- package/src/project-graph/plugins/loader.js +13 -6
- package/src/project-graph/utils/project-configuration-utils.js +31 -1
- package/src/tasks-runner/forked-process-task-runner.js +30 -8
- package/src/utils/delayed-spinner.d.ts +40 -0
- package/src/utils/delayed-spinner.js +58 -0
- package/src/utils/package-json.d.ts +1 -0
- package/src/utils/package-json.js +5 -1
- package/src/command-line/import/utils/needs-install.d.ts +0 -3
- package/src/command-line/import/utils/needs-install.js +0 -31
package/src/core/graph/styles.js
CHANGED
@@ -1 +1 @@
|
|
1
|
-
"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{
|
1
|
+
"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{6395:()=>{}},s=>{var e;e=6395,s(s.s=e)}]);
|
@@ -30,6 +30,7 @@ const get_sync_generator_changes_1 = require("../message-types/get-sync-generato
|
|
30
30
|
const get_registered_sync_generators_1 = require("../message-types/get-registered-sync-generators");
|
31
31
|
const update_workspace_context_1 = require("../message-types/update-workspace-context");
|
32
32
|
const flush_sync_generator_changes_to_disk_1 = require("../message-types/flush-sync-generator-changes-to-disk");
|
33
|
+
const delayed_spinner_1 = require("../../utils/delayed-spinner");
|
33
34
|
const DAEMON_ENV_SETTINGS = {
|
34
35
|
NX_PROJECT_GLOB_CACHE: 'false',
|
35
36
|
NX_CACHE_PROJECTS_CONFIG: 'false',
|
@@ -113,6 +114,11 @@ class DaemonClient {
|
|
113
114
|
return this.sendToDaemonViaQueue({ type: 'REQUEST_SHUTDOWN' });
|
114
115
|
}
|
115
116
|
async getProjectGraphAndSourceMaps() {
|
117
|
+
let spinner;
|
118
|
+
if (delayed_spinner_1.SHOULD_SHOW_SPINNERS) {
|
119
|
+
// If the graph takes a while to load, we want to show a spinner.
|
120
|
+
spinner = new delayed_spinner_1.DelayedSpinner('Calculating the project graph on the Nx Daemon', 500).scheduleMessageUpdate('Calculating the project graph on the Nx Daemon is taking longer than expected. Re-run with NX_DAEMON=false to see more details.', 30_000);
|
121
|
+
}
|
116
122
|
try {
|
117
123
|
const response = await this.sendToDaemonViaQueue({
|
118
124
|
type: 'REQUEST_PROJECT_GRAPH',
|
@@ -130,6 +136,9 @@ class DaemonClient {
|
|
130
136
|
throw e;
|
131
137
|
}
|
132
138
|
}
|
139
|
+
finally {
|
140
|
+
spinner?.cleanup();
|
141
|
+
}
|
133
142
|
}
|
134
143
|
async getAllFileData() {
|
135
144
|
return await this.sendToDaemonViaQueue({ type: 'REQUEST_FILE_DATA' });
|
Binary file
|
package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { CreateDependenciesContext } from '../../../../project-graph/plugins';
|
2
|
-
import { RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
|
1
|
+
import type { CreateDependenciesContext } from '../../../../project-graph/plugins';
|
2
|
+
import { type RawProjectGraphDependency } from '../../../../project-graph/project-graph-builder';
|
3
3
|
import { TargetProjectLocator } from './target-project-locator';
|
4
4
|
export declare function buildExplicitPackageJsonDependencies(ctx: CreateDependenciesContext, targetProjectLocator: TargetProjectLocator): RawProjectGraphDependency[];
|
package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.buildExplicitPackageJsonDependencies = buildExplicitPackageJsonDependencies;
|
4
|
-
const node_path_1 = require("node:path");
|
5
4
|
const project_graph_1 = require("../../../../config/project-graph");
|
6
5
|
const file_utils_1 = require("../../../../project-graph/file-utils");
|
7
6
|
const project_graph_builder_1 = require("../../../../project-graph/project-graph-builder");
|
@@ -9,43 +8,30 @@ const json_1 = require("../../../../utils/json");
|
|
9
8
|
const path_1 = require("../../../../utils/path");
|
10
9
|
function buildExplicitPackageJsonDependencies(ctx, targetProjectLocator) {
|
11
10
|
const res = [];
|
12
|
-
let packageNameMap = undefined;
|
13
11
|
const nodes = Object.values(ctx.projects);
|
14
12
|
Object.keys(ctx.filesToProcess.projectFileMap).forEach((source) => {
|
15
13
|
Object.values(ctx.filesToProcess.projectFileMap[source]).forEach((f) => {
|
16
14
|
if (isPackageJsonAtProjectRoot(nodes, f.file)) {
|
17
|
-
|
18
|
-
packageNameMap = packageNameMap || createPackageNameMap(ctx.projects);
|
19
|
-
processPackageJson(source, f.file, ctx, targetProjectLocator, res, packageNameMap);
|
15
|
+
processPackageJson(source, f.file, ctx, targetProjectLocator, res);
|
20
16
|
}
|
21
17
|
});
|
22
18
|
});
|
23
19
|
return res;
|
24
20
|
}
|
25
|
-
function createPackageNameMap(projects) {
|
26
|
-
const res = {};
|
27
|
-
for (let projectName of Object.keys(projects)) {
|
28
|
-
try {
|
29
|
-
const packageJson = (0, json_1.parseJson)((0, file_utils_1.defaultFileRead)((0, node_path_1.join)(projects[projectName].root, 'package.json')));
|
30
|
-
res[packageJson.name ?? projectName] = projectName;
|
31
|
-
}
|
32
|
-
catch (e) { }
|
33
|
-
}
|
34
|
-
return res;
|
35
|
-
}
|
36
21
|
function isPackageJsonAtProjectRoot(nodes, fileName) {
|
37
22
|
return (fileName.endsWith('package.json') &&
|
38
23
|
nodes.find((projectNode) => (0, path_1.joinPathFragments)(projectNode.root, 'package.json') === fileName));
|
39
24
|
}
|
40
|
-
function processPackageJson(sourceProject, fileName, ctx, targetProjectLocator, collectedDeps
|
25
|
+
function processPackageJson(sourceProject, fileName, ctx, targetProjectLocator, collectedDeps) {
|
41
26
|
try {
|
42
27
|
const deps = readDeps((0, json_1.parseJson)((0, file_utils_1.defaultFileRead)(fileName)));
|
43
28
|
for (const d of Object.keys(deps)) {
|
44
|
-
|
45
|
-
if (
|
29
|
+
const localProject = targetProjectLocator.findDependencyInWorkspaceProjects(d);
|
30
|
+
if (localProject) {
|
31
|
+
// package.json refers to another project in the monorepo
|
46
32
|
const dependency = {
|
47
33
|
source: sourceProject,
|
48
|
-
target:
|
34
|
+
target: localProject,
|
49
35
|
sourceFile: fileName,
|
50
36
|
type: project_graph_1.DependencyType.static,
|
51
37
|
};
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { ProjectGraphExternalNode, ProjectGraphProjectNode } from '../../../../config/project-graph';
|
1
|
+
import type { ProjectGraphExternalNode, ProjectGraphProjectNode } from '../../../../config/project-graph';
|
2
2
|
/**
|
3
3
|
* The key is a combination of the package name and the workspace relative directory
|
4
4
|
* containing the file importing it e.g. `lodash__packages/my-lib`, the value is the
|
@@ -15,6 +15,7 @@ export declare class TargetProjectLocator {
|
|
15
15
|
private tsConfig;
|
16
16
|
private paths;
|
17
17
|
private typescriptResolutionCache;
|
18
|
+
private packageEntryPointsToProjectMap;
|
18
19
|
constructor(nodes: Record<string, ProjectGraphProjectNode>, externalNodes?: Record<string, ProjectGraphExternalNode>, npmResolutionCache?: NpmResolutionCache);
|
19
20
|
/**
|
20
21
|
* Resolve any workspace or external project that matches the given import expression,
|
@@ -38,6 +39,7 @@ export declare class TargetProjectLocator {
|
|
38
39
|
* @returns
|
39
40
|
*/
|
40
41
|
findPaths(normalizedImportExpr: string): string[] | undefined;
|
42
|
+
findDependencyInWorkspaceProjects(dep: string): string | null;
|
41
43
|
private resolveImportWithTypescript;
|
42
44
|
private resolveImportWithRequire;
|
43
45
|
private findProjectOfResolvedModule;
|
@@ -7,10 +7,11 @@ const node_path_1 = require("node:path");
|
|
7
7
|
const semver_1 = require("semver");
|
8
8
|
const find_project_for_path_1 = require("../../../../project-graph/utils/find-project-for-path");
|
9
9
|
const fileutils_1 = require("../../../../utils/fileutils");
|
10
|
+
const get_package_name_from_import_path_1 = require("../../../../utils/get-package-name-from-import-path");
|
10
11
|
const workspace_root_1 = require("../../../../utils/workspace-root");
|
12
|
+
const packages_1 = require("../../utils/packages");
|
11
13
|
const resolve_relative_to_dir_1 = require("../../utils/resolve-relative-to-dir");
|
12
14
|
const typescript_1 = require("../../utils/typescript");
|
13
|
-
const get_package_name_from_import_path_1 = require("../../../../utils/get-package-name-from-import-path");
|
14
15
|
/**
|
15
16
|
* Use a shared cache to avoid repeated npm package resolution work within the TargetProjectLocator.
|
16
17
|
*/
|
@@ -98,6 +99,12 @@ class TargetProjectLocator {
|
|
98
99
|
return this.findProjectOfResolvedModule(resolvedModule);
|
99
100
|
}
|
100
101
|
catch { }
|
102
|
+
// fall back to see if it's a locally linked workspace project where the
|
103
|
+
// output might not exist yet
|
104
|
+
const localProject = this.findDependencyInWorkspaceProjects(importExpr);
|
105
|
+
if (localProject) {
|
106
|
+
return localProject;
|
107
|
+
}
|
101
108
|
// nothing found, cache for later
|
102
109
|
this.npmResolutionCache.set(importExpr, null);
|
103
110
|
return null;
|
@@ -182,6 +189,10 @@ class TargetProjectLocator {
|
|
182
189
|
}
|
183
190
|
return undefined;
|
184
191
|
}
|
192
|
+
findDependencyInWorkspaceProjects(dep) {
|
193
|
+
this.packageEntryPointsToProjectMap ??= (0, packages_1.getPackageEntryPointsToProjectMap)(this.nodes);
|
194
|
+
return this.packageEntryPointsToProjectMap[dep]?.name ?? null;
|
195
|
+
}
|
185
196
|
resolveImportWithTypescript(normalizedImportExpr, filePath) {
|
186
197
|
let resolvedModule;
|
187
198
|
if (this.typescriptResolutionCache.has(normalizedImportExpr)) {
|
@@ -0,0 +1,3 @@
|
|
1
|
+
import type { ProjectGraphProjectNode } from '../../../config/project-graph';
|
2
|
+
import type { ProjectConfiguration } from '../../../config/workspace-json-project-json';
|
3
|
+
export declare function getPackageEntryPointsToProjectMap<T extends ProjectGraphProjectNode | ProjectConfiguration>(projects: Record<string, T>): Record<string, T>;
|
@@ -0,0 +1,25 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.getPackageEntryPointsToProjectMap = getPackageEntryPointsToProjectMap;
|
4
|
+
const posix_1 = require("node:path/posix");
|
5
|
+
function getPackageEntryPointsToProjectMap(projects) {
|
6
|
+
const result = {};
|
7
|
+
for (const project of Object.values(projects)) {
|
8
|
+
const metadata = 'data' in project ? project.data.metadata : project.metadata;
|
9
|
+
if (!metadata?.js) {
|
10
|
+
continue;
|
11
|
+
}
|
12
|
+
const { packageName, packageExports } = metadata.js;
|
13
|
+
if (!packageExports || typeof packageExports === 'string') {
|
14
|
+
// no `exports` or it points to a file, which would be the equivalent of
|
15
|
+
// an '.' export, in which case the package name is the entry point
|
16
|
+
result[packageName] = project;
|
17
|
+
}
|
18
|
+
else {
|
19
|
+
for (const entryPoint of Object.keys(packageExports)) {
|
20
|
+
result[(0, posix_1.join)(packageName, entryPoint)] = project;
|
21
|
+
}
|
22
|
+
}
|
23
|
+
}
|
24
|
+
return result;
|
25
|
+
}
|
@@ -84,6 +84,12 @@ function createNodeFromPackageJson(pkgJsonPath, workspaceRoot, cache) {
|
|
84
84
|
const hash = (0, file_hasher_1.hashObject)({
|
85
85
|
...json,
|
86
86
|
root: projectRoot,
|
87
|
+
/**
|
88
|
+
* Increment this number to force processing the package.json again. Do it
|
89
|
+
* when the implementation of this plugin is changed and results in different
|
90
|
+
* results for the same package.json contents.
|
91
|
+
*/
|
92
|
+
bust: 1,
|
87
93
|
});
|
88
94
|
const cached = cache[hash];
|
89
95
|
if (cached) {
|
@@ -18,6 +18,7 @@ const configuration_1 = require("../config/configuration");
|
|
18
18
|
const fs_1 = require("fs");
|
19
19
|
const error_types_1 = require("./error-types");
|
20
20
|
const project_configuration_utils_1 = require("./utils/project-configuration-utils");
|
21
|
+
const delayed_spinner_1 = require("../utils/delayed-spinner");
|
21
22
|
let storedFileMap = null;
|
22
23
|
let storedAllWorkspaceFiles = null;
|
23
24
|
let storedRustReferences = null;
|
@@ -186,11 +187,39 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins,
|
|
186
187
|
const builder = new project_graph_builder_1.ProjectGraphBuilder(graph, context.fileMap.projectFileMap, context.fileMap.nonProjectFiles);
|
187
188
|
const createDependencyPlugins = plugins.filter((plugin) => plugin.createDependencies);
|
188
189
|
perf_hooks_1.performance.mark('createDependencies:start');
|
190
|
+
let spinner;
|
191
|
+
const inProgressPlugins = new Set();
|
192
|
+
function updateSpinner() {
|
193
|
+
if (!spinner) {
|
194
|
+
return;
|
195
|
+
}
|
196
|
+
if (inProgressPlugins.size === 1) {
|
197
|
+
return `Creating project graph dependencies with ${inProgressPlugins.keys()[0]}`;
|
198
|
+
}
|
199
|
+
else if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
200
|
+
return [
|
201
|
+
`Creating project graph dependencies with ${inProgressPlugins.size} plugins`,
|
202
|
+
...Array.from(inProgressPlugins).map((p) => ` - ${p}`),
|
203
|
+
].join('\n');
|
204
|
+
}
|
205
|
+
else {
|
206
|
+
return `Creating project graph dependencies with ${inProgressPlugins.size} plugins`;
|
207
|
+
}
|
208
|
+
}
|
209
|
+
if (delayed_spinner_1.SHOULD_SHOW_SPINNERS) {
|
210
|
+
spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph dependencies with ${plugins.length} plugins`);
|
211
|
+
}
|
189
212
|
await Promise.all(createDependencyPlugins.map(async (plugin) => {
|
190
213
|
perf_hooks_1.performance.mark(`${plugin.name}:createDependencies - start`);
|
214
|
+
inProgressPlugins.add(plugin.name);
|
191
215
|
try {
|
192
|
-
const dependencies = await plugin
|
216
|
+
const dependencies = await plugin
|
217
|
+
.createDependencies({
|
193
218
|
...context,
|
219
|
+
})
|
220
|
+
.finally(() => {
|
221
|
+
inProgressPlugins.delete(plugin.name);
|
222
|
+
updateSpinner();
|
194
223
|
});
|
195
224
|
for (const dep of dependencies) {
|
196
225
|
builder.addDependency(dep.source, dep.target, dep.type, 'sourceFile' in dep ? dep.sourceFile : null);
|
@@ -206,6 +235,7 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins,
|
|
206
235
|
}));
|
207
236
|
perf_hooks_1.performance.mark('createDependencies:end');
|
208
237
|
perf_hooks_1.performance.measure(`createDependencies`, `createDependencies:start`, `createDependencies:end`);
|
238
|
+
spinner?.cleanup();
|
209
239
|
const graphWithDeps = builder.getUpdatedProjectGraph();
|
210
240
|
const { errors: metadataErrors, graph: updatedGraph } = await applyProjectMetadata(graphWithDeps, plugins, {
|
211
241
|
nxJsonConfiguration: context.nxJsonConfiguration,
|
@@ -232,9 +262,32 @@ async function applyProjectMetadata(graph, plugins, context, sourceMap) {
|
|
232
262
|
const results = [];
|
233
263
|
const errors = [];
|
234
264
|
perf_hooks_1.performance.mark('createMetadata:start');
|
265
|
+
let spinner;
|
266
|
+
const inProgressPlugins = new Set();
|
267
|
+
function updateSpinner() {
|
268
|
+
if (!spinner) {
|
269
|
+
return;
|
270
|
+
}
|
271
|
+
if (inProgressPlugins.size === 1) {
|
272
|
+
return `Creating project metadata with ${inProgressPlugins.keys()[0]}`;
|
273
|
+
}
|
274
|
+
else if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
275
|
+
return [
|
276
|
+
`Creating project metadata with ${inProgressPlugins.size} plugins`,
|
277
|
+
...Array.from(inProgressPlugins).map((p) => ` - ${p}`),
|
278
|
+
].join('\n');
|
279
|
+
}
|
280
|
+
else {
|
281
|
+
return `Creating project metadata with ${inProgressPlugins.size} plugins`;
|
282
|
+
}
|
283
|
+
}
|
284
|
+
if (delayed_spinner_1.SHOULD_SHOW_SPINNERS) {
|
285
|
+
spinner = new delayed_spinner_1.DelayedSpinner(`Creating project metadata with ${plugins.length} plugins`);
|
286
|
+
}
|
235
287
|
const promises = plugins.map(async (plugin) => {
|
236
288
|
if (plugin.createMetadata) {
|
237
289
|
perf_hooks_1.performance.mark(`${plugin.name}:createMetadata - start`);
|
290
|
+
inProgressPlugins.add(plugin.name);
|
238
291
|
try {
|
239
292
|
const metadata = await plugin.createMetadata(graph, context);
|
240
293
|
results.push({ metadata, pluginName: plugin.name });
|
@@ -243,12 +296,15 @@ async function applyProjectMetadata(graph, plugins, context, sourceMap) {
|
|
243
296
|
errors.push(new error_types_1.CreateMetadataError(e, plugin.name));
|
244
297
|
}
|
245
298
|
finally {
|
299
|
+
inProgressPlugins.delete(plugin.name);
|
300
|
+
updateSpinner();
|
246
301
|
perf_hooks_1.performance.mark(`${plugin.name}:createMetadata - end`);
|
247
302
|
perf_hooks_1.performance.measure(`${plugin.name}:createMetadata`, `${plugin.name}:createMetadata - start`, `${plugin.name}:createMetadata - end`);
|
248
303
|
}
|
249
304
|
}
|
250
305
|
});
|
251
306
|
await Promise.all(promises);
|
307
|
+
spinner?.cleanup();
|
252
308
|
for (const { metadata: projectsMetadata, pluginName } of results) {
|
253
309
|
for (const project in projectsMetadata) {
|
254
310
|
const projectConfiguration = graph.nodes[project]?.data;
|
@@ -1,14 +1,15 @@
|
|
1
1
|
import { PluginConfiguration } from '../../config/nx-json';
|
2
|
-
import {
|
2
|
+
import { CreateDependenciesContext, CreateMetadataContext, CreateNodesContextV2, CreateNodesResult, NxPluginV2, ProjectsMetadata } from './public-api';
|
3
3
|
import { ProjectGraph } from '../../config/project-graph';
|
4
|
+
import { RawProjectGraphDependency } from '../project-graph-builder';
|
4
5
|
export declare class LoadedNxPlugin {
|
5
6
|
readonly name: string;
|
6
7
|
readonly createNodes?: [
|
7
8
|
filePattern: string,
|
8
9
|
fn: (matchedFiles: string[], context: CreateNodesContextV2) => Promise<Array<readonly [plugin: string, file: string, result: CreateNodesResult]>>
|
9
10
|
];
|
10
|
-
readonly createDependencies?: (context: CreateDependenciesContext) =>
|
11
|
-
readonly createMetadata?: (graph: ProjectGraph, context: CreateMetadataContext) =>
|
11
|
+
readonly createDependencies?: (context: CreateDependenciesContext) => Promise<RawProjectGraphDependency[]>;
|
12
|
+
readonly createMetadata?: (graph: ProjectGraph, context: CreateMetadataContext) => Promise<ProjectsMetadata>;
|
12
13
|
readonly options?: unknown;
|
13
14
|
readonly include?: string[];
|
14
15
|
readonly exclude?: string[];
|
@@ -57,10 +57,10 @@ class LoadedNxPlugin {
|
|
57
57
|
};
|
58
58
|
}
|
59
59
|
if (plugin.createDependencies) {
|
60
|
-
this.createDependencies = (context) => plugin.createDependencies(this.options, context);
|
60
|
+
this.createDependencies = async (context) => plugin.createDependencies(this.options, context);
|
61
61
|
}
|
62
62
|
if (plugin.createMetadata) {
|
63
|
-
this.createMetadata = (graph, context) => plugin.createMetadata(graph, this.options, context);
|
63
|
+
this.createMetadata = async (graph, context) => plugin.createMetadata(graph, this.options, context);
|
64
64
|
}
|
65
65
|
}
|
66
66
|
}
|
@@ -68,7 +68,7 @@ export interface PluginCreateMetadataMessage {
|
|
68
68
|
export interface PluginCreateDependenciesResult {
|
69
69
|
type: 'createDependenciesResult';
|
70
70
|
payload: {
|
71
|
-
dependencies: ReturnType<LoadedNxPlugin['createDependencies']
|
71
|
+
dependencies: Awaited<ReturnType<LoadedNxPlugin['createDependencies']>>;
|
72
72
|
success: true;
|
73
73
|
tx: string;
|
74
74
|
} | {
|
@@ -80,7 +80,7 @@ export interface PluginCreateDependenciesResult {
|
|
80
80
|
export interface PluginCreateMetadataResult {
|
81
81
|
type: 'createMetadataResult';
|
82
82
|
payload: {
|
83
|
-
metadata: ReturnType<LoadedNxPlugin['createMetadata']
|
83
|
+
metadata: Awaited<ReturnType<LoadedNxPlugin['createMetadata']>>;
|
84
84
|
success: true;
|
85
85
|
tx: string;
|
86
86
|
} | {
|
@@ -25,6 +25,7 @@ const error_types_1 = require("../error-types");
|
|
25
25
|
const path = require("node:path/posix");
|
26
26
|
const typescript_1 = require("../../plugins/js/utils/typescript");
|
27
27
|
const load_resolved_plugin_1 = require("./load-resolved-plugin");
|
28
|
+
const packages_1 = require("../../plugins/js/utils/packages");
|
28
29
|
function readPluginPackageJson(pluginName, projects, paths = (0, installation_directory_1.getNxRequirePaths)()) {
|
29
30
|
try {
|
30
31
|
const result = (0, package_json_1.readModulePackageJsonWithoutFallbacks)(pluginName, paths);
|
@@ -89,26 +90,32 @@ function lookupLocalPlugin(importPath, projects, root = workspace_root_1.workspa
|
|
89
90
|
}
|
90
91
|
return { path: path.join(root, projectConfig.root), projectConfig };
|
91
92
|
}
|
93
|
+
let packageEntryPointsToProjectMap;
|
92
94
|
function findNxProjectForImportPath(importPath, projects, root = workspace_root_1.workspaceRoot) {
|
93
95
|
const tsConfigPaths = readTsConfigPaths(root);
|
94
|
-
const
|
95
|
-
|
96
|
-
|
96
|
+
const possibleTsPaths = tsConfigPaths[importPath]?.map((p) => (0, path_1.normalizePath)(path.relative(root, path.join(root, p)))) ?? [];
|
97
|
+
const projectRootMappings = new Map();
|
98
|
+
if (possibleTsPaths.length) {
|
97
99
|
const projectNameMap = new Map();
|
98
100
|
for (const projectRoot in projects) {
|
99
101
|
const project = projects[projectRoot];
|
100
102
|
projectRootMappings.set(project.root, project.name);
|
101
103
|
projectNameMap.set(project.name, project);
|
102
104
|
}
|
103
|
-
for (const tsConfigPath of
|
105
|
+
for (const tsConfigPath of possibleTsPaths) {
|
104
106
|
const nxProject = (0, find_project_for_path_1.findProjectForPath)(tsConfigPath, projectRootMappings);
|
105
107
|
if (nxProject) {
|
106
108
|
return projectNameMap.get(nxProject);
|
107
109
|
}
|
108
110
|
}
|
109
|
-
logger_1.logger.verbose('Unable to find local plugin', possiblePaths, projectRootMappings);
|
110
|
-
throw new Error('Unable to resolve local plugin with import path ' + importPath);
|
111
111
|
}
|
112
|
+
packageEntryPointsToProjectMap ??=
|
113
|
+
(0, packages_1.getPackageEntryPointsToProjectMap)(projects);
|
114
|
+
if (packageEntryPointsToProjectMap[importPath]) {
|
115
|
+
return packageEntryPointsToProjectMap[importPath];
|
116
|
+
}
|
117
|
+
logger_1.logger.verbose('Unable to find local plugin', possibleTsPaths, projectRootMappings);
|
118
|
+
throw new Error('Unable to resolve local plugin with import path ' + importPath);
|
112
119
|
}
|
113
120
|
let tsconfigPaths;
|
114
121
|
function readTsConfigPaths(root = workspace_root_1.workspaceRoot) {
|
@@ -20,6 +20,7 @@ const path_1 = require("path");
|
|
20
20
|
const perf_hooks_1 = require("perf_hooks");
|
21
21
|
const error_types_1 = require("../error-types");
|
22
22
|
const globs_1 = require("../../utils/globs");
|
23
|
+
const delayed_spinner_1 = require("../../utils/delayed-spinner");
|
23
24
|
function mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInformation,
|
24
25
|
// This function is used when reading project configuration
|
25
26
|
// in generators, where we don't want to do this.
|
@@ -224,6 +225,28 @@ function mergeMetadata(sourceMap, sourceInformation, baseSourceMapPath, metadata
|
|
224
225
|
async function createProjectConfigurations(root = workspace_root_1.workspaceRoot, nxJson, projectFiles, // making this parameter allows devkit to pick up newly created projects
|
225
226
|
plugins) {
|
226
227
|
perf_hooks_1.performance.mark('build-project-configs:start');
|
228
|
+
let spinner;
|
229
|
+
const inProgressPlugins = new Set();
|
230
|
+
function updateSpinner() {
|
231
|
+
if (!spinner) {
|
232
|
+
return;
|
233
|
+
}
|
234
|
+
if (inProgressPlugins.size === 1) {
|
235
|
+
return `Creating project graph nodes with ${inProgressPlugins.keys()[0]}`;
|
236
|
+
}
|
237
|
+
else if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
238
|
+
return [
|
239
|
+
`Creating project graph nodes with ${inProgressPlugins.size} plugins`,
|
240
|
+
...Array.from(inProgressPlugins).map((p) => ` - ${p}`),
|
241
|
+
].join('\n');
|
242
|
+
}
|
243
|
+
else {
|
244
|
+
return `Creating project graph nodes with ${inProgressPlugins.size} plugins`;
|
245
|
+
}
|
246
|
+
}
|
247
|
+
if (delayed_spinner_1.SHOULD_SHOW_SPINNERS) {
|
248
|
+
spinner = new delayed_spinner_1.DelayedSpinner(`Creating project graph nodes with ${plugins.length} plugins`);
|
249
|
+
}
|
227
250
|
const results = [];
|
228
251
|
const errors = [];
|
229
252
|
// We iterate over plugins first - this ensures that plugins specified first take precedence.
|
@@ -233,10 +256,12 @@ plugins) {
|
|
233
256
|
continue;
|
234
257
|
}
|
235
258
|
const matchingConfigFiles = findMatchingConfigFiles(projectFiles, pattern, include, exclude);
|
259
|
+
inProgressPlugins.add(pluginName);
|
236
260
|
let r = createNodes(matchingConfigFiles, {
|
237
261
|
nxJsonConfiguration: nxJson,
|
238
262
|
workspaceRoot: root,
|
239
|
-
})
|
263
|
+
})
|
264
|
+
.catch((e) => {
|
240
265
|
const errorBodyLines = [
|
241
266
|
`An error occurred while processing files for the ${pluginName} plugin.`,
|
242
267
|
];
|
@@ -263,10 +288,15 @@ plugins) {
|
|
263
288
|
errors.push(error);
|
264
289
|
// The plugin didn't return partial results, so we return an empty array.
|
265
290
|
return error.partialResults.map((r) => [pluginName, r[0], r[1]]);
|
291
|
+
})
|
292
|
+
.finally(() => {
|
293
|
+
inProgressPlugins.delete(pluginName);
|
294
|
+
updateSpinner();
|
266
295
|
});
|
267
296
|
results.push(r);
|
268
297
|
}
|
269
298
|
return Promise.all(results).then((results) => {
|
299
|
+
spinner?.cleanup();
|
270
300
|
const { projectRootMap, externalNodes, rootMap, configurationSourceMaps } = mergeCreateNodesResults(results, nxJson, errors);
|
271
301
|
perf_hooks_1.performance.mark('build-project-configs:end');
|
272
302
|
perf_hooks_1.performance.measure('build-project-configs', 'build-project-configs:start', 'build-project-configs:end');
|
@@ -220,24 +220,46 @@ class ForkedProcessTaskRunner {
|
|
220
220
|
}
|
221
221
|
}
|
222
222
|
let outWithErr = [];
|
223
|
+
let exitCode;
|
224
|
+
let stdoutHasEnded = false;
|
225
|
+
let stderrHasEnded = false;
|
226
|
+
let processHasExited = false;
|
227
|
+
const handleProcessEnd = () => {
|
228
|
+
// ensure process has exited and both stdout and stderr have ended before we pass along the logs
|
229
|
+
// if we only wait for the process to exit, we might miss some logs as stdout and stderr might still be streaming
|
230
|
+
if (stdoutHasEnded && stderrHasEnded && processHasExited) {
|
231
|
+
// we didn't print any output as we were running the command
|
232
|
+
// print all the collected output|
|
233
|
+
const terminalOutput = outWithErr.join('');
|
234
|
+
const code = exitCode;
|
235
|
+
if (!streamOutput) {
|
236
|
+
this.options.lifeCycle.printTaskTerminalOutput(task, code === 0 ? 'success' : 'failure', terminalOutput);
|
237
|
+
}
|
238
|
+
this.writeTerminalOutput(temporaryOutputPath, terminalOutput);
|
239
|
+
res({ code, terminalOutput });
|
240
|
+
}
|
241
|
+
};
|
223
242
|
p.stdout.on('data', (chunk) => {
|
224
243
|
outWithErr.push(chunk.toString());
|
225
244
|
});
|
245
|
+
p.stdout.on('end', () => {
|
246
|
+
stdoutHasEnded = true;
|
247
|
+
handleProcessEnd();
|
248
|
+
});
|
226
249
|
p.stderr.on('data', (chunk) => {
|
227
250
|
outWithErr.push(chunk.toString());
|
228
251
|
});
|
252
|
+
p.stderr.on('end', () => {
|
253
|
+
stderrHasEnded = true;
|
254
|
+
handleProcessEnd();
|
255
|
+
});
|
229
256
|
p.on('exit', (code, signal) => {
|
230
257
|
this.processes.delete(p);
|
231
258
|
if (code === null)
|
232
259
|
code = (0, exit_codes_1.signalToCode)(signal);
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
if (!streamOutput) {
|
237
|
-
this.options.lifeCycle.printTaskTerminalOutput(task, code === 0 ? 'success' : 'failure', terminalOutput);
|
238
|
-
}
|
239
|
-
this.writeTerminalOutput(temporaryOutputPath, terminalOutput);
|
240
|
-
res({ code, terminalOutput });
|
260
|
+
exitCode = code;
|
261
|
+
processHasExited = true;
|
262
|
+
handleProcessEnd();
|
241
263
|
});
|
242
264
|
}
|
243
265
|
catch (e) {
|
@@ -0,0 +1,40 @@
|
|
1
|
+
import * as ora from 'ora';
|
2
|
+
/**
|
3
|
+
* A class that allows to delay the creation of a spinner, as well
|
4
|
+
* as schedule updates to the message of the spinner. Useful for
|
5
|
+
* scenarios where one wants to only show a spinner if an operation
|
6
|
+
* takes longer than a certain amount of time.
|
7
|
+
*/
|
8
|
+
export declare class DelayedSpinner {
|
9
|
+
spinner: ora.Ora;
|
10
|
+
timeouts: NodeJS.Timeout[];
|
11
|
+
initial: number;
|
12
|
+
/**
|
13
|
+
* Constructs a new {@link DelayedSpinner} instance.
|
14
|
+
*
|
15
|
+
* @param message The message to display in the spinner
|
16
|
+
* @param ms The number of milliseconds to wait before creating the spinner
|
17
|
+
*/
|
18
|
+
constructor(message: string, ms?: number);
|
19
|
+
/**
|
20
|
+
* Sets the message to display in the spinner.
|
21
|
+
*
|
22
|
+
* @param message The message to display in the spinner
|
23
|
+
* @returns The {@link DelayedSpinner} instance
|
24
|
+
*/
|
25
|
+
setMessage(message: string): this;
|
26
|
+
/**
|
27
|
+
* Schedules an update to the message of the spinner. Useful for
|
28
|
+
* changing the message after a certain amount of time has passed.
|
29
|
+
*
|
30
|
+
* @param message The message to display in the spinner
|
31
|
+
* @param delay How long to wait before updating the message
|
32
|
+
* @returns The {@link DelayedSpinner} instance
|
33
|
+
*/
|
34
|
+
scheduleMessageUpdate(message: string, delay: number): this;
|
35
|
+
/**
|
36
|
+
* Stops the spinner and cleans up any scheduled timeouts.
|
37
|
+
*/
|
38
|
+
cleanup(): void;
|
39
|
+
}
|
40
|
+
export declare const SHOULD_SHOW_SPINNERS: boolean;
|
@@ -0,0 +1,58 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.SHOULD_SHOW_SPINNERS = exports.DelayedSpinner = void 0;
|
4
|
+
const ora = require("ora");
|
5
|
+
/**
|
6
|
+
* A class that allows to delay the creation of a spinner, as well
|
7
|
+
* as schedule updates to the message of the spinner. Useful for
|
8
|
+
* scenarios where one wants to only show a spinner if an operation
|
9
|
+
* takes longer than a certain amount of time.
|
10
|
+
*/
|
11
|
+
class DelayedSpinner {
|
12
|
+
/**
|
13
|
+
* Constructs a new {@link DelayedSpinner} instance.
|
14
|
+
*
|
15
|
+
* @param message The message to display in the spinner
|
16
|
+
* @param ms The number of milliseconds to wait before creating the spinner
|
17
|
+
*/
|
18
|
+
constructor(message, ms = 500) {
|
19
|
+
this.timeouts = [];
|
20
|
+
this.initial = Date.now();
|
21
|
+
this.timeouts.push(setTimeout(() => {
|
22
|
+
this.spinner = ora(message);
|
23
|
+
}, ms).unref());
|
24
|
+
}
|
25
|
+
/**
|
26
|
+
* Sets the message to display in the spinner.
|
27
|
+
*
|
28
|
+
* @param message The message to display in the spinner
|
29
|
+
* @returns The {@link DelayedSpinner} instance
|
30
|
+
*/
|
31
|
+
setMessage(message) {
|
32
|
+
this.spinner.text = message;
|
33
|
+
return this;
|
34
|
+
}
|
35
|
+
/**
|
36
|
+
* Schedules an update to the message of the spinner. Useful for
|
37
|
+
* changing the message after a certain amount of time has passed.
|
38
|
+
*
|
39
|
+
* @param message The message to display in the spinner
|
40
|
+
* @param delay How long to wait before updating the message
|
41
|
+
* @returns The {@link DelayedSpinner} instance
|
42
|
+
*/
|
43
|
+
scheduleMessageUpdate(message, delay) {
|
44
|
+
this.timeouts.push(setTimeout(() => {
|
45
|
+
this.spinner.text = message;
|
46
|
+
}, delay).unref());
|
47
|
+
return this;
|
48
|
+
}
|
49
|
+
/**
|
50
|
+
* Stops the spinner and cleans up any scheduled timeouts.
|
51
|
+
*/
|
52
|
+
cleanup() {
|
53
|
+
this.spinner?.stop();
|
54
|
+
this.timeouts.forEach((t) => clearTimeout(t));
|
55
|
+
}
|
56
|
+
}
|
57
|
+
exports.DelayedSpinner = DelayedSpinner;
|
58
|
+
exports.SHOULD_SHOW_SPINNERS = process.stdout.isTTY;
|