@nrwl/workspace 13.4.6 → 13.4.7-beta.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/affected-project-graph/locators/tsconfig-json-changes.js +8 -10
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js.map +1 -1
- package/src/core/file-map-utils.js +41 -55
- package/src/core/file-map-utils.js.map +1 -1
- package/src/core/file-utils.d.ts +2 -3
- package/src/core/file-utils.js +3 -17
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/git-based-file-hasher.js +2 -2
- package/src/core/hasher/git-based-file-hasher.js.map +1 -1
- package/src/core/hasher/node-based-file-hasher.d.ts +1 -1
- package/src/core/hasher/node-based-file-hasher.js +2 -2
- package/src/core/hasher/node-based-file-hasher.js.map +1 -1
- package/src/core/project-graph/operators.d.ts +0 -1
- package/src/core/project-graph/operators.js +1 -7
- package/src/core/project-graph/operators.js.map +1 -1
- package/src/core/target-project-locator.d.ts +2 -2
- package/src/core/target-project-locator.js +22 -17
- package/src/core/target-project-locator.js.map +1 -1
- package/src/utilities/perf-logging.js +3 -2
- package/src/utilities/perf-logging.js.map +1 -1
- package/src/utils/rules/visit-not-ignored-files.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.4.
|
|
3
|
+
"version": "13.4.7-beta.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.4.
|
|
85
|
-
"@nrwl/devkit": "13.4.
|
|
86
|
-
"@nrwl/jest": "13.4.
|
|
87
|
-
"@nrwl/linter": "13.4.
|
|
84
|
+
"@nrwl/cli": "13.4.7-beta.1",
|
|
85
|
+
"@nrwl/devkit": "13.4.7-beta.1",
|
|
86
|
+
"@nrwl/jest": "13.4.7-beta.1",
|
|
87
|
+
"@nrwl/linter": "13.4.7-beta.1"
|
|
88
88
|
},
|
|
89
89
|
"nx-migrations": {
|
|
90
90
|
"migrations": "./migrations.json"
|
|
@@ -1,16 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTouchedProjectsFromTsConfig = void 0;
|
|
4
|
-
const path_1 = require("path");
|
|
5
4
|
const json_diff_1 = require("../../../utilities/json-diff");
|
|
6
|
-
const project_graph_1 = require("../../project-graph");
|
|
7
|
-
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
8
5
|
const getTouchedProjectsFromTsConfig = (touchedFiles, _a, _b, _c, graph) => {
|
|
9
6
|
const tsConfigJsonChanges = touchedFiles.find((change) => change.file === 'tsconfig.json' || change.file === 'tsconfig.base.json');
|
|
10
7
|
if (!tsConfigJsonChanges) {
|
|
11
8
|
return [];
|
|
12
9
|
}
|
|
13
|
-
const sortedNodes = (0, project_graph_1.getSortedProjectNodes)(graph.nodes);
|
|
14
10
|
const changes = tsConfigJsonChanges.getChanges();
|
|
15
11
|
if (!allChangesArePathChanges(changes)) {
|
|
16
12
|
return Object.keys(graph.nodes);
|
|
@@ -25,7 +21,7 @@ const getTouchedProjectsFromTsConfig = (touchedFiles, _a, _b, _c, graph) => {
|
|
|
25
21
|
if (change.type === json_diff_1.DiffType.Deleted) {
|
|
26
22
|
return Object.keys(graph.nodes);
|
|
27
23
|
}
|
|
28
|
-
touched.push(...getProjectsAffectedByPaths(change,
|
|
24
|
+
touched.push(...getProjectsAffectedByPaths(change, Object.values(graph.nodes)));
|
|
29
25
|
}
|
|
30
26
|
return touched;
|
|
31
27
|
};
|
|
@@ -36,14 +32,16 @@ function allChangesArePathChanges(changes) {
|
|
|
36
32
|
/**
|
|
37
33
|
* Gets both previous project and current project of a particular change to tsconfig paths
|
|
38
34
|
*/
|
|
39
|
-
function getProjectsAffectedByPaths(change,
|
|
35
|
+
function getProjectsAffectedByPaths(change, nodes) {
|
|
40
36
|
const result = [];
|
|
41
37
|
const paths = [change.value.lhs, change.value.rhs];
|
|
42
38
|
paths.forEach((path) => {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
39
|
+
nodes.forEach((project) => {
|
|
40
|
+
const normalizedPath = path && path.startsWith('./') ? path.substring(2) : path;
|
|
41
|
+
const r = project.data.root;
|
|
42
|
+
const root = r && r.endsWith('/') ? r.substring(0, r.length - 1) : r;
|
|
43
|
+
if ((normalizedPath && root && normalizedPath.startsWith(root)) ||
|
|
44
|
+
normalizedPath == root) {
|
|
47
45
|
result.push(project.name);
|
|
48
46
|
}
|
|
49
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsconfig-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/tsconfig-json-changes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tsconfig-json-changes.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/affected-project-graph/locators/tsconfig-json-changes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,64 +1,53 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateProjectFileMap = exports.createProjectFileMap = void 0;
|
|
4
|
-
const
|
|
5
|
-
function
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
function createProjectRootMappings(workspaceJson, projectFileMap) {
|
|
6
|
+
const projectRootMappings = new Map();
|
|
7
|
+
for (const projectName of Object.keys(workspaceJson.projects)) {
|
|
8
|
+
if (!projectFileMap[projectName]) {
|
|
9
|
+
projectFileMap[projectName] = [];
|
|
10
|
+
}
|
|
11
|
+
const root = workspaceJson.projects[projectName].root;
|
|
12
|
+
projectRootMappings.set(root.endsWith('/') ? root.substring(0, root.length - 1) : root, projectFileMap[projectName]);
|
|
13
|
+
}
|
|
14
|
+
return projectRootMappings;
|
|
15
|
+
}
|
|
16
|
+
function findMatchingProjectFiles(projectRootMappings, file) {
|
|
17
|
+
for (let currentPath = (0, path_1.dirname)(file); currentPath != (0, path_1.dirname)(currentPath); currentPath = (0, path_1.dirname)(currentPath)) {
|
|
18
|
+
const p = projectRootMappings.get(currentPath);
|
|
19
|
+
if (p) {
|
|
20
|
+
return p;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return null;
|
|
17
24
|
}
|
|
18
25
|
function createProjectFileMap(workspaceJson, allWorkspaceFiles) {
|
|
19
26
|
const projectFileMap = {};
|
|
20
|
-
const
|
|
21
|
-
const seen = new Set();
|
|
22
|
-
for (const projectName of sortedProjects) {
|
|
23
|
-
projectFileMap[projectName] = [];
|
|
24
|
-
}
|
|
27
|
+
const projectRootMappings = createProjectRootMappings(workspaceJson, projectFileMap);
|
|
25
28
|
for (const f of allWorkspaceFiles) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
for (const projectName of sortedProjects) {
|
|
30
|
-
const p = workspaceJson.projects[projectName];
|
|
31
|
-
if (f.file.startsWith(p.root || p.sourceRoot)) {
|
|
32
|
-
projectFileMap[projectName].push(f);
|
|
33
|
-
break;
|
|
34
|
-
}
|
|
29
|
+
const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f.file);
|
|
30
|
+
if (matchingProjectFiles) {
|
|
31
|
+
matchingProjectFiles.push(f);
|
|
35
32
|
}
|
|
36
33
|
}
|
|
37
34
|
return { projectFileMap, allWorkspaceFiles };
|
|
38
35
|
}
|
|
39
36
|
exports.createProjectFileMap = createProjectFileMap;
|
|
40
37
|
function updateProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, updatedFiles, deletedFiles) {
|
|
41
|
-
const
|
|
42
|
-
for (let projectName of sortedProjects) {
|
|
43
|
-
if (!projectFileMap[projectName]) {
|
|
44
|
-
projectFileMap[projectName] = [];
|
|
45
|
-
}
|
|
46
|
-
}
|
|
38
|
+
const projectRootMappings = createProjectRootMappings(workspaceJson, projectFileMap);
|
|
47
39
|
for (const f of updatedFiles.keys()) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
});
|
|
60
|
-
}
|
|
61
|
-
break;
|
|
40
|
+
const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f);
|
|
41
|
+
if (matchingProjectFiles) {
|
|
42
|
+
const fileData = matchingProjectFiles.find((t) => t.file === f);
|
|
43
|
+
if (fileData) {
|
|
44
|
+
fileData.hash = updatedFiles.get(f);
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
matchingProjectFiles.push({
|
|
48
|
+
file: f,
|
|
49
|
+
hash: updatedFiles.get(f),
|
|
50
|
+
});
|
|
62
51
|
}
|
|
63
52
|
}
|
|
64
53
|
const fileData = allWorkspaceFiles.find((t) => t.file === f);
|
|
@@ -73,14 +62,11 @@ function updateProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles,
|
|
|
73
62
|
}
|
|
74
63
|
}
|
|
75
64
|
for (const f of deletedFiles) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
projectFileMap[projectName].splice(index, 1);
|
|
82
|
-
}
|
|
83
|
-
break;
|
|
65
|
+
const matchingProjectFiles = findMatchingProjectFiles(projectRootMappings, f);
|
|
66
|
+
if (matchingProjectFiles) {
|
|
67
|
+
const index = matchingProjectFiles.findIndex((t) => t.file === f);
|
|
68
|
+
if (index > -1) {
|
|
69
|
+
matchingProjectFiles.splice(index, 1);
|
|
84
70
|
}
|
|
85
71
|
}
|
|
86
72
|
const index = allWorkspaceFiles.findIndex((t) => t.file === f);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-map-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-map-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"file-map-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-map-utils.ts"],"names":[],"mappings":"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"}
|
package/src/core/file-utils.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { WorkspaceJsonConfiguration } from '@nrwl/tao/src/shared/workspace';
|
|
2
|
-
import type { FileData, NxJsonConfiguration
|
|
2
|
+
import type { FileData, NxJsonConfiguration } from '@nrwl/devkit';
|
|
3
3
|
import type { NxArgs } from '../command-line/utils';
|
|
4
4
|
import type { Environment } from './shared-interfaces';
|
|
5
5
|
export interface Change {
|
|
@@ -13,7 +13,7 @@ export declare class WholeFileChange implements Change {
|
|
|
13
13
|
}
|
|
14
14
|
export declare function isWholeFileChange(change: Change): change is WholeFileChange;
|
|
15
15
|
export declare function readFileIfExisting(path: string): string;
|
|
16
|
-
export declare function calculateFileChanges(files: string[], allWorkspaceFiles: FileData[], nxArgs?: NxArgs, readFileAtRevision?: (f: string, r: void | string) => string, ignore?:
|
|
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;
|
|
19
19
|
export declare function readWorkspaceConfig(opts: {
|
|
@@ -29,5 +29,4 @@ export declare function workspaceLayout(): {
|
|
|
29
29
|
libsDir: string;
|
|
30
30
|
};
|
|
31
31
|
export declare function readEnvironment(): Environment;
|
|
32
|
-
export declare function normalizedProjectRoot(p: ProjectGraphNode): string;
|
|
33
32
|
export { FileData };
|
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.
|
|
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");
|
|
@@ -9,7 +9,7 @@ const path_1 = require("path");
|
|
|
9
9
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
10
10
|
const fileutils_1 = require("../utilities/fileutils");
|
|
11
11
|
const json_diff_1 = require("../utilities/json-diff");
|
|
12
|
-
const
|
|
12
|
+
const ignore_1 = require("ignore");
|
|
13
13
|
class WholeFileChange {
|
|
14
14
|
constructor() {
|
|
15
15
|
this.type = 'WholeFileChange';
|
|
@@ -25,7 +25,7 @@ function readFileIfExisting(path) {
|
|
|
25
25
|
}
|
|
26
26
|
exports.readFileIfExisting = readFileIfExisting;
|
|
27
27
|
function getIgnoredGlobs() {
|
|
28
|
-
const ig =
|
|
28
|
+
const ig = (0, ignore_1.default)();
|
|
29
29
|
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.gitignore`));
|
|
30
30
|
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.nxignore`));
|
|
31
31
|
return ig;
|
|
@@ -166,18 +166,4 @@ function readEnvironment() {
|
|
|
166
166
|
return { nxJson, workspaceJson, workspaceResults: null };
|
|
167
167
|
}
|
|
168
168
|
exports.readEnvironment = readEnvironment;
|
|
169
|
-
function normalizedProjectRoot(p) {
|
|
170
|
-
if (p.data && p.data.root) {
|
|
171
|
-
const path = p.data.root.split('/').filter((v) => !!v);
|
|
172
|
-
if (path.length === 1) {
|
|
173
|
-
return path[0];
|
|
174
|
-
}
|
|
175
|
-
// Remove the first part of the path, usually 'libs'
|
|
176
|
-
return path.slice(1).join('/');
|
|
177
|
-
}
|
|
178
|
-
else {
|
|
179
|
-
return '';
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
exports.normalizedProjectRoot = normalizedProjectRoot;
|
|
183
169
|
//# sourceMappingURL=file-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-utils.ts"],"names":[],"mappings":";;;AAAA,8DAIwC;AAMxC,
|
|
1
|
+
{"version":3,"file":"file-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/file-utils.ts"],"names":[],"mappings":";;;AAAA,8DAIwC;AAMxC,yCAA4C;AAC5C,iDAAyC;AACzC,2BAA8C;AAC9C,+BAAoD;AAEpD,2DAA2D;AAC3D,sDAAoD;AACpD,sDAAkD;AAElD,mCAA4B;AAU5B,MAAa,eAAe;IAA5B;QACE,SAAI,GAAG,iBAAiB,CAAC;IAC3B,CAAC;CAAA;AAFD,0CAEC;AAED,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,MAAM,CAAC,IAAI,KAAK,iBAAiB,CAAC;AAC3C,CAAC;AAFD,8CAEC;AAED,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC;AAFD,gDAEC;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,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,oBAAoB,CAClC,KAAe,EACf,iBAA6B,EAC7B,MAAe,EACf,qBAGc,yBAAyB,EACvC,MAAM,GAAG,eAAe,EAAE;IAE1B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAEhD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACrB,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,CAAC,CAAC,CAAC;QACvB,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC;QAExB,OAAO;YACL,IAAI,EAAE,CAAC;YACP,GAAG;YACH,IAAI;YACJ,UAAU,EAAE,GAAa,EAAE;gBACzB,IAAI,CAAC,MAAM,EAAE;oBACX,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;iBAChC;gBAED,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;oBAC5C,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;iBAChC;gBACD,QAAQ,GAAG,EAAE;oBACX,KAAK,OAAO;wBACV,MAAM,MAAM,GAAG,kBAAkB,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;wBAClD,MAAM,MAAM,GAAG,kBAAkB,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;wBAElD,IAAI;4BACF,OAAO,IAAA,oBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;yBACzD;wBAAC,OAAO,CAAC,EAAE;4BACV,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;yBAChC;oBACH;wBACE,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;iBAClC;YACH,CAAC;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AA7CD,oDA6CC;AAEY,QAAA,aAAa,GAAG,IAAI,GAAG,KAAK,CAAC;AAE1C,SAAS,yBAAyB,CAChC,IAAY,EACZ,QAAuB;IAEvB,IAAI;QACF,MAAM,YAAY,GAAG,GAAG,sBAAW,GAAG,UAAG,GAAG,IAAI,EAAE,CAAC;QACnD,MAAM,iBAAiB,GAAG,IAAA,wBAAQ,EAAC,+BAA+B,CAAC;aAChE,QAAQ,EAAE;aACV,IAAI,EAAE,CAAC;QACV,MAAM,uBAAuB,GAAG,IAAA,eAAQ,EAAC,iBAAiB,EAAE,YAAY,CAAC;aACtE,KAAK,CAAC,UAAG,CAAC;aACV,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,CAAC,QAAQ;YACd,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC;YAC7B,CAAC,CAAC,IAAA,wBAAQ,EAAC,YAAY,QAAQ,IAAI,uBAAuB,EAAE,EAAE;gBAC1D,SAAS,EAAE,qBAAa;aACzB,CAAC;iBACC,QAAQ,EAAE;iBACV,IAAI,EAAE,CAAC;KACf;IAAC,WAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,mBAAmB,CAAC;QACzB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,sBAAW;KAClB,CAAC,CAAC;AACL,CAAC;AALD,8CAKC;AAED,SAAgB,mBAAmB,CAAC,IAGnC;IACC,MAAM,EAAE,GAAG,IAAI,sBAAU,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,EAAE,CAAC,0BAA0B,EAAE,CAAC;IAC7C,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,EAAE;QAChC,MAAM,SAAS,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,CAAC;KAC1B;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAZD,kDAYC;AAED,SAAgB,iBAAiB;IAC/B,IAAI,IAAA,sBAAU,EAAC,GAAG,sBAAW,eAAe,CAAC,EAAE;QAC7C,OAAO,cAAc,CAAC;KACvB;SAAM;QACL,OAAO,gBAAgB,CAAC;KACzB;AACH,CAAC;AAND,8CAMC;AAED,SAAgB,eAAe,CAAC,QAAgB;IAC9C,OAAO,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,sBAAW,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;AAC5D,CAAC;AAFD,0CAEC;AAED,SAAgB,eAAe;IAC7B,OAAO,IAAA,qBAAY,EAAC,GAAG,sBAAW,eAAe,CAAC,CAAC;AACrD,CAAC;AAFD,0CAEC;AAED,SAAgB,UAAU,CACxB,OAAe,GAAG,sBAAW,UAAU;IAEvC,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAsB,IAAI,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAa,CAAC,CAAC;IACvD,IAAI,aAAa,EAAE;QACjB,uCAAY,aAAa,GAAK,MAAM,EAAG;KACxC;SAAM;QACL,OAAO,MAAM,CAAC;KACf;AACH,CAAC;AAdD,gCAcC;AAED,SAAS,iBAAiB,CAAC,MAA4B;IACrD,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC;QACnC,IAAI;YACF,OAAO,IAAA,qBAAY,EAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;SACnD;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SAC3E;KACF;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAED,SAAgB,eAAe;;IAC7B,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,OAAO,mCAAI,MAAM;QAClD,OAAO,EAAE,MAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,OAAO,mCAAI,MAAM;KACnD,CAAC;AACJ,CAAC;AAND,0CAMC;AAED,SAAgB,eAAe;IAC7B,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,MAAM,aAAa,GAAG,iBAAiB,EAAE,CAAC;IAC1C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,IAAI,EAAS,CAAC;AAClE,CAAC;AAJD,0CAIC"}
|
|
@@ -7,7 +7,7 @@ const perf_hooks_1 = require("perf_hooks");
|
|
|
7
7
|
const git_hasher_1 = require("./git-hasher");
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const file_hasher_base_1 = require("./file-hasher-base");
|
|
10
|
-
const
|
|
10
|
+
const ignore_1 = require("ignore");
|
|
11
11
|
class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
12
12
|
/**
|
|
13
13
|
* For the project graph daemon server use-case we can potentially skip expensive work
|
|
@@ -39,7 +39,7 @@ class GitBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
39
39
|
exports.GitBasedFileHasher = GitBasedFileHasher;
|
|
40
40
|
function getIgnoredGlobs() {
|
|
41
41
|
if ((0, fs_1.existsSync)(`${app_root_1.appRootPath}/.nxignore`)) {
|
|
42
|
-
const ig =
|
|
42
|
+
const ig = (0, ignore_1.default)();
|
|
43
43
|
ig.add((0, fs_1.readFileSync)(`${app_root_1.appRootPath}/.nxignore`, 'utf-8'));
|
|
44
44
|
return ig;
|
|
45
45
|
}
|
|
@@ -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;
|
|
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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FileHasherBase } from './file-hasher-base';
|
|
2
2
|
export declare class NodeBasedFileHasher extends FileHasherBase {
|
|
3
|
-
ignoredGlobs:
|
|
3
|
+
ignoredGlobs: import("ignore").Ignore;
|
|
4
4
|
init(): Promise<void>;
|
|
5
5
|
hashFiles(files: string[]): Promise<Map<string, string>>;
|
|
6
6
|
private allFilesInDir;
|
|
@@ -8,7 +8,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
10
|
const devkit_1 = require("@nrwl/devkit");
|
|
11
|
-
const
|
|
11
|
+
const ignore_1 = require("ignore");
|
|
12
12
|
class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
13
13
|
constructor() {
|
|
14
14
|
super(...arguments);
|
|
@@ -61,7 +61,7 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
|
|
|
61
61
|
}
|
|
62
62
|
exports.NodeBasedFileHasher = NodeBasedFileHasher;
|
|
63
63
|
function getIgnoredGlobs() {
|
|
64
|
-
const ig =
|
|
64
|
+
const ig = (0, ignore_1.default)();
|
|
65
65
|
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.gitignore`));
|
|
66
66
|
ig.add(readFileIfExisting(`${app_root_1.appRootPath}/.nxignore`));
|
|
67
67
|
ig.add((0, devkit_1.stripIndents) `
|
|
@@ -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,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,yCAA4C;
|
|
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,OAAO,CAAC,EAAE,GAAE;YAChB,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE,GAAE;IAChB,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"}
|
|
@@ -6,7 +6,6 @@ export declare function filterNodes(predicate?: (n: ProjectGraphNode) => boolean
|
|
|
6
6
|
*/
|
|
7
7
|
export declare function isWorkspaceProject(project: ProjectGraphNode): boolean;
|
|
8
8
|
export declare function isNpmProject(project: ProjectGraphNode): project is ProjectGraphExternalNode;
|
|
9
|
-
export declare function getSortedProjectNodes(nodes: Record<string, ProjectGraphNode>): ProjectGraphNode<any>[];
|
|
10
9
|
/**
|
|
11
10
|
* @deprecated will be removed in v14. All projects in ProjectGraph's `nodes` are workspace projects. Use {@link pruneExternalNodes}
|
|
12
11
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.withDeps = exports.pruneExternalNodes = exports.onlyWorkspaceProjects = exports.
|
|
3
|
+
exports.withDeps = exports.pruneExternalNodes = exports.onlyWorkspaceProjects = exports.isNpmProject = exports.isWorkspaceProject = exports.filterNodes = exports.reverse = void 0;
|
|
4
4
|
const reverseMemo = new Map();
|
|
5
5
|
function reverse(graph) {
|
|
6
6
|
const resultFromMemo = reverseMemo.get(graph);
|
|
@@ -67,12 +67,6 @@ function isNpmProject(project) {
|
|
|
67
67
|
return (project === null || project === void 0 ? void 0 : project.type) === 'npm';
|
|
68
68
|
}
|
|
69
69
|
exports.isNpmProject = isNpmProject;
|
|
70
|
-
function getSortedProjectNodes(nodes) {
|
|
71
|
-
return Object.values(nodes).sort((nodeA, nodeB) => {
|
|
72
|
-
return nodeA.data.root.length > nodeB.data.root.length ? -1 : 1;
|
|
73
|
-
});
|
|
74
|
-
}
|
|
75
|
-
exports.getSortedProjectNodes = getSortedProjectNodes;
|
|
76
70
|
/**
|
|
77
71
|
* @deprecated will be removed in v14. All projects in ProjectGraph's `nodes` are workspace projects. Use {@link pruneExternalNodes}
|
|
78
72
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/operators.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/operators.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,7 @@ import { ProjectGraphExternalNode } from '@nrwl/devkit';
|
|
|
3
3
|
export declare class TargetProjectLocator {
|
|
4
4
|
private readonly nodes;
|
|
5
5
|
private readonly externalNodes;
|
|
6
|
-
private
|
|
7
|
-
private sortedWorkspaceProjects;
|
|
6
|
+
private projectRootMappings;
|
|
8
7
|
private npmProjects;
|
|
9
8
|
private tsConfig;
|
|
10
9
|
private paths;
|
|
@@ -29,4 +28,5 @@ export declare class TargetProjectLocator {
|
|
|
29
28
|
private findProjectOfResolvedModule;
|
|
30
29
|
private getAbsolutePath;
|
|
31
30
|
private getRootTsConfig;
|
|
31
|
+
private findMatchingProjectFiles;
|
|
32
32
|
}
|
|
@@ -7,14 +7,12 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
7
7
|
const fileutils_1 = require("../utilities/fileutils");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
10
|
-
const project_graph_1 = require("./project-graph");
|
|
11
10
|
class TargetProjectLocator {
|
|
12
11
|
constructor(nodes, externalNodes) {
|
|
13
12
|
var _a, _b;
|
|
14
13
|
this.nodes = nodes;
|
|
15
14
|
this.externalNodes = externalNodes;
|
|
16
|
-
this.
|
|
17
|
-
this.sortedWorkspaceProjects = this.sortedProjects.map((node) => (Object.assign(Object.assign({}, node), { data: Object.assign(Object.assign({}, node.data), { normalizedRoot: (0, file_utils_1.normalizedProjectRoot)(node) }) })));
|
|
15
|
+
this.projectRootMappings = createProjectRootMappings(this.nodes);
|
|
18
16
|
this.npmProjects = this.externalNodes
|
|
19
17
|
? Object.values(this.externalNodes)
|
|
20
18
|
: [];
|
|
@@ -63,16 +61,6 @@ class TargetProjectLocator {
|
|
|
63
61
|
return resolvedProject;
|
|
64
62
|
}
|
|
65
63
|
}
|
|
66
|
-
// TODO(meeroslav): this block should be removed as it's going around typescript paths
|
|
67
|
-
// unless we want to support local JS projects
|
|
68
|
-
const importedProject = this.sortedWorkspaceProjects.find((p) => {
|
|
69
|
-
const projectImport = `@${npmScope}/${p.data.normalizedRoot}`;
|
|
70
|
-
return (normalizedImportExpr === projectImport ||
|
|
71
|
-
normalizedImportExpr.startsWith(`${projectImport}/`));
|
|
72
|
-
});
|
|
73
|
-
if (importedProject) {
|
|
74
|
-
return importedProject.name;
|
|
75
|
-
}
|
|
76
64
|
// nothing found, cache for later
|
|
77
65
|
this.npmResolutionCache.set(normalizedImportExpr, undefined);
|
|
78
66
|
return null;
|
|
@@ -124,10 +112,10 @@ class TargetProjectLocator {
|
|
|
124
112
|
}
|
|
125
113
|
}
|
|
126
114
|
findProjectOfResolvedModule(resolvedModule) {
|
|
127
|
-
const
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
115
|
+
const normalizedResolvedModule = resolvedModule.startsWith('./')
|
|
116
|
+
? resolvedModule.substring(2)
|
|
117
|
+
: resolvedModule;
|
|
118
|
+
const importedProject = this.findMatchingProjectFiles(normalizedResolvedModule);
|
|
131
119
|
return importedProject ? importedProject.name : void 0;
|
|
132
120
|
}
|
|
133
121
|
getAbsolutePath(path) {
|
|
@@ -151,6 +139,23 @@ class TargetProjectLocator {
|
|
|
151
139
|
}
|
|
152
140
|
return { path, absolutePath, config: (0, devkit_1.parseJson)(content) };
|
|
153
141
|
}
|
|
142
|
+
findMatchingProjectFiles(file) {
|
|
143
|
+
for (let currentPath = file; currentPath != (0, path_1.dirname)(currentPath); currentPath = (0, path_1.dirname)(currentPath)) {
|
|
144
|
+
const p = this.projectRootMappings.get(currentPath);
|
|
145
|
+
if (p) {
|
|
146
|
+
return p;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
return null;
|
|
150
|
+
}
|
|
154
151
|
}
|
|
155
152
|
exports.TargetProjectLocator = TargetProjectLocator;
|
|
153
|
+
function createProjectRootMappings(nodes) {
|
|
154
|
+
const projectRootMappings = new Map();
|
|
155
|
+
for (const projectName of Object.keys(nodes)) {
|
|
156
|
+
const root = nodes[projectName].data.root;
|
|
157
|
+
projectRootMappings.set(root && root.endsWith('/') ? root.substring(0, root.length - 1) : root, nodes[projectName]);
|
|
158
|
+
}
|
|
159
|
+
return projectRootMappings;
|
|
160
|
+
}
|
|
156
161
|
//# sourceMappingURL=target-project-locator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/target-project-locator.ts"],"names":[],"mappings":";;;AAAA,wDAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"target-project-locator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/core/target-project-locator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const perf_hooks_1 = require("perf_hooks");
|
|
4
4
|
if (process.env.NX_PERF_LOGGING) {
|
|
5
5
|
const obs = new perf_hooks_1.PerformanceObserver((list) => {
|
|
6
|
-
const entry
|
|
7
|
-
|
|
6
|
+
for (const entry of list.getEntries()) {
|
|
7
|
+
console.log(`Time for '${entry.name}'`, entry.duration);
|
|
8
|
+
}
|
|
8
9
|
});
|
|
9
10
|
obs.observe({ entryTypes: ['measure'] });
|
|
10
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"perf-logging.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/perf-logging.ts"],"names":[],"mappings":";;AAAA,2CAAiD;AAEjD,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;IAC/B,MAAM,GAAG,GAAG,IAAI,gCAAmB,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"perf-logging.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/perf-logging.ts"],"names":[],"mappings":";;AAAA,2CAAiD;AAEjD,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;IAC/B,MAAM,GAAG,GAAG,IAAI,gCAAmB,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACrC,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;SACzD;IACH,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;CAC1C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visit-not-ignored-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/visit-not-ignored-files.ts"],"names":[],"mappings":";;;AAAA,+CAA6D;AAC7D,2DAKoC;AACpC,
|
|
1
|
+
{"version":3,"file":"visit-not-ignored-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/visit-not-ignored-files.ts"],"names":[],"mappings":";;;AAAA,+CAA6D;AAC7D,2DAKoC;AACpC,mCAAwC;AAExC,SAAgB,oBAAoB,CAClC,OAA2E,EAC3E,MAAY,IAAA,gBAAS,EAAC,EAAE,CAAC;IAEzB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,EAAsB,CAAC;QAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC7B,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;YACd,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC5C;QACD,SAAS,KAAK,CAAC,IAAU;YACvB,IAAI,IAAI,KAAI,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,CAAC,IAAI,CAAC,CAAA,EAAE;gBAC7B,OAAO;aACR;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACnC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAI,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE;oBACjC,OAAO;iBACR;gBACD,MAAM,SAAS,GAAG,OAAO,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC3D,IAAI,SAAS,EAAE;oBACb,IAAA,qBAAQ,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBAClC,KAAK,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC,CAAC;AACJ,CAAC;AAhCD,oDAgCC"}
|
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.4.
|
|
4
|
+
exports.nxVersion = '13.4.7-beta.1';
|
|
5
5
|
exports.angularCliVersion = '~13.1.0';
|
|
6
6
|
exports.typescriptVersion = '~4.4.3';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|