@nrwl/workspace 13.3.0-beta.4 → 13.3.1-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 +11 -7
- package/src/command-line/format.js +4 -4
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/utils.js +2 -4
- package/src/command-line/utils.js.map +1 -1
- package/src/core/assert-workspace-validity.js +6 -22
- package/src/core/assert-workspace-validity.js.map +1 -1
- package/src/core/hasher/file-hasher.js +2 -0
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +27 -4
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.d.ts +0 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js +6 -25
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +8 -4
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.d.ts +1 -1
- package/src/core/project-graph/daemon/client/client.js +40 -17
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +69 -28
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +44 -43
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.d.ts +1 -2
- package/src/core/project-graph/daemon/server/shutdown-utils.js.map +1 -1
- package/src/core/project-graph/daemon/server/start.js +2 -0
- package/src/core/project-graph/daemon/server/start.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.d.ts +3 -1
- package/src/core/project-graph/daemon/server/watcher.js +24 -23
- package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
- package/src/core/project-graph/project-graph.js +31 -6
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/generators/move/lib/update-build-targets.js +7 -4
- package/src/generators/move/lib/update-build-targets.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.d.ts +3 -1
- package/src/tasks-runner/forked-process-task-runner.js +8 -1
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycle.d.ts +10 -11
- package/src/tasks-runner/life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command/components/no-targets-run.d.ts +7 -0
- package/src/tasks-runner/run-command/components/no-targets-run.js +20 -0
- package/src/tasks-runner/run-command/components/no-targets-run.js.map +1 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.d.ts +7 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.js +17 -0
- package/src/tasks-runner/run-command/components/nx-output-row-title.js.map +1 -0
- package/src/tasks-runner/run-command/components/run-command.d.ts +16 -0
- package/src/tasks-runner/run-command/components/run-command.js +55 -0
- package/src/tasks-runner/run-command/components/run-command.js.map +1 -0
- package/src/tasks-runner/run-command/components/run-many.d.ts +15 -0
- package/src/tasks-runner/run-command/components/run-many.js +123 -0
- package/src/tasks-runner/run-command/components/run-many.js.map +1 -0
- package/src/tasks-runner/run-command/components/task-list.d.ts +7 -0
- package/src/tasks-runner/run-command/components/task-list.js +29 -0
- package/src/tasks-runner/run-command/components/task-list.js.map +1 -0
- package/src/tasks-runner/run-command/components/task-row.d.ts +12 -0
- package/src/tasks-runner/run-command/components/task-row.js +52 -0
- package/src/tasks-runner/run-command/components/task-row.js.map +1 -0
- package/src/tasks-runner/{run-command.d.ts → run-command/index.d.ts} +4 -7
- package/src/tasks-runner/{run-command.js → run-command/index.js} +45 -28
- package/src/tasks-runner/run-command/index.js.map +1 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.d.ts +30 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js +34 -0
- package/src/tasks-runner/run-command/ink-run-many-life-cycle.js.map +1 -0
- package/src/tasks-runner/task-orchestrator.js +3 -2
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +1 -1
- package/src/tasks-runner/tasks-runner.js.map +1 -1
- package/src/tasks-runner/utils.js +5 -3
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utilities/plugins/plugin-capabilities.js +10 -11
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/project-graph-utils.d.ts +1 -0
- package/src/utilities/project-graph-utils.js +17 -1
- package/src/utilities/project-graph-utils.js.map +1 -1
- package/src/utils/rules/format-files.js +5 -5
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/tasks-runner/run-command.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "13.3.
|
|
3
|
+
"version": "13.3.1-beta.1",
|
|
4
4
|
"description": "Smart, Extensible Build Framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -61,20 +61,20 @@
|
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
|
-
"@parcel/watcher": "2.0.
|
|
65
|
-
"@nrwl/cli": "13.3.0-beta.4",
|
|
66
|
-
"@nrwl/devkit": "13.3.0-beta.4",
|
|
67
|
-
"@nrwl/jest": "13.3.0-beta.4",
|
|
68
|
-
"@nrwl/linter": "13.3.0-beta.4",
|
|
64
|
+
"@parcel/watcher": "2.0.4",
|
|
69
65
|
"chokidar": "^3.5.1",
|
|
70
66
|
"cosmiconfig": "^4.0.0",
|
|
71
67
|
"fs-extra": "^9.1.0",
|
|
72
68
|
"dotenv": "~10.0.0",
|
|
69
|
+
"figures": "3.2.0",
|
|
73
70
|
"glob": "7.1.4",
|
|
74
71
|
"ignore": "^5.0.4",
|
|
72
|
+
"ink": "^3.2.0",
|
|
73
|
+
"ink-spinner": "^4.0.3",
|
|
75
74
|
"npm-run-all": "^4.1.5",
|
|
76
75
|
"npm-run-path": "^4.0.1",
|
|
77
76
|
"open": "^7.4.2",
|
|
77
|
+
"react": "17.0.2",
|
|
78
78
|
"rxjs": "^6.5.4",
|
|
79
79
|
"semver": "7.3.4",
|
|
80
80
|
"strip-ansi": "6.0.0",
|
|
@@ -85,7 +85,11 @@
|
|
|
85
85
|
"flat": "^5.0.2",
|
|
86
86
|
"minimatch": "3.0.4",
|
|
87
87
|
"enquirer": "~2.3.6",
|
|
88
|
-
"tslib": "^2.3.0"
|
|
88
|
+
"tslib": "^2.3.0",
|
|
89
|
+
"@nrwl/cli": "13.3.1-beta.1",
|
|
90
|
+
"@nrwl/devkit": "13.3.1-beta.1",
|
|
91
|
+
"@nrwl/jest": "13.3.1-beta.1",
|
|
92
|
+
"@nrwl/linter": "13.3.1-beta.1"
|
|
89
93
|
},
|
|
90
94
|
"nx-migrations": {
|
|
91
95
|
"migrations": "./migrations.json"
|
|
@@ -123,16 +123,16 @@ function check(patterns) {
|
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
function updateWorkspaceJsonToMatchFormatVersion() {
|
|
126
|
-
const
|
|
126
|
+
const workspaceConfigPath = (0, workspace_1.workspaceConfigName)(app_root_1.appRootPath);
|
|
127
127
|
try {
|
|
128
|
-
const workspaceJson = (0, devkit_1.readJsonFile)(
|
|
128
|
+
const workspaceJson = (0, devkit_1.readJsonFile)(workspaceConfigPath);
|
|
129
129
|
const reformatted = (0, workspace_1.reformattedWorkspaceJsonOrNull)(workspaceJson);
|
|
130
130
|
if (reformatted) {
|
|
131
|
-
(0, devkit_1.writeJsonFile)(
|
|
131
|
+
(0, devkit_1.writeJsonFile)(workspaceConfigPath, reformatted);
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
134
|
catch (e) {
|
|
135
|
-
console.error(`Failed to format: ${
|
|
135
|
+
console.error(`Failed to format workspace config: ${workspaceConfigPath}`);
|
|
136
136
|
console.error(e);
|
|
137
137
|
}
|
|
138
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/format.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,8 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
|
|
|
47
47
|
Object.entries(args).forEach(([key, value]) => {
|
|
48
48
|
const dasherized = (0, devkit_1.names)(key).fileName;
|
|
49
49
|
if (nxSpecific.includes(dasherized) || dasherized.startsWith('nx-')) {
|
|
50
|
-
|
|
50
|
+
if (value !== undefined)
|
|
51
|
+
nxArgs[key] = value;
|
|
51
52
|
}
|
|
52
53
|
else if (!ignoreArgs.includes(key)) {
|
|
53
54
|
overrides[key] = value;
|
|
@@ -135,9 +136,6 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
|
|
|
135
136
|
else if (args['parallel'] !== undefined) {
|
|
136
137
|
nxArgs['parallel'] = Number(args['parallel']);
|
|
137
138
|
}
|
|
138
|
-
else {
|
|
139
|
-
nxArgs['parallel'] = undefined;
|
|
140
|
-
}
|
|
141
139
|
return { nxArgs, overrides };
|
|
142
140
|
}
|
|
143
141
|
exports.splitArgsIntoNxArgsAndOverrides = splitArgsIntoNxArgsAndOverrides;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/utils.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C,mDAAgD;AAChD,gDAA6C;AAC7C,yCAAqC;AAGrC,MAAM,MAAM,GAAa;IACvB,QAAQ;IACR,eAAe;IACf,MAAM;IACN,QAAQ;IACR,UAAU;IACV,cAAc;IACd,SAAS;IACT,aAAa;IACb,MAAM;IACN,WAAW;IACX,eAAe;IACf,MAAM;IACN,oBAAoB;CACrB,CAAC;AAEF,MAAM,OAAO,GAAa,CAAC,GAAG,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;AAEzD,MAAM,WAAW,GAAa;IAC5B,GAAG,MAAM;IACT,WAAW;IACX,aAAa;IACb,KAAK;IACL,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,QAAQ;CACT,CAAC;AAmCF,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAE/B,SAAgB,+BAA+B,CAC7C,IAAqB,EACrB,IAA4D,EAC5D,OAAO,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE;IAEjC,MAAM,UAAU,GACd,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;IAE5E,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAa,EAAE;QAChD,aAAa,EAAE;YACb,cAAc,EAAE,IAAI;SACrB;KACF,CAAC,CAAC;IACH,+CAA+C;IAC/C,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAErB,OAAO,SAAS,CAAC,CAAC,CAAC;IAEnB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC5C,MAAM,UAAU,GAAG,IAAA,cAAK,EAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QACvC,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACnE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.assertWorkspaceValidity = void 0;
|
|
4
|
-
const
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function assertWorkspaceValidity(workspaceJson, nxJson) {
|
|
6
6
|
const workspaceJsonProjects = Object.keys(workspaceJson.projects);
|
|
7
7
|
const projects = Object.assign({}, workspaceJson.projects);
|
|
@@ -14,13 +14,10 @@ function assertWorkspaceValidity(workspaceJson, nxJson) {
|
|
|
14
14
|
}
|
|
15
15
|
else if (typeof value === 'string') {
|
|
16
16
|
// This is invalid because the only valid string is '*'
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
],
|
|
22
|
-
});
|
|
23
|
-
process.exit(1);
|
|
17
|
+
throw new Error((0, devkit_1.stripIndents) `
|
|
18
|
+
Configuration Error
|
|
19
|
+
nx.json is not configured properly. "${path.join(' > ')}" is improperly configured to implicitly depend on "${value}" but should be an array of project names or "*".
|
|
20
|
+
`);
|
|
24
21
|
}
|
|
25
22
|
else if (Array.isArray(value)) {
|
|
26
23
|
acc.push([entry[0], value]);
|
|
@@ -58,11 +55,7 @@ function assertWorkspaceValidity(workspaceJson, nxJson) {
|
|
|
58
55
|
${projectNames.map((projectName) => ` ${projectName}`).join('\n')}`;
|
|
59
56
|
message += str;
|
|
60
57
|
});
|
|
61
|
-
|
|
62
|
-
title: 'Configuration Error',
|
|
63
|
-
bodyLines: [message],
|
|
64
|
-
});
|
|
65
|
-
process.exit(1);
|
|
58
|
+
throw new Error(`Configuration Error\n${message}`);
|
|
66
59
|
}
|
|
67
60
|
exports.assertWorkspaceValidity = assertWorkspaceValidity;
|
|
68
61
|
function detectAndSetInvalidProjectValues(map, sourceName, desiredProjectNames, validProjects) {
|
|
@@ -71,13 +64,4 @@ function detectAndSetInvalidProjectValues(map, sourceName, desiredProjectNames,
|
|
|
71
64
|
map.set(sourceName, invalidProjects);
|
|
72
65
|
}
|
|
73
66
|
}
|
|
74
|
-
function minus(a, b) {
|
|
75
|
-
const res = [];
|
|
76
|
-
a.forEach((aa) => {
|
|
77
|
-
if (!b.find((bb) => bb === aa)) {
|
|
78
|
-
res.push(aa);
|
|
79
|
-
}
|
|
80
|
-
});
|
|
81
|
-
return res;
|
|
82
|
-
}
|
|
83
67
|
//# sourceMappingURL=assert-workspace-validity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assert-workspace-validity.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/assert-workspace-validity.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"assert-workspace-validity.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/assert-workspace-validity.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ class FileHasher {
|
|
|
17
17
|
this.fileHashes = {};
|
|
18
18
|
this.workspaceFiles = new Set();
|
|
19
19
|
this.usesGitForHashing = false;
|
|
20
|
+
this.isInitialized = false;
|
|
20
21
|
}
|
|
21
22
|
/**
|
|
22
23
|
* For the project graph daemon server use-case we can potentially skip expensive work
|
|
@@ -35,6 +36,7 @@ class FileHasher {
|
|
|
35
36
|
return getFileHashesResult.untrackedUncommittedFiles;
|
|
36
37
|
}
|
|
37
38
|
incrementalUpdate(updatedFiles, deletedFiles = []) {
|
|
39
|
+
this.ensureInitialized();
|
|
38
40
|
perf_hooks_1.performance.mark('incremental hashing:start');
|
|
39
41
|
updatedFiles.forEach((hash, filename) => {
|
|
40
42
|
this.fileHashes[filename] = hash;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,2CAAyC;AACzC,6CAGsB;AACtB,iDAA6D;AAE7D,MAAa,UAAU;IAMrB,YAA6B,OAAoB;QAApB,YAAO,GAAP,OAAO,CAAa;QALjD,eAAU,GAA+B,EAAE,CAAC;QAC5C,mBAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACnC,sBAAiB,GAAG,KAAK,CAAC;QAClB,kBAAa,GAAG,KAAK,CAAC;IAEsB,CAAC;IAErD,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACxC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,31 +3,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.buildExplicitPackageJsonDependencies = void 0;
|
|
4
4
|
const file_utils_1 = require("../../file-utils");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const path_1 = require("path");
|
|
6
7
|
function buildExplicitPackageJsonDependencies(workspace, graph, filesToProcess) {
|
|
7
8
|
const res = [];
|
|
9
|
+
let packageNameMap = undefined;
|
|
8
10
|
Object.keys(filesToProcess).forEach((source) => {
|
|
9
11
|
Object.values(filesToProcess[source]).forEach((f) => {
|
|
10
12
|
if (isPackageJsonAtProjectRoot(graph.nodes, f.file)) {
|
|
11
|
-
|
|
13
|
+
// we only create the package name map once and only if a package.json file changes
|
|
14
|
+
packageNameMap = packageNameMap || createPackageNameMap(workspace);
|
|
15
|
+
processPackageJson(source, f.file, graph, res, packageNameMap);
|
|
12
16
|
}
|
|
13
17
|
});
|
|
14
18
|
});
|
|
15
19
|
return res;
|
|
16
20
|
}
|
|
17
21
|
exports.buildExplicitPackageJsonDependencies = buildExplicitPackageJsonDependencies;
|
|
22
|
+
function createPackageNameMap(w) {
|
|
23
|
+
const res = {};
|
|
24
|
+
for (let projectName of Object.keys(w.projects)) {
|
|
25
|
+
try {
|
|
26
|
+
const packageJson = (0, devkit_1.parseJson)((0, file_utils_1.defaultFileRead)((0, path_1.join)(w.projects[projectName].root, 'package.json')));
|
|
27
|
+
res[packageJson.name || `@${w.npmScope}/${projectName}`] = projectName;
|
|
28
|
+
}
|
|
29
|
+
catch (e) { }
|
|
30
|
+
}
|
|
31
|
+
return res;
|
|
32
|
+
}
|
|
18
33
|
function isPackageJsonAtProjectRoot(nodes, fileName) {
|
|
19
34
|
return Object.values(nodes).find((projectNode) => (projectNode.type === 'lib' || projectNode.type === 'app') &&
|
|
20
35
|
(0, devkit_1.joinPathFragments)(projectNode.data.root, 'package.json') === fileName);
|
|
21
36
|
}
|
|
22
|
-
function processPackageJson(sourceProject, fileName, graph, collectedDeps) {
|
|
37
|
+
function processPackageJson(sourceProject, fileName, graph, collectedDeps, packageNameMap) {
|
|
23
38
|
try {
|
|
24
39
|
const deps = readDeps((0, devkit_1.parseJson)((0, file_utils_1.defaultFileRead)(fileName)));
|
|
40
|
+
// the name matches the import path
|
|
25
41
|
deps.forEach((d) => {
|
|
26
42
|
// package.json refers to another project in the monorepo
|
|
27
|
-
if (
|
|
43
|
+
if (packageNameMap[d]) {
|
|
44
|
+
collectedDeps.push({
|
|
45
|
+
sourceProjectName: sourceProject,
|
|
46
|
+
targetProjectName: packageNameMap[d],
|
|
47
|
+
sourceProjectFile: fileName,
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
else if (graph.externalNodes[`npm:${d}`]) {
|
|
28
51
|
collectedDeps.push({
|
|
29
52
|
sourceProjectName: sourceProject,
|
|
30
|
-
targetProjectName: d
|
|
53
|
+
targetProjectName: `npm:${d}`,
|
|
31
54
|
sourceProjectFile: fileName,
|
|
32
55
|
});
|
|
33
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explicit-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,iDAAmD;AACnD,yCAKsB;
|
|
1
|
+
{"version":3,"file":"explicit-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
import { ProjectGraphBuilder, ProjectGraphProcessorContext } from '@nrwl/devkit';
|
|
2
|
-
export declare function convertNpmScriptsToTargets(projectRoot: string): {};
|
|
3
2
|
export declare function buildWorkspaceProjectNodes(ctx: ProjectGraphProcessorContext, builder: ProjectGraphBuilder): void;
|
|
@@ -1,34 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.buildWorkspaceProjectNodes =
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const packageJsonString = (0, file_utils_1.defaultFileRead)(`${projectRoot}/package.json`).toString();
|
|
8
|
-
const parsedPackagedJson = JSON.parse(packageJsonString);
|
|
9
|
-
const res = {};
|
|
10
|
-
// handle no scripts
|
|
11
|
-
Object.keys(parsedPackagedJson.scripts || {}).forEach((script) => {
|
|
12
|
-
res[script] = {
|
|
13
|
-
executor: '@nrwl/workspace:run-script',
|
|
14
|
-
options: {
|
|
15
|
-
script,
|
|
16
|
-
},
|
|
17
|
-
};
|
|
18
|
-
});
|
|
19
|
-
return res;
|
|
20
|
-
}
|
|
21
|
-
catch (e) {
|
|
22
|
-
return undefined;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
exports.convertNpmScriptsToTargets = convertNpmScriptsToTargets;
|
|
3
|
+
exports.buildWorkspaceProjectNodes = void 0;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
const project_graph_utils_1 = require("../../../utilities/project-graph-utils");
|
|
26
7
|
function buildWorkspaceProjectNodes(ctx, builder) {
|
|
27
8
|
const toAdd = [];
|
|
28
9
|
Object.keys(ctx.workspace.projects).forEach((key) => {
|
|
29
10
|
const p = ctx.workspace.projects[key];
|
|
30
|
-
if (
|
|
31
|
-
p.targets =
|
|
11
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(p.root, 'package.json'))) {
|
|
12
|
+
p.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(p.root, p.targets);
|
|
32
13
|
}
|
|
33
14
|
const projectType = p.projectType === 'application'
|
|
34
15
|
? key.endsWith('-e2e')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":";;;AAIA,+BAA4B;AAC5B,2BAAgC;AAChC,gFAAoF;AAEpF,SAAgB,0BAA0B,CACxC,GAAiC,EACjC,OAA4B;IAE5B,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClD,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;YAC5C,CAAC,CAAC,OAAO,GAAG,IAAA,gDAA0B,EAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;SAC3D;QACD,MAAM,WAAW,GACf,CAAC,CAAC,WAAW,KAAK,aAAa;YAC7B,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK;YACT,CAAC,CAAC,KAAK,CAAC;QACZ,MAAM,IAAI,GACR,GAAG,CAAC,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE;YACxC,CAAC,CAAC,EAAE,CAAC;QAET,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,WAAW;YACjB,IAAI,kCACC,CAAC,KACJ,IAAI,EACJ,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GACxB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,mDAAmD;IACnD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5B,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,OAAO,CAAC,OAAO,CAAC;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA9CD,gEA8CC"}
|
|
@@ -33,14 +33,18 @@ function buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, all
|
|
|
33
33
|
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(workspaceJson.projects));
|
|
34
34
|
const packageJsonDeps = readCombinedDeps();
|
|
35
35
|
const rootTsConfig = readRootTsConfig();
|
|
36
|
-
let filesToProcess
|
|
37
|
-
let cachedFileData
|
|
36
|
+
let filesToProcess;
|
|
37
|
+
let cachedFileData;
|
|
38
38
|
if (cache &&
|
|
39
39
|
!(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(cache, packageJsonDeps, workspaceJson, normalizedNxJson, rootTsConfig)) {
|
|
40
40
|
const fromCache = (0, nx_deps_cache_1.extractCachedFileData)(projectFileMap, cache);
|
|
41
41
|
filesToProcess = fromCache.filesToProcess;
|
|
42
42
|
cachedFileData = fromCache.cachedFileData;
|
|
43
43
|
}
|
|
44
|
+
else {
|
|
45
|
+
filesToProcess = projectFileMap;
|
|
46
|
+
cachedFileData = {};
|
|
47
|
+
}
|
|
44
48
|
const context = createContext(workspaceJson, normalizedNxJson, projectFileMap, filesToProcess);
|
|
45
49
|
let projectGraph = yield buildProjectGraphUsingContext(context, cachedFileData, projectGraphVersion);
|
|
46
50
|
const projectGraphCache = (0, nx_deps_cache_1.createCache)(nxJson, packageJsonDeps, projectGraph, rootTsConfig);
|
|
@@ -68,8 +72,8 @@ function buildProjectGraphUsingContext(ctx, cachedFileData, projectGraphVersion)
|
|
|
68
72
|
for (const proj of Object.keys(cachedFileData)) {
|
|
69
73
|
for (const f of builder.graph.nodes[proj].data.files) {
|
|
70
74
|
const cached = cachedFileData[proj][f.file];
|
|
71
|
-
if (cached) {
|
|
72
|
-
f.deps = cached.deps;
|
|
75
|
+
if (cached && cached.deps) {
|
|
76
|
+
f.deps = [...cached.deps];
|
|
73
77
|
}
|
|
74
78
|
}
|
|
75
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/build-project-graph.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,2DAA2D;AAC3D,+BAA4B;AAC5B,2CAAyC;AACzC,4EAAuE;AACvE,8CAIuB;AACvB,4DAAuD;AACvD,4DAOkC;AAClC,6DAAwE;AACxE,+CAGuB;AACvB,2BAAgC;AAChC,yBAAyB;AACzB,0JAAiJ;AAEjJ,SAAsB,iBAAiB;;QACrC,MAAM,aAAa,GAAG,IAAA,8BAAiB,GAAE,CAAC;QAC1C,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,GACzC,IAAA,iCAAoB,EAAC,aAAa,CAAC,CAAC;QAEtC,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;QAE9C,OAAO,CACL,MAAM,oCAAoC,CACxC,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,KAAK,EACL,YAAY,CACb,CACF,CAAC,YAAY,CAAC;IACjB,CAAC;CAAA;AAjBD,8CAiBC;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,
|
|
1
|
+
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/build-project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare function startInCurrentProcess(): void;
|
|
|
6
6
|
export declare function stop(): void;
|
|
7
7
|
/**
|
|
8
8
|
* As noted in the comments above the createServer() call, in order to reliably (meaning it works
|
|
9
|
-
* cross-platform) check whether
|
|
9
|
+
* cross-platform) check whether the server is available to request a project graph from we
|
|
10
10
|
* need to actually attempt connecting to it.
|
|
11
11
|
*
|
|
12
12
|
* Because of the behavior of named pipes on Windows, we cannot simply treat them as a file and
|
|
@@ -31,22 +31,48 @@ function startInBackground() {
|
|
|
31
31
|
/**
|
|
32
32
|
* Ensure the server is actually available to connect to via IPC before resolving
|
|
33
33
|
*/
|
|
34
|
+
let attempts = 0;
|
|
34
35
|
return new Promise((resolve) => {
|
|
35
36
|
const id = setInterval(() => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
36
37
|
if (yield isServerAvailable()) {
|
|
37
38
|
clearInterval(id);
|
|
38
39
|
resolve(backgroundProcess.pid);
|
|
39
40
|
}
|
|
40
|
-
|
|
41
|
+
else if (attempts > 200) {
|
|
42
|
+
// daemon fails to start, the process probably exited
|
|
43
|
+
// we print the logs and exit the client
|
|
44
|
+
throw daemonProcessException('Failed to start the Nx Daemon process.');
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
attempts++;
|
|
48
|
+
}
|
|
49
|
+
}), 10);
|
|
41
50
|
});
|
|
42
51
|
}
|
|
43
52
|
catch (err) {
|
|
44
|
-
|
|
45
|
-
process.exit(1);
|
|
53
|
+
throw err;
|
|
46
54
|
}
|
|
47
55
|
});
|
|
48
56
|
}
|
|
49
57
|
exports.startInBackground = startInBackground;
|
|
58
|
+
function daemonProcessException(message) {
|
|
59
|
+
try {
|
|
60
|
+
let log = (0, fs_1.readFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE).toString().split('\n');
|
|
61
|
+
if (log.length > 20) {
|
|
62
|
+
log = log.slice(log.length - 20);
|
|
63
|
+
}
|
|
64
|
+
return new Error([
|
|
65
|
+
message,
|
|
66
|
+
'Messages from the log:',
|
|
67
|
+
...log,
|
|
68
|
+
'\n',
|
|
69
|
+
`More information: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}`,
|
|
70
|
+
].join('\n'));
|
|
71
|
+
}
|
|
72
|
+
catch (e) {
|
|
73
|
+
return new Error(message);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
50
76
|
function startInCurrentProcess() {
|
|
51
77
|
devkit_1.logger.info(`NX Daemon Server - Starting in the current process...`);
|
|
52
78
|
(0, child_process_1.spawnSync)(process.execPath, ['../server/start.js'], {
|
|
@@ -65,7 +91,7 @@ function stop() {
|
|
|
65
91
|
exports.stop = stop;
|
|
66
92
|
/**
|
|
67
93
|
* As noted in the comments above the createServer() call, in order to reliably (meaning it works
|
|
68
|
-
* cross-platform) check whether
|
|
94
|
+
* cross-platform) check whether the server is available to request a project graph from we
|
|
69
95
|
* need to actually attempt connecting to it.
|
|
70
96
|
*
|
|
71
97
|
* Because of the behavior of named pipes on Windows, we cannot simply treat them as a file and
|
|
@@ -106,19 +132,18 @@ function getProjectGraphFromServer() {
|
|
|
106
132
|
perf_hooks_1.performance.mark('getProjectGraphFromServer-start');
|
|
107
133
|
const socket = (0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH);
|
|
108
134
|
socket.on('error', (err) => {
|
|
109
|
-
let
|
|
135
|
+
let error;
|
|
110
136
|
if (err.message.startsWith('connect ENOENT')) {
|
|
111
|
-
|
|
137
|
+
error = daemonProcessException('The Daemon Server is not running');
|
|
112
138
|
}
|
|
113
139
|
if (err.message.startsWith('connect ECONNREFUSED')) {
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
140
|
+
error = daemonProcessException(`A server instance had not been fully shut down. Please try running the command again.`);
|
|
141
|
+
(0, socket_utils_1.killSocketOrPath)();
|
|
142
|
+
}
|
|
143
|
+
if (err.message.startsWith('read ECONNRESET')) {
|
|
144
|
+
error = daemonProcessException(`Unable to connect to the daemon process.`);
|
|
119
145
|
}
|
|
120
|
-
|
|
121
|
-
return reject(new Error(errorMessage) || err);
|
|
146
|
+
return reject(error || err);
|
|
122
147
|
});
|
|
123
148
|
/**
|
|
124
149
|
* Immediately after connecting to the server we send it the known project graph creation
|
|
@@ -138,15 +163,13 @@ function getProjectGraphFromServer() {
|
|
|
138
163
|
perf_hooks_1.performance.mark('json-parse-end');
|
|
139
164
|
perf_hooks_1.performance.measure('deserialize graph result on the client', 'json-parse-start', 'json-parse-end');
|
|
140
165
|
if (projectGraphResult.error) {
|
|
141
|
-
devkit_1.logger.error(`NX Daemon Client - The server returned an Error`);
|
|
142
166
|
return reject(projectGraphResult.error);
|
|
143
167
|
}
|
|
144
168
|
perf_hooks_1.performance.measure('total for getProjectGraphFromServer()', 'getProjectGraphFromServer-start', 'json-parse-end');
|
|
145
169
|
return resolve(projectGraphResult.projectGraph);
|
|
146
170
|
}
|
|
147
|
-
catch (
|
|
148
|
-
|
|
149
|
-
return reject(new Error('Could not deserialize the ProjectGraph'));
|
|
171
|
+
catch (e) {
|
|
172
|
+
return reject(new Error(`Could not deserialize the ProjectGraph.\n${e.message}`));
|
|
150
173
|
}
|
|
151
174
|
});
|
|
152
175
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":";;;;AAAA,yCAAoD;AACpD,iDAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
|