@nrwl/workspace 10.4.14 → 10.4.15
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 +2 -2
- package/src/core/affected-project-graph/locators/workspace-projects.js +2 -2
- package/src/core/affected-project-graph/locators/workspace-projects.js.map +1 -1
- package/src/core/file-graph/index.d.ts +1 -1
- package/src/core/file-graph/index.js +1 -1
- package/src/core/file-graph/index.js.map +1 -1
- package/src/core/file-graph/project-file-map.d.ts +5 -0
- package/src/core/file-graph/{file-map.js → project-file-map.js} +4 -4
- package/src/core/file-graph/project-file-map.js.map +1 -0
- package/src/core/hasher/file-hasher.d.ts +1 -0
- package/src/core/hasher/file-hasher.js +6 -2
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/hasher/git-hasher.js +23 -29
- package/src/core/hasher/git-hasher.js.map +1 -1
- package/src/core/hasher/hasher.js +27 -8
- package/src/core/hasher/hasher.js.map +1 -1
- package/src/core/nx-deps/nx-deps-cache.d.ts +3 -3
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/project-graph-models.d.ts +3 -2
- package/src/core/project-graph/project-graph-models.js.map +1 -1
- package/src/core/project-graph/project-graph.d.ts +2 -2
- package/src/core/project-graph/project-graph.js +9 -6
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/core/target-project-locator.js +1 -1
- package/src/core/target-project-locator.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/core/file-graph/file-map.d.ts +0 -5
- package/src/core/file-graph/file-map.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "10.4.
|
|
3
|
+
"version": "10.4.15",
|
|
4
4
|
"description": "Extensible Dev Tools for Monorepos",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"@angular-devkit/architect": "~0.1001.3",
|
|
56
56
|
"@angular-devkit/core": "~10.1.3",
|
|
57
57
|
"@angular-devkit/schematics": "~10.1.3",
|
|
58
|
-
"@nrwl/cli": "10.4.
|
|
58
|
+
"@nrwl/cli": "10.4.15",
|
|
59
59
|
"cosmiconfig": "^4.0.0",
|
|
60
60
|
"fs-extra": "7.0.1",
|
|
61
61
|
"dotenv": "6.2.0",
|
|
@@ -23,8 +23,8 @@ exports.getImplicitlyTouchedProjects = (fileChanges, workspaceJson, nxJson) => {
|
|
|
23
23
|
return [];
|
|
24
24
|
}
|
|
25
25
|
const touched = new Set();
|
|
26
|
-
for (const [
|
|
27
|
-
const implicitDependencyWasChanged = fileChanges.some((f) => minimatch(f.file,
|
|
26
|
+
for (const [pattern, projects] of Object.entries(nxJson.implicitDependencies)) {
|
|
27
|
+
const implicitDependencyWasChanged = fileChanges.some((f) => minimatch(f.file, pattern));
|
|
28
28
|
if (!implicitDependencyWasChanged) {
|
|
29
29
|
continue;
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAG1B,QAAA,kBAAkB,GAA0B,CACvD,YAAY,EACZ,aAAa,EACH,EAAE;IACZ,iDAAiD;IACjD,4CAA4C;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;SACxD,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAM,EAAE,EAAE,CAC3C,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACzC;SACA,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAEzB,OAAO,YAAY;SAChB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;YACvC,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9C,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;YACjE,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC,CAAC;AAEW,QAAA,4BAA4B,GAA0B,CACjE,WAAW,EACX,aAAa,EACb,MAAM,EACI,EAAE;IACZ,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAChC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AAG1B,QAAA,kBAAkB,GAA0B,CACvD,YAAY,EACZ,aAAa,EACH,EAAE;IACZ,iDAAiD;IACjD,4CAA4C;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;SACxD,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAM,EAAE,EAAE,CAC3C,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACzC;SACA,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAEzB,OAAO,YAAY;SAChB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;YACvC,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9C,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;YACjE,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC,CAAC;AAEW,QAAA,4BAA4B,GAA0B,CACjE,WAAW,EACX,aAAa,EACb,MAAM,EACI,EAAE;IACZ,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAChC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,MAAM,CAAC,oBAAoB,CAC5B,EAAE;QACD,MAAM,4BAA4B,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAC3B,CAAC;QACF,IAAI,CAAC,4BAA4B,EAAE;YACjC,SAAS;SACV;QAED,8DAA8D;QAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC3B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;SACrD;KACF;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from './file-map';
|
|
1
|
+
export * from './project-file-map';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./file-map"), exports);
|
|
4
|
+
tslib_1.__exportStar(require("./project-file-map"), exports);
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/file-graph/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/file-graph/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
function
|
|
3
|
+
exports.createProjectFileMap = void 0;
|
|
4
|
+
function createProjectFileMap(workspaceJson, files) {
|
|
5
5
|
const fileMap = {};
|
|
6
6
|
const seen = new Set();
|
|
7
7
|
// Sorting here so `apps/client-e2e` comes before `apps/client` and has
|
|
@@ -32,5 +32,5 @@ function createFileMap(workspaceJson, files) {
|
|
|
32
32
|
});
|
|
33
33
|
return fileMap;
|
|
34
34
|
}
|
|
35
|
-
exports.
|
|
36
|
-
//# sourceMappingURL=file-map.js.map
|
|
35
|
+
exports.createProjectFileMap = createProjectFileMap;
|
|
36
|
+
//# sourceMappingURL=project-file-map.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project-file-map.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/file-graph/project-file-map.ts"],"names":[],"mappings":";;;AAMA,SAAgB,oBAAoB,CAClC,aAAkB,EAClB,KAAiB;IAEjB,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;IACvB,uEAAuE;IACvE,kCAAkC;IAClC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;SAChC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACb,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC/C,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAC1C,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YACrC,CAAC,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC;SACD,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACvB,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9C,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClB,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBACpB,OAAO;aACR;YACD,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBAC7B,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAClB;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACL,OAAO,OAAO,CAAC;AACjB,CAAC;AA/BD,oDA+BC"}
|
|
@@ -8,6 +8,7 @@ export declare class FileHasher {
|
|
|
8
8
|
workspaceFiles: any[];
|
|
9
9
|
usesGitForHashing: boolean;
|
|
10
10
|
constructor(hashing: HashingImp);
|
|
11
|
+
clear(): void;
|
|
11
12
|
init(): void;
|
|
12
13
|
hashFile(path: string, transformer?: (x: string) => string | null): string;
|
|
13
14
|
private getHashesFromGit;
|
|
@@ -24,10 +24,14 @@ class FileHasher {
|
|
|
24
24
|
this.usesGitForHashing = false;
|
|
25
25
|
this.init();
|
|
26
26
|
}
|
|
27
|
-
|
|
28
|
-
perf_hooks_1.performance.mark('init hashing:start');
|
|
27
|
+
clear() {
|
|
29
28
|
this.fileHashes = {};
|
|
30
29
|
this.workspaceFiles = [];
|
|
30
|
+
this.usesGitForHashing = false;
|
|
31
|
+
}
|
|
32
|
+
init() {
|
|
33
|
+
perf_hooks_1.performance.mark('init hashing:start');
|
|
34
|
+
this.clear();
|
|
31
35
|
this.getHashesFromGit();
|
|
32
36
|
this.usesGitForHashing = Object.keys(this.fileHashes).length > 0;
|
|
33
37
|
perf_hooks_1.performance.mark('init hashing:end');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,2BAAkC;AAClC,iDAA4D;AAC5D,mDAAmD;AACnD,2CAAyC;AAOzC,SAAgB,qBAAqB,CAAC,OAAe;IACnD,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;KAChC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAPD,sDAOC;AAED,MAAa,UAAU;IAKrB,YAA6B,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;QAJhD,eAAU,GAA+B,EAAE,CAAC;QAC5C,mBAAc,GAAG,EAAE,CAAC;QACpB,sBAAiB,GAAG,KAAK,CAAC;QAGxB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,IAAI;
|
|
1
|
+
{"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,6CAA6C;AAC7C,2BAAkC;AAClC,iDAA4D;AAC5D,mDAAmD;AACnD,2CAAyC;AAOzC,SAAgB,qBAAqB,CAAC,OAAe;IACnD,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;KAChC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAPD,sDAOC;AAED,MAAa,UAAU;IAKrB,YAA6B,OAAmB;QAAnB,YAAO,GAAP,OAAO,CAAY;QAJhD,eAAU,GAA+B,EAAE,CAAC;QAC5C,mBAAc,GAAG,EAAE,CAAC;QACpB,sBAAiB,GAAG,KAAK,CAAC;QAGxB,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACjC,CAAC;IAED,IAAI;QACF,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACjE,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,cAA4C,IAAI;QACrE,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,sBAAW,CAAC;YAC/C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAClC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;SACzE;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAEO,gBAAgB;QACtB,MAAM,UAAU,GAAG,sBAAW,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1C,0BAAa,CAAC,sBAAW,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;YACpD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC;YACpD;;;eAGG;YACH,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,kBAAsC;QACxD,IAAI;YACF,IAAI,kBAAkB,CAAC,WAAW,EAAE;gBAClC,MAAM,eAAe,GAAG,kBAAkB,CAAC,WAAW,CACpD,iBAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CACjD,CAAC;gBACF,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;aAClD;iBAAM;gBACL,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;aACvD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,CAAC;SACX;IACH,CAAC;CACF;AAhED,gCAgEC;AAEY,QAAA,iBAAiB,GAAG,IAAI,UAAU,CAAC,6BAAc,CAAC,CAAC"}
|
|
@@ -8,7 +8,7 @@ function parseGitLsTree(output) {
|
|
|
8
8
|
const changes = new Map();
|
|
9
9
|
if (output) {
|
|
10
10
|
const gitRegex = /([0-9]{6})\s(blob|commit)\s([a-f0-9]{40})\s*(.*)/;
|
|
11
|
-
output.split('\
|
|
11
|
+
output.split('\0').forEach((line) => {
|
|
12
12
|
if (line) {
|
|
13
13
|
const matches = line.match(gitRegex);
|
|
14
14
|
if (matches && matches[3] && matches[4]) {
|
|
@@ -24,37 +24,31 @@ function parseGitLsTree(output) {
|
|
|
24
24
|
}
|
|
25
25
|
return changes;
|
|
26
26
|
}
|
|
27
|
-
function parseGitStatus(
|
|
27
|
+
function parseGitStatus(path) {
|
|
28
|
+
const output = spawnProcess('git', ['status', '-s', '-u', '-z', '.'], path);
|
|
28
29
|
const changes = new Map();
|
|
29
30
|
if (!output) {
|
|
30
31
|
return changes;
|
|
31
32
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (changeType[0] === 'R') {
|
|
47
|
-
changes.set(filenames[0], 'D');
|
|
48
|
-
changes.set(filenames[filenames.length - 1], changeType);
|
|
49
|
-
}
|
|
50
|
-
else if (changeType === '??') {
|
|
51
|
-
changes.set(filenames.join(' '), changeType);
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
changes.set(filenames[filenames.length - 1], changeType);
|
|
33
|
+
// Because `-z` doesn't respect the relative paths configuration,
|
|
34
|
+
// we need to manually strip the root path from the filenames.
|
|
35
|
+
const prefix = spawnProcess('git', ['rev-parse', '--show-prefix'], path);
|
|
36
|
+
var chunks = output.split('\0');
|
|
37
|
+
for (let i = 0; i < chunks.length; i++) {
|
|
38
|
+
const chunk = chunks[i];
|
|
39
|
+
if (chunk.length) {
|
|
40
|
+
// The XY is the two-letter status code.
|
|
41
|
+
// See: https://git-scm.com/docs/git-status#_short_format
|
|
42
|
+
const X = chunk[0].trim();
|
|
43
|
+
const Y = chunk[1].trim();
|
|
44
|
+
const filename = chunk.substring(3).replace(new RegExp(`^${prefix}`), '');
|
|
45
|
+
if (X === 'R') {
|
|
46
|
+
changes.set(chunks[++i], 'D');
|
|
55
47
|
}
|
|
48
|
+
// If both present, Y shows the status of the working tree
|
|
49
|
+
changes.set(filename, Y || X);
|
|
56
50
|
}
|
|
57
|
-
}
|
|
51
|
+
}
|
|
58
52
|
return changes;
|
|
59
53
|
}
|
|
60
54
|
function spawnProcess(command, args, cwd) {
|
|
@@ -62,7 +56,7 @@ function spawnProcess(command, args, cwd) {
|
|
|
62
56
|
if (r.status !== 0) {
|
|
63
57
|
throw new Error(`Failed to run ${command} ${args.join(' ')}.\n${r.stdout}\n${r.stderr}`);
|
|
64
58
|
}
|
|
65
|
-
return r.stdout.toString().
|
|
59
|
+
return r.stdout.toString().trimRight();
|
|
66
60
|
}
|
|
67
61
|
function getGitHashForFiles(filesToHash, path) {
|
|
68
62
|
const changes = new Map();
|
|
@@ -81,12 +75,12 @@ function getGitHashForFiles(filesToHash, path) {
|
|
|
81
75
|
return changes;
|
|
82
76
|
}
|
|
83
77
|
function gitLsTree(path) {
|
|
84
|
-
return parseGitLsTree(spawnProcess('git', ['ls-tree', 'HEAD', '-r'], path));
|
|
78
|
+
return parseGitLsTree(spawnProcess('git', ['ls-tree', 'HEAD', '-r', '-z'], path));
|
|
85
79
|
}
|
|
86
80
|
function gitStatus(path) {
|
|
87
81
|
const deletedFiles = [];
|
|
88
82
|
const filesToHash = [];
|
|
89
|
-
parseGitStatus(
|
|
83
|
+
parseGitStatus(path).forEach((changeType, filename) => {
|
|
90
84
|
if (changeType !== 'D') {
|
|
91
85
|
filesToHash.push(filename);
|
|
92
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/git-hasher.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,+BAA4B;AAC5B,2BAA8B;AAE9B,SAAS,cAAc,CAAC,MAAc;IACpC,MAAM,OAAO,GAAwB,IAAI,GAAG,EAAkB,CAAC;IAC/D,IAAI,MAAM,EAAE;QACV,MAAM,QAAQ,GAAW,kDAAkD,CAAC;QAC5E,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,IAAI,IAAI,EAAE;gBACR,MAAM,OAAO,GAA4B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC9D,IAAI,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;oBACvC,MAAM,IAAI,GAAW,OAAO,CAAC,CAAC,CAAC,CAAC;oBAChC,MAAM,QAAQ,GAAW,OAAO,CAAC,CAAC,CAAC,CAAC;oBACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;iBAC7B;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,GAAG,CAAC,CAAC;iBAC9D;aACF;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/git-hasher.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ const file_utils_1 = require("../file-utils");
|
|
|
7
7
|
const child_process_1 = require("child_process");
|
|
8
8
|
const file_hasher_1 = require("./file-hasher");
|
|
9
9
|
const hashing_impl_1 = require("./hashing-impl");
|
|
10
|
+
const minimatch = require("minimatch");
|
|
11
|
+
const perf_hooks_1 = require("perf_hooks");
|
|
10
12
|
const resolve = require('resolve');
|
|
11
13
|
class Hasher {
|
|
12
14
|
constructor(projectGraph, nxJson, options, hashing = undefined) {
|
|
@@ -18,10 +20,12 @@ class Hasher {
|
|
|
18
20
|
this.fileHasher = file_hasher_1.defaultFileHasher;
|
|
19
21
|
}
|
|
20
22
|
else {
|
|
23
|
+
// this is only used for testing
|
|
21
24
|
this.hashing = hashing;
|
|
22
25
|
this.fileHasher = new file_hasher_1.FileHasher(hashing);
|
|
26
|
+
this.fileHasher.clear();
|
|
23
27
|
}
|
|
24
|
-
this.projectHashes = new ProjectHasher(this.projectGraph, this.
|
|
28
|
+
this.projectHashes = new ProjectHasher(this.projectGraph, this.hashing);
|
|
25
29
|
}
|
|
26
30
|
hashTasks(tasks) {
|
|
27
31
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -64,17 +68,26 @@ class Hasher {
|
|
|
64
68
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
65
69
|
if (this.runtimeInputs)
|
|
66
70
|
return this.runtimeInputs;
|
|
71
|
+
perf_hooks_1.performance.mark('hasher:runtime inputs hash:start');
|
|
67
72
|
const inputs = this.options && this.options.runtimeCacheInputs
|
|
68
73
|
? this.options.runtimeCacheInputs
|
|
69
74
|
: [];
|
|
70
75
|
if (inputs.length > 0) {
|
|
71
76
|
try {
|
|
72
|
-
const values = (yield Promise.all(inputs.map((input) =>
|
|
73
|
-
|
|
74
|
-
|
|
77
|
+
const values = (yield Promise.all(inputs.map((input) => new Promise((res, rej) => {
|
|
78
|
+
child_process_1.exec(input, (err, stdout, stderr) => {
|
|
79
|
+
if (err) {
|
|
80
|
+
rej(err);
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
res({ input, value: `${stdout}${stderr}`.trim() });
|
|
84
|
+
}
|
|
85
|
+
});
|
|
75
86
|
}))));
|
|
76
87
|
const value = this.hashing.hashArray(values.map((v) => v.value));
|
|
77
88
|
const runtime = values.reduce((m, c) => ((m[c.input] = c.value), m), {});
|
|
89
|
+
perf_hooks_1.performance.mark('hasher:runtime inputs hash:end');
|
|
90
|
+
perf_hooks_1.performance.measure('hasher:runtime inputs hash', 'hasher:runtime inputs hash:start', 'hasher:runtime inputs hash:end');
|
|
78
91
|
return { value, runtime };
|
|
79
92
|
}
|
|
80
93
|
catch (e) {
|
|
@@ -91,8 +104,13 @@ class Hasher {
|
|
|
91
104
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
92
105
|
if (this.implicitDependencies)
|
|
93
106
|
return this.implicitDependencies;
|
|
107
|
+
perf_hooks_1.performance.mark('hasher:implicit deps hash:start');
|
|
108
|
+
const patterns = Object.keys(this.nxJson.implicitDependencies || {});
|
|
109
|
+
const implicitDeps = (this.projectGraph.allWorkspaceFiles || [])
|
|
110
|
+
.filter((f) => !!patterns.find((pattern) => minimatch(f.file, pattern)))
|
|
111
|
+
.map((f) => f.file);
|
|
94
112
|
const fileNames = [
|
|
95
|
-
...
|
|
113
|
+
...implicitDeps,
|
|
96
114
|
...file_utils_1.rootWorkspaceFileNames(),
|
|
97
115
|
'package-lock.json',
|
|
98
116
|
'yarn.lock',
|
|
@@ -104,6 +122,8 @@ class Hasher {
|
|
|
104
122
|
return { file, hash };
|
|
105
123
|
});
|
|
106
124
|
const combinedHash = this.hashing.hashArray(fileHashes.map((v) => v.hash));
|
|
125
|
+
perf_hooks_1.performance.mark('hasher:implicit deps hash:end');
|
|
126
|
+
perf_hooks_1.performance.measure('hasher:implicit deps hash', 'hasher:implicit deps hash:start', 'hasher:implicit deps hash:end');
|
|
107
127
|
return {
|
|
108
128
|
value: combinedHash,
|
|
109
129
|
sources: fileHashes.reduce((m, c) => ((m[c.file] = c.hash), m), {}),
|
|
@@ -147,9 +167,8 @@ class Hasher {
|
|
|
147
167
|
exports.Hasher = Hasher;
|
|
148
168
|
Hasher.version = '1.0';
|
|
149
169
|
class ProjectHasher {
|
|
150
|
-
constructor(projectGraph,
|
|
170
|
+
constructor(projectGraph, hashing) {
|
|
151
171
|
this.projectGraph = projectGraph;
|
|
152
|
-
this.fileHasher = fileHasher;
|
|
153
172
|
this.hashing = hashing;
|
|
154
173
|
this.sourceHashes = {};
|
|
155
174
|
}
|
|
@@ -184,7 +203,7 @@ class ProjectHasher {
|
|
|
184
203
|
this.sourceHashes[projectName] = new Promise((res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
185
204
|
const p = this.projectGraph.nodes[projectName];
|
|
186
205
|
const fileNames = p.data.files.map((f) => f.file);
|
|
187
|
-
const values =
|
|
206
|
+
const values = p.data.files.map((f) => f.hash);
|
|
188
207
|
res(this.hashing.hashArray([...fileNames, ...values]));
|
|
189
208
|
}));
|
|
190
209
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/hasher.ts"],"names":[],"mappings":";;;;AAGA,2BAAkC;AAClC,8CAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/hasher/hasher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FileData } from '../file-utils';
|
|
2
2
|
import { ProjectGraph, ProjectGraphDependency, ProjectGraphNode } from '../project-graph';
|
|
3
|
-
import {
|
|
3
|
+
import { ProjectFileMap } from '@nrwl/workspace/src/core/file-graph';
|
|
4
4
|
export interface ProjectGraphCache {
|
|
5
5
|
version: string;
|
|
6
6
|
rootFiles: FileData[];
|
|
@@ -9,8 +9,8 @@ export interface ProjectGraphCache {
|
|
|
9
9
|
}
|
|
10
10
|
export declare function readCache(): false | ProjectGraphCache;
|
|
11
11
|
export declare function writeCache(rootFiles: FileData[], projectGraph: ProjectGraph): void;
|
|
12
|
-
export declare function differentFromCache(fileMap:
|
|
12
|
+
export declare function differentFromCache(fileMap: ProjectFileMap, c: ProjectGraphCache): {
|
|
13
13
|
noDifference: boolean;
|
|
14
|
-
filesDifferentFromCache:
|
|
14
|
+
filesDifferentFromCache: ProjectFileMap;
|
|
15
15
|
partiallyConstructedProjectGraph?: ProjectGraph;
|
|
16
16
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/nx-deps/nx-deps-cache.ts"],"names":[],"mappings":";;;AAAA,8CAAuD;AAMvD,+BAA4B;AAC5B,mDAAmD;AACnD,2BAAgC;AAChC,oCAAoC;AACpC,qDAK+B;AAE/B,2CAAyC;AASzC,MAAM,SAAS,GAAG,WAAI,CAAC,sBAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AACpE,MAAM,UAAU,GAAG,WAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;AAClD,SAAgB,SAAS;IACvB,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACrC,IAAI;QACF,IAAI,CAAC,eAAU,CAAC,SAAS,CAAC,EAAE;YAC1B,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;SAClC;KACF;IAAC,OAAO,CAAC,EAAE;QACV;;;;;;;;;WASG;QACH,IAAI,CAAC,2BAAe,CAAC,SAAS,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;SAC7D;KACF;IAED,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,IAAI;QACF,IAAI,sBAAU,CAAC,UAAU,CAAC,EAAE;YAC1B,IAAI,GAAG,wBAAY,CAAC,UAAU,CAAC,CAAC;SACjC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CACT,6BAA6B,UAAU,uDAAuD,CAC/F,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;IAED,wBAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACnC,wBAAW,CAAC,OAAO,CAAC,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;IACxE,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7B,CAAC;AArCD,8BAqCC;AAED,SAAgB,UAAU,CACxB,SAAqB,EACrB,YAA0B;IAE1B,wBAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACtC,yBAAa,CAAC,UAAU,EAAE;QACxB,OAAO,EAAE,KAAK;QACd,SAAS;QACT,KAAK,EAAE,YAAY,CAAC,KAAK;QACzB,YAAY,EAAE,YAAY,CAAC,YAAY;KACxC,CAAC,CAAC;IACH,wBAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACpC,wBAAW,CAAC,OAAO,CAAC,aAAa,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC;AAC7E,CAAC;AAbD,gCAaC;AAED,SAAgB,kBAAkB,CAChC,
|
|
1
|
+
{"version":3,"file":"nx-deps-cache.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/nx-deps/nx-deps-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ProjectFileMap } from '../file-graph';
|
|
2
2
|
import { FileData } from '../file-utils';
|
|
3
3
|
import { NxJson } from '../shared-interfaces';
|
|
4
4
|
export interface ProjectGraph {
|
|
5
5
|
nodes: Record<string, ProjectGraphNode>;
|
|
6
6
|
dependencies: Record<string, ProjectGraphDependency[]>;
|
|
7
|
+
allWorkspaceFiles?: FileData[];
|
|
7
8
|
}
|
|
8
9
|
export declare enum DependencyType {
|
|
9
10
|
static = "static",
|
|
@@ -32,7 +33,7 @@ export declare type AddProjectDependency = (type: DependencyType | string, sourc
|
|
|
32
33
|
export interface ProjectGraphContext {
|
|
33
34
|
workspaceJson: any;
|
|
34
35
|
nxJson: NxJson;
|
|
35
|
-
fileMap:
|
|
36
|
+
fileMap: ProjectFileMap;
|
|
36
37
|
}
|
|
37
38
|
export declare enum ProjectType {
|
|
38
39
|
app = "app",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph-models.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph-models.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"project-graph-models.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph-models.ts"],"names":[],"mappings":";;;AAYA,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,mCAAiB,CAAA;IACjB,qCAAmB,CAAA;IACnB,uCAAqB,CAAA;AACvB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AAkCD,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,0BAAW,CAAA;IACX,0BAAW,CAAA;IACX,0BAAW,CAAA;AACb,CAAC,EAJW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAItB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { FileRead } from '../file-utils';
|
|
1
|
+
import { FileData, FileRead } from '../file-utils';
|
|
2
2
|
import { ProjectGraph } from './project-graph-models';
|
|
3
3
|
import { ProjectGraphCache } from '../nx-deps/nx-deps-cache';
|
|
4
4
|
import { NxJson } from '../shared-interfaces';
|
|
5
|
-
export declare function createProjectGraph(workspaceJson?: any, nxJson?: NxJson<string[] | "*">, workspaceFiles?:
|
|
5
|
+
export declare function createProjectGraph(workspaceJson?: any, nxJson?: NxJson<string[] | "*">, workspaceFiles?: FileData[], fileRead?: FileRead, cache?: false | ProjectGraphCache, shouldCache?: boolean): ProjectGraph;
|
|
@@ -14,11 +14,11 @@ function createProjectGraph(workspaceJson = file_utils_1.readWorkspaceJson(), nx
|
|
|
14
14
|
assert_workspace_validity_1.assertWorkspaceValidity(workspaceJson, nxJson);
|
|
15
15
|
const normalizedNxJson = normalize_nx_json_1.normalizeNxJson(nxJson);
|
|
16
16
|
const rootFiles = file_utils_1.rootWorkspaceFileData();
|
|
17
|
-
const
|
|
17
|
+
const projectFileMap = file_graph_1.createProjectFileMap(workspaceJson, workspaceFiles);
|
|
18
18
|
if (cache && !file_utils_1.filesChanged(rootFiles, cache.rootFiles)) {
|
|
19
|
-
const diff = nx_deps_cache_1.differentFromCache(
|
|
19
|
+
const diff = nx_deps_cache_1.differentFromCache(projectFileMap, cache);
|
|
20
20
|
if (diff.noDifference) {
|
|
21
|
-
return diff.partiallyConstructedProjectGraph;
|
|
21
|
+
return addWorkspaceFiles(diff.partiallyConstructedProjectGraph, workspaceFiles);
|
|
22
22
|
}
|
|
23
23
|
const ctx = {
|
|
24
24
|
workspaceJson,
|
|
@@ -29,22 +29,25 @@ function createProjectGraph(workspaceJson = file_utils_1.readWorkspaceJson(), nx
|
|
|
29
29
|
if (shouldCache) {
|
|
30
30
|
nx_deps_cache_1.writeCache(rootFiles, projectGraph);
|
|
31
31
|
}
|
|
32
|
-
return projectGraph;
|
|
32
|
+
return addWorkspaceFiles(projectGraph, workspaceFiles);
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
35
|
const ctx = {
|
|
36
36
|
workspaceJson,
|
|
37
37
|
nxJson: normalizedNxJson,
|
|
38
|
-
fileMap:
|
|
38
|
+
fileMap: projectFileMap,
|
|
39
39
|
};
|
|
40
40
|
const projectGraph = buildProjectGraph(ctx, fileRead, null);
|
|
41
41
|
if (shouldCache) {
|
|
42
42
|
nx_deps_cache_1.writeCache(rootFiles, projectGraph);
|
|
43
43
|
}
|
|
44
|
-
return projectGraph;
|
|
44
|
+
return addWorkspaceFiles(projectGraph, workspaceFiles);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
exports.createProjectGraph = createProjectGraph;
|
|
48
|
+
function addWorkspaceFiles(projectGraph, allWorkspaceFiles) {
|
|
49
|
+
return Object.assign(Object.assign({}, projectGraph), { allWorkspaceFiles });
|
|
50
|
+
}
|
|
48
51
|
function buildProjectGraph(ctx, fileRead, projectGraph) {
|
|
49
52
|
perf_hooks_1.performance.mark('build project graph:start');
|
|
50
53
|
const builder = new project_graph_builder_1.ProjectGraphBuilder(projectGraph);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":";;;AAAA,4EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ class TargetProjectLocator {
|
|
|
37
37
|
findProjectWithImport(importExpr, filePath, npmScope) {
|
|
38
38
|
const normalizedImportExpr = importExpr.split('#')[0];
|
|
39
39
|
if (fileutils_1.isRelativePath(normalizedImportExpr)) {
|
|
40
|
-
const resolvedModule = path_1.join(path_1.dirname(filePath), normalizedImportExpr);
|
|
40
|
+
const resolvedModule = path_1.posix.join(path_1.dirname(filePath), normalizedImportExpr);
|
|
41
41
|
return this.findProjectOfResolvedModule(resolvedModule);
|
|
42
42
|
}
|
|
43
43
|
const npmProject = this.findNpmPackage(importExpr);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/target-project-locator.ts"],"names":[],"mappings":";;;AAAA,oDAA4D;AAC5D,6CAAgF;AAKhF,mDAIyB;AACzB,kDAA2E;AAC3E,+
|
|
1
|
+
{"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/target-project-locator.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.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '10.4.
|
|
4
|
+
exports.nxVersion = '10.4.15';
|
|
5
5
|
exports.angularCliVersion = '~10.1.3';
|
|
6
6
|
exports.typescriptVersion = '~4.0.3';
|
|
7
7
|
exports.prettierVersion = '2.1.2';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"file-map.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/file-graph/file-map.ts"],"names":[],"mappings":";;;AAMA,SAAgB,aAAa,CAAC,aAAkB,EAAE,KAAiB;IACjE,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;IACvB,uEAAuE;IACvE,kCAAkC;IAClC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;SAChC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACb,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC/C,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAC1C,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YACrC,CAAC,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC;SACD,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACvB,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9C,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClB,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBACpB,OAAO;aACR;YACD,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBAC7B,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAClB;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACL,OAAO,OAAO,CAAC;AACjB,CAAC;AA5BD,sCA4BC"}
|