@nrwl/workspace 13.3.0-beta.23 → 13.3.0-beta.24
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 +28 -24
- package/src/core/project-graph/daemon/client/client.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/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "13.3.0-beta.
|
|
3
|
+
"version": "13.3.0-beta.24",
|
|
4
4
|
"description": "Smart, Extensible Build Framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -86,10 +86,10 @@
|
|
|
86
86
|
"minimatch": "3.0.4",
|
|
87
87
|
"enquirer": "~2.3.6",
|
|
88
88
|
"tslib": "^2.3.0",
|
|
89
|
-
"@nrwl/cli": "13.3.0-beta.
|
|
90
|
-
"@nrwl/devkit": "13.3.0-beta.
|
|
91
|
-
"@nrwl/jest": "13.3.0-beta.
|
|
92
|
-
"@nrwl/linter": "13.3.0-beta.
|
|
89
|
+
"@nrwl/cli": "13.3.0-beta.24",
|
|
90
|
+
"@nrwl/devkit": "13.3.0-beta.24",
|
|
91
|
+
"@nrwl/jest": "13.3.0-beta.24",
|
|
92
|
+
"@nrwl/linter": "13.3.0-beta.24"
|
|
93
93
|
},
|
|
94
94
|
"nx-migrations": {
|
|
95
95
|
"migrations": "./migrations.json"
|
|
@@ -10,7 +10,6 @@ const perf_hooks_1 = require("perf_hooks");
|
|
|
10
10
|
const cache_1 = require("../cache");
|
|
11
11
|
const socket_utils_1 = require("../socket-utils");
|
|
12
12
|
const tmp_dir_1 = require("../tmp-dir");
|
|
13
|
-
const output_1 = require("../../../../utilities/output");
|
|
14
13
|
function startInBackground() {
|
|
15
14
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
16
15
|
yield (0, cache_1.safelyCleanUpExistingProcess)();
|
|
@@ -42,19 +41,7 @@ function startInBackground() {
|
|
|
42
41
|
else if (attempts > 200) {
|
|
43
42
|
// daemon fails to start, the process probably exited
|
|
44
43
|
// we print the logs and exit the client
|
|
45
|
-
|
|
46
|
-
if (log.length > 20) {
|
|
47
|
-
log = log.slice(log.length - 20);
|
|
48
|
-
}
|
|
49
|
-
output_1.output.error({
|
|
50
|
-
title: 'Failed to start the Nx Daemon process.',
|
|
51
|
-
bodyLines: [
|
|
52
|
-
...log,
|
|
53
|
-
'\n',
|
|
54
|
-
`More information: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}`,
|
|
55
|
-
],
|
|
56
|
-
});
|
|
57
|
-
process.exit(1);
|
|
44
|
+
throw daemonProcessException('Failed to start the Nx Daemon process.');
|
|
58
45
|
}
|
|
59
46
|
else {
|
|
60
47
|
attempts++;
|
|
@@ -63,12 +50,29 @@ function startInBackground() {
|
|
|
63
50
|
});
|
|
64
51
|
}
|
|
65
52
|
catch (err) {
|
|
66
|
-
|
|
67
|
-
process.exit(1);
|
|
53
|
+
throw err;
|
|
68
54
|
}
|
|
69
55
|
});
|
|
70
56
|
}
|
|
71
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
|
+
}
|
|
72
76
|
function startInCurrentProcess() {
|
|
73
77
|
devkit_1.logger.info(`NX Daemon Server - Starting in the current process...`);
|
|
74
78
|
(0, child_process_1.spawnSync)(process.execPath, ['../server/start.js'], {
|
|
@@ -128,18 +132,18 @@ function getProjectGraphFromServer() {
|
|
|
128
132
|
perf_hooks_1.performance.mark('getProjectGraphFromServer-start');
|
|
129
133
|
const socket = (0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH);
|
|
130
134
|
socket.on('error', (err) => {
|
|
131
|
-
let
|
|
135
|
+
let error;
|
|
132
136
|
if (err.message.startsWith('connect ENOENT')) {
|
|
133
|
-
|
|
137
|
+
error = daemonProcessException('The Daemon Server is not running');
|
|
134
138
|
}
|
|
135
139
|
if (err.message.startsWith('connect ECONNREFUSED')) {
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
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('connect ECONNRESET')) {
|
|
144
|
+
error = daemonProcessException(`Unable to connect to the daemon process.`);
|
|
141
145
|
}
|
|
142
|
-
return reject(
|
|
146
|
+
return reject(error || err);
|
|
143
147
|
});
|
|
144
148
|
/**
|
|
145
149
|
* Immediately after connecting to the server we send it the known project graph creation
|
|
@@ -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,2BAAwD;AACxD,6BAA8B;AAC9B,2CAAyC;AACzC,oCAGkB;AAClB,kDAIyB;AACzB,wCAAoD;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const server_1 = require("./server");
|
|
6
|
+
const process = require("process");
|
|
6
7
|
(() => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
7
8
|
try {
|
|
8
9
|
yield (0, server_1.startServer)();
|
|
9
10
|
}
|
|
10
11
|
catch (err) {
|
|
11
12
|
devkit_1.logger.error(err);
|
|
13
|
+
process.exit(1);
|
|
12
14
|
}
|
|
13
15
|
}))();
|
|
14
16
|
//# sourceMappingURL=start.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/start.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,qCAAuC;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/start.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,qCAAuC;AACvC,mCAAmC;AAEnC,CAAC,GAAS,EAAE;IACV,IAAI;QACF,MAAM,IAAA,oBAAW,GAAE,CAAC;KACrB;IAAC,OAAO,GAAG,EAAE;QACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAChB;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
|
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.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.3.0-beta.
|
|
4
|
+
exports.nxVersion = '13.3.0-beta.24';
|
|
5
5
|
exports.angularCliVersion = '~13.0.0';
|
|
6
6
|
exports.typescriptVersion = '~4.4.3';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|