@nrwl/linter 13.8.7 → 13.8.8-beta.0

package/package.json

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

package/src/executors/eslint/hasher.d.ts

@@ -1,3 +1,8 @@
-import { Task, TaskGraph } from '@nrwl/devkit';
+import { ProjectGraph, Task, TaskGraph, WorkspaceJsonConfiguration } from '@nrwl/devkit';
 import { Hash, Hasher } from '@nrwl/workspace/src/core/hasher/hasher';
-export default function run(task: Task, taskGraph: TaskGraph, hasher: Hasher): Promise<Hash>;
+export default function run(task: Task, context: {
+    hasher: Hasher;
+    projectGraph: ProjectGraph;
+    taskGraph: TaskGraph;
+    workspaceConfig: WorkspaceJsonConfiguration;
+}): Promise<Hash>;

package/src/executors/eslint/hasher.js

@@ -1,44 +1,29 @@
 "use strict";
 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) {
+function run(task, context) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         if (task.overrides['hasTypeAwareRules'] === true) {
-            return hasher.hashTaskWithDepsAndContext(task);
+            return context.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);
-        const workspace = new workspace_1.Workspaces(app_root_1.appRootPath).readWorkspaceConfiguration();
-        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();
+        const command = context.hasher.hashCommand(task);
+        const source = yield context.hasher.hashSource(task);
+        const deps = allDeps(task.id, context.taskGraph, context.projectGraph);
+        const tags = context.hasher.hashArray(deps.map((d) => (context.workspaceConfig.projects[d].tags || []).join('|')));
+        const taskContext = yield context.hasher.hashContext();
         return {
-            value: hasher.hashArray([
+            value: context.hasher.hashArray([
                 command,
-                sources,
+                source,
                 tags,
-                context.implicitDeps.value,
-                context.runtime.value,
+                taskContext.implicitDeps.value,
+                taskContext.runtime.value,
             ]),
             details: {
                 command,
-                nodes: { [task.target.project]: sources, tags },
-                implicitDeps: context.implicitDeps.files,
-                runtime: context.runtime.runtime,
+                nodes: { [task.target.project]: source, tags },
+                implicitDeps: taskContext.implicitDeps.files,
+                runtime: taskContext.runtime.runtime,
             },
         };
     });

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;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"}
+{"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/executors/eslint/hasher.ts"],"names":[],"mappings":";;;AAQA,SAA8B,GAAG,CAC/B,IAAU,EACV,OAKC;;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,IAAI,EAAE;YAChD,OAAO,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;SACxD;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CACnC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAC5E,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACvD,OAAO;YACL,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9B,OAAO;gBACP,MAAM;gBACN,IAAI;gBACJ,WAAW,CAAC,YAAY,CAAC,KAAK;gBAC9B,WAAW,CAAC,OAAO,CAAC,KAAK;aAC1B,CAAC;YACF,OAAO,EAAE;gBACP,OAAO;gBACP,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;gBAC9C,YAAY,EAAE,WAAW,CAAC,YAAY,CAAC,KAAK;gBAC5C,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO;aACrC;SACF,CAAC;IACJ,CAAC;CAAA;AAnCD,sBAmCC;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/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.7';
+exports.nxVersion = '13.8.8-beta.0';
 exports.tslintVersion = '~6.1.0';
 exports.tslintToEslintConfigVersion = '^2.4.0';
 exports.buildAngularVersion = '~13.2.0';