eslint-config-beslogic 2.1.0 → 2.2.1

package/CHANGELOG.md

@@ -1,6 +1,59 @@
 # Changelog
 
-## Unreleased
+## 2.2.1
+
+- Bumped `eslint-plugin-react` to `^7.33`
+  - Check context objects with `react/display-name`
+  - Added React 18 deprecations
+- Remove accidental recommendation to install `eslint-plugn-react-redux` from non-redux presets in `README.md`
+- Now enforce at least 1 newline after imports even with dprint preset.
+- Turn on `allowImplicit`, `checkForEach`, and `allowVoid` for rule `array-callback-return`
+- Bumped `eslint-plugin-total-functions` to `>=6.0`
+  - which bumps `typescript` dependency to `4.7.3`
+- Bumped `eslint-plugin-testing-library` to `^6.0` which enables a lot more rules by default
+- Bumped `eslint-plugin-unicorn` to `>=49.0`
+  - Re-enabled `prefer-event-target` in Angular preset
+  - Disabled deprecated `unicorn/no-unsafe-regex`
+  - Start checking arguments again for `unicorn/no-useless-undefined`
+    now that it can also autofix `undefined` defaults to optional parameters
+- Re-enabled `unicorn/no-nested-ternary`, which allows a single nested level if parenthesised
+- Bumped `eslint-plugin-sonarjs` to `^1.0`
+  - Updated vulnerable dependencies
+  - They updated their license
+- Bumped `eslint-plugin-simple-import-sort` to `>=12.0`
+- Bumped `eslint-plugin-regexp` to `^2.0`
+  - Reduced dependencies
+  - Removal of deprecated rules: <https://github.com/ota-meshi/eslint-plugin-regexp#removed>
+- Bumped `eslint-plugin-jest` to `^28.0.0`
+  - `jest/no-if` has been replaced by `jest/no-conditional-in-test`
+  - `jest/prefer-importing-jest-globals` is enabled by default, which removes needing a dependency
+    on often outdated `@types/jest` and removes the need for `types: ["jest"]` in `tsconfig.json`
+- Bumped `dprint` to `^0.40.2` to prepare for process plugins
+
+- Bumped `@typescript-eslint/eslint-plugin` to `^7.4`
+  - Re-enabled `@typescript-eslint/no-import-type-side-effects`
+    and set `@typescript-eslint/consistent-type-imports` back to default options
+  - Bumped `eslint` to `^8.56`
+  - which bumps `typescript` dependency to `4.7.5`
+- Prefered `@typescript-eslint/prefer-destructuring` over `autofix/prefer-destructuring`
+- Disabled `@typescript-eslint/key-spacing`, `autofix/func-call-spacing`,
+  and `lines-around-comment` in `dprint` preset
+
+- Patched-out prettier from nx generators
+- Used Search&Replace based package patching:
+  - Removes `patch-package` from dependencies
+  - Removes bundled git patches
+- Speedup check for `eslint-plugin-total-functions` install
+
+- Bumped `eslint-plugin-n` to `>=16.2`. Notably, this:
+  - improves support for ts-node
+  - Updates documentation links
+  - Sets Node 16 as the minimal default w/o having to configure `engines` in `package.json`
+  - Allow for automatic ts mapping detection
+- Re-enabled `n/no-unpublished-*` rules by default as it's now based on package being public/private
+- Set `ignoreTypeImport: true` by default for `n/no-unpublished-import`
+
+## 2.1.0
 
 - Bumped the following minimum versions:
   - `@angular-eslint/eslint-plugin@>=16.2`
@@ -12,7 +65,7 @@
   - Assuming `node>=16`, `typescript>=4.5` and `@angular/compiler>=16.2.5`
   - This should speedup config parsing that had to check for specific versions
 - Made `eslint-plugin-total-functions` optional due to its extra-strictness and it had to be
-  explicitly specified anyway due to version resolution issues.
+  explicitly specified anyway due to version resolution issues
 - Added link to changelog in README
 - Improved detection of installed peer dependencies' version number to be more accurate and faster
 
@@ -26,7 +79,7 @@
 
 ## 2.0.0
 
-- Created CHANGELOG.md
+- Created `CHANGELOG.md`
 - Changed the maximum line length from `120` to `100`
 - Split language-specific `editor.defaultFormatter` to work around
   <https://github.com/microsoft/vscode/issues/168411>

package/README.md

@@ -45,7 +45,7 @@ Extend the following in your base `tsconfig.json` (follow link for more details)
 "extends": "eslint-config-beslogic/tsconfig.4.3.json",
 ```
 
-"No Unchecked Indexed Access" makes index accesses even stricter. You may not want it in your project. You can disable it with `"compilerOptions": { "noUncheckedIndexedAccess": false }`.
+"No Unchecked Indexed Access" makes index accesses even stricter. You may not want it in your project or in your tests. You can disable it with `"compilerOptions": { "noUncheckedIndexedAccess": false }`.
 
 If deploying / bundling with an Angular npm package, also set `angularCompilerOptions": { "strictMetadataEmit": true }`
 
@@ -141,7 +141,7 @@ Configurations for React projects. Comes with `JSX` support.
 Add the following `devDependencies` to your `package.json`:
 
 ```shell
-npm install --save-dev eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-react-redux eslint-plugin-react-prefer-function-component
+npm install --save-dev eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-react-prefer-function-component
 ```
 
 ### `beslogic/react-native`
@@ -151,7 +151,7 @@ Configurations for [React Native](https://reactnative.dev/) projects, including
 Add the following `devDependencies` to your `package.json`:
 
 ```shell
-npm install --save-dev eslint-plugin-react-native eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-react-redux eslint-plugin-react-prefer-function-component
+npm install --save-dev eslint-plugin-react-native eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-react-prefer-function-component
 ```
 
 ### `beslogic/react-redux`
@@ -161,7 +161,7 @@ Configurations for React projects using the Redux bindings. Already extends `bes
 Add the following `devDependencies` to your `package.json`:
 
 ```shell
-npm install --save-dev eslint-plugin-react-redux eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-react-redux eslint-plugin-react-prefer-function-component
+npm install --save-dev eslint-plugin-react-redux eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-react-prefer-function-component
 ```
 
 ### `beslogic/mui`
@@ -171,7 +171,7 @@ npm install --save-dev eslint-plugin-react-redux eslint-plugin-jsx-a11y eslint-p
 Add the following `devDependencies` to your `package.json`:
 
 ```shell
-npm install --save-dev eslint-plugin-mui eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-react-redux eslint-plugin-react-prefer-function-component
+npm install --save-dev eslint-plugin-mui eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-react-prefer-function-component
 ```
 
 ### `beslogic/angular`

package/angular.js

@@ -3,7 +3,8 @@
 
 const { getModuleVersion, jestNoRestrictedSyntax } = require("./lib/utils")
 
-const angularEslintPluginVersion = getModuleVersion("@angular-eslint/eslint-plugin", 16.2)
+const angularEslintVersion = getModuleVersion("@angular-eslint/eslint-plugin", 16.2)
+const typescriptVersion = getModuleVersion("typescript", 4.7)
 
 const javascriptConfig = require("./javascript")
 const typescriptConfig = require("./typescript")
@@ -17,6 +18,8 @@ const noRestrictedSyntax = [
     "message":
       "Angular hooks need to be functions defined on the prototype: https://github.com/angular/angular/issues/7270#issuecomment-201137617"
   },
+  // TODO: Possibly implement that ourselves?
+  // Upstream request: https://github.com/MelvinVermeer/eslint-plugin-no-relative-import-paths/issues/30
   {
     "selector": "ImportDeclaration[source.value=/\\.\\.\\u002F?$/]",
     "message": "Don't use imports that ends in \"..\" or \"../\""
@@ -90,7 +93,7 @@ module.exports = {
         ],
         // Autofix for this rule was broken: https://github.com/angular-eslint/angular-eslint/pull/1602
         // somewhat fixed in 16.1, but not proper: https://github.com/angular-eslint/angular-eslint/issues/1197
-        "@angular-eslint/template/attributes-order": angularEslintPluginVersion >= 17.1
+        "@angular-eslint/template/attributes-order": angularEslintVersion >= 17.1
           ? "error"
           : "off",
         // and it was added in 14.2.0. Not enforcing it for now allows a wider range of versions.
@@ -178,7 +181,7 @@ module.exports = {
         // https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/README.md#parseroptionscreatedefaultprogram
         "deprecated__createDefaultProgram": true,
         // Needed specifically for @typescript-eslint/consistent-type-imports
-        "emitDecoratorMetadata": true
+        "emitDecoratorMetadata": typescriptVersion >= 5
       },
       "rules": {
         /*
@@ -277,27 +280,6 @@ module.exports = {
         "@typescript-eslint/no-invalid-this": "off",
         // Redundant with Angular's dependecy injection
         "@typescript-eslint/parameter-properties": "off",
-
-        /*
-         * These two configs are meant to work around the following issue wit Decorators:
-         * https://github.com/typescript-eslint/typescript-eslint/issues/5468#issuecomment-1906180432
-         * Once the following PR is merged, we can check for that specific @typescript-eslint version
-         * to only apply the workaround before it.
-         * https://github.com/typescript-eslint/typescript-eslint/pull/8335
-         */
-        // This only relates to TypeScript 5.0's --verbatimModuleSyntax,
-        // by not enforcing this rule yet, we are not loosing much compared to what we had before.
-        // We have to disable it for the "fixStyle: 'inline-type-imports'" workaround to be allowed at all time
-        "@typescript-eslint/no-import-type-side-effects": "off",
-        "@typescript-eslint/consistent-type-imports": [
-          "error",
-          {
-            // Sets the autofix to use `import { type A } from '...'` which works around the above mentionned issue
-            // This only affects autofixing to help devs not aware of this edge case, both styles are always allowed.
-            "fixStyle": "inline-type-imports"
-          }
-        ],
-
         "unicorn/no-keyword-prefix": [
           "error",
           {
@@ -308,8 +290,6 @@ module.exports = {
             ]
           }
         ],
-        // False positives with Angular's EventEmitter: https://github.com/sindresorhus/eslint-plugin-unicorn/issues/1853
-        "unicorn/prefer-event-target": "off",
         // Angular is ESM
         "unicorn/prefer-module": "error",
         // This is not supported in Angular's Vite builder https://github.com/angular/angular-cli/issues/26507

package/dprint.js

@@ -177,11 +177,13 @@ module.exports = {
         "computed-property-spacing": "off",
         "autofix/computed-property-spacing": "off",
         "func-call-spacing": "off",
+        "autofix/func-call-spacing": "off",
         "@typescript-eslint/func-call-spacing": "off",
         "generator-star-spacing": "off",
         "autofix/generator-star-spacing": "off",
         "key-spacing": "off",
         "autofix/key-spacing": "off",
+        "@typescript-eslint/key-spacing": "off",
         "keyword-spacing": "off",
         "autofix/keyword-spacing": "off",
         "@typescript-eslint/keyword-spacing": "off",
@@ -224,8 +226,9 @@ module.exports = {
         /*
          * Unconfigurable or unknown linked configuration
          */
-        "@typescript-eslint/lines-around-comment": "off",
+        "lines-around-comment": "off",
         "autofix/lines-around-comment": "off",
+        "@typescript-eslint/lines-around-comment": "off",
         "no-extra-parens": "off",
         "autofix/no-extra-parens": "off",
         "@typescript-eslint/no-extra-parens": "off",
@@ -236,8 +239,7 @@ module.exports = {
         "new-parens": "off",
         "autofix/new-parens": "off",
         "no-floating-decimal": "off",
-        "autofix/no-floating-decimal": "off",
-        "import/newline-after-import": "off"
+        "autofix/no-floating-decimal": "off"
       }
     }
   ]

package/javascript.js

@@ -69,7 +69,7 @@ module.exports = {
   ],
   "extends": [
     "eslint:recommended",
-    "plugin:sonarjs/recommended",
+    "plugin:sonarjs/recommended-legacy",
     "plugin:unicorn/all",
     "plugin:regexp/all",
     "plugin:import/recommended",
@@ -90,6 +90,7 @@ module.exports = {
   "ignorePatterns": ["node_modules/"],
   // Useful when using experimental features and code transpiled by Babel
   "parser": "@babel/eslint-parser",
+  "reportUnusedDisableDirectives": true,
   "overrides": [
     {
       "files": [
@@ -430,9 +431,18 @@ module.exports = {
       { "considerQueryString": true }
     ],
     "import/no-empty-named-blocks": "error",
+    // exactCount has issues with require, at least that's taken care of by dprint:
+    // https://github.com/import-js/eslint-plugin-import/issues/2905
+    // With https://github.com/dprint/dprint-plugin-typescript/issues/394 we could disable this
+    // rule entirely in dprint preset.
     "import/newline-after-import": [
       "error",
-      { "considerComments": true }
+      {
+        /* eslint-disable-next-line etc/no-commented-out-code
+        -- see above comment, bump minimal eslint-plugin-import when this is fixed and enforced */
+        // "exactCount": false,
+        "considerComments": true
+      }
     ],
     "import/no-named-as-default": "error",
     "import/no-named-as-default-member": "error",
@@ -469,6 +479,9 @@ module.exports = {
         "case": "camelCase"
       }
     ],
+    // Only works on 3 node imports by default, and can't configure a default for all imports.
+    // Leave it up to the programmer.
+    "unicorn/import-style": "off",
     "unicorn/no-array-reduce": [
       "error",
       {
@@ -486,16 +499,10 @@ module.exports = {
         ]
       }
     ],
-    "unicorn/no-nested-ternary": "off",
     "unicorn/no-null": "off",
-    // Not as bad in frontend environment
-    "unicorn/no-unsafe-regex": "warn",
-    "unicorn/no-useless-undefined": [
-      "error",
-      {
-        "checkArguments": false
-      }
-    ],
+    // This rule has been deprecated in favor of eslint-plugin-regexp
+    "unicorn/no-unsafe-regex": "off",
+    "unicorn/no-useless-undefined": "error",
     "unicorn/numeric-separators-style": "error",
     "unicorn/prefer-add-event-listener": "error",
     "unicorn/prefer-array-find": [
@@ -569,18 +576,18 @@ module.exports = {
       {
         "groups": [
           // Side effect imports.
-          ["^\\u0000"],
+          [String.raw`^\u0000`],
           // Node.js builtins prefixed with `node:`.
           ["^node:"],
           // Packages.
           // Things that start with a letter (or digit or underscore), or `@` followed by a letter.
-          ["^@?\\w"],
+          [String.raw`^@?\w`],
           // Absolute imports and other imports such as Vue-style `@/foo`.
           // Anything not matched in another group.
           ["^"],
           // Relative imports.
           // Anything that starts with a dot or src/
-          ["^(\\.|src/)"]
+          [String.raw`^(\.|src/)`]
         ]
       }
     ],
@@ -623,6 +630,8 @@ module.exports = {
     ],
     // I don't think this is that much more readable imo. Especially for regexp beginners
     "regexp/prefer-named-capture-group": "off",
+    // TODO: Re-enable once VSCode has syntax highlighting for the v flag
+    "regexp/require-unicode-sets-regexp": "off",
     // Obsoleted by eslint-plugin-regexp
     "no-invalid-regexp": "off",
     "prefer-named-capture-group": "off",
@@ -633,7 +642,10 @@ module.exports = {
      * Excludes rules taken care of by eslint-plugin-autofix
      */
     "accessor-pairs": "error",
-    "array-callback-return": "error",
+    "array-callback-return": [
+      "error",
+      { "allowImplicit": true, "checkForEach": true, "allowVoid": true }
+    ],
     "block-scoped-var": "error",
     "camelcase": "error",
     "class-methods-use-this": "error",
@@ -828,7 +840,8 @@ module.exports = {
         ],
         "patterns": [
           {
-            // no-realtive-import paths doesn't catch ./..
+            // no-relative-import paths doesn't catch ./..
+            // TODO: Consider fixing ourselves
             // https://github.com/MelvinVermeer/eslint-plugin-no-relative-import-paths/issues/30
             "group": ["./../"],
             "message": "Relative parent imports are not allowed."

package/jest.js

@@ -1,5 +1,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright 2024 Beslogic Inc.
+const { getModuleVersion } = require("./lib/utils")
+
+const jestGlobalsVersion = getModuleVersion("@jest/globals", 29)
 
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
@@ -67,6 +70,12 @@ module.exports = {
         "onlyFunctionsWithExpectInLoop": true
       }
     ],
+    // https://github.com/jestjs/jest/issues/15084
+    // Since this will require a major jest version bump anyway,
+    // I feel confortable not waiting for our own major version bump to add this
+    ...(jestGlobalsVersion < 30
+      ? { "jest/prefer-importing-jest-globals": "off" }
+      : {}),
     // Top-level describe is often used for component name, which is capitalized
     "jest/prefer-lowercase-title": [
       "error",

package/json-like.js

@@ -29,6 +29,7 @@ module.exports = {
       "error",
       "double"
     ],
-    "autofix/quote-props": "error"
+    "autofix/quote-props": "error",
+    "unicorn/prefer-string-raw": "off"
   }
 }

package/lib/patch-dependencies.js

@@ -0,0 +1,165 @@
+const { readFileSync, writeFileSync } = require("node:fs")
+const { join, dirname } = require("node:path")
+const { resolveModuleLocation } = require("./utils")
+
+// ANSI color chart: https://en.m.wikipedia.org/wiki/ANSI_escape_code#Colors
+
+const searchAndReplace = async (
+  /** @type {string} */ file,
+  /** @type {{from: string | RegExp, to: string}[]} */ replacements
+) => {
+  try {
+    /* eslint-disable n/no-sync -- We're a script running in async methods */
+    let data = readFileSync(file, "utf8")
+    for (const replacement of replacements) {
+      data = data.replaceAll(replacement.from, replacement.to)
+    }
+    writeFileSync(file, data, "utf8")
+    /* eslint-enable n/no-sync */
+  } catch (error) {
+    console.error(
+      "\n\u001B[31m" +
+        `The following error happenned while patching ${file} with eslint-config-beslogic. ` +
+        "Please contact samuel.therrien@beslogic.com with the package version and the full error to get it fixed." +
+        "\u001B[0m"
+    )
+    throw error
+  }
+}
+
+const getPackageBase = (/** @type {string} */ packageName) => {
+  const location = resolveModuleLocation(`${packageName}/package.json`)
+  if (!location) {
+    console.info(
+      `\n\u001B[32m${packageName} not found in node_modules, no need to patch.\u001B[0m`
+    )
+
+    return
+  }
+
+  return dirname(location)
+}
+
+const patches = [
+  async () => {
+    const packageName = "@angular/material"
+    const base = getPackageBase(packageName)
+    if (!base) return
+    await searchAndReplace(
+      join(base, "dialog", "index.d.ts"),
+      [
+        {
+          "from": "MatDialogRef<T, R = any>",
+          "to": "MatDialogRef<T, R = void>"
+        }
+      ]
+    )
+
+    return packageName
+  },
+
+  async () => {
+    const packageName = "@nx/angular"
+    const base = getPackageBase(packageName)
+    if (!base) return
+    await Promise.all([
+      searchAndReplace(
+        join(base, "src", "generators", "add-linting", "lib", "create-eslint-configuration.js"),
+        [
+          // Remove code that adds preset extensions
+          {
+            "from": "plugin:@nx/angular",
+            "to": ""
+          },
+          {
+            "from": "plugin:@angular-eslint/template/process-inline-templates",
+            "to": ""
+          },
+          {
+            "from": "plugin:@nx/angular-template",
+            "to": ""
+          },
+          // Remove empty extends
+          {
+            "from": /extends: \[\s*\],?/gu,
+            "to": ""
+          }
+        ]
+      ),
+      // Patch out prettier
+      searchAndReplace(
+        join(base, "src", "generators", "ng-add", "utilities", "workspace.js"),
+        [
+          {
+            "from": "!packageJson.devDependencies['prettier']",
+            "to": "false"
+          },
+          {
+            "from": "esbenp.prettier-vscode",
+            "to": ""
+          }
+        ]
+      )
+    ])
+
+    return packageName
+  },
+  async () => {
+    const packageName = "@nx/eslint"
+    const base = getPackageBase(packageName)
+    if (!base) return
+    // Patch out prettier
+    await searchAndReplace(
+      join(base, "src", "generators", "lint-project", "setup-root-eslint.js"),
+      [
+        {
+          "from": /'eslint-config-prettier':.+?,/gu,
+          "to": ""
+        }
+      ]
+    )
+
+    return packageName
+  },
+  async () => {
+    const packageName = "@nx/js"
+    const base = getPackageBase(packageName)
+    if (!base) return
+    // Patch out prettier
+    await searchAndReplace(
+      join(base, "src", "generators", "init", "init.js"),
+      [
+        {
+          "from": /prettier:.+?,/gu,
+          "to": ""
+        },
+        {
+          "from": "if (prettierrcNameOptions",
+          "to": "if (false && prettierrcNameOptions"
+        },
+        {
+          "from": "!tree.exists(`.prettierignore`)",
+          "to": "false"
+        },
+        {
+          "from": "!json.recommendations.includes(extension)",
+          "to": "false"
+        },
+        {
+          "from": "devkit_1.ensurePackage)('prettier'",
+          "to": "//"
+        }
+      ]
+    )
+
+    return packageName
+  }
+].map(patch =>
+  patch().then(packageName =>
+    packageName && console.info(
+      `\n\u001B[32m${packageName} patched successfully! Now go write great code!\u001B[0m`
+    )
+  )
+)
+
+Promise.all(patches)

package/lib/utils.js

@@ -6,12 +6,25 @@ const getModuleVersion = (
     // eslint-disable-next-line n/global-require -- Dynamic loading
     return Number.parseFloat(require(`${nodeModule}/package.json`).version)
   } catch (error) {
-    console.warn(error)
+    if (
+      !(error instanceof Error &&
+        error.message.startsWith(`Cannot find module '${nodeModule}/package.json'`))
+    ) {
+      console.warn(error)
+    }
 
     return fallbackVersion
   }
 }
 
+const resolveModuleLocation = (/** @type {string} */ nodeModule) => {
+  try {
+    return require.resolve(nodeModule)
+  } catch {
+    return false
+  }
+}
+
 const jestNoRestrictedSyntax = (
   /** @type {(string | number | { selector: string; })[]} */ noRestrictedSyntax
 ) =>
@@ -25,5 +38,6 @@ const jestNoRestrictedSyntax = (
 
 module.exports = {
   getModuleVersion,
-  jestNoRestrictedSyntax
+  jestNoRestrictedSyntax,
+  resolveModuleLocation
 }

package/node-js.js

@@ -32,20 +32,22 @@ module.exports = {
   },
   "rules": {
     // Node settings (https://github.com/eslint-community/eslint-plugin-n#readme)
-    "n/handle-callback-err": "error",
-    "n/no-callback-literal": "error",
-    "n/no-new-require": "error",
-    "n/no-path-concat": "error",
-    "n/no-process-exit": "error",
     "n/callback-return": "error",
     "n/exports-style": "error",
+    "n/global-require": "error",
+    "n/handle-callback-err": "error",
+    "n/no-callback-literal": "error",
     "n/no-extraneous-import": [
       "error",
       {
         "allowModules": ["ws"]
       }
     ],
-    "n/global-require": "error",
+    "n/no-new-require": "error",
+    "n/no-path-concat": "error",
+    "n/no-process-exit": "error",
+    // Doesn't really work
+    "n/no-missing-import": "off",
     "n/no-mixed-requires": "error",
     "n/no-restricted-import": "error",
     "n/no-restricted-require": "error",
@@ -53,6 +55,12 @@ module.exports = {
       "error",
       { "allowAtRootLevel": true }
     ],
+    "n/no-unpublished-import": [
+      "error",
+      {
+        "ignoreTypeImport": true
+      }
+    ],
     "n/prefer-global/buffer": "error",
     "n/prefer-global/console": "error",
     "n/prefer-global/process": "error",
@@ -60,21 +68,18 @@ module.exports = {
     "n/prefer-global/text-encoder": "error",
     "n/prefer-global/url-search-params": "error",
     "n/prefer-global/url": "error",
+    // Only available in eslint-plugin-n@17
+    // No need to support as long as unicorn/prefer-node-protocol isn't deprecated
+    // "n/prefer-node-protocol": "error",
     "n/prefer-promises/dns": "error",
     "n/prefer-promises/fs": "error",
-    // Doesn't really work
-    "n/no-missing-import": "off",
-    // no-unpublished-* only matters for published packages
-    "n/no-unpublished-import": "off",
-    "n/no-unpublished-require": "off",
+
     // Is CommonJS, not ESM
     "unicorn/prefer-module": "off",
     "unicorn/prevent-abbreviations": [
       "error",
       preventAbbreviationsConfig
     ],
-    // Actually important in backend apps
-    "unicorn/no-unsafe-regex": "error",
     // Use some logging instead
     "no-console": "error",
     "no-restricted-globals": [

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "eslint-config-beslogic",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "ESLint rules, plugins and configs used at Beslogic",
   "main": "index.js",
+  "// dependencies": "Run for ourselves when we install dependencies w/o running npm i afterward",
   "scripts": {
     "eslint": "eslint ./ --ignore-path .gitignore",
     "lint": "node ./node_modules/dprint/bin check && npm run eslint",
     "lint:fix": "node ./node_modules/dprint/bin fmt && npm run eslint -- --fix",
     "upgrade": "npx npm-check-updates -u & npm i",
     "yalc": "yalc publish",
-    "postinstall": "node ./lib/apply-patches.js",
-    "dependencies": "node ./lib/apply-patches.js"
+    "postinstall": "node ./lib/patch-dependencies.js",
+    "dependencies": "node ./lib/patch-dependencies.js"
   },
   "keywords": [
     "eslint",
@@ -40,27 +41,26 @@
   "dependencies": {
     "@babel/eslint-parser": "^7.20.12",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.1",
-    "@typescript-eslint/eslint-plugin": "^6.2",
+    "@typescript-eslint/eslint-plugin": "^7.4",
     "confusing-browser-globals": "^1.0",
-    "dprint": "^0.39.1",
-    "eslint": "^8.28",
-    "eslint-import-resolver-typescript": "^3.1",
+    "dprint": "^0.40.2",
+    "eslint": "^8.56",
+    "eslint-import-resolver-typescript": "^3.2.6",
     "eslint-plugin-angular-file-naming": "^1.0.6",
-    "eslint-plugin-autofix": "^1.1.0",
+    "eslint-plugin-autofix": "^1.1 || ^2.0",
     "eslint-plugin-etc": "^2.0",
     "eslint-plugin-extra-rules": "^0.0.0-development",
     "eslint-plugin-import": "^2.27.3",
-    "eslint-plugin-jest": "^27.2.3",
+    "eslint-plugin-jest": "^28.0",
     "eslint-plugin-jest-formatting": "^3.1",
-    "eslint-plugin-no-autofix": "^1.2",
+    "eslint-plugin-no-autofix": "^1.2 || ^2.0",
     "eslint-plugin-no-relative-import-paths": "^1.5.3",
     "eslint-plugin-prefer-arrow": "^1.2",
-    "eslint-plugin-regexp": "^1.12",
-    "eslint-plugin-simple-import-sort": ">=9.0",
-    "eslint-plugin-sonarjs": "^0.20",
-    "eslint-plugin-unicorn": "^46.0",
-    "eslint-plugin-unused-imports": "^3.0",
-    "patch-package": "^7.0.0"
+    "eslint-plugin-regexp": "^2.0",
+    "eslint-plugin-simple-import-sort": ">=12.0",
+    "eslint-plugin-sonarjs": "^1.0",
+    "eslint-plugin-unicorn": ">=49.0",
+    "eslint-plugin-unused-imports": "^3.0"
   },
   "// eslint-plugin-total-functions": "Supported version is dictated by TypeScript and ESLint",
   "// (cont)": "Also made optional because of extra strictness",
@@ -70,16 +70,16 @@
     "@angular-eslint/template-parser": ">=16.2",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-mui": "^0.1.1",
-    "eslint-plugin-n": ">=14.0",
-    "eslint-plugin-react": "^7.32.2",
-    "eslint-plugin-react-hooks": "^4.3",
+    "eslint-plugin-n": ">=17.0",
+    "eslint-plugin-react": "^7.33",
+    "eslint-plugin-react-hooks": "^4.3 || ^5.0",
     "eslint-plugin-react-prefer-function-component": "^3.2.0",
     "eslint-plugin-react-redux": "^4.0",
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-rxjs-angular": "github:BesLogic/eslint-plugin-rxjs-angular#dist",
     "eslint-plugin-storybook": "^0.6.10",
-    "eslint-plugin-testing-library": "^5.10.2",
-    "eslint-plugin-total-functions": ">=5.0"
+    "eslint-plugin-testing-library": "^6.0",
+    "eslint-plugin-total-functions": ">=6.0"
   },
   "devDependencies": {
     "@types/eslint": "^8.37.0",

package/react.js

@@ -114,7 +114,14 @@ module.exports = {
      */
     // Using only max-lines and not max-lines-per-function as most of the react code lives in functions.
     "max-lines-per-function": "off",
-    // react overrides (https://github.com/yannickcr/eslint-plugin-react#list-of-supported-rules)
+
+    /*
+     * react overrides (https://github.com/yannickcr/eslint-plugin-react#list-of-supported-rules)
+     */
+    "react/display-name": [
+      "error",
+      { "checkContextObjects": true }
+    ],
     "react/forbid-component-props": [
       "error",
       // With most styling solutions, style can be fine

package/tsconfig.4.3.json

@@ -4,9 +4,11 @@
     "newLine": "LF", // Now default in TypeScript 5.0
     "forceConsistentCasingInFileNames": true, // Now default in TypeScript 5.0
     "noFallthroughCasesInSwitch": true,
-    "noImplicitOverride": true, // TypeScript 4.3+
+    "noImplicitOverride": true,
     "noImplicitReturns": true,
-    "noUncheckedIndexedAccess": true, // This makes index accesses even stricter. You may not want it in your project.
+    // This makes index accesses even stricter. You may not want it in your project.
+    // You should probably disable it at least in tests.
+    "noUncheckedIndexedAccess": true,
     "module": "ESNext", // ESNext or CommonJS
     "target": "ES2017", // ES2017 or higher
     "lib": [

package/tsconfig.5.0.json

@@ -1,6 +1,11 @@
 {
   "extends": "./tsconfig.4.3.json",
   "compilerOptions": {
-    "verbatimModuleSyntax": true
+    "verbatimModuleSyntax": true,
+    // Since this is no longer needed for Angular with TypeScript 5, let's
+    // disable it so @typescript-eslint/consistent-type-imports doesn't turn
+    // itself off in files using decorators.
+    // https://typescript-eslint.io/rules/consistent-type-imports/#caveat-decorators--experimentaldecorators-true--emitdecoratormetadata-true
+    "experimentalDecorators": false
   }
 }

package/typescript.js

@@ -3,7 +3,7 @@
 
 const javascriptConfig = require("./javascript")
 const { jestNoRestrictedSyntax } = require("./lib/utils")
-const { getModuleVersion } = require("./lib/utils")
+const { resolveModuleLocation } = require("./lib/utils")
 
 const commaDangleDefault = "always-multiline"
 const noRestrictedSyntax = [
@@ -23,7 +23,7 @@ const paddingLineBetweenStatementsConfig = javascriptConfig
   ?.find(override => override.extends === "plugin:autofix/all")
   ?.rules?.["autofix/padding-line-between-statements"]
 
-const totalFunctionsVersion = getModuleVersion("eslint-plugin-total-functions", 0)
+const hasTotalFunctions = !!resolveModuleLocation("eslint-plugin-total-functions")
 
 /** @type {import("eslint").Linter.Config} */
 module.exports = {
@@ -33,12 +33,12 @@ module.exports = {
         "*.ts",
         "*.tsx"
       ],
-      "plugins": totalFunctionsVersion
+      "plugins": hasTotalFunctions
         ? ["total-functions"]
         : [],
       "extends": [
         "plugin:@typescript-eslint/all",
-        ...totalFunctionsVersion
+        ...hasTotalFunctions
           ? ["plugin:total-functions/recommended"]
           : [],
         "plugin:etc/recommended",
@@ -123,7 +123,7 @@ module.exports = {
          *   - `inputEvent.target as Partial<HTMLInputElement>` <-- Oops!
          *   - `event.target as Partial<HTMLInputElement> | null` <-- Ok!
          */
-        "total-functions/no-unsafe-type-assertion": totalFunctionsVersion
+        "total-functions/no-unsafe-type-assertion": hasTotalFunctions
           ? "warn"
           : "off",
         // False positives with external library
@@ -153,9 +153,6 @@ module.exports = {
         // TypeScript already ensures no options are missing
         "unicorn/no-object-as-default-parameter": "off",
 
-        // Note: not useable with interfaces https://github.com/typescript-eslint/typescript-eslint/issues/1103
-        // @typescript-eslint/class-methods-use-this only exists since 6.2
-        "class-methods-use-this": "off",
         // Using simple-import-sort instead
         "sort-imports": "off",
         // Not usable with typescript anyway
@@ -180,6 +177,10 @@ module.exports = {
           "error",
           commaDangleDefault
         ],
+        // @typescript-eslint v7.1.0 will disable this automatically as it added its own version
+        "consistent-return": "off",
+        // Prefer "noImplicitReturns": true in tsconfig.json
+        "@typescript-eslint/consistent-return": "off",
         // Explicit types rules complicates things uselessly and are redundant
         "@typescript-eslint/explicit-function-return-type": "off",
         "@typescript-eslint/explicit-member-accessibility": [
@@ -375,6 +376,23 @@ module.exports = {
             ]
           }
         ],
+        // Favor safer @typescript-eslint/prefer-destructuring
+        "autofix/prefer-destructuring": "off",
+        "@typescript-eslint/prefer-destructuring": [
+          "error",
+          {
+            // Same as default, needed to configure the second object
+            "array": true,
+            "object": true
+          },
+          {
+            // Destructuring w/o assignement keyword (const/let) requires wrapping in parentheses,
+            // which can be confusing for example when destructuring into `this`.
+            // https://github.com/eslint/eslint/issues/18460
+            "enforceForRenamedProperties": false,
+            "enforceForDeclarationWithTypeAnnotation": true
+          }
+        ],
         "@typescript-eslint/prefer-enum-initializers": "off",
         // TODO: Would accept this if it had autofixes, otherwise this is too tedious to use. Check again later
         "@typescript-eslint/prefer-readonly-parameter-types": "off",
@@ -402,6 +420,9 @@ module.exports = {
           {
             "allowBoolean": true,
             "allowNullish": true
+            // Purposefully keeping allowArray: false (v7.4)
+            // as the best way to format arrays is to use Intl.ListFormat
+            // and array's default .join() risks producing "[object Object]"
           }
         ],
         "@typescript-eslint/semi": [
@@ -421,7 +442,14 @@ module.exports = {
             "int32Hint": true
           }
         ],
+        // We accept nullish as falsy
         "@typescript-eslint/strict-boolean-expressions": "off",
+        "@typescript-eslint/switch-exhaustiveness-check": [
+          "error",
+          {
+            "requireDefaultForNonUnion": true
+          }
+        ],
         "@typescript-eslint/unbound-method": [
           "error",
           {

package/lib/apply-patches.js

@@ -1,76 +0,0 @@
-const { exec } = require("node:child_process")
-const { readdirSync, existsSync } = require("node:fs")
-const { join } = require("node:path")
-
-// ANSI color chart: https://en.m.wikipedia.org/wiki/ANSI_escape_code#Colors
-
-const appRootPath = join(__dirname, "..", "..", "..")
-if (!existsSync(join(appRootPath, "package.json"))) {
-  /* eslint-disable-next-line n/no-process-exit, unicorn/no-process-exit --
-  Probably ran in eslint-config-beslogic, just early exit. patch-package would fail anyway */
-  process.exit(0)
-}
-
-const execCallback = (/** @type {string} */ packageName) =>
-(
-  /** @type {import('node:child_process').ExecException | null} */
-  error,
-  /** @type {string} */
-  stdout,
-  /** @type {string} */
-  stderr
-) => {
-  // NOTE: Can't use `.startsWith` because if "--force" is used, the message will start with
-  // "npm WARN using --force Recommended protections disabled."
-  if (stdout) console.info(stdout)
-  if (stderr.includes("Error: Patch file found for package")) {
-    console.info(`\u001B[32m${packageName} not found in node_modules, no need to patch.\u001B[0m`)
-
-    return
-  }
-  if (stderr.includes("\nWarning: ")) {
-    const reworded = stderr.replace(
-      "run\n\n    patch-package @nx/angular",
-      "contact\n\n    samuel.therrien@beslogic.com"
-    )
-    console.warn(`\u001B[33m${reworded}\u001B[0m`)
-
-    return
-  }
-  if (stderr.includes("\n**ERROR** Failed to apply patch for package") && stdout.includes("✔")) {
-    console.info(
-      `\u001B[32m${packageName} has patches for multiple versions, at least one was applied successfully!\u001B[0m`
-    )
-
-    return
-  }
-  if (error) {
-    console.error(
-      "\u001B[31m" +
-        `The following error happenned while patching ${packageName} with eslint-config-beslogic. ` +
-        "Please contact samuel.therrien@beslogic.com with the package version and the full error to get it fixed." +
-        "\u001B[0m"
-    )
-    throw error
-  }
-  if (stderr) console.error(`\u001B[31m${stderr}\u001B[0m`)
-  console.info(`\u001B[32m${packageName} patched successfully! Now go write great code!\u001B[0m`)
-}
-
-const folders = readdirSync("lib/patches")
-for (const folder of folders) {
-  const packageName = folder.replaceAll("+", "/")
-  console.info(`\u001B[93mPatching ${packageName}\u001B[0m`)
-  // We cannot apply individual patches with patch-package, ang using git is more cumbersome / less safe.
-  // So instead we apply individual patch folders.
-  // This is necessary if we have multiple patches for optional dependencies.
-  // https://www.npmjs.com/package/patch-package#user-content-notes
-  exec(
-    "npx patch-package" +
-      ` --patch-dir=node_modules/eslint-config-beslogic/lib/patches/${folder}` +
-      " --ignore-whitespace" +
-      " --error-on-fail",
-    { "cwd": appRootPath },
-    execCallback(packageName)
-  )
-}

package/lib/patches/@angular+material/@angular+material+14.2.7.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@angular/material/dialog/index.d.ts b/node_modules/@angular/material/dialog/index.d.ts
-index 6dc3eab..c9fa899 100644
---- a/node_modules/@angular/material/dialog/index.d.ts
-+++ b/node_modules/@angular/material/dialog/index.d.ts
-@@ -397,7 +397,7 @@ export declare class MatDialogModule {
- /**
-  * Reference to a dialog opened via the MatDialog service.
-  */
--export declare class MatDialogRef<T, R = any> {
-+export declare class MatDialogRef<T, R = void> {
-     private _ref;
-     _containerInstance: _MatDialogContainerBase;
-     /** The instance of component opened into the dialog. */

package/lib/patches/@angular+material/@angular+material+15.1.2.patch

@@ -1,14 +0,0 @@
-# https://github.com/angular/components/issues/12898
-diff --git a/node_modules/@angular/material/dialog/index.d.ts b/node_modules/@angular/material/dialog/index.d.ts
-index 914c287..80caedb 100644
---- a/node_modules/@angular/material/dialog/index.d.ts
-+++ b/node_modules/@angular/material/dialog/index.d.ts
-@@ -425,7 +425,7 @@ export declare class MatDialogModule {
- /**
-  * Reference to a dialog opened via the MatDialog service.
-  */
--export declare class MatDialogRef<T, R = any> {
-+export declare class MatDialogRef<T, R = void> {
-     private _ref;
-     _containerInstance: _MatDialogContainerBase;
-     /** The instance of component opened into the dialog. */

package/lib/patches/@angular+material/@angular+material+16.2.10.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@angular/material/dialog/index.d.ts b/node_modules/@angular/material/dialog/index.d.ts
-index 7d4f965..cd6bdcf 100644
---- a/node_modules/@angular/material/dialog/index.d.ts
-+++ b/node_modules/@angular/material/dialog/index.d.ts
-@@ -428,7 +428,7 @@ export declare class MatDialogModule {
- /**
-  * Reference to a dialog opened via the MatDialog service.
-  */
--export declare class MatDialogRef<T, R = any> {
-+export declare class MatDialogRef<T, R = void> {
-     private _ref;
-     _containerInstance: _MatDialogContainerBase;
-     /** The instance of component opened into the dialog. */

package/lib/patches/@angular+material/@angular+material+17.2.0.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@angular/material/dialog/index.d.ts b/node_modules/@angular/material/dialog/index.d.ts
-index e1a0275..efecaab 100644
---- a/node_modules/@angular/material/dialog/index.d.ts
-+++ b/node_modules/@angular/material/dialog/index.d.ts
-@@ -420,7 +420,7 @@ export declare class MatDialogModule {
- /**
-  * Reference to a dialog opened via the MatDialog service.
-  */
--export declare class MatDialogRef<T, R = any> {
-+export declare class MatDialogRef<T, R = void> {
-     private _ref;
-     _containerInstance: MatDialogContainer;
-     /** The instance of component opened into the dialog. */

package/lib/patches/@nx+angular/@nx+angular+16.3.2.patch

@@ -1,56 +0,0 @@
-diff --git a/node_modules/@nx/angular/src/generators/add-linting/lib/create-eslint-configuration.js b/node_modules/@nx/angular/src/generators/add-linting/lib/create-eslint-configuration.js
-index 7acd7d3..dde125a 100644
---- a/node_modules/@nx/angular/src/generators/add-linting/lib/create-eslint-configuration.js
-+++ b/node_modules/@nx/angular/src/generators/add-linting/lib/create-eslint-configuration.js
-@@ -7,8 +7,6 @@ const extendAngularEslintJson = (json, options) => {
-     const overrides = [
-         Object.assign(Object.assign({}, json.overrides[0]), { files: ['*.ts'], extends: [
-                 ...(json.overrides[0].extends || []),
--                'plugin:@nx/angular',
--                'plugin:@angular-eslint/template/process-inline-templates',
-             ], rules: {
-                 '@angular-eslint/directive-selector': [
-                     'error',
-@@ -27,15 +25,6 @@ const extendAngularEslintJson = (json, options) => {
-                     },
-                 ],
-             } }),
--        {
--            files: ['*.html'],
--            extends: ['plugin:@nx/angular-template'],
--            /**
--             * Having an empty rules object present makes it more obvious to the user where they would
--             * extend things from if they needed to
--             */
--            rules: {},
--        },
-     ];
-     return Object.assign(Object.assign({}, json), { overrides });
- };
-@@ -53,10 +42,6 @@ function createEsLintConfiguration(tree, options) {
-         overrides: [
-             {
-                 files: ['*.ts'],
--                extends: [
--                    'plugin:@nx/angular',
--                    'plugin:@angular-eslint/template/process-inline-templates',
--                ],
-                 /**
-                  * NOTE: We no longer set parserOptions.project by default when creating new projects.
-                  *
-@@ -94,15 +79,6 @@ function createEsLintConfiguration(tree, options) {
-                     ],
-                 },
-             },
--            {
--                files: ['*.html'],
--                extends: ['plugin:@nx/angular-template'],
--                /**
--                 * Having an empty rules object present makes it more obvious to the user where they would
--                 * extend things from if they needed to
--                 */
--                rules: {},
--            },
-         ],
-     };
-     (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), configJson);