@nx/eslint-plugin 20.0.0-beta.5 → 20.0.0-beta.7

package/migrations.json

@@ -1,11 +1,5 @@
 {
   "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/eslint-plugin-nx with @nx/eslint-plugin",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
     "update-17-2-6-rename-workspace-rules": {
       "cli": "nx",
       "version": "17.2.6-beta.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "20.0.0-beta.5",
+  "version": "20.0.0-beta.7",
   "private": false,
   "description": "The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
   "repository": {
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "@eslint/compat": "^1.1.1",
-    "@nx/devkit": "20.0.0-beta.5",
-    "@nx/js": "20.0.0-beta.5",
+    "@nx/devkit": "20.0.0-beta.7",
+    "@nx/js": "20.0.0-beta.7",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
     "chalk": "^4.1.0",

package/src/configs/javascript.d.ts

@@ -44,7 +44,7 @@ declare const _default: {
          * previously defined v5 of `@typescript-eslint`. v6 of `@typescript-eslint`
          * changed how configurations are defined.
          *
-         * TODO(v20): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
+         * TODO(eslint): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
          */
         '@typescript-eslint/no-non-null-assertion': string;
         '@typescript-eslint/adjacent-overload-signatures': string;
@@ -59,7 +59,7 @@ declare const _default: {
          * During the migration to use ESLint v9 and typescript-eslint v8 for new workspaces,
          * this rule would have created a lot of noise, so we are disabling it by default for now.
          *
-         * TODO(v20): we should make this part of what we re-evaluate in v20
+         * TODO(eslint): we should make this part of what we re-evaluate in v20
          */
         '@typescript-eslint/no-require-imports': string;
     };

package/src/configs/javascript.js

@@ -53,7 +53,7 @@ exports.default = {
          * previously defined v5 of `@typescript-eslint`. v6 of `@typescript-eslint`
          * changed how configurations are defined.
          *
-         * TODO(v20): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
+         * TODO(eslint): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
          */
         '@typescript-eslint/no-non-null-assertion': 'warn',
         '@typescript-eslint/adjacent-overload-signatures': 'error',
@@ -68,7 +68,7 @@ exports.default = {
          * During the migration to use ESLint v9 and typescript-eslint v8 for new workspaces,
          * this rule would have created a lot of noise, so we are disabling it by default for now.
          *
-         * TODO(v20): we should make this part of what we re-evaluate in v20
+         * TODO(eslint): we should make this part of what we re-evaluate in v20
          */
         '@typescript-eslint/no-require-imports': 'off',
     },

package/src/configs/typescript.d.ts

@@ -26,7 +26,7 @@ declare const _default: {
          * previously defined v5 of `@typescript-eslint`. v6 of `@typescript-eslint`
          * changed how configurations are defined.
          *
-         * TODO(v20): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
+         * TODO(eslint): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
          */
         '@typescript-eslint/no-non-null-assertion': string;
         '@typescript-eslint/adjacent-overload-signatures': string;
@@ -41,7 +41,7 @@ declare const _default: {
          * During the migration to use ESLint v9 and typescript-eslint v8 for new workspaces,
          * this rule would have created a lot of noise, so we are disabling it by default for now.
          *
-         * TODO(v20): we should make this part of what we re-evaluate in v20
+         * TODO(eslint): we should make this part of what we re-evaluate in v20
          */
         '@typescript-eslint/no-require-imports': string;
     };

package/src/configs/typescript.js

@@ -36,7 +36,7 @@ exports.default = {
          * previously defined v5 of `@typescript-eslint`. v6 of `@typescript-eslint`
          * changed how configurations are defined.
          *
-         * TODO(v20): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
+         * TODO(eslint): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
          */
         '@typescript-eslint/no-non-null-assertion': 'warn',
         '@typescript-eslint/adjacent-overload-signatures': 'error',
@@ -51,7 +51,7 @@ exports.default = {
          * During the migration to use ESLint v9 and typescript-eslint v8 for new workspaces,
          * this rule would have created a lot of noise, so we are disabling it by default for now.
          *
-         * TODO(v20): we should make this part of what we re-evaluate in v20
+         * TODO(eslint): we should make this part of what we re-evaluate in v20
          */
         '@typescript-eslint/no-require-imports': 'off',
     },

package/src/flat-configs/javascript.js

@@ -53,7 +53,7 @@ exports.default = typescript_eslint_1.default.config(js_1.default.configs.recomm
          * previously defined v5 of `@typescript-eslint`. v6 of `@typescript-eslint`
          * changed how configurations are defined.
          *
-         * TODO(v20): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
+         * TODO(eslint): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
          */
         '@typescript-eslint/no-non-null-assertion': 'warn',
         '@typescript-eslint/adjacent-overload-signatures': 'error',
@@ -68,7 +68,7 @@ exports.default = typescript_eslint_1.default.config(js_1.default.configs.recomm
          * During the migration to use ESLint v9 and typescript-eslint v8 for new workspaces,
          * this rule would have created a lot of noise, so we are disabling it by default for now.
          *
-         * TODO(v20): we should make this part of what we re-evaluate in v20
+         * TODO(eslint): we should make this part of what we re-evaluate in v20
          */
         '@typescript-eslint/no-require-imports': 'off',
     },

package/src/flat-configs/typescript.js

@@ -37,7 +37,7 @@ exports.default = typescript_eslint_1.default.config(js_1.default.configs.recomm
          * previously defined v5 of `@typescript-eslint`. v6 of `@typescript-eslint`
          * changed how configurations are defined.
          *
-         * TODO(v20): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
+         * TODO(eslint): re-evalute these deviations from @typescript-eslint/recommended in v20 of Nx
          */
         '@typescript-eslint/no-non-null-assertion': 'warn',
         '@typescript-eslint/adjacent-overload-signatures': 'error',
@@ -52,7 +52,7 @@ exports.default = typescript_eslint_1.default.config(js_1.default.configs.recomm
          * During the migration to use ESLint v9 and typescript-eslint v8 for new workspaces,
          * this rule would have created a lot of noise, so we are disabling it by default for now.
          *
-         * TODO(v20): we should make this part of what we re-evaluate in v20
+         * TODO(eslint): we should make this part of what we re-evaluate in v20
          */
         '@typescript-eslint/no-require-imports': 'off',
     },

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

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

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-const path_1 = require("path");
-const binary_extensions_1 = require("@nx/devkit/src/utils/binary-extensions");
-const eslintFileNames = [
-    '.eslintrc',
-    '.eslintrc.js',
-    '.eslintrc.cjs',
-    '.eslintrc.yaml',
-    '.eslintrc.yml',
-    '.eslintrc.json',
-    'eslint.config.js', // new format that requires `ESLINT_USE_FLAT_CONFIG=true`
-];
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/eslint-plugin-nx', '@nx/eslint-plugin');
-    /**
-     * Matches:
-     * * // eslint-disable-next-line @nrwl/nx/...
-     * * // eslint-disable-line @nrwl/nx/...
-     * * /* eslint-disable @nrwl/nx/...
-     */
-    const ignoreLineRegex = /(eslint-disable(?:(?:-next)?-line)?\s*)@nrwl\/nx/g;
-    (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (path) => {
-        if ((0, binary_extensions_1.isBinaryPath)(path)) {
-            return;
-        }
-        let contents = tree.read(path).toString();
-        if (eslintFileNames.includes((0, path_1.basename)(path))) {
-            if (!contents.includes('@nrwl/nx')) {
-                return;
-            }
-            contents = contents.replace(new RegExp('@nrwl/nx', 'g'), '@nx');
-        }
-        if (ignoreLineRegex.test(contents)) {
-            contents = contents.replace(ignoreLineRegex, '$1@nx');
-        }
-        tree.write(path, contents);
-    });
-    await (0, devkit_1.formatFiles)(tree);
-}