@nrwl/linter 14.5.0-beta.0 → 14.5.0-beta.3

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [14.5.0-beta.0](https://github.com/nrwl/nx/compare/14.4.2...14.5.0-beta.0) (2022-07-11)
+# [14.5.0-beta.3](https://github.com/nrwl/nx/compare/14.4.2...14.5.0-beta.3) (2022-07-21)
 
 **Note:** Version bump only for package @nrwl/linter

package/migrations.json

@@ -76,6 +76,18 @@
       "version": "14.2.3-beta.0",
       "description": "Adds @swc/core and @swc-node as a dev dep if you are using them (repeated due to prior mistake)",
       "factory": "./src/migrations/update-14-1-9/add-swc-deps-if-needed"
+    },
+    "experimental-to-utils-deps": {
+      "cli": "nx",
+      "version": "14.4.4",
+      "description": "Adds @typescript-eslint/utils as a dev dep",
+      "factory": "./src/migrations/update-14-4-4/experimental-to-utils-deps"
+    },
+    "experimental-to-utils-rules": {
+      "cli": "nx",
+      "version": "14.4.4",
+      "description": "Switch from  @typescript-eslint/experimental-utils to @typescript-eslint/utils in all rules and rules.spec files",
+      "factory": "./src/migrations/update-14-4-4/experimental-to-utils-rules"
     }
   },
   "packageJsonUpdates": {
@@ -245,6 +257,14 @@
           "version": "^5.29.0"
         }
       }
+    },
+    "14.4.4": {
+      "version": "14.4.4",
+      "packages": {
+        "@typescript-eslint/utils": {
+          "version": "^5.29.0"
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/linter",
-  "version": "14.5.0-beta.0",
+  "version": "14.5.0-beta.3",
   "description": "The Linter plugin contains executors, generator, plugin and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
     "type": "git",
@@ -33,10 +33,10 @@
     "eslint": "^8.0.0"
   },
   "dependencies": {
-    "@nrwl/devkit": "14.5.0-beta.0",
-    "@nrwl/jest": "14.5.0-beta.0",
+    "@nrwl/devkit": "14.5.0-beta.3",
+    "@nrwl/jest": "14.5.0-beta.3",
     "@phenomnomnominal/tsquery": "4.1.1",
-    "nx": "14.5.0-beta.0",
+    "nx": "14.5.0-beta.3",
     "tmp": "~0.2.1",
     "tslib": "^2.3.0"
   },
@@ -45,5 +45,5 @@
       "optional": true
     }
   },
-  "gitHead": "438ea6cdfed60dc0f7f358e967650f004f2e7c42"
+  "gitHead": "8c7b76e8f1f42a33dfcbf7245664082cbc10f619"
 }

package/src/generators/workspace-rule/files/__name__.spec.ts__tmpl__

@@ -1,4 +1,4 @@
-import { TSESLint } from '@typescript-eslint/experimental-utils';
+import { TSESLint } from '@typescript-eslint/utils';
 import { rule, RULE_NAME } from './<%= name %>';
 
 const ruleTester = new TSESLint.RuleTester({

package/src/generators/workspace-rule/files/__name__.ts__tmpl__

@@ -14,7 +14,7 @@
  * https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin/src/rules
  */
 
-import { ESLintUtils } from '@typescript-eslint/experimental-utils';
+import { ESLintUtils } from '@typescript-eslint/utils';
 
 // NOTE: The rule will be available in ESLint configs as "@nrwl/nx/workspace/<%= name %>"
 export const RULE_NAME = '<%= name %>';

package/src/migrations/update-14-4-4/experimental-to-utils-deps.d.ts

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

package/src/migrations/update-14-4-4/experimental-to-utils-deps.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const workspace_rules_project_1 = require("../../generators/workspace-rules-project/workspace-rules-project");
+const versions_1 = require("../../utils/versions");
+function addTypescriptEslintUtilsIfNeeded(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+            let removed = false;
+            if (packageJson.devDependencies['@typescript-eslint/experimental-utils']) {
+                yield (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['@typescript-eslint/experimental-utils']);
+                removed = true;
+            }
+            if (packageJson.dependencies['@typescript-eslint/experimental-utils']) {
+                yield (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@typescript-eslint/experimental-utils'], []);
+                removed = true;
+            }
+            if (removed || tree.exists(workspace_rules_project_1.WORKSPACE_PLUGIN_DIR)) {
+                (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@typescript-eslint/utils': versions_1.typescriptESLintVersion });
+                yield (0, devkit_1.formatFiles)(tree);
+            }
+            return;
+        }
+        catch (_a) { }
+    });
+}
+exports.default = addTypescriptEslintUtilsIfNeeded;
+//# sourceMappingURL=experimental-to-utils-deps.js.map

package/src/migrations/update-14-4-4/experimental-to-utils-deps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"experimental-to-utils-deps.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-14-4-4/experimental-to-utils-deps.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,8GAAwG;AACxG,mDAA+D;AAE/D,SAA8B,gCAAgC,CAAC,IAAU;;QACvE,IAAI;YACF,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACnD,IAAI,OAAO,GAAG,KAAK,CAAC;YAEpB,IAAI,WAAW,CAAC,eAAe,CAAC,uCAAuC,CAAC,EAAE;gBACxE,MAAM,IAAA,0CAAiC,EACrC,IAAI,EACJ,EAAE,EACF,CAAC,uCAAuC,CAAC,CAC1C,CAAC;gBACF,OAAO,GAAG,IAAI,CAAC;aAChB;YAED,IAAI,WAAW,CAAC,YAAY,CAAC,uCAAuC,CAAC,EAAE;gBACrE,MAAM,IAAA,0CAAiC,EACrC,IAAI,EACJ,CAAC,uCAAuC,CAAC,EACzC,EAAE,CACH,CAAC;gBACF,OAAO,GAAG,IAAI,CAAC;aAChB;YAED,IAAI,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,8CAAoB,CAAC,EAAE;gBAChD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,EAAE,0BAA0B,EAAE,kCAAuB,EAAE,CACxD,CAAC;gBAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;aACzB;YACD,OAAO;SACR;QAAC,WAAM,GAAE;IACZ,CAAC;CAAA;AAlCD,mDAkCC"}

package/src/migrations/update-14-4-4/experimental-to-utils-rules.d.ts

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

package/src/migrations/update-14-4-4/experimental-to-utils-rules.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+function updateFile(fileAst, fileContents) {
+    const importStatement = (0, tsquery_1.tsquery)(fileAst, 'ImportDeclaration StringLiteral[value=@typescript-eslint/experimental-utils]');
+    if (importStatement.length === 0) {
+        return;
+    }
+    const contentSlices = fileContents.split('@typescript-eslint/experimental-utils');
+    let updatedFileContents = '';
+    for (let i = 0; i < contentSlices.length / 2; i++) {
+        updatedFileContents += `${contentSlices[i]}@typescript-eslint/utils`;
+    }
+    updatedFileContents += contentSlices[contentSlices.length - 1];
+    return updatedFileContents;
+}
+function experimentalToUtilsUpdate(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            (0, devkit_1.visitNotIgnoredFiles)(tree, 'tools/eslint-rules', (path) => {
+                if (path.endsWith('.ts')) {
+                    const fileContents = tree.read(path).toString('utf-8');
+                    const fileAst = tsquery_1.tsquery.ast(fileContents);
+                    const updatedContents = updateFile(fileAst, fileContents);
+                    if (updatedContents) {
+                        tree.write(path, updatedContents);
+                    }
+                }
+            });
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+        catch (_a) { }
+    });
+}
+exports.default = experimentalToUtilsUpdate;
+//# sourceMappingURL=experimental-to-utils-rules.js.map

package/src/migrations/update-14-4-4/experimental-to-utils-rules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"experimental-to-utils-rules.js","sourceRoot":"","sources":["../../../../../../packages/linter/src/migrations/update-14-4-4/experimental-to-utils-rules.ts"],"names":[],"mappings":";;;AAAA,yCAAuE;AACvE,uDAAoD;AAEpD,SAAS,UAAU,CAAC,OAAY,EAAE,YAAoB;IACpD,MAAM,eAAe,GAAU,IAAA,iBAAO,EACpC,OAAO,EACP,8EAA8E,CAC/E,CAAC;IACF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,OAAO;KACR;IACD,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CACtC,uCAAuC,CACxC,CAAC;IACF,IAAI,mBAAmB,GAAG,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACjD,mBAAmB,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,0BAA0B,CAAC;KACtE;IACD,mBAAmB,IAAI,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/D,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,SAA8B,yBAAyB,CAAC,IAAU;;QAChE,IAAI;YACF,IAAA,6BAAoB,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxD,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBACxB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBACvD,MAAM,OAAO,GAAG,iBAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;oBAE1C,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;oBAC1D,IAAI,eAAe,EAAE;wBACnB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;qBACnC;iBACF;YACH,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAAC,WAAM,GAAE;IACZ,CAAC;CAAA;AAhBD,4CAgBC"}