@nrwl/workspace 13.3.0-beta.15 → 13.3.0-beta.16
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/hasher/file-hasher.js +2 -0
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +49 -23
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.js +3 -1
- package/src/core/project-graph/daemon/server/watcher.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.16",
|
|
4
4
|
"description": "Smart, Extensible Build Framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -62,10 +62,10 @@
|
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
64
|
"@parcel/watcher": "2.0.4",
|
|
65
|
-
"@nrwl/cli": "13.3.0-beta.
|
|
66
|
-
"@nrwl/devkit": "13.3.0-beta.
|
|
67
|
-
"@nrwl/jest": "13.3.0-beta.
|
|
68
|
-
"@nrwl/linter": "13.3.0-beta.
|
|
65
|
+
"@nrwl/cli": "13.3.0-beta.16",
|
|
66
|
+
"@nrwl/devkit": "13.3.0-beta.16",
|
|
67
|
+
"@nrwl/jest": "13.3.0-beta.16",
|
|
68
|
+
"@nrwl/linter": "13.3.0-beta.16",
|
|
69
69
|
"chokidar": "^3.5.1",
|
|
70
70
|
"cosmiconfig": "^4.0.0",
|
|
71
71
|
"fs-extra": "^9.1.0",
|
|
@@ -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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"}
|
|
@@ -33,13 +33,13 @@ function getCachedSerializedProjectGraphPromise() {
|
|
|
33
33
|
resetInternalStateIfNxDepsMissing();
|
|
34
34
|
if (collectedUpdatedFiles.size == 0 && collectedDeletedFiles.size == 0) {
|
|
35
35
|
if (!cachedSerializedProjectGraphPromise) {
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
cachedSerializedProjectGraphPromise =
|
|
37
|
+
processFilesAndCreateAndSerializeProjectGraph();
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
cachedSerializedProjectGraphPromise =
|
|
42
|
+
processFilesAndCreateAndSerializeProjectGraph();
|
|
43
43
|
}
|
|
44
44
|
return yield cachedSerializedProjectGraphPromise;
|
|
45
45
|
}
|
|
@@ -64,33 +64,58 @@ function addUpdatedAndDeletedFiles(updatedFiles, deletedFiles) {
|
|
|
64
64
|
if (waitPeriod < 4000) {
|
|
65
65
|
waitPeriod = waitPeriod * 2;
|
|
66
66
|
}
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
cachedSerializedProjectGraphPromise =
|
|
68
|
+
processFilesAndCreateAndSerializeProjectGraph();
|
|
69
69
|
}, waitPeriod);
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
exports.addUpdatedAndDeletedFiles = addUpdatedAndDeletedFiles;
|
|
73
73
|
function processCollectedUpdatedAndDeletedFiles() {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
74
|
+
try {
|
|
75
|
+
perf_hooks_1.performance.mark('hash-watched-changes-start');
|
|
76
|
+
const updatedFiles = (0, git_hasher_1.getGitHashForFiles)([...collectedUpdatedFiles.values()], app_root_1.appRootPath);
|
|
77
|
+
const deletedFiles = [...collectedDeletedFiles.values()];
|
|
78
|
+
perf_hooks_1.performance.mark('hash-watched-changes-end');
|
|
79
|
+
perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
|
|
80
|
+
file_hasher_1.defaultFileHasher.incrementalUpdate(updatedFiles, deletedFiles);
|
|
81
|
+
const workspaceJson = (0, file_utils_1.readWorkspaceJson)();
|
|
82
|
+
logger_1.serverLogger.requestLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
|
|
83
|
+
// when workspace.json changes we cannot be sure about the correctness of the project file map
|
|
84
|
+
if (collectedUpdatedFiles.has(configName) ||
|
|
85
|
+
collectedDeletedFiles.has(configName)) {
|
|
86
|
+
projectFileMapWithFiles = (0, file_utils_1.createProjectFileMap)(workspaceJson);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
projectFileMapWithFiles = projectFileMapWithFiles
|
|
90
|
+
? (0, file_utils_1.updateProjectFileMap)(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, updatedFiles, deletedFiles)
|
|
91
|
+
: (0, file_utils_1.createProjectFileMap)(workspaceJson);
|
|
92
|
+
}
|
|
93
|
+
collectedUpdatedFiles.clear();
|
|
94
|
+
collectedDeletedFiles.clear();
|
|
95
|
+
}
|
|
96
|
+
catch (e) {
|
|
97
|
+
// this is expected
|
|
98
|
+
// for instance, workspace.json can be incorrect etc
|
|
99
|
+
// we are resetting internal state to start from scratch next time a file changes
|
|
100
|
+
// given the user the opportunity to fix the error
|
|
101
|
+
// if Nx requests the project graph prior to the error being fixed,
|
|
102
|
+
// the error will be propagated
|
|
103
|
+
logger_1.serverLogger.log(`Error detected when recomputing project file map: ${e.message}`);
|
|
104
|
+
resetInternalState();
|
|
105
|
+
return e;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
function processFilesAndCreateAndSerializeProjectGraph() {
|
|
109
|
+
const err = processCollectedUpdatedAndDeletedFiles();
|
|
110
|
+
if (err) {
|
|
111
|
+
return Promise.resolve({
|
|
112
|
+
error: err,
|
|
113
|
+
serializedProjectGraph: null,
|
|
114
|
+
});
|
|
86
115
|
}
|
|
87
116
|
else {
|
|
88
|
-
|
|
89
|
-
? (0, file_utils_1.updateProjectFileMap)(workspaceJson, projectFileMapWithFiles.projectFileMap, projectFileMapWithFiles.allWorkspaceFiles, updatedFiles, deletedFiles)
|
|
90
|
-
: (0, file_utils_1.createProjectFileMap)(workspaceJson);
|
|
117
|
+
return createAndSerializeProjectGraph();
|
|
91
118
|
}
|
|
92
|
-
collectedUpdatedFiles.clear();
|
|
93
|
-
collectedDeletedFiles.clear();
|
|
94
119
|
}
|
|
95
120
|
function createAndSerializeProjectGraph() {
|
|
96
121
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
@@ -124,6 +149,7 @@ function resetInternalState() {
|
|
|
124
149
|
currentProjectGraphCache = undefined;
|
|
125
150
|
collectedUpdatedFiles.clear();
|
|
126
151
|
collectedDeletedFiles.clear();
|
|
152
|
+
file_hasher_1.defaultFileHasher.clear();
|
|
127
153
|
waitPeriod = 100;
|
|
128
154
|
}
|
|
129
155
|
exports.resetInternalState = resetInternalState;
|
|
@@ -1 +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":";;;;AACA,2DAA2D;AAC3D,2CAAyC;AACzC,oDAI6B;AAC7B,6DAAgE;AAChE,2DAAgE;AAChE,qCAAwC;AACxC,mEAAiF;AACjF,8DAAqE;AACrE,kEAIwC;AACxC,+DAA6D;AAE7D,MAAM,UAAU,GAAG,IAAA,+BAAmB,EAAC,sBAAW,CAAC,CAAC;AACpD,IAAI,mCAGF,CAAC;AACH,IAAI,uBAES,CAAC;AACd,IAAI,wBAAuD,CAAC;AAE5D,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;AAChD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;AAChD,IAAI,UAAU,GAAG,GAAG,CAAC;AACrB,IAAI,kBAAkB,CAAC;AAEvB,SAAsB,sCAAsC;;QAC1D,IAAI;YACF,oEAAoE;YACpE,IAAI,kBAAkB,EAAE;gBACtB,YAAY,CAAC,kBAAkB,CAAC,CAAC;gBACjC,kBAAkB,GAAG,SAAS,CAAC;aAChC;YAED,sBAAsB;YACtB,UAAU,GAAG,GAAG,CAAC;YACjB,iCAAiC,EAAE,CAAC;YACpC,IAAI,qBAAqB,CAAC,IAAI,IAAI,CAAC,IAAI,qBAAqB,CAAC,IAAI,IAAI,CAAC,EAAE;gBACtE,IAAI,CAAC,mCAAmC,EAAE;oBACxC,
|
|
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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"}
|
|
@@ -81,7 +81,9 @@ function subscribeToWorkspaceChanges(cb) {
|
|
|
81
81
|
if (hasIgnoreFileUpdate) {
|
|
82
82
|
cachedIgnoreGlobs = getIgnoredGlobs(app_root_1.appRootPath);
|
|
83
83
|
}
|
|
84
|
-
const nonIgnoredEvents = workspaceRelativeEvents
|
|
84
|
+
const nonIgnoredEvents = workspaceRelativeEvents
|
|
85
|
+
.filter(({ path }) => !!path)
|
|
86
|
+
.filter(({ path }) => !cachedIgnoreGlobs.ignores(path));
|
|
85
87
|
if (!nonIgnoredEvents || !nonIgnoredEvents.length) {
|
|
86
88
|
return;
|
|
87
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/watcher.ts"],"names":[],"mappings":";;;;AAAA;;;;;;GAMG;AACH,yCAA6C;AAC7C,2DAA2D;AAE3D,2BAAkC;AAClC,mCAA4B;AAC5B,+BAAsC;AACtC,kDAAsD;AAEtD;;;;;;;;;;;GAWG;AACH,MAAM,aAAa,GAAG;IACpB,IAAA,WAAI,EAAC,sBAAW,EAAE,cAAc,CAAC;IACjC,IAAA,WAAI,EAAC,sBAAW,EAAE,MAAM,CAAC;IACzB,IAAA,WAAI,EAAC,sBAAW,EAAE,MAAM,CAAC;IACzB,kCAAmB;CACpB,CAAC;AAEF;;;GAGG;AACH,SAAS,eAAe,CAAC,IAAY;IACnC,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,IAAI;QACF,EAAE,CAAC,GAAG,CAAC,IAAA,iBAAY,EAAC,GAAG,IAAI,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;KACrD;IAAC,WAAM,GAAE;IACV,IAAI;QACF,EAAE,CAAC,GAAG,CAAC,IAAA,iBAAY,EAAC,GAAG,IAAI,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;KACpD;IAAC,WAAM,GAAE;IACV,OAAO,EAAE,CAAC;AACZ,CAAC;AAQD,SAAsB,2BAA2B,CAC/C,EAAuC;;QAEvC;;;;WAIG;QACH,MAAM,OAAO,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAEhD,IAAI,iBAAiB,GAAG,eAAe,CAAC,sBAAW,CAAC,CAAC;QAErD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,SAAS,CAC1C,sBAAW,EACX,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YACd,qCAAqC;YACrC,IAAI,GAAG,EAAE;gBACP,OAAO,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;aACtB;YAED,IAAI,mBAAmB,GAAG,KAAK,CAAC;YAEhC,0FAA0F;YAC1F,MAAM,uBAAuB,GAAY,EAAE,CAAC;YAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,MAAM,sBAAsB,GAAU;oBACpC,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,IAAI,EAAE,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,sBAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;iBACvD,CAAC;gBACF,IACE,sBAAsB,CAAC,IAAI,KAAK,YAAY;oBAC5C,sBAAsB,CAAC,IAAI,KAAK,WAAW,EAC3C;oBACA,mBAAmB,GAAG,IAAI,CAAC;iBAC5B;gBACD,uBAAuB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;aACtD;YAED,mGAAmG;YACnG,IAAI,mBAAmB,EAAE;gBACvB,iBAAiB,GAAG,eAAe,CAAC,sBAAW,CAAC,CAAC;aAClD;YAED,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/watcher.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.3.0-beta.
|
|
4
|
+
exports.nxVersion = '13.3.0-beta.16';
|
|
5
5
|
exports.angularCliVersion = '~13.0.0';
|
|
6
6
|
exports.typescriptVersion = '~4.4.3';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|