@nrwl/workspace 13.7.1 → 13.7.2
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +5 -5
- package/src/core/hasher/file-hasher.d.ts +1 -1
- package/src/core/hasher/file-hasher.js +2 -2
- package/src/core/project-graph/daemon/client/client.d.ts +3 -3
- package/src/core/project-graph/daemon/client/client.js +39 -39
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/project-graph.js +12 -1
- package/src/core/project-graph/project-graph.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.7.
|
|
3
|
+
"version": "13.7.2",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -81,10 +81,10 @@
|
|
|
81
81
|
"minimatch": "3.0.4",
|
|
82
82
|
"enquirer": "~2.3.6",
|
|
83
83
|
"tslib": "^2.3.0",
|
|
84
|
-
"@nrwl/cli": "13.7.
|
|
85
|
-
"@nrwl/devkit": "13.7.
|
|
86
|
-
"@nrwl/jest": "13.7.
|
|
87
|
-
"@nrwl/linter": "13.7.
|
|
84
|
+
"@nrwl/cli": "13.7.2",
|
|
85
|
+
"@nrwl/devkit": "13.7.2",
|
|
86
|
+
"@nrwl/jest": "13.7.2",
|
|
87
|
+
"@nrwl/linter": "13.7.2"
|
|
88
88
|
},
|
|
89
89
|
"nx-migrations": {
|
|
90
90
|
"migrations": "./migrations.json"
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { FileHasherBase } from
|
|
1
|
+
import { FileHasherBase } from './file-hasher-base';
|
|
2
2
|
export declare const defaultFileHasher: FileHasherBase;
|
|
@@ -7,11 +7,11 @@ const node_based_file_hasher_1 = require("./node-based-file-hasher");
|
|
|
7
7
|
const child_process_1 = require("child_process");
|
|
8
8
|
function createFileHasher() {
|
|
9
9
|
// special case for unit tests
|
|
10
|
-
if (app_root_1.appRootPath ===
|
|
10
|
+
if (app_root_1.appRootPath === '/root') {
|
|
11
11
|
return new node_based_file_hasher_1.NodeBasedFileHasher();
|
|
12
12
|
}
|
|
13
13
|
try {
|
|
14
|
-
(0, child_process_1.execSync)(
|
|
14
|
+
(0, child_process_1.execSync)('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
|
|
15
15
|
return new git_based_file_hasher_1.GitBasedFileHasher();
|
|
16
16
|
}
|
|
17
17
|
catch (_a) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { ProjectGraph } from
|
|
3
|
-
import { ChildProcess } from
|
|
4
|
-
export declare function startInBackground(): Promise<ChildProcess[
|
|
2
|
+
import { ProjectGraph } from '@nrwl/devkit';
|
|
3
|
+
import { ChildProcess } from 'child_process';
|
|
4
|
+
export declare function startInBackground(): Promise<ChildProcess['pid']>;
|
|
5
5
|
export declare function startInCurrentProcess(): void;
|
|
6
6
|
export declare function stop(): void;
|
|
7
7
|
/**
|
|
@@ -16,19 +16,19 @@ function startInBackground() {
|
|
|
16
16
|
yield (0, cache_1.safelyCleanUpExistingProcess)();
|
|
17
17
|
(0, fs_extra_1.ensureDirSync)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE);
|
|
18
18
|
(0, fs_extra_1.ensureFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE);
|
|
19
|
-
const out = (0, fs_1.openSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE,
|
|
20
|
-
const err = (0, fs_1.openSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE,
|
|
21
|
-
const backgroundProcess = (0, child_process_1.spawn)(process.execPath, [
|
|
19
|
+
const out = (0, fs_1.openSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
|
20
|
+
const err = (0, fs_1.openSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
|
21
|
+
const backgroundProcess = (0, child_process_1.spawn)(process.execPath, ['../server/start.js'], {
|
|
22
22
|
cwd: __dirname,
|
|
23
|
-
stdio: [
|
|
23
|
+
stdio: ['ignore', out, err],
|
|
24
24
|
detached: true,
|
|
25
25
|
windowsHide: true,
|
|
26
|
-
shell: false
|
|
26
|
+
shell: false,
|
|
27
27
|
});
|
|
28
28
|
backgroundProcess.unref();
|
|
29
29
|
// Persist metadata about the background process so that it can be cleaned up later if needed
|
|
30
30
|
yield (0, cache_1.writeDaemonJsonProcessCache)({
|
|
31
|
-
processId: backgroundProcess.pid
|
|
31
|
+
processId: backgroundProcess.pid,
|
|
32
32
|
});
|
|
33
33
|
/**
|
|
34
34
|
* Ensure the server is actually available to connect to via IPC before resolving
|
|
@@ -43,7 +43,7 @@ function startInBackground() {
|
|
|
43
43
|
else if (attempts > 200) {
|
|
44
44
|
// daemon fails to start, the process probably exited
|
|
45
45
|
// we print the logs and exit the client
|
|
46
|
-
reject(daemonProcessException(
|
|
46
|
+
reject(daemonProcessException('Failed to start the Nx Daemon process.'));
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
attempts++;
|
|
@@ -55,17 +55,17 @@ function startInBackground() {
|
|
|
55
55
|
exports.startInBackground = startInBackground;
|
|
56
56
|
function daemonProcessException(message) {
|
|
57
57
|
try {
|
|
58
|
-
let log = (0, fs_1.readFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE).toString().split(
|
|
58
|
+
let log = (0, fs_1.readFileSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE).toString().split('\n');
|
|
59
59
|
if (log.length > 20) {
|
|
60
60
|
log = log.slice(log.length - 20);
|
|
61
61
|
}
|
|
62
62
|
return new Error([
|
|
63
63
|
message,
|
|
64
|
-
|
|
64
|
+
'Messages from the log:',
|
|
65
65
|
...log,
|
|
66
|
-
|
|
67
|
-
`More information: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}
|
|
68
|
-
].join(
|
|
66
|
+
'\n',
|
|
67
|
+
`More information: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}`,
|
|
68
|
+
].join('\n'));
|
|
69
69
|
}
|
|
70
70
|
catch (e) {
|
|
71
71
|
return new Error(message);
|
|
@@ -73,20 +73,20 @@ function daemonProcessException(message) {
|
|
|
73
73
|
}
|
|
74
74
|
function startInCurrentProcess() {
|
|
75
75
|
output_1.output.log({
|
|
76
|
-
title: `Daemon Server - Starting in the current process
|
|
76
|
+
title: `Daemon Server - Starting in the current process...`,
|
|
77
77
|
});
|
|
78
|
-
(0, child_process_1.spawnSync)(process.execPath, [
|
|
78
|
+
(0, child_process_1.spawnSync)(process.execPath, ['../server/start.js'], {
|
|
79
79
|
cwd: __dirname,
|
|
80
|
-
stdio:
|
|
80
|
+
stdio: 'inherit',
|
|
81
81
|
});
|
|
82
82
|
}
|
|
83
83
|
exports.startInCurrentProcess = startInCurrentProcess;
|
|
84
84
|
function stop() {
|
|
85
|
-
(0, child_process_1.spawnSync)(process.execPath, [
|
|
85
|
+
(0, child_process_1.spawnSync)(process.execPath, ['../server/stop.js'], {
|
|
86
86
|
cwd: __dirname,
|
|
87
|
-
stdio:
|
|
87
|
+
stdio: 'inherit',
|
|
88
88
|
});
|
|
89
|
-
output_1.output.log({ title:
|
|
89
|
+
output_1.output.log({ title: 'Daemon Server - Stopped' });
|
|
90
90
|
}
|
|
91
91
|
exports.stop = stop;
|
|
92
92
|
/**
|
|
@@ -105,7 +105,7 @@ function isServerAvailable() {
|
|
|
105
105
|
socket.destroy();
|
|
106
106
|
resolve(true);
|
|
107
107
|
});
|
|
108
|
-
socket.once(
|
|
108
|
+
socket.once('error', () => {
|
|
109
109
|
resolve(false);
|
|
110
110
|
});
|
|
111
111
|
}
|
|
@@ -129,24 +129,24 @@ exports.isServerAvailable = isServerAvailable;
|
|
|
129
129
|
function getProjectGraphFromServer() {
|
|
130
130
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
131
131
|
return new Promise((resolve, reject) => {
|
|
132
|
-
perf_hooks_1.performance.mark(
|
|
132
|
+
perf_hooks_1.performance.mark('getProjectGraphFromServer-start');
|
|
133
133
|
const socket = (0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH);
|
|
134
|
-
socket.on(
|
|
134
|
+
socket.on('error', (err) => {
|
|
135
135
|
if (!err.message) {
|
|
136
136
|
return reject(err);
|
|
137
137
|
}
|
|
138
|
-
if (err.message.startsWith(
|
|
138
|
+
if (err.message.startsWith('LOCK-FILES-CHANGED')) {
|
|
139
139
|
return getProjectGraphFromServer().then(resolve, reject);
|
|
140
140
|
}
|
|
141
141
|
let error;
|
|
142
|
-
if (err.message.startsWith(
|
|
143
|
-
error = daemonProcessException(
|
|
142
|
+
if (err.message.startsWith('connect ENOENT')) {
|
|
143
|
+
error = daemonProcessException('The Daemon Server is not running');
|
|
144
144
|
}
|
|
145
|
-
else if (err.message.startsWith(
|
|
145
|
+
else if (err.message.startsWith('connect ECONNREFUSED')) {
|
|
146
146
|
error = daemonProcessException(`A server instance had not been fully shut down. Please try running the command again.`);
|
|
147
147
|
(0, socket_utils_1.killSocketOrPath)();
|
|
148
148
|
}
|
|
149
|
-
else if (err.message.startsWith(
|
|
149
|
+
else if (err.message.startsWith('read ECONNRESET')) {
|
|
150
150
|
error = daemonProcessException(`Unable to connect to the daemon process.`);
|
|
151
151
|
}
|
|
152
152
|
return reject(error || err);
|
|
@@ -156,23 +156,23 @@ function getProjectGraphFromServer() {
|
|
|
156
156
|
* request payload. See the notes above createServer() for more context as to why we explicitly
|
|
157
157
|
* request the graph from the client like this.
|
|
158
158
|
*/
|
|
159
|
-
socket.on(
|
|
160
|
-
socket.write(
|
|
161
|
-
let serializedProjectGraphResult =
|
|
162
|
-
socket.on(
|
|
159
|
+
socket.on('connect', () => {
|
|
160
|
+
socket.write('REQUEST_PROJECT_GRAPH_PAYLOAD');
|
|
161
|
+
let serializedProjectGraphResult = '';
|
|
162
|
+
socket.on('data', (data) => {
|
|
163
163
|
serializedProjectGraphResult += data.toString();
|
|
164
164
|
});
|
|
165
|
-
socket.on(
|
|
165
|
+
socket.on('end', () => {
|
|
166
166
|
try {
|
|
167
|
-
perf_hooks_1.performance.mark(
|
|
167
|
+
perf_hooks_1.performance.mark('json-parse-start');
|
|
168
168
|
const projectGraphResult = JSON.parse(serializedProjectGraphResult);
|
|
169
|
-
perf_hooks_1.performance.mark(
|
|
170
|
-
perf_hooks_1.performance.measure(
|
|
169
|
+
perf_hooks_1.performance.mark('json-parse-end');
|
|
170
|
+
perf_hooks_1.performance.measure('deserialize graph result on the client', 'json-parse-start', 'json-parse-end');
|
|
171
171
|
if (projectGraphResult.error) {
|
|
172
172
|
reject(projectGraphResult.error);
|
|
173
173
|
}
|
|
174
174
|
else {
|
|
175
|
-
perf_hooks_1.performance.measure(
|
|
175
|
+
perf_hooks_1.performance.measure('total for getProjectGraphFromServer()', 'getProjectGraphFromServer-start', 'json-parse-end');
|
|
176
176
|
return resolve(projectGraphResult.projectGraph);
|
|
177
177
|
}
|
|
178
178
|
}
|
|
@@ -181,13 +181,13 @@ function getProjectGraphFromServer() {
|
|
|
181
181
|
? serializedProjectGraphResult.substring(serializedProjectGraphResult.length - 300)
|
|
182
182
|
: serializedProjectGraphResult;
|
|
183
183
|
reject(daemonProcessException([
|
|
184
|
-
|
|
184
|
+
'Could not deserialize project graph.',
|
|
185
185
|
`Message: ${e.message}`,
|
|
186
|
-
|
|
186
|
+
'\n',
|
|
187
187
|
`Received:`,
|
|
188
188
|
endOfGraph,
|
|
189
|
-
|
|
190
|
-
].join(
|
|
189
|
+
'\n',
|
|
190
|
+
].join('\n')));
|
|
191
191
|
}
|
|
192
192
|
});
|
|
193
193
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":";;;;AACA,iDAA+D;AAC/D,2BAA4C;AAC5C,uCAAyD;AACzD,6BAA8B;AAC9B,2CAAyC;AACzC,yDAAsD;AACtD,oCAGkB;AAClB,kDAAwE;AACxE,wCAGoB;AAEpB,SAAsB,iBAAiB;;QACrC,MAAM,IAAA,oCAA4B,GAAE,CAAC;QACrC,IAAA,wBAAa,EAAC,0CAAgC,CAAC,CAAC;QAChD,IAAA,yBAAc,EAAC,gCAAsB,CAAC,CAAC;QAEvC,MAAM,GAAG,GAAG,IAAA,aAAQ,EAAC,gCAAsB,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,IAAA,aAAQ,EAAC,gCAAsB,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,iBAAiB,GAAG,IAAA,qBAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,oBAAoB,CAAC,EAAE;YACxE,GAAG,EAAE,SAAS;YACd,KAAK,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC;YAC3B,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;QACH,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAE1B,6FAA6F;QAC7F,MAAM,IAAA,mCAA2B,EAAC;YAChC,SAAS,EAAE,iBAAiB,CAAC,GAAG;SACjC,CAAC,CAAC;QAEH;;WAEG;QACH,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAS,EAAE;gBAChC,IAAI,MAAM,iBAAiB,EAAE,EAAE;oBAC7B,aAAa,CAAC,EAAE,CAAC,CAAC;oBAClB,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;iBAChC;qBAAM,IAAI,QAAQ,GAAG,GAAG,EAAE;oBACzB,qDAAqD;oBACrD,wCAAwC;oBACxC,MAAM,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":";;;;AACA,iDAA+D;AAC/D,2BAA4C;AAC5C,uCAAyD;AACzD,6BAA8B;AAC9B,2CAAyC;AACzC,yDAAsD;AACtD,oCAGkB;AAClB,kDAAwE;AACxE,wCAGoB;AAEpB,SAAsB,iBAAiB;;QACrC,MAAM,IAAA,oCAA4B,GAAE,CAAC;QACrC,IAAA,wBAAa,EAAC,0CAAgC,CAAC,CAAC;QAChD,IAAA,yBAAc,EAAC,gCAAsB,CAAC,CAAC;QAEvC,MAAM,GAAG,GAAG,IAAA,aAAQ,EAAC,gCAAsB,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,IAAA,aAAQ,EAAC,gCAAsB,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,iBAAiB,GAAG,IAAA,qBAAK,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,oBAAoB,CAAC,EAAE;YACxE,GAAG,EAAE,SAAS;YACd,KAAK,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC;YAC3B,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;QACH,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAE1B,6FAA6F;QAC7F,MAAM,IAAA,mCAA2B,EAAC;YAChC,SAAS,EAAE,iBAAiB,CAAC,GAAG;SACjC,CAAC,CAAC;QAEH;;WAEG;QACH,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAS,EAAE;gBAChC,IAAI,MAAM,iBAAiB,EAAE,EAAE;oBAC7B,aAAa,CAAC,EAAE,CAAC,CAAC;oBAClB,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;iBAChC;qBAAM,IAAI,QAAQ,GAAG,GAAG,EAAE;oBACzB,qDAAqD;oBACrD,wCAAwC;oBACxC,MAAM,CACJ,sBAAsB,CAAC,wCAAwC,CAAC,CACjE,CAAC;iBACH;qBAAM;oBACL,QAAQ,EAAE,CAAC;iBACZ;YACH,CAAC,CAAA,EAAE,EAAE,CAAC,CAAC;QACT,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAzCD,8CAyCC;AAED,SAAS,sBAAsB,CAAC,OAAe;IAC7C,IAAI;QACF,IAAI,GAAG,GAAG,IAAA,iBAAY,EAAC,gCAAsB,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE;YACnB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;SAClC;QACD,OAAO,IAAI,KAAK,CACd;YACE,OAAO;YACP,wBAAwB;YACxB,GAAG,GAAG;YACN,IAAI;YACJ,qBAAqB,gCAAsB,EAAE;SAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC3B;AACH,CAAC;AAED,SAAgB,qBAAqB;IACnC,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oDAAoD;KAC5D,CAAC,CAAC;IAEH,IAAA,yBAAS,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,oBAAoB,CAAC,EAAE;QAClD,GAAG,EAAE,SAAS;QACd,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;AACL,CAAC;AATD,sDASC;AAED,SAAgB,IAAI;IAClB,IAAA,yBAAS,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,mBAAmB,CAAC,EAAE;QACjD,GAAG,EAAE,SAAS;QACd,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IAEH,eAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC;AACnD,CAAC;AAPD,oBAOC;AAED;;;;;;;GAOG;AACH,SAAsB,iBAAiB;;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI;gBACF,MAAM,MAAM,GAAG,IAAA,aAAO,EAAC,kCAAmB,EAAE,GAAG,EAAE;oBAC/C,MAAM,CAAC,OAAO,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;oBACxB,OAAO,CAAC,KAAK,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;aACJ;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,CAAC,KAAK,CAAC,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAdD,8CAcC;AAED;;;;;;;;;GASG;AACH,SAAsB,yBAAyB;;QAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,wBAAW,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,IAAA,aAAO,EAAC,kCAAmB,CAAC,CAAC;YAE5C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;oBAChB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACpB;gBACD,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;oBAChD,OAAO,yBAAyB,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;iBAC1D;gBACD,IAAI,KAAU,CAAC;gBACf,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;oBAC5C,KAAK,GAAG,sBAAsB,CAAC,kCAAkC,CAAC,CAAC;iBACpE;qBAAM,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE;oBACzD,KAAK,GAAG,sBAAsB,CAC5B,uFAAuF,CACxF,CAAC;oBACF,IAAA,+BAAgB,GAAE,CAAC;iBACpB;qBAAM,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;oBACpD,KAAK,GAAG,sBAAsB,CAC5B,0CAA0C,CAC3C,CAAC;iBACH;gBACD,OAAO,MAAM,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YAEH;;;;eAIG;YACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACxB,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBAE9C,IAAI,4BAA4B,GAAG,EAAE,CAAC;gBACtC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACzB,4BAA4B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClD,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACpB,IAAI;wBACF,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;wBACrC,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;wBACpE,wBAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;wBACnC,wBAAW,CAAC,OAAO,CACjB,wCAAwC,EACxC,kBAAkB,EAClB,gBAAgB,CACjB,CAAC;wBACF,IAAI,kBAAkB,CAAC,KAAK,EAAE;4BAC5B,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;yBAClC;6BAAM;4BACL,wBAAW,CAAC,OAAO,CACjB,uCAAuC,EACvC,iCAAiC,EACjC,gBAAgB,CACjB,CAAC;4BACF,OAAO,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;yBACjD;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,UAAU,GACd,4BAA4B,CAAC,MAAM,GAAG,GAAG;4BACvC,CAAC,CAAC,4BAA4B,CAAC,SAAS,CACpC,4BAA4B,CAAC,MAAM,GAAG,GAAG,CAC1C;4BACH,CAAC,CAAC,4BAA4B,CAAC;wBACnC,MAAM,CACJ,sBAAsB,CACpB;4BACE,sCAAsC;4BACtC,YAAY,CAAC,CAAC,OAAO,EAAE;4BACvB,IAAI;4BACJ,WAAW;4BACX,UAAU;4BACV,IAAI;yBACL,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CACF,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AApFD,8DAoFC"}
|
|
@@ -10,6 +10,7 @@ const output_1 = require("../../utilities/output");
|
|
|
10
10
|
const is_ci_1 = require("../../utilities/is_ci");
|
|
11
11
|
const file_hasher_1 = require("../hasher/file-hasher");
|
|
12
12
|
const tmp_dir_1 = require("@nrwl/workspace/src/core/project-graph/daemon/tmp-dir");
|
|
13
|
+
const fs_1 = require("fs");
|
|
13
14
|
/**
|
|
14
15
|
* Synchronously reads the latest cached copy of the workspace's ProjectGraph.
|
|
15
16
|
* @throws {Error} if there is no cached ProjectGraph to read from
|
|
@@ -70,6 +71,7 @@ function createProjectGraphAsync(projectGraphVersion = '5.0') {
|
|
|
70
71
|
// option=true,env=true => daemon
|
|
71
72
|
// option=false,env=true => daemon
|
|
72
73
|
if ((0, is_ci_1.isCI)() ||
|
|
74
|
+
isDocker() ||
|
|
73
75
|
(0, tmp_dir_1.isDaemonDisabled)() ||
|
|
74
76
|
(useDaemonProcessOption === true && env === 'false') ||
|
|
75
77
|
(useDaemonProcessOption === false && env === undefined) ||
|
|
@@ -85,8 +87,8 @@ function createProjectGraphAsync(projectGraphVersion = '5.0') {
|
|
|
85
87
|
return projectGraphAdapter('5.0', projectGraphVersion, yield daemonClient.getProjectGraphFromServer());
|
|
86
88
|
}
|
|
87
89
|
catch (e) {
|
|
88
|
-
// common errors with the daemon due to OS settings (cannot watch all the files available)
|
|
89
90
|
if (e.message.indexOf('inotify_add_watch') > -1) {
|
|
91
|
+
// common errors with the daemon due to OS settings (cannot watch all the files available)
|
|
90
92
|
output_1.output.note({
|
|
91
93
|
title: `Unable to start Nx Daemon due to the limited amount of inotify watches, continuing without the daemon.`,
|
|
92
94
|
bodyLines: [
|
|
@@ -113,6 +115,15 @@ function createProjectGraphAsync(projectGraphVersion = '5.0') {
|
|
|
113
115
|
});
|
|
114
116
|
}
|
|
115
117
|
exports.createProjectGraphAsync = createProjectGraphAsync;
|
|
118
|
+
function isDocker() {
|
|
119
|
+
try {
|
|
120
|
+
(0, fs_1.statSync)('/.dockerenv');
|
|
121
|
+
return true;
|
|
122
|
+
}
|
|
123
|
+
catch (_a) {
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
116
127
|
function printErrorMessage(e) {
|
|
117
128
|
const lines = e.message.split('\n');
|
|
118
129
|
output_1.output.error({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":";;;;AAAA,yCAA0D;AAC1D,4DAAwE;AACxE,+DAA0D;AAC1D,8CAA8D;AAC9D,mDAAgD;AAChD,iDAA6C;AAC7C,uDAA0D;AAC1D,mFAI+D;
|
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.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.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.7.
|
|
4
|
+
exports.nxVersion = '13.7.2';
|
|
5
5
|
exports.angularCliVersion = '~13.2.0';
|
|
6
6
|
exports.typescriptVersion = '~4.5.2';
|
|
7
7
|
exports.prettierVersion = '^2.5.1';
|