@nrwl/linter 13.3.0-beta.2 → 13.3.0-beta.23

package/migrations.json

@@ -58,6 +58,12 @@
       "version": "12.9.0-beta.0",
       "description": "Remove ESLint parserOptions.project config if no rules requiring type-checking are in use",
       "factory": "./src/migrations/update-12-4-0/remove-eslint-project-config-if-no-type-checking-rules"
+    },
+    "eslint-8-updates": {
+      "cli": "nx",
+      "version": "13.3.0-beta.0",
+      "description": "Update eslint-rules jest.config.js in order to support ESLint v8 exports mapping, remove category field",
+      "factory": "./src/migrations/update-13-3-0/eslint-8-updates"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/linter",
-  "version": "13.3.0-beta.2",
+  "version": "13.3.0-beta.23",
   "description": "Lint Plugin for Nx",
   "repository": {
     "type": "git",
@@ -30,8 +30,9 @@
   "builders": "./executors.json",
   "schematics": "./generators.json",
   "dependencies": {
-    "@nrwl/devkit": "13.3.0-beta.2",
-    "@nrwl/jest": "13.3.0-beta.2",
+    "@phenomnomnominal/tsquery": "4.1.1",
+    "@nrwl/devkit": "13.3.0-beta.23",
+    "@nrwl/jest": "13.3.0-beta.23",
     "eslint": "8.2.0",
     "glob": "7.1.4",
     "minimatch": "3.0.4",

package/src/migrations/update-13-3-0/eslint-8-updates.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export default function eslint8Updates(tree: Tree): Promise<void>;

package/src/migrations/update-13-3-0/eslint-8-updates.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const jest_1 = require("@nrwl/jest");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+function eslint8Updates(tree) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        try {
+            const existingJestConfigPath = (0, devkit_1.normalizePath)('tools/eslint-rules/jest.config.js');
+            // Add extra config to the jest.config.js file to allow ESLint 8 exports mapping to work with jest
+            (0, jest_1.addPropertyToJestConfig)(tree, existingJestConfigPath, 'moduleNameMapper', {
+                '@eslint/eslintrc': '@eslint/eslintrc/dist/eslintrc-universal.cjs',
+            });
+            (0, devkit_1.visitNotIgnoredFiles)(tree, 'tools/eslint-rules', (path) => {
+                if (!path.endsWith('.ts')) {
+                    return;
+                }
+                const fileContents = tree.read(path).toString('utf-8');
+                const fileAst = tsquery_1.tsquery.ast(fileContents);
+                const isESLintRuleFile = (0, tsquery_1.tsquery)(fileAst, 'PropertyAccessExpression[expression.escapedText=ESLintUtils][name.escapedText=RuleCreator]').length > 0;
+                if (!isESLintRuleFile) {
+                    return;
+                }
+                const categoryPropertyAssignmentNode = (0, tsquery_1.tsquery)(fileAst, 'PropertyAssignment[name.escapedText=meta] PropertyAssignment[name.escapedText=docs]  PropertyAssignment[name.escapedText=category]')[0];
+                if (!categoryPropertyAssignmentNode) {
+                    return;
+                }
+                let end = categoryPropertyAssignmentNode.getEnd();
+                if (fileContents.substring(end, end + 1) === ',') {
+                    end++;
+                }
+                const updatedContents = fileContents.slice(0, categoryPropertyAssignmentNode.getFullStart()) +
+                    fileContents.slice(end);
+                tree.write(path, updatedContents);
+            });
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+        catch (_a) { }
+    });
+}
+exports.default = eslint8Updates;
+//# sourceMappingURL=eslint-8-updates.js.map

package/src/migrations/update-13-3-0/eslint-8-updates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eslint-8-updates.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-13-3-0/eslint-8-updates.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,qCAAqD;AACrD,uDAAoD;AAEpD,SAA8B,cAAc,CAAC,IAAU;;QACrD,IAAI;YACF,MAAM,sBAAsB,GAAG,IAAA,sBAAa,EAC1C,mCAAmC,CACpC,CAAC;YAEF,kGAAkG;YAClG,IAAA,8BAAuB,EAAC,IAAI,EAAE,sBAAsB,EAAE,kBAAkB,EAAE;gBACxE,kBAAkB,EAAE,8CAA8C;aACnE,CAAC,CAAC;YAEH,IAAA,6BAAoB,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBACzB,OAAO;iBACR;gBACD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACvD,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC1C,MAAM,gBAAgB,GACpB,IAAA,iBAAO,EACL,OAAO,EACP,4FAA4F,CAC7F,CAAC,MAAM,GAAG,CAAC,CAAC;gBACf,IAAI,CAAC,gBAAgB,EAAE;oBACrB,OAAO;iBACR;gBACD,MAAM,8BAA8B,GAAG,IAAA,iBAAO,EAC5C,OAAO,EACP,oIAAoI,CACrI,CAAC,CAAC,CAAC,CAAC;gBACL,IAAI,CAAC,8BAA8B,EAAE;oBACnC,OAAO;iBACR;gBACD,IAAI,GAAG,GAAG,8BAA8B,CAAC,MAAM,EAAE,CAAC;gBAClD,IAAI,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;oBAChD,GAAG,EAAE,CAAC;iBACP;gBACD,MAAM,eAAe,GACnB,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,8BAA8B,CAAC,YAAY,EAAE,CAAC;oBACpE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAAC,WAAM,GAAE;IACZ,CAAC;CAAA;AA5CD,iCA4CC"}

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.3.0-beta.2';
+exports.nxVersion = '13.3.0-beta.23';
 exports.tslintVersion = '~6.1.0';
 exports.tslintToEslintConfigVersion = '^2.4.0';
 exports.buildAngularVersion = '~13.0.0';