@nrwl/linter 13.8.4 → 13.8.7

package/LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2017-2022 Narwhal Technologies Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/linter",
-  "version": "13.8.4",
+  "version": "13.8.7",
   "description": "Lint Plugin for Nx",
   "repository": {
     "type": "git",
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "4.1.1",
-    "@nrwl/devkit": "13.8.4",
-    "@nrwl/jest": "13.8.4",
+    "@nrwl/devkit": "13.8.7",
+    "@nrwl/jest": "13.8.7",
     "tmp": "~0.2.1",
     "tslib": "^2.3.0"
   },

package/src/executors/eslint/hasher.js

@@ -3,19 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const app_root_1 = require("@nrwl/tao/src/utils/app-root");
 const workspace_1 = require("@nrwl/tao/src/shared/workspace");
+const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
 function run(task, taskGraph, hasher) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         if (task.overrides['hasTypeAwareRules'] === true) {
             return hasher.hashTaskWithDepsAndContext(task);
         }
+        if (!global.projectGraph) {
+            try {
+                global.projectGraph = (0, project_graph_1.readCachedProjectGraph)();
+            }
+            catch (_a) {
+                // do nothing, if project graph is unavailable we fallback to using all projects
+            }
+        }
+        const projectGraph = global.projectGraph;
         const command = hasher.hashCommand(task);
         const sources = yield hasher.hashSource(task);
-        // TODO: This will be used once we pass hasher's projectGraph
-        // const deps = allDeps(task.id, taskGraph);
         const workspace = new workspace_1.Workspaces(app_root_1.appRootPath).readWorkspaceConfiguration();
-        const tags = hasher.hashArray(
-        // deps.map((d) => (workspace.projects[d].tags || []).join('|'))
-        Object.values(workspace.projects).map((proj) => (proj.tags || []).join('|')));
+        const deps = projectGraph
+            ? allDeps(task.id, taskGraph, projectGraph)
+            : Object.keys(workspace.projects);
+        const tags = hasher.hashArray(deps.map((d) => (workspace.projects[d].tags || []).join('|')));
         const context = yield hasher.hashContext();
         return {
             value: hasher.hashArray([
@@ -35,10 +44,11 @@ function run(task, taskGraph, hasher) {
     });
 }
 exports.default = run;
-function allDeps(taskId, taskGraph) {
-    return [
-        ...taskGraph.dependencies[taskId].map((task) => taskGraph.tasks[task].target.project),
-        ...taskGraph.dependencies[taskId].flatMap((task) => allDeps(task, taskGraph)),
-    ];
+function allDeps(taskId, taskGraph, projectGraph) {
+    const project = taskGraph.tasks[taskId].target.project;
+    const dependencies = projectGraph.dependencies[project]
+        .filter((d) => !!projectGraph.nodes[d.target])
+        .map((d) => d.target);
+    return dependencies;
 }
 //# sourceMappingURL=hasher.js.map

package/src/executors/eslint/hasher.js.map

@@ -1 +1 @@
-{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/eslint/hasher.ts"],"names":[],"mappings":";;;AAEA,2DAA2D;AAC3D,8DAA4D;AAE5D,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,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9C,6DAA6D;QAC7D,4CAA4C;QAC5C,MAAM,SAAS,GAAG,IAAI,sBAAU,CAAC,sBAAW,CAAC,CAAC,0BAA0B,EAAE,CAAC;QAC3E,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS;QAC3B,gEAAgE;QAChE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAC7E,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;AAjCD,sBAiCC;AAED,SAAS,OAAO,CAAC,MAAc,EAAE,SAAoB;IACnD,OAAO;QACL,GAAG,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,CACnC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAC/C;QACD,GAAG,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACjD,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CACzB;KACF,CAAC;AACJ,CAAC"}
+{"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"}

package/src/generators/workspace-rules-project/files/tsconfig.json__tmpl__

@@ -1,5 +1,5 @@
 {
-  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+  "extends": "<%= rootTsConfigPath %>",
   "compilerOptions": {
     "module": "commonjs"
   },

package/src/generators/workspace-rules-project/workspace-rules-project.js

@@ -4,6 +4,7 @@ exports.lintWorkspaceRulesProjectSchematic = exports.lintWorkspaceRulesProjectGe
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const jest_1 = require("@nrwl/jest");
+const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
 const path_1 = require("path");
 const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
 exports.WORKSPACE_RULES_PROJECT_NAME = 'eslint-rules';
@@ -26,6 +27,7 @@ function lintWorkspaceRulesProjectGenerator(tree) {
         (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), workspace_lint_rules_1.workspaceLintPluginDir, {
             tmpl: '',
             offsetFromRoot: (0, devkit_1.offsetFromRoot)(WORKSPACE_PLUGIN_DIR),
+            rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(tree, WORKSPACE_PLUGIN_DIR),
         });
         /**
          * Ensure that when workspace rules are updated they cause all projects to be affected for now.

package/src/generators/workspace-rules-project/workspace-rules-project.js.map

@@ -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;SACrD,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;AAvDD,gFAuDC;AAEY,QAAA,kCAAkC,GAAG,IAAA,2BAAkB,EAClE,kCAAkC,CACnC,CAAC"}
+{"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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.buildAngularVersion = exports.tslintToEslintConfigVersion = exports.tslintVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.8.4';
+exports.nxVersion = '13.8.7';
 exports.tslintVersion = '~6.1.0';
 exports.tslintToEslintConfigVersion = '^2.4.0';
 exports.buildAngularVersion = '~13.2.0';