@nrwl/linter 13.8.4-beta.0 → 13.8.6
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 +3 -3
- package/src/executors/eslint/hasher.js +20 -10
- package/src/executors/eslint/hasher.js.map +1 -1
- package/src/generators/workspace-rules-project/files/tsconfig.json__tmpl__ +1 -1
- package/src/generators/workspace-rules-project/workspace-rules-project.js +2 -0
- package/src/generators/workspace-rules-project/workspace-rules-project.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/linter",
|
|
3
|
-
"version": "13.8.
|
|
3
|
+
"version": "13.8.6",
|
|
4
4
|
"description": "Lint Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
37
|
-
"@nrwl/devkit": "13.8.
|
|
38
|
-
"@nrwl/jest": "13.8.
|
|
37
|
+
"@nrwl/devkit": "13.8.6",
|
|
38
|
+
"@nrwl/jest": "13.8.6",
|
|
39
39
|
"tmp": "~0.2.1",
|
|
40
40
|
"tslib": "^2.3.0"
|
|
41
41
|
},
|
|
@@ -3,19 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
5
5
|
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
6
|
+
const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
6
7
|
function run(task, taskGraph, hasher) {
|
|
7
8
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
9
|
if (task.overrides['hasTypeAwareRules'] === true) {
|
|
9
10
|
return hasher.hashTaskWithDepsAndContext(task);
|
|
10
11
|
}
|
|
12
|
+
if (!global.projectGraph) {
|
|
13
|
+
try {
|
|
14
|
+
global.projectGraph = (0, project_graph_1.readCachedProjectGraph)();
|
|
15
|
+
}
|
|
16
|
+
catch (_a) {
|
|
17
|
+
// do nothing, if project graph is unavailable we fallback to using all projects
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
const projectGraph = global.projectGraph;
|
|
11
21
|
const command = hasher.hashCommand(task);
|
|
12
22
|
const sources = yield hasher.hashSource(task);
|
|
13
|
-
// TODO: This will be used once we pass hasher's projectGraph
|
|
14
|
-
// const deps = allDeps(task.id, taskGraph);
|
|
15
23
|
const workspace = new workspace_1.Workspaces(app_root_1.appRootPath).readWorkspaceConfiguration();
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
24
|
+
const deps = projectGraph
|
|
25
|
+
? allDeps(task.id, taskGraph, projectGraph)
|
|
26
|
+
: Object.keys(workspace.projects);
|
|
27
|
+
const tags = hasher.hashArray(deps.map((d) => (workspace.projects[d].tags || []).join('|')));
|
|
19
28
|
const context = yield hasher.hashContext();
|
|
20
29
|
return {
|
|
21
30
|
value: hasher.hashArray([
|
|
@@ -35,10 +44,11 @@ function run(task, taskGraph, hasher) {
|
|
|
35
44
|
});
|
|
36
45
|
}
|
|
37
46
|
exports.default = run;
|
|
38
|
-
function allDeps(taskId, taskGraph) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
47
|
+
function allDeps(taskId, taskGraph, projectGraph) {
|
|
48
|
+
const project = taskGraph.tasks[taskId].target.project;
|
|
49
|
+
const dependencies = projectGraph.dependencies[project]
|
|
50
|
+
.filter((d) => !!projectGraph.nodes[d.target])
|
|
51
|
+
.map((d) => d.target);
|
|
52
|
+
return dependencies;
|
|
43
53
|
}
|
|
44
54
|
//# sourceMappingURL=hasher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/eslint/hasher.ts"],"names":[],"mappings":";;;AAEA,2DAA2D;AAC3D,8DAA4D;
|
|
1
|
+
{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/eslint/hasher.ts"],"names":[],"mappings":";;;AAEA,2DAA2D;AAC3D,8DAA4D;AAC5D,0EAAgF;AAEhF,SAA8B,GAAG,CAC/B,IAAU,EACV,SAAoB,EACpB,MAAc;;QAEd,IAAI,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,IAAI,EAAE;YAChD,OAAO,MAAM,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;SAChD;QACD,IAAI,CAAE,MAAc,CAAC,YAAY,EAAE;YACjC,IAAI;gBACD,MAAc,CAAC,YAAY,GAAG,IAAA,sCAAsB,GAAE,CAAC;aACzD;YAAC,WAAM;gBACN,gFAAgF;aACjF;SACF;QACD,MAAM,YAAY,GAAI,MAAc,CAAC,YAAY,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,sBAAU,CAAC,sBAAW,CAAC,CAAC,0BAA0B,EAAE,CAAC;QAC3E,MAAM,IAAI,GAAG,YAAY;YACvB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC;YAC3C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAC3B,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAC9D,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;QAC3C,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC;gBACtB,OAAO;gBACP,OAAO;gBACP,IAAI;gBACJ,OAAO,CAAC,YAAY,CAAC,KAAK;gBAC1B,OAAO,CAAC,OAAO,CAAC,KAAK;aACtB,CAAC;YACF,OAAO,EAAE;gBACP,OAAO;gBACP,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE;gBAC/C,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK;gBACxC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;aACjC;SACF,CAAC;IACJ,CAAC;CAAA;AAzCD,sBAyCC;AAED,SAAS,OAAO,CACd,MAAc,EACd,SAAoB,EACpB,YAA0B;IAE1B,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;IACvD,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC;SACpD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;SAC7C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACxB,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.lintWorkspaceRulesProjectSchematic = exports.lintWorkspaceRulesProjectGe
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const jest_1 = require("@nrwl/jest");
|
|
7
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
7
8
|
const path_1 = require("path");
|
|
8
9
|
const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
|
|
9
10
|
exports.WORKSPACE_RULES_PROJECT_NAME = 'eslint-rules';
|
|
@@ -26,6 +27,7 @@ function lintWorkspaceRulesProjectGenerator(tree) {
|
|
|
26
27
|
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), workspace_lint_rules_1.workspaceLintPluginDir, {
|
|
27
28
|
tmpl: '',
|
|
28
29
|
offsetFromRoot: (0, devkit_1.offsetFromRoot)(WORKSPACE_PLUGIN_DIR),
|
|
30
|
+
rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(tree, WORKSPACE_PLUGIN_DIR),
|
|
29
31
|
});
|
|
30
32
|
/**
|
|
31
33
|
* Ensure that when workspace rules are updated they cause all projects to be affected for now.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-rules-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts"],"names":[],"mappings":";;;;AAAA,yCAWsB;AACtB,qCAA2E;AAC3E,+BAA4B;AAC5B,2EAA0E;AAE7D,QAAA,4BAA4B,GAAG,cAAc,CAAC;AAE3D,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAElD,SAAsB,kCAAkC,CAAC,IAAU;;QACjE,qDAAqD;QACrD,IAAI;YACF,IAAA,iCAAwB,EAAC,IAAI,EAAE,oCAA4B,CAAC,CAAC;YAC7D,OAAO;SACR;QAAC,WAAM,GAAE;QAEV,2EAA2E;QAC3E,IAAA,gCAAuB,EAAC,IAAI,EAAE,oCAA4B,EAAE;YAC1D,IAAI,EAAE,oBAAoB;YAC1B,UAAU,EAAE,oBAAoB;YAChC,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QAEH,8BAA8B;QAC9B,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,6CAAsB,EAAE;YACpE,IAAI,EAAE,EAAE;YACR,cAAc,EAAE,IAAA,uBAAc,EAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-rules-project.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts"],"names":[],"mappings":";;;;AAAA,yCAWsB;AACtB,qCAA2E;AAC3E,yEAAyF;AACzF,+BAA4B;AAC5B,2EAA0E;AAE7D,QAAA,4BAA4B,GAAG,cAAc,CAAC;AAE3D,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAElD,SAAsB,kCAAkC,CAAC,IAAU;;QACjE,qDAAqD;QACrD,IAAI;YACF,IAAA,iCAAwB,EAAC,IAAI,EAAE,oCAA4B,CAAC,CAAC;YAC7D,OAAO;SACR;QAAC,WAAM,GAAE;QAEV,2EAA2E;QAC3E,IAAA,gCAAuB,EAAC,IAAI,EAAE,oCAA4B,EAAE;YAC1D,IAAI,EAAE,oBAAoB;YAC1B,UAAU,EAAE,oBAAoB;YAChC,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QAEH,8BAA8B;QAC9B,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,6CAAsB,EAAE;YACpE,IAAI,EAAE,EAAE;YACR,cAAc,EAAE,IAAA,uBAAc,EAAC,oBAAoB,CAAC;YACpD,gBAAgB,EAAE,IAAA,0CAA6B,EAAC,IAAI,EAAE,oBAAoB,CAAC;SAC5E,CAAC,CAAC;QAEH;;;WAGG;QACH,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QACzD,IAAA,qCAA4B,EAAC,IAAI,kCAC5B,eAAe,KAClB,oBAAoB,kCACf,eAAe,CAAC,oBAAoB,KACvC,CAAC,GAAG,oBAAoB,OAAO,CAAC,EAAE,GAAG,OAEvC,CAAC;QAEH,uDAAuD;QACvD,MAAM,oBAAoB,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;YAC5D,OAAO,EAAE,oCAA4B;YACrC,UAAU,EAAE,KAAK;YACjB,eAAe,EAAE,IAAI;YACrB,SAAS,EAAE,MAAM;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QAEH,kGAAkG;QAClG,IAAA,8BAAuB,EACrB,IAAI,EACJ,IAAA,0BAAiB,EAAC,oBAAoB,EAAE,gBAAgB,CAAC,EACzD,kBAAkB,EAClB;YACE,kBAAkB,EAAE,8CAA8C;SACnE,CACF,CAAC;QAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,oBAAoB,CAAC;IAC9B,CAAC;CAAA;AAxDD,gFAwDC;AAEY,QAAA,kCAAkC,GAAG,IAAA,2BAAkB,EAClE,kCAAkC,CACnC,CAAC"}
|
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.buildAngularVersion = exports.tslintToEslintConfigVersion = exports.tslintVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.8.
|
|
4
|
+
exports.nxVersion = '13.8.6';
|
|
5
5
|
exports.tslintVersion = '~6.1.0';
|
|
6
6
|
exports.tslintToEslintConfigVersion = '^2.4.0';
|
|
7
7
|
exports.buildAngularVersion = '~13.2.0';
|