Merge pull request #396 from AndreaPontrandolfo/AndreaPontrandolfo/issue384

AndreaPontrandolfo · web-flow · commit 58b00c4144d6 · 2025-04-25T14:09:53.000+02:00
AndreaPontrandolfo/issue384
diff --git a/.changeset/lovely-donkeys-rule.md b/.changeset/lovely-donkeys-rule.md
@@ -0,0 +1,7 @@
+---
+'eslint-config-sheriff': minor
+'@sherifforg/create-config': minor
+'@sherifforg/cli': minor
+---
+
+feat: bumped some deps
diff --git a/.github/workflows/merge-checks.yml b/.github/workflows/merge-checks.yml
@@ -33,6 +33,6 @@ jobs:
       - name: Install dependencies
         run: pnpm install
       - name: Launch Turborepo Remote Caching
-        uses: rharkor/caching-for-turbo@v1.5
+        uses: rharkor/caching-for-turbo@v1.8
       - name: Run qa checks
         run: pnpm merge-checks
diff --git a/apps/config-validation-playground/package.json b/apps/config-validation-playground/package.json
@@ -22,7 +22,7 @@
     "@types/node": "^22.10.3",
     "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.5",
-    "eslint": "^9.19.0",
+    "eslint": "^9.25.1",
     "eslint-config-sheriff": "workspace:*",
     "tsconfig": "workspace:*",
     "typescript": "^5.8.3"
diff --git a/apps/docs-website/docs/cli-usage/_category_.json b/apps/docs-website/docs/cli-usage/_category_.json
@@ -0,0 +1,8 @@
+{
+  "label": "🤖 CLI usage",
+  "position": 14,
+  "link": {
+    "type": "generated-index",
+    "description": "In this section you will learn about everything you can do with the Sheriff CLI."
+  }
+}
diff --git a/apps/docs-website/docs/cli-usage/commands-reference.mdx b/apps/docs-website/docs/cli-usage/commands-reference.mdx
@@ -1,10 +1,11 @@
 ---
-sidebar_position: 10
+sidebar_position: 2
+description: "🗺️ All the CLI commands."
 ---
 
 import { CLIOptionsCatalog } from "@sherifforg/constants";
 
-# 🗺️ CLI reference
+# Commands reference
 
 ## @sherifforg/create-config
 
diff --git a/apps/docs-website/docs/cli-usage/get-started.md b/apps/docs-website/docs/cli-usage/get-started.md
@@ -1,8 +1,9 @@
 ---
-sidebar_position: 15
+sidebar_position: 1
+description: 'How to use the Sheriff CLI.'
 ---
 
-# 🤖 Usage in CI
+# Get started
 
 ## Intro
 
@@ -13,9 +14,9 @@ The Sheriff CLI is composed of 2 packages:
 
 The `@sherifforg/cli` is invoked in the CLI with the `sheriff` command.
 
-It is advised to integrate the `@sherifforg/cli` in your CI pipelines to ensure that the Sheriff configuration is always correct and up-to-date, but you can also integrate it into pre-commit hooks if that's your preference.
+It is advised to integrate the `@sherifforg/cli` in your **CI pipelines** to ensure that the Sheriff configuration is always correct and up-to-date, but you can also integrate it into pre-commit hooks if that's your preference.
 
-## Usage
+## How to run it
 
 To get started, install it in your project:
 
@@ -82,7 +83,7 @@ Sheriff will scan the config file trying to find a variable named **exactly** `s
 
 ## Options
 
-The `@sherifforg/cli` is very flexible and offers a variety of options to customize it's behavior. Look at the [API reference](./cli-reference#sherifforgcli) for detailed info on the available options.
+The `@sherifforg/cli` is very flexible and offers a variety of options to customize it's behavior. Look at the [API reference](./commands-reference#sherifforgcli) for detailed info on the available options.
 
 You can:
 
diff --git a/apps/docs-website/docs/faq.md b/apps/docs-website/docs/faq.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 19
+sidebar_position: 18
 ---
 
 # 📚 FAQ
diff --git a/apps/docs-website/docs/migration-guide.mdx b/apps/docs-website/docs/migration-guide.mdx
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 17
+sidebar_position: 16
 ---
 
 import Tabs from "@theme/Tabs";
diff --git a/apps/docs-website/docs/monorepo-support.mdx b/apps/docs-website/docs/monorepo-support.mdx
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 13
+sidebar_position: 12
 ---
 
 import Tabs from "@theme/Tabs";
diff --git a/apps/docs-website/docs/performance-tips.mdx b/apps/docs-website/docs/performance-tips.mdx
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 16
+sidebar_position: 15
 ---
 
 import Tabs from "@theme/Tabs";
diff --git a/apps/docs-website/docs/prettier-support.md b/apps/docs-website/docs/prettier-support.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 11
+sidebar_position: 10
 ---
 
 # 💅 Prettier support
diff --git a/apps/docs-website/docs/prior-art.mdx b/apps/docs-website/docs/prior-art.mdx
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 18
+sidebar_position: 17
 ---
 
 # 🧐 Prior art
diff --git a/apps/docs-website/docs/setup/automatic-setup.mdx b/apps/docs-website/docs/setup/automatic-setup.mdx
@@ -15,7 +15,7 @@ Let the CLI take care of everything!
     npm init @sherifforg/config
     ```
 
-    Visit the [CLI docs](../cli-reference#sherifforgcreate-config) for a detailed look at the available options.
+    Visit the [CLI docs](../cli-usage/commands-reference#sherifforgcreate-config) for a detailed look at the available options.
 
     :::tip
 
diff --git a/apps/docs-website/docs/troubleshooting.md b/apps/docs-website/docs/troubleshooting.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 20
+sidebar_position: 19
 ---
 
 # 🩹 Troubleshooting
@@ -19,4 +19,4 @@ Refer to the [Nextjs compatibility documentation](./faq.md#is-sheriff-compatible
 
 ## My editor feels slow
 
-Make sure to read the appropriate docs [here](./performance-considerations.mdx).
+Make sure to read the appropriate docs [here](./performance-tips.mdx).
diff --git a/apps/docs-website/docs/typescript-support/_category_.json b/apps/docs-website/docs/typescript-support/_category_.json
@@ -1,6 +1,6 @@
 {
   "label": "🛡️ Typescript support",
-  "position": 14,
+  "position": 13,
   "link": {
     "type": "generated-index"
   }
diff --git a/apps/docs-website/docs/vscode-support.md b/apps/docs-website/docs/vscode-support.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 12
+sidebar_position: 11
 ---
 
 # 🚀 VSCode support
diff --git a/apps/docs-website/package.json b/apps/docs-website/package.json
@@ -44,7 +44,7 @@
     "@types/node": "^22.10.3",
     "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.5",
-    "eslint": "^9.19.0",
+    "eslint": "^9.25.1",
     "eslint-config-sheriff": "workspace:*",
     "eslint-plugin-mdx": "^3.1.5",
     "jiti": "^2.4.2",
diff --git a/apps/sheriff-webservices/package.json b/apps/sheriff-webservices/package.json
@@ -22,13 +22,13 @@
   },
   "dependencies": {
     "@eslint-react/eslint-plugin": "^1.10.1",
-    "@eslint/js": "^9.19.0",
+    "@eslint/js": "^9.25.1",
     "@hono/node-server": "^1.7.0",
     "@next/eslint-plugin-next": "^15.1.6",
     "@regru/eslint-plugin-prefer-early-return": "^1.0.0",
     "@stylistic/eslint-plugin": "^2.6.4",
     "@vitest/eslint-plugin": "^1.1.25",
-    "eslint": "^9.19.0",
+    "eslint": "^9.25.1",
     "eslint-config-sheriff": "workspace:*",
     "eslint-plugin-arrow-return-style": "^1.3.0",
     "eslint-plugin-astro": "^1.3.1",
@@ -51,7 +51,7 @@
     "eslint-plugin-unicorn": "^56.0.1",
     "hono": "^3.12.0",
     "lodash": "^4.17.21",
-    "typescript-eslint": "^8.29.1"
+    "typescript-eslint": "^8.31.0"
   },
   "packageManager": "pnpm@9.15.1",
   "engines": {
diff --git a/apps/sheriff-webservices/src/getAllRules.ts b/apps/sheriff-webservices/src/getAllRules.ts
@@ -41,11 +41,10 @@ export const getAllRules = (
   ) => Record<string, RuleOptions>,
 ): TSESLint.FlatConfig.Config['rules'] => {
   const reactRulesCatalog = {
-    // @ts-expect-error
     ...prependRulesWithPluginName(react.rules, 'react'),
+    // @ts-expect-error
     ...prependRulesWithPluginName(reactAccessibility.rules, 'jsx-a11y'),
     ...prependRulesWithPluginName(reactHooks.rules, 'react-hooks'),
-    // @ts-expect-error
     ...prependRulesWithPluginName(reactRefresh.rules, 'react-refresh'),
     ...prependRulesWithPluginName(
       (rel1cxReact as unknown as Plugin).rules,
diff --git a/knip.jsonc b/knip.jsonc
@@ -1,12 +1,11 @@
 {
-  "$schema": "https://unpkg.com/knip@3/schema-jsonc.json",
+  "$schema": "https://unpkg.com/knip@5/schema-jsonc.json",
   "ignoreWorkspaces": [
     "packages/sheriff-utils",
     "apps/config-validation-playground",
     "apps/cli-playground",
     "apps/docs-website",
   ],
-  "ignore": ["**/eslint.config.ts"],
   "ignoreDependencies": [
     "@turbo/gen",
     "eslint-import-resolver-typescript",
diff --git a/package.json b/package.json
@@ -35,12 +35,12 @@
     "@sherifforg/cli": "workspace:*",
     "@sherifforg/create-config": "workspace:*",
     "@turbo/gen": "^2.2.3",
-    "knip": "^5.42.0",
+    "knip": "^5.50.5",
     "prettier": "^3.3.2",
     "turbo": "^2.2.3",
     "typesync": "0.14.0"
   },
-  "packageManager": "pnpm@9.15.2",
+  "packageManager": "pnpm@10.9.0",
   "engines": {
     "node": ">=20.10.0"
   },
@@ -56,8 +56,10 @@
     },
     "onlyBuiltDependencies": [
       "@swc/core",
+      "core-js",
       "esbuild",
-      "sharp"
+      "sharp",
+      "unrs-resolver"
     ]
   }
 }
diff --git a/packages/eslint-config-sheriff/package.json b/packages/eslint-config-sheriff/package.json
@@ -55,8 +55,8 @@
   },
   "dependencies": {
     "@eslint-react/eslint-plugin": "^1.10.1",
-    "@eslint/compat": "^1.2.6",
-    "@eslint/js": "^9.19.0",
+    "@eslint/compat": "^1.2.8",
+    "@eslint/js": "^9.25.1",
     "@next/eslint-plugin-next": "^15.1.6",
     "@regru/eslint-plugin-prefer-early-return": "^1.0.0",
     "@stylistic/eslint-plugin": "^2.6.4",
@@ -86,7 +86,7 @@
     "eslint-plugin-unicorn": "^56.0.1",
     "globals": "^15.11.0",
     "lodash": "^4.17.21",
-    "typescript-eslint": "^8.29.1"
+    "typescript-eslint": "^8.31.0"
   },
   "peerDependencies": {
     "eslint": ">=9.0.0",
@@ -104,10 +104,10 @@
     "@types/eslint-plugin-jsx-a11y": "^6.10.0",
     "@types/lodash": "^4.17.13",
     "@types/node": "^22.10.3",
-    "@typescript-eslint/parser": "^8.29.1",
-    "@typescript-eslint/utils": "^8.29.1",
+    "@typescript-eslint/parser": "^8.31.0",
+    "@typescript-eslint/utils": "^8.31.0",
     "dts-bundle-generator": "^9.5.1",
-    "eslint": "^9.19.0",
+    "eslint": "^9.25.1",
     "jiti": "^2.4.2",
     "publint": "^0.3.11",
     "tsconfig": "workspace:*",
diff --git a/packages/eslint-config-sheriff/src/getExportableConfig.ts b/packages/eslint-config-sheriff/src/getExportableConfig.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
+import { globalIgnores } from 'eslint/config';
 import getGitignorePatterns from 'eslint-config-flat-gitignore';
 import lodash from 'lodash';
 import { ignores, sheriffStartingOptions } from '@sherifforg/constants';
@@ -112,14 +113,14 @@ export const getExportableConfig = (
     ? userConfigChoices.ignores?.inheritedFromGitignore
     : true;
 
-  exportableConfig.push({
-    ignores: [
+  exportableConfig.push(
+    globalIgnores([
       ...(hasIgnoresRecommended ? ignores : []),
       ...(hasIgnoresInheritedFromGitignore
         ? getGitignorePatterns({ strict: false }).ignores
         : []),
-    ],
-  });
+    ]),
+  );
 
   return exportableConfig;
 };
diff --git a/packages/eslint-config-sheriff/src/getReactConfig.ts b/packages/eslint-config-sheriff/src/getReactConfig.ts
@@ -26,21 +26,21 @@ export const getReactConfig = (
     },
     {
       files: [supportedFileTypes],
-      // @ts-expect-error
       plugins: { react },
       settings: {
         react: {
           version: 'detect',
         },
       },
       rules: {
-        ...react.configs.flat?.recommended.rules,
-        ...react.configs.flat?.['jsx-runtime'].rules,
+        ...react.configs.flat.recommended.rules,
+        ...react.configs.flat['jsx-runtime'].rules,
         ...reactHandPickedRules,
       },
     },
     {
       files: [`**/*{${allJsxExtensions}}`],
+      // @ts-expect-error
       rules: getTsNamingConventionRule({ isTsx: true }),
     },
     {
diff --git a/packages/sheriff-cli/README.md b/packages/sheriff-cli/README.md
@@ -4,4 +4,4 @@ This is the package of `@sherifforg/cli`.
 
 The Sheriff CLI is used to manage Sheriff-based ESLint configs.
 
-[Learn more](https://www.eslint-config-sheriff.dev/docs/usage-in-ci).
+[Learn more](https://www.eslint-config-sheriff.dev/docs/cli-usage).
diff --git a/packages/sheriff-cli/package.json b/packages/sheriff-cli/package.json
@@ -27,7 +27,7 @@
     "@sherifforg/types": "workspace:*",
     "@types/node": "^22.10.3",
     "@types/yargs": "^17.0.33",
-    "eslint": "^9.19.0",
+    "eslint": "^9.25.1",
     "eslint-config-sheriff": "workspace:*",
     "publint": "^0.3.11",
     "tsconfig": "workspace:*",
diff --git a/packages/sheriff-cli/src/index.ts b/packages/sheriff-cli/src/index.ts
@@ -244,7 +244,7 @@ async function main() {
     if (!sheriffOptionsVariableDeclaration) {
       // this is only a "info" level log because it's plausible that the user doesn't have a sheriffOptions variable.
       consola.info(
-        'No variable named "sheriffOptions" found in ESLint configuration. This could be intended, or maybe you forgot to name the Sheriff options obejct exactly "sheriffOptions". Check the documentation for more info: https://www.eslint-config-sheriff.dev/docs/usage-in-ci#how-it-works',
+        'No variable named "sheriffOptions" found in ESLint configuration. This could be intended, or maybe you forgot to name the Sheriff options obejct exactly "sheriffOptions". Check the documentation for more info: https://www.eslint-config-sheriff.dev/docs/cli-usage/get-started#how-it-works',
       );
 
       return;
diff --git a/packages/sheriff-create-config/package.json b/packages/sheriff-create-config/package.json
@@ -33,7 +33,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.3",
     "@types/yargs": "^17.0.33",
-    "eslint": "^9.19.0",
+    "eslint": "^9.25.1",
     "eslint-config-sheriff": "workspace:*",
     "jiti": "^2.4.2",
     "publint": "^0.3.11",
diff --git a/packages/sheriff-utils/package.json b/packages/sheriff-utils/package.json
@@ -21,7 +21,7 @@
     "@sherifforg/types": "workspace:*",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.3",
-    "eslint": "^9.19.0",
+    "eslint": "^9.25.1",
     "eslint-config-sheriff": "workspace:*",
     "lodash-es": "^4.17.21",
     "publint": "^0.3.11",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
