@nrwl/workspace 13.0.0-beta.3 → 13.0.0-beta.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/package.json +5 -5
- package/src/core/project-graph/daemon/client/client.js +0 -3
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts +6 -0
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +119 -0
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -0
- package/src/core/project-graph/daemon/server/server.js +18 -72
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "13.0.0-beta.
|
|
3
|
+
"version": "13.0.0-beta.4",
|
|
4
4
|
"description": "Smart, Extensible Build Framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -57,10 +57,10 @@
|
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
59
|
"@parcel/watcher": "2.0.0-alpha.11",
|
|
60
|
-
"@nrwl/cli": "13.0.0-beta.
|
|
61
|
-
"@nrwl/devkit": "13.0.0-beta.
|
|
62
|
-
"@nrwl/jest": "13.0.0-beta.
|
|
63
|
-
"@nrwl/linter": "13.0.0-beta.
|
|
60
|
+
"@nrwl/cli": "13.0.0-beta.4",
|
|
61
|
+
"@nrwl/devkit": "13.0.0-beta.4",
|
|
62
|
+
"@nrwl/jest": "13.0.0-beta.4",
|
|
63
|
+
"@nrwl/linter": "13.0.0-beta.4",
|
|
64
64
|
"chokidar": "^3.5.1",
|
|
65
65
|
"cosmiconfig": "^4.0.0",
|
|
66
66
|
"fs-extra": "^9.1.0",
|
|
@@ -13,8 +13,6 @@ const tmp_dir_1 = require("../tmp-dir");
|
|
|
13
13
|
function startInBackground() {
|
|
14
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
15
|
yield cache_1.safelyCleanUpExistingProcess();
|
|
16
|
-
devkit_1.logger.info(`NX Daemon Server - Starting in a background process...`);
|
|
17
|
-
devkit_1.logger.log(` Logs from the Daemon process can be found here: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}\n`);
|
|
18
16
|
try {
|
|
19
17
|
const out = fs_1.openSync(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
|
20
18
|
const err = fs_1.openSync(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
|
@@ -141,7 +139,6 @@ function getProjectGraphFromServer() {
|
|
|
141
139
|
devkit_1.logger.error(`NX Daemon Client - The server returned an Error`);
|
|
142
140
|
return reject(projectGraphResult.error);
|
|
143
141
|
}
|
|
144
|
-
devkit_1.logger.info('NX Daemon Client - Resolved ProjectGraph');
|
|
145
142
|
perf_hooks_1.performance.measure('total for getProjectGraphFromServer()', 'getProjectGraphFromServer-start', 'json-parse-end');
|
|
146
143
|
return resolve(projectGraphResult.projectGraph);
|
|
147
144
|
}
|
|
@@ -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,iDAAiD;AACjD,2BAA0C;AAC1C,6BAA8B;AAC9B,2CAAyC;AACzC,oCAGkB;AAClB,kDAIyB;AACzB,wCAAoD;AAEpD,SAAsB,iBAAiB;;QACrC,MAAM,oCAA4B,EAAE,CAAC;QAErC,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare function getCachedSerializedProjectGraphPromise(): Promise<{
|
|
2
|
+
error: Error;
|
|
3
|
+
serializedProjectGraph: string;
|
|
4
|
+
}>;
|
|
5
|
+
export declare function addUpdatedAndDeletedFiles(updatedFiles: string[], deletedFiles: string[]): void;
|
|
6
|
+
export declare function resetAfterError(): void;
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resetAfterError = exports.addUpdatedAndDeletedFiles = exports.getCachedSerializedProjectGraphPromise = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
6
|
+
const perf_hooks_1 = require("perf_hooks");
|
|
7
|
+
const file_utils_1 = require("../../../file-utils");
|
|
8
|
+
const file_hasher_1 = require("../../../hasher/file-hasher");
|
|
9
|
+
const git_hasher_1 = require("../../../hasher/git-hasher");
|
|
10
|
+
const logger_1 = require("./logger");
|
|
11
|
+
const build_project_graph_1 = require("../../build-project-graph");
|
|
12
|
+
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
13
|
+
const nx_deps_cache_1 = require("../../../nx-deps/nx-deps-cache");
|
|
14
|
+
const configName = workspace_1.workspaceConfigName(app_root_1.appRootPath);
|
|
15
|
+
let cachedSerializedProjectGraphPromise;
|
|
16
|
+
let projectFileMapWithFiles;
|
|
17
|
+
let currentProjectGraphCache;
|
|
18
|
+
const collectedUpdatedFiles = new Set();
|
|
19
|
+
const collectedDeletedFiles = new Set();
|
|
20
|
+
let waitPeriod = 100;
|
|
21
|
+
let scheduledTimeoutId;
|
|
22
|
+
function getCachedSerializedProjectGraphPromise() {
|
|
23
|
+
// recomputing it now on demand. we can ignore the scheduled timeout
|
|
24
|
+
if (scheduledTimeoutId) {
|
|
25
|
+
clearTimeout(scheduledTimeoutId);
|
|
26
|
+
}
|
|
27
|
+
// reset the wait time
|
|
28
|
+
waitPeriod = 100;
|
|
29
|
+
if (collectedUpdatedFiles.size == 0 && collectedDeletedFiles.size == 0) {
|
|
30
|
+
if (!cachedSerializedProjectGraphPromise) {
|
|
31
|
+
cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph();
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
processCollectedUpdatedAndDeletedFiles();
|
|
36
|
+
cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph();
|
|
37
|
+
}
|
|
38
|
+
return cachedSerializedProjectGraphPromise;
|
|
39
|
+
}
|
|
40
|
+
exports.getCachedSerializedProjectGraphPromise = getCachedSerializedProjectGraphPromise;
|
|
41
|
+
function addUpdatedAndDeletedFiles(updatedFiles, deletedFiles) {
|
|
42
|
+
for (let f of updatedFiles) {
|
|
43
|
+
collectedDeletedFiles.delete(f);
|
|
44
|
+
collectedUpdatedFiles.add(f);
|
|
45
|
+
}
|
|
46
|
+
for (let f of deletedFiles) {
|
|
47
|
+
collectedUpdatedFiles.delete(f);
|
|
48
|
+
collectedDeletedFiles.add(f);
|
|
49
|
+
}
|
|
50
|
+
if (!scheduledTimeoutId) {
|
|
51
|
+
scheduledTimeoutId = setTimeout(() => {
|
|
52
|
+
scheduledTimeoutId = undefined;
|
|
53
|
+
if (waitPeriod < 4000) {
|
|
54
|
+
waitPeriod = waitPeriod * 2;
|
|
55
|
+
}
|
|
56
|
+
processCollectedUpdatedAndDeletedFiles();
|
|
57
|
+
cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph();
|
|
58
|
+
}, waitPeriod);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
exports.addUpdatedAndDeletedFiles = addUpdatedAndDeletedFiles;
|
|
62
|
+
function processCollectedUpdatedAndDeletedFiles() {
|
|
63
|
+
perf_hooks_1.performance.mark('hash-watched-changes-start');
|
|
64
|
+
const updatedFiles = git_hasher_1.getGitHashForFiles([...collectedUpdatedFiles.values()], app_root_1.appRootPath);
|
|
65
|
+
const deletedFiles = [...collectedDeletedFiles.values()];
|
|
66
|
+
collectedUpdatedFiles.clear();
|
|
67
|
+
collectedDeletedFiles.clear();
|
|
68
|
+
perf_hooks_1.performance.mark('hash-watched-changes-end');
|
|
69
|
+
perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
|
|
70
|
+
file_hasher_1.defaultFileHasher.incrementalUpdate(updatedFiles, deletedFiles);
|
|
71
|
+
const workspaceJson = file_utils_1.readWorkspaceJson();
|
|
72
|
+
logger_1.serverLogger.nestedLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
|
|
73
|
+
// when workspace.json changes we cannot be sure about the correctness of the project file map
|
|
74
|
+
if (collectedUpdatedFiles.has(configName) ||
|
|
75
|
+
collectedDeletedFiles.has(configName)) {
|
|
76
|
+
projectFileMapWithFiles = file_utils_1.createProjectFileMap(workspaceJson);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
projectFileMapWithFiles = projectFileMapWithFiles
|
|
80
|
+
? file_utils_1.updateProjectFileMap(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, updatedFiles, deletedFiles)
|
|
81
|
+
: file_utils_1.createProjectFileMap(workspaceJson);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
function createAndSerializeProjectGraph() {
|
|
85
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
86
|
+
try {
|
|
87
|
+
perf_hooks_1.performance.mark('create-project-graph-start');
|
|
88
|
+
const workspaceJson = file_utils_1.readWorkspaceJson();
|
|
89
|
+
const { projectGraph, projectGraphCache } = yield build_project_graph_1.buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, currentProjectGraphCache || nx_deps_cache_1.readCache(), true, '4.0');
|
|
90
|
+
currentProjectGraphCache = projectGraphCache;
|
|
91
|
+
perf_hooks_1.performance.mark('create-project-graph-end');
|
|
92
|
+
perf_hooks_1.performance.measure('total execution time for createProjectGraph()', 'create-project-graph-start', 'create-project-graph-end');
|
|
93
|
+
perf_hooks_1.performance.mark('json-stringify-start');
|
|
94
|
+
const serializedProjectGraph = JSON.stringify(projectGraph);
|
|
95
|
+
perf_hooks_1.performance.mark('json-stringify-end');
|
|
96
|
+
perf_hooks_1.performance.measure('serialize graph', 'json-stringify-start', 'json-stringify-end');
|
|
97
|
+
return {
|
|
98
|
+
error: null,
|
|
99
|
+
serializedProjectGraph,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
catch (err) {
|
|
103
|
+
return {
|
|
104
|
+
error: err,
|
|
105
|
+
serializedProjectGraph: null,
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
function resetAfterError() {
|
|
111
|
+
cachedSerializedProjectGraphPromise = undefined;
|
|
112
|
+
projectFileMapWithFiles = undefined;
|
|
113
|
+
currentProjectGraphCache = undefined;
|
|
114
|
+
collectedUpdatedFiles.clear();
|
|
115
|
+
collectedDeletedFiles.clear();
|
|
116
|
+
waitPeriod = 100;
|
|
117
|
+
}
|
|
118
|
+
exports.resetAfterError = resetAfterError;
|
|
119
|
+
//# sourceMappingURL=project-graph-incremental-recomputation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project-graph-incremental-recomputation.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,49 +7,11 @@ const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
|
7
7
|
const net_1 = require("net");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const perf_hooks_1 = require("perf_hooks");
|
|
10
|
-
const file_utils_1 = require("../../../file-utils");
|
|
11
|
-
const file_hasher_1 = require("../../../hasher/file-hasher");
|
|
12
|
-
const git_hasher_1 = require("../../../hasher/git-hasher");
|
|
13
10
|
const socket_utils_1 = require("../socket-utils");
|
|
14
11
|
const logger_1 = require("./logger");
|
|
15
12
|
const shutdown_utils_1 = require("./shutdown-utils");
|
|
16
13
|
const watcher_1 = require("./watcher");
|
|
17
|
-
const
|
|
18
|
-
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
19
|
-
const nx_deps_cache_1 = require("../../../nx-deps/nx-deps-cache");
|
|
20
|
-
const configName = workspace_1.workspaceConfigName(app_root_1.appRootPath);
|
|
21
|
-
let cachedSerializedProjectGraphPromise;
|
|
22
|
-
let projectFileMapWithFiles;
|
|
23
|
-
let currentProjectGraphCache;
|
|
24
|
-
function createAndSerializeProjectGraph(updatedFiles, deletedFiles, shouldWriteCache) {
|
|
25
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
try {
|
|
27
|
-
perf_hooks_1.performance.mark('create-project-graph-start');
|
|
28
|
-
const workspaceJson = file_utils_1.readWorkspaceJson();
|
|
29
|
-
projectFileMapWithFiles = projectFileMapWithFiles
|
|
30
|
-
? file_utils_1.updateProjectFileMap(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, updatedFiles, deletedFiles)
|
|
31
|
-
: file_utils_1.createProjectFileMap(workspaceJson);
|
|
32
|
-
const { projectGraph, projectGraphCache } = yield build_project_graph_1.buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, currentProjectGraphCache || nx_deps_cache_1.readCache(), shouldWriteCache, '4.0');
|
|
33
|
-
currentProjectGraphCache = projectGraphCache;
|
|
34
|
-
perf_hooks_1.performance.mark('create-project-graph-end');
|
|
35
|
-
perf_hooks_1.performance.measure('total execution time for createProjectGraph()', 'create-project-graph-start', 'create-project-graph-end');
|
|
36
|
-
perf_hooks_1.performance.mark('json-stringify-start');
|
|
37
|
-
const serializedProjectGraph = JSON.stringify(projectGraph);
|
|
38
|
-
perf_hooks_1.performance.mark('json-stringify-end');
|
|
39
|
-
perf_hooks_1.performance.measure('serialize graph', 'json-stringify-start', 'json-stringify-end');
|
|
40
|
-
return {
|
|
41
|
-
error: null,
|
|
42
|
-
serializedProjectGraph,
|
|
43
|
-
};
|
|
44
|
-
}
|
|
45
|
-
catch (err) {
|
|
46
|
-
return {
|
|
47
|
-
error: err,
|
|
48
|
-
serializedProjectGraph: null,
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
|
-
});
|
|
52
|
-
}
|
|
14
|
+
const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
|
|
53
15
|
function respondToClient(socket, message) {
|
|
54
16
|
socket.write(message, () => {
|
|
55
17
|
// Close the connection once all data has been written so that the client knows when to read it.
|
|
@@ -76,19 +38,16 @@ const server = net_1.createServer((socket) => {
|
|
|
76
38
|
}
|
|
77
39
|
perf_hooks_1.performance.mark('server-connection');
|
|
78
40
|
logger_1.serverLogger.requestLog('Client Request for Project Graph Received');
|
|
79
|
-
|
|
80
|
-
cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph(new Map(), [], true);
|
|
81
|
-
}
|
|
82
|
-
const result = yield cachedSerializedProjectGraphPromise;
|
|
41
|
+
const result = yield project_graph_incremental_recomputation_1.getCachedSerializedProjectGraphPromise();
|
|
83
42
|
if (result.error) {
|
|
84
|
-
|
|
43
|
+
project_graph_incremental_recomputation_1.resetAfterError();
|
|
85
44
|
logger_1.serverLogger.nestedLog(`Error when preparing serialized project graph: ${result.error.message}`);
|
|
86
45
|
respondToClient(socket, socket_utils_1.serializeResult(result.error, result.serializedProjectGraph));
|
|
87
46
|
return;
|
|
88
47
|
}
|
|
89
48
|
const serializedResult = socket_utils_1.serializeResult(result.error, result.serializedProjectGraph);
|
|
90
49
|
if (!serializedResult) {
|
|
91
|
-
|
|
50
|
+
project_graph_incremental_recomputation_1.resetAfterError();
|
|
92
51
|
logger_1.serverLogger.nestedLog(`Error when serializing project graph result`);
|
|
93
52
|
respondToClient(socket, socket_utils_1.serializeResult(new Error('Critical error when serializing server result, check server logs'), null));
|
|
94
53
|
return;
|
|
@@ -176,36 +135,23 @@ const handleWorkspaceChanges = (err, changeEvents) => tslib_1.__awaiter(void 0,
|
|
|
176
135
|
return;
|
|
177
136
|
}
|
|
178
137
|
logger_1.serverLogger.watcherLog(watcher_1.convertChangeEventsToLogMessage(changeEvents));
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
deletedFiles.push(event.path);
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
filesToHash.push(event.path);
|
|
189
|
-
}
|
|
138
|
+
try {
|
|
139
|
+
const filesToHash = [];
|
|
140
|
+
const deletedFiles = [];
|
|
141
|
+
for (const event of changeEvents) {
|
|
142
|
+
if (event.type === 'delete') {
|
|
143
|
+
deletedFiles.push(event.path);
|
|
190
144
|
}
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
perf_hooks_1.performance.mark('hash-watched-changes-end');
|
|
194
|
-
perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
|
|
195
|
-
file_hasher_1.defaultFileHasher.incrementalUpdate(updatedFiles, deletedFiles);
|
|
196
|
-
logger_1.serverLogger.nestedLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
|
|
197
|
-
// when workspace.json changes we cannot be sure about the correctness of the project file map
|
|
198
|
-
if (updatedFiles.has(configName) ||
|
|
199
|
-
deletedFiles.indexOf(configName) > -1) {
|
|
200
|
-
projectFileMapWithFiles = undefined;
|
|
145
|
+
else {
|
|
146
|
+
filesToHash.push(event.path);
|
|
201
147
|
}
|
|
202
|
-
res(yield createAndSerializeProjectGraph(updatedFiles, deletedFiles, true));
|
|
203
148
|
}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
149
|
+
project_graph_incremental_recomputation_1.addUpdatedAndDeletedFiles(filesToHash, deletedFiles);
|
|
150
|
+
}
|
|
151
|
+
catch (err) {
|
|
152
|
+
logger_1.serverLogger.log(`Unexpected Error`);
|
|
153
|
+
console.error(err);
|
|
154
|
+
}
|
|
209
155
|
});
|
|
210
156
|
function startServer() {
|
|
211
157
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.tslintVersion = exports.typescriptESLintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.0.0-beta.
|
|
4
|
+
exports.nxVersion = '13.0.0-beta.4';
|
|
5
5
|
exports.angularCliVersion = '~12.2.0';
|
|
6
6
|
exports.typescriptVersion = '~4.3.5';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|