@nrwl/workspace 13.7.0 → 13.7.1
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/dep-graph/3rdpartylicenses.txt +0 -24
- package/src/core/file-utils.d.ts +2 -2
- package/src/core/file-utils.js +6 -6
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/file-hasher.d.ts +1 -1
- package/src/core/hasher/file-hasher.js +3 -12
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/hasher/git-based-file-hasher.js +7 -6
- package/src/core/hasher/git-based-file-hasher.js.map +1 -1
- package/src/core/hasher/node-based-file-hasher.js +19 -9
- package/src/core/hasher/node-based-file-hasher.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.d.ts +3 -3
- package/src/core/project-graph/daemon/client/client.js +66 -71
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/project-graph.js +2 -2
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/migrations/update-13-6-0/remove-old-task-runner-options.js +3 -2
- package/src/migrations/update-13-6-0/remove-old-task-runner-options.js.map +1 -1
- package/src/utilities/cache-directory.js +3 -3
- package/src/utilities/cache-directory.js.map +1 -1
- package/src/utilities/output.js +2 -1
- package/src/utilities/output.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.1",
|
|
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.1",
|
|
85
|
+
"@nrwl/devkit": "13.7.1",
|
|
86
|
+
"@nrwl/jest": "13.7.1",
|
|
87
|
+
"@nrwl/linter": "13.7.1"
|
|
88
88
|
},
|
|
89
89
|
"nx-migrations": {
|
|
90
90
|
"migrations": "./migrations.json"
|
|
@@ -684,30 +684,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
684
684
|
SOFTWARE.
|
|
685
685
|
|
|
686
686
|
|
|
687
|
-
webpack
|
|
688
|
-
MIT
|
|
689
|
-
Copyright JS Foundation and other contributors
|
|
690
|
-
|
|
691
|
-
Permission is hereby granted, free of charge, to any person obtaining
|
|
692
|
-
a copy of this software and associated documentation files (the
|
|
693
|
-
'Software'), to deal in the Software without restriction, including
|
|
694
|
-
without limitation the rights to use, copy, modify, merge, publish,
|
|
695
|
-
distribute, sublicense, and/or sell copies of the Software, and to
|
|
696
|
-
permit persons to whom the Software is furnished to do so, subject to
|
|
697
|
-
the following conditions:
|
|
698
|
-
|
|
699
|
-
The above copyright notice and this permission notice shall be
|
|
700
|
-
included in all copies or substantial portions of the Software.
|
|
701
|
-
|
|
702
|
-
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
703
|
-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
704
|
-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
705
|
-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
706
|
-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
707
|
-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
708
|
-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
709
|
-
|
|
710
|
-
|
|
711
687
|
xstate
|
|
712
688
|
MIT
|
|
713
689
|
The MIT License (MIT)
|
package/src/core/file-utils.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { WorkspaceJsonConfiguration } from '@nrwl/tao/src/shared/workspace';
|
|
2
|
+
import type { FileData, NxJsonConfiguration } from '@nrwl/devkit';
|
|
2
3
|
import type { NxArgs } from '../command-line/utils';
|
|
3
4
|
import type { Environment } from './shared-interfaces';
|
|
4
5
|
export interface Change {
|
|
@@ -12,7 +13,6 @@ export declare class WholeFileChange implements Change {
|
|
|
12
13
|
}
|
|
13
14
|
export declare function isWholeFileChange(change: Change): change is WholeFileChange;
|
|
14
15
|
export declare function readFileIfExisting(path: string): string;
|
|
15
|
-
export declare function getIgnoredGlobs(): import("ignore").Ignore;
|
|
16
16
|
export declare function calculateFileChanges(files: string[], allWorkspaceFiles: FileData[], nxArgs?: NxArgs, readFileAtRevision?: (f: string, r: void | string) => string, ignore?: import("ignore").Ignore): FileChange[];
|
|
17
17
|
export declare const TEN_MEGABYTES: number;
|
|
18
18
|
export declare function readWorkspaceJson(): WorkspaceJsonConfiguration;
|
package/src/core/file-utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.readEnvironment = exports.workspaceLayout = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.readWorkspaceJson = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.
|
|
3
|
+
exports.readEnvironment = exports.workspaceLayout = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.workspaceFileName = exports.readWorkspaceConfig = exports.readWorkspaceJson = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.readFileIfExisting = exports.isWholeFileChange = exports.WholeFileChange = void 0;
|
|
4
4
|
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
@@ -25,11 +25,11 @@ function readFileIfExisting(path) {
|
|
|
25
25
|
}
|
|
26
26
|
exports.readFileIfExisting = readFileIfExisting;
|
|
27
27
|
function getIgnoredGlobs() {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
const ig = (0, ignore_1.default)();
|
|
29
|
+
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.gitignore`));
|
|
30
|
+
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.nxignore`));
|
|
31
|
+
return ig;
|
|
31
32
|
}
|
|
32
|
-
exports.getIgnoredGlobs = getIgnoredGlobs;
|
|
33
33
|
function calculateFileChanges(files, allWorkspaceFiles, nxArgs, readFileAtRevision = defaultReadFileAtRevision, ignore = getIgnoredGlobs()) {
|
|
34
34
|
files = files.filter((f) => !ignore.ignores(f));
|
|
35
35
|
return files.map((f) => {
|
|
@@ -54,7 +54,7 @@ function calculateFileChanges(files, allWorkspaceFiles, nxArgs, readFileAtRevisi
|
|
|
54
54
|
try {
|
|
55
55
|
return (0, json_diff_1.jsonDiff)(JSON.parse(atBase), JSON.parse(atHead));
|
|
56
56
|
}
|
|
57
|
-
catch (
|
|
57
|
+
catch (e) {
|
|
58
58
|
return [new WholeFileChange()];
|
|
59
59
|
}
|
|
60
60
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { FileHasherBase } from
|
|
1
|
+
import { FileHasherBase } from "./file-hasher-base";
|
|
2
2
|
export declare const defaultFileHasher: FileHasherBase;
|
|
@@ -2,29 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.defaultFileHasher = void 0;
|
|
4
4
|
const git_based_file_hasher_1 = require("./git-based-file-hasher");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
5
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
7
6
|
const node_based_file_hasher_1 = require("./node-based-file-hasher");
|
|
8
|
-
const fs_1 = require("fs");
|
|
9
7
|
const child_process_1 = require("child_process");
|
|
10
8
|
function createFileHasher() {
|
|
11
9
|
// special case for unit tests
|
|
12
|
-
if (app_root_1.appRootPath ===
|
|
10
|
+
if (app_root_1.appRootPath === "/root") {
|
|
13
11
|
return new node_based_file_hasher_1.NodeBasedFileHasher();
|
|
14
12
|
}
|
|
15
13
|
try {
|
|
16
|
-
|
|
17
|
-
(0, fs_1.statSync)((0, devkit_1.joinPathFragments)(app_root_1.appRootPath, '.git')).isDirectory();
|
|
14
|
+
(0, child_process_1.execSync)("git rev-parse --is-inside-work-tree", { stdio: "ignore" });
|
|
18
15
|
return new git_based_file_hasher_1.GitBasedFileHasher();
|
|
19
16
|
}
|
|
20
17
|
catch (_a) {
|
|
21
|
-
|
|
22
|
-
(0, child_process_1.execSync)('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
|
|
23
|
-
return new git_based_file_hasher_1.GitBasedFileHasher();
|
|
24
|
-
}
|
|
25
|
-
catch (_b) {
|
|
26
|
-
return new node_based_file_hasher_1.NodeBasedFileHasher();
|
|
27
|
-
}
|
|
18
|
+
return new node_based_file_hasher_1.NodeBasedFileHasher();
|
|
28
19
|
}
|
|
29
20
|
}
|
|
30
21
|
exports.defaultFileHasher = createFileHasher();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,mEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,mEAA6D;AAC7D,2DAA2D;AAC3D,qEAA+D;AAE/D,iDAAyC;AAEzC,SAAS,gBAAgB;IACvB,8BAA8B;IAC9B,IAAI,sBAAW,KAAK,OAAO,EAAE;QAC3B,OAAO,IAAI,4CAAmB,EAAE,CAAC;KAClC;IACD,IAAI;QACF,IAAA,wBAAQ,EAAC,qCAAqC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,OAAO,IAAI,0CAAkB,EAAE,CAAC;KACjC;IAAC,WAAM;QACN,OAAO,IAAI,4CAAmB,EAAE,CAAC;KAClC;AACH,CAAC;AAEY,QAAA,iBAAiB,GAAG,gBAAgB,EAAE,CAAC"}
|
|
@@ -19,9 +19,9 @@ class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
19
19
|
perf_hooks_1.performance.mark('init hashing:start');
|
|
20
20
|
this.clear();
|
|
21
21
|
const gitResult = yield (0, git_hasher_1.getFileHashes)(app_root_1.appRootPath);
|
|
22
|
-
const
|
|
22
|
+
const ignore = getIgnoredGlobs();
|
|
23
23
|
gitResult.allFiles.forEach((hash, filename) => {
|
|
24
|
-
if (!ignores(filename)) {
|
|
24
|
+
if (!ignore.ignores(filename)) {
|
|
25
25
|
this.fileHashes.set(filename, hash);
|
|
26
26
|
}
|
|
27
27
|
});
|
|
@@ -37,13 +37,14 @@ class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
exports.GitBasedFileHasher = GitBasedFileHasher;
|
|
40
|
-
function
|
|
40
|
+
function getIgnoredGlobs() {
|
|
41
41
|
if ((0, fs_1.existsSync)(`${app_root_1.appRootPath}/.nxignore`)) {
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
const ig = (0, ignore_1.default)();
|
|
43
|
+
ig.add((0, fs_1.readFileSync)(`${app_root_1.appRootPath}/.nxignore`, 'utf-8'));
|
|
44
|
+
return ig;
|
|
44
45
|
}
|
|
45
46
|
else {
|
|
46
|
-
return () => false;
|
|
47
|
+
return { ignores: (file) => false };
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
//# sourceMappingURL=git-based-file-hasher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/git-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,2CAAyC;AACzC,6CAAiE;AACjE,2BAA8C;AAC9C,yDAAoD;AACpD,mCAA4B;AAE5B,MAAa,kBAAmB,SAAQ,iCAAc;IACpD;;;;OAIG;IACG,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAa,EAAC,sBAAW,CAAC,CAAC;YACnD,MAAM,
|
|
1
|
+
{"version":3,"file":"git-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/git-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,2CAAyC;AACzC,6CAAiE;AACjE,2BAA8C;AAC9C,yDAAoD;AACpD,mCAA4B;AAE5B,MAAa,kBAAmB,SAAQ,iCAAc;IACpD;;;;OAIG;IACG,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAa,EAAC,sBAAW,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YACjC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;iBACrC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,KAAe;;YAC7B,OAAO,CAAC,MAAM,IAAA,+BAAkB,EAAC,KAAK,EAAE,sBAAW,CAAC,CAAC,CAAC,MAAM,CAAC;QAC/D,CAAC;KAAA;CACF;AA7BD,gDA6BC;AAED,SAAS,eAAe;IACtB,IAAI,IAAA,eAAU,EAAC,GAAG,sBAAW,YAAY,CAAC,EAAE;QAC1C,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;QACpB,EAAE,CAAC,GAAG,CAAC,IAAA,iBAAY,EAAC,GAAG,sBAAW,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1D,OAAO,EAAE,CAAC;KACX;SAAM;QACL,OAAO,EAAE,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC;KAC7C;AACH,CAAC"}
|
|
@@ -7,17 +7,12 @@ const perf_hooks_1 = require("perf_hooks");
|
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const file_hasher_base_1 = require("./file-hasher-base");
|
|
10
|
-
const file_utils_1 = require("../file-utils");
|
|
11
10
|
const devkit_1 = require("@nrwl/devkit");
|
|
11
|
+
const ignore_1 = require("ignore");
|
|
12
12
|
class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
13
13
|
constructor() {
|
|
14
14
|
super(...arguments);
|
|
15
|
-
this.ignoredGlobs =
|
|
16
|
-
'node_modules',
|
|
17
|
-
'tmp',
|
|
18
|
-
'dist',
|
|
19
|
-
'build',
|
|
20
|
-
]);
|
|
15
|
+
this.ignoredGlobs = getIgnoredGlobs();
|
|
21
16
|
}
|
|
22
17
|
init() {
|
|
23
18
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
@@ -44,8 +39,8 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
44
39
|
}
|
|
45
40
|
try {
|
|
46
41
|
(0, fs_1.readdirSync)(absoluteDirName).forEach((c) => {
|
|
47
|
-
const absoluteChild = (0,
|
|
48
|
-
const relChild = (0, path_1.relative)(app_root_1.appRootPath, absoluteChild)
|
|
42
|
+
const absoluteChild = (0, path_1.join)(absoluteDirName, c);
|
|
43
|
+
const relChild = (0, path_1.relative)(app_root_1.appRootPath, absoluteChild);
|
|
49
44
|
if (this.ignoredGlobs.ignores(relChild)) {
|
|
50
45
|
return;
|
|
51
46
|
}
|
|
@@ -65,4 +60,19 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
65
60
|
}
|
|
66
61
|
}
|
|
67
62
|
exports.NodeBasedFileHasher = NodeBasedFileHasher;
|
|
63
|
+
function getIgnoredGlobs() {
|
|
64
|
+
const ig = (0, ignore_1.default)();
|
|
65
|
+
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.gitignore`));
|
|
66
|
+
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.nxignore`));
|
|
67
|
+
ig.add((0, devkit_1.stripIndents) `
|
|
68
|
+
node_modules
|
|
69
|
+
tmp
|
|
70
|
+
dist
|
|
71
|
+
build
|
|
72
|
+
`);
|
|
73
|
+
return ig;
|
|
74
|
+
}
|
|
75
|
+
function readFileIfExisting(path) {
|
|
76
|
+
return (0, fs_1.existsSync)(path) ? (0, fs_1.readFileSync)(path, 'utf-8') : '';
|
|
77
|
+
}
|
|
68
78
|
//# sourceMappingURL=node-based-file-hasher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,2CAAyC;AAEzC,+
|
|
1
|
+
{"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAC3D,2CAAyC;AAEzC,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,yCAA4C;AAC5C,mCAA4B;AAE5B,MAAa,mBAAoB,SAAQ,iCAAc;IAAvD;;QACE,iBAAY,GAAG,eAAe,EAAE,CAAC;IAkDnC,CAAC;IAhDO,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,IAAI,CAAC,aAAa,CAAC,sBAAW,EAAE,IAAI,CAAC,CAAC;YAEtC,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,KAAe;;YAC7B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpC,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5B;YACD,OAAO,CAAC,CAAC;QACX,CAAC;KAAA;IAEO,aAAa,CACnB,eAAuB,EACvB,UAAmB,IAAI;QAEvB,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,sBAAW,EAAE,eAAe,CAAC,CAAC;QAC1D,IAAI,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACvD,OAAO;SACR;QACD,IAAI;YACF,IAAA,gBAAW,EAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,sBAAW,EAAE,aAAa,CAAC,CAAC;gBACtD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACvC,OAAO;iBACR;gBACD,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,aAAa,CAAC,CAAC;oBAClC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;wBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;qBACxD;yBAAM,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE;wBACrC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;qBACzC;iBACF;gBAAC,WAAM,GAAE;YACZ,CAAC,CAAC,CAAC;SACJ;QAAC,WAAM,GAAE;IACZ,CAAC;CACF;AAnDD,kDAmDC;AAED,SAAS,eAAe;IACtB,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,sBAAW,aAAa,CAAC,CAAC,CAAC;IACxD,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,sBAAW,YAAY,CAAC,CAAC,CAAC;IACvD,EAAE,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAA;;;;;KAKhB,CAAC,CAAC;IACL,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}
|
|
@@ -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,61 +16,56 @@ 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
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
catch (err) {
|
|
56
|
-
throw err;
|
|
57
|
-
}
|
|
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
|
+
cwd: __dirname,
|
|
23
|
+
stdio: ["ignore", out, err],
|
|
24
|
+
detached: true,
|
|
25
|
+
windowsHide: true,
|
|
26
|
+
shell: false
|
|
27
|
+
});
|
|
28
|
+
backgroundProcess.unref();
|
|
29
|
+
// Persist metadata about the background process so that it can be cleaned up later if needed
|
|
30
|
+
yield (0, cache_1.writeDaemonJsonProcessCache)({
|
|
31
|
+
processId: backgroundProcess.pid
|
|
32
|
+
});
|
|
33
|
+
/**
|
|
34
|
+
* Ensure the server is actually available to connect to via IPC before resolving
|
|
35
|
+
*/
|
|
36
|
+
let attempts = 0;
|
|
37
|
+
return new Promise((resolve, reject) => {
|
|
38
|
+
const id = setInterval(() => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
39
|
+
if (yield isServerAvailable()) {
|
|
40
|
+
clearInterval(id);
|
|
41
|
+
resolve(backgroundProcess.pid);
|
|
42
|
+
}
|
|
43
|
+
else if (attempts > 200) {
|
|
44
|
+
// daemon fails to start, the process probably exited
|
|
45
|
+
// we print the logs and exit the client
|
|
46
|
+
reject(daemonProcessException("Failed to start the Nx Daemon process."));
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
attempts++;
|
|
50
|
+
}
|
|
51
|
+
}), 10);
|
|
52
|
+
});
|
|
58
53
|
});
|
|
59
54
|
}
|
|
60
55
|
exports.startInBackground = startInBackground;
|
|
61
56
|
function daemonProcessException(message) {
|
|
62
57
|
try {
|
|
63
|
-
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");
|
|
64
59
|
if (log.length > 20) {
|
|
65
60
|
log = log.slice(log.length - 20);
|
|
66
61
|
}
|
|
67
62
|
return new Error([
|
|
68
63
|
message,
|
|
69
|
-
|
|
64
|
+
"Messages from the log:",
|
|
70
65
|
...log,
|
|
71
|
-
|
|
72
|
-
`More information: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}
|
|
73
|
-
].join(
|
|
66
|
+
"\n",
|
|
67
|
+
`More information: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}`
|
|
68
|
+
].join("\n"));
|
|
74
69
|
}
|
|
75
70
|
catch (e) {
|
|
76
71
|
return new Error(message);
|
|
@@ -78,20 +73,20 @@ function daemonProcessException(message) {
|
|
|
78
73
|
}
|
|
79
74
|
function startInCurrentProcess() {
|
|
80
75
|
output_1.output.log({
|
|
81
|
-
title: `Daemon Server - Starting in the current process
|
|
76
|
+
title: `Daemon Server - Starting in the current process...`
|
|
82
77
|
});
|
|
83
|
-
(0, child_process_1.spawnSync)(process.execPath, [
|
|
78
|
+
(0, child_process_1.spawnSync)(process.execPath, ["../server/start.js"], {
|
|
84
79
|
cwd: __dirname,
|
|
85
|
-
stdio:
|
|
80
|
+
stdio: "inherit"
|
|
86
81
|
});
|
|
87
82
|
}
|
|
88
83
|
exports.startInCurrentProcess = startInCurrentProcess;
|
|
89
84
|
function stop() {
|
|
90
|
-
(0, child_process_1.spawnSync)(process.execPath, [
|
|
85
|
+
(0, child_process_1.spawnSync)(process.execPath, ["../server/stop.js"], {
|
|
91
86
|
cwd: __dirname,
|
|
92
|
-
stdio:
|
|
87
|
+
stdio: "inherit"
|
|
93
88
|
});
|
|
94
|
-
output_1.output.log({ title:
|
|
89
|
+
output_1.output.log({ title: "Daemon Server - Stopped" });
|
|
95
90
|
}
|
|
96
91
|
exports.stop = stop;
|
|
97
92
|
/**
|
|
@@ -110,7 +105,7 @@ function isServerAvailable() {
|
|
|
110
105
|
socket.destroy();
|
|
111
106
|
resolve(true);
|
|
112
107
|
});
|
|
113
|
-
socket.once(
|
|
108
|
+
socket.once("error", () => {
|
|
114
109
|
resolve(false);
|
|
115
110
|
});
|
|
116
111
|
}
|
|
@@ -134,24 +129,24 @@ exports.isServerAvailable = isServerAvailable;
|
|
|
134
129
|
function getProjectGraphFromServer() {
|
|
135
130
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
136
131
|
return new Promise((resolve, reject) => {
|
|
137
|
-
perf_hooks_1.performance.mark(
|
|
132
|
+
perf_hooks_1.performance.mark("getProjectGraphFromServer-start");
|
|
138
133
|
const socket = (0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH);
|
|
139
|
-
socket.on(
|
|
134
|
+
socket.on("error", (err) => {
|
|
140
135
|
if (!err.message) {
|
|
141
136
|
return reject(err);
|
|
142
137
|
}
|
|
143
|
-
if (err.message.startsWith(
|
|
138
|
+
if (err.message.startsWith("LOCK-FILES-CHANGED")) {
|
|
144
139
|
return getProjectGraphFromServer().then(resolve, reject);
|
|
145
140
|
}
|
|
146
141
|
let error;
|
|
147
|
-
if (err.message.startsWith(
|
|
148
|
-
error = daemonProcessException(
|
|
142
|
+
if (err.message.startsWith("connect ENOENT")) {
|
|
143
|
+
error = daemonProcessException("The Daemon Server is not running");
|
|
149
144
|
}
|
|
150
|
-
else if (err.message.startsWith(
|
|
145
|
+
else if (err.message.startsWith("connect ECONNREFUSED")) {
|
|
151
146
|
error = daemonProcessException(`A server instance had not been fully shut down. Please try running the command again.`);
|
|
152
147
|
(0, socket_utils_1.killSocketOrPath)();
|
|
153
148
|
}
|
|
154
|
-
else if (err.message.startsWith(
|
|
149
|
+
else if (err.message.startsWith("read ECONNRESET")) {
|
|
155
150
|
error = daemonProcessException(`Unable to connect to the daemon process.`);
|
|
156
151
|
}
|
|
157
152
|
return reject(error || err);
|
|
@@ -161,23 +156,23 @@ function getProjectGraphFromServer() {
|
|
|
161
156
|
* request payload. See the notes above createServer() for more context as to why we explicitly
|
|
162
157
|
* request the graph from the client like this.
|
|
163
158
|
*/
|
|
164
|
-
socket.on(
|
|
165
|
-
socket.write(
|
|
166
|
-
let serializedProjectGraphResult =
|
|
167
|
-
socket.on(
|
|
159
|
+
socket.on("connect", () => {
|
|
160
|
+
socket.write("REQUEST_PROJECT_GRAPH_PAYLOAD");
|
|
161
|
+
let serializedProjectGraphResult = "";
|
|
162
|
+
socket.on("data", (data) => {
|
|
168
163
|
serializedProjectGraphResult += data.toString();
|
|
169
164
|
});
|
|
170
|
-
socket.on(
|
|
165
|
+
socket.on("end", () => {
|
|
171
166
|
try {
|
|
172
|
-
perf_hooks_1.performance.mark(
|
|
167
|
+
perf_hooks_1.performance.mark("json-parse-start");
|
|
173
168
|
const projectGraphResult = JSON.parse(serializedProjectGraphResult);
|
|
174
|
-
perf_hooks_1.performance.mark(
|
|
175
|
-
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");
|
|
176
171
|
if (projectGraphResult.error) {
|
|
177
172
|
reject(projectGraphResult.error);
|
|
178
173
|
}
|
|
179
174
|
else {
|
|
180
|
-
perf_hooks_1.performance.measure(
|
|
175
|
+
perf_hooks_1.performance.measure("total for getProjectGraphFromServer()", "getProjectGraphFromServer-start", "json-parse-end");
|
|
181
176
|
return resolve(projectGraphResult.projectGraph);
|
|
182
177
|
}
|
|
183
178
|
}
|
|
@@ -186,13 +181,13 @@ function getProjectGraphFromServer() {
|
|
|
186
181
|
? serializedProjectGraphResult.substring(serializedProjectGraphResult.length - 300)
|
|
187
182
|
: serializedProjectGraphResult;
|
|
188
183
|
reject(daemonProcessException([
|
|
189
|
-
|
|
184
|
+
"Could not deserialize project graph.",
|
|
190
185
|
`Message: ${e.message}`,
|
|
191
|
-
|
|
186
|
+
"\n",
|
|
192
187
|
`Received:`,
|
|
193
188
|
endOfGraph,
|
|
194
|
-
|
|
195
|
-
].join(
|
|
189
|
+
"\n"
|
|
190
|
+
].join("\n")));
|
|
196
191
|
}
|
|
197
192
|
});
|
|
198
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,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,8 +100,8 @@ function createProjectGraphAsync(projectGraphVersion = '5.0') {
|
|
|
100
100
|
output_1.output.warn({
|
|
101
101
|
title: `Nx Daemon was not able to compute the project graph.`,
|
|
102
102
|
bodyLines: [
|
|
103
|
-
`Log file with the error: ${errorLogFile}
|
|
104
|
-
|
|
103
|
+
`Log file with the error: ${errorLogFile}`,
|
|
104
|
+
`Please file an issue at https://github.com/nrwl/nx`,
|
|
105
105
|
'Nx Daemon is going to be disabled until you run "nx reset".',
|
|
106
106
|
],
|
|
107
107
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.removeOldTaskRunnerOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function removeOldTaskRunnerOptions(host) {
|
|
6
|
+
var _a, _b;
|
|
6
7
|
const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(host);
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
const options = (_b = (_a = workspaceConfig.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
|
|
9
|
+
if (options) {
|
|
9
10
|
delete options.scan;
|
|
10
11
|
delete options.analytics;
|
|
11
12
|
(0, devkit_1.updateWorkspaceConfiguration)(host, workspaceConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-old-task-runner-options.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAEtB,SAAgB,0BAA0B,CAAC,IAAU
|
|
1
|
+
{"version":3,"file":"remove-old-task-runner-options.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAEtB,SAAgB,0BAA0B,CAAC,IAAU;;IACnD,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,MAAA,MAAA,eAAe,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,CAAC;IACzE,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC,SAAS,CAAC;QACzB,IAAA,qCAA4B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;KACrD;AACH,CAAC;AARD,gEAQC;AAED,kBAAe,0BAA0B,CAAC"}
|
|
@@ -19,11 +19,11 @@ function cacheDirectory(root, cacheDirectory) {
|
|
|
19
19
|
cacheDirectory = cacheDirFromEnv;
|
|
20
20
|
}
|
|
21
21
|
if (cacheDirectory) {
|
|
22
|
-
if (
|
|
23
|
-
return
|
|
22
|
+
if ((0, path_1.isAbsolute)(cacheDirectory)) {
|
|
23
|
+
return cacheDirectory;
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
|
-
return cacheDirectory;
|
|
26
|
+
return (0, path_1.join)(root, cacheDirectory);
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AAAA,yCAAiE;AACjE,+
|
|
1
|
+
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AAAA,yCAAiE;AACjE,+BAAwC;AACxC,2DAA2D;AAE3D,SAAS,0BAA0B,CAAC,IAAY;IAC9C,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAsB,IAAA,WAAI,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;KACjE;IAAC,WAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,cAAsB;IAC1D,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACvD,IAAI,eAAe,EAAE;QACnB,cAAc,GAAG,eAAe,CAAC;KAClC;IACD,IAAI,cAAc,EAAE;QAClB,IAAI,IAAA,iBAAU,EAAC,cAAc,CAAC,EAAE;YAC9B,OAAO,cAAc,CAAC;SACvB;aAAM;YACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACnC;KACF;SAAM;QACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnD;AACH,CAAC;AAEY,QAAA,QAAQ,GAAG,cAAc,CACpC,sBAAW,EACX,0BAA0B,CAAC,sBAAW,CAAC,CACxC,CAAC"}
|
package/src/utilities/output.js
CHANGED
|
@@ -7,7 +7,8 @@ const is_ci_1 = require("./is_ci");
|
|
|
7
7
|
/**
|
|
8
8
|
* Automatically disable styling applied by chalk if CI=true
|
|
9
9
|
*/
|
|
10
|
-
|
|
10
|
+
const forceColor = process.env.FORCE_COLOR === '' || process.env.FORCE_COLOR === 'true';
|
|
11
|
+
if ((0, is_ci_1.isCI)() && !forceColor) {
|
|
11
12
|
chalk.level = 0;
|
|
12
13
|
}
|
|
13
14
|
class CLIOutput {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/output.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAAyB;AACzB,mCAA+B;AAyB/B;;GAEG;AACH,IAAI,IAAA,YAAI,GAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/output.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.1';
|
|
5
5
|
exports.angularCliVersion = '~13.2.0';
|
|
6
6
|
exports.typescriptVersion = '~4.5.2';
|
|
7
7
|
exports.prettierVersion = '^2.5.1';
|