From b3ebaf32a1029fd914bb4add6d0c14bf5cdf41e7 Mon Sep 17 00:00:00 2001 From: PelayoFelgueroso Date: Tue, 2 Dec 2025 13:36:34 +0100 Subject: [PATCH 1/5] Fix ESLint configuration by removing Next.js plugin incompatibility --- .../components/footer/code/FooterCodePage.tsx | 2 +- package-lock.json | 3 ++- packages/eslint-config/next.js | 27 +++++++++++++++---- packages/eslint-config/package.json | 1 + 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/apps/website/screens/components/footer/code/FooterCodePage.tsx b/apps/website/screens/components/footer/code/FooterCodePage.tsx index a4666a0f1..63eb5d359 100644 --- a/apps/website/screens/components/footer/code/FooterCodePage.tsx +++ b/apps/website/screens/components/footer/code/FooterCodePage.tsx @@ -78,7 +78,7 @@ const sections = [ - logo + logos diff --git a/package-lock.json b/package-lock.json index e28622c70..6fdec9b24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,6 @@ "lint-staged": "^15.2.7", "prettier": "^3.2.5", "storybook-addon-pseudo-states": "^9.1.10", - "ts-node": "^10.9.2", "turbo": "^2.0.4", "typescript": "^5.6.3" }, @@ -21514,6 +21513,7 @@ "@typescript-eslint/eslint-plugin": "^8.44.1", "@typescript-eslint/parser": "^8.44.1", "@vercel/style-guide": "^6.0.0", + "eslint-config-next": "^16.0.5", "eslint-config-prettier": "^10.1.8", "eslint-config-turbo": "^2.6.1", "eslint-plugin-only-warn": "^1.1.0", @@ -22365,6 +22365,7 @@ "playwright": "^1.54.1", "storybook": "^9.1.10", "storybook-addon-pseudo-states": "^9.1.10", + "ts-node": "^10.9.2", "tsup": "^8.1.0", "typescript": "^5.6.3", "vitest": "^3.2.4", diff --git a/packages/eslint-config/next.js b/packages/eslint-config/next.js index 14354b5cb..8e3fcb15d 100644 --- a/packages/eslint-config/next.js +++ b/packages/eslint-config/next.js @@ -1,13 +1,9 @@ import reactInternal from "./react-internal.js"; -import vercelNext from "@vercel/style-guide/eslint/next"; -import { FlatCompat } from "@eslint/eslintrc"; import tsPlugin from "@typescript-eslint/eslint-plugin"; import tsParser from "@typescript-eslint/parser"; import globals from "globals"; import { join } from "path"; -const compat = new FlatCompat(); - /** * @param {{ tsconfigRootDir: string, tsconfigName?: string }} options * @returns {import("eslint").Config[]} @@ -15,7 +11,28 @@ const compat = new FlatCompat(); export default function nextConfig({ tsconfigRootDir, tsconfigName = "tsconfig.lint.json" } = {}) { return [ ...reactInternal, - ...compat.config(vercelNext), + { + files: ["**/*.{ts,tsx}"], + plugins: { "@typescript-eslint": tsPlugin }, + languageOptions: { + parser: tsParser, + parserOptions: { + project: join(tsconfigRootDir, tsconfigName), + tsconfigRootDir, + }, + globals: { + ...globals.browser, + ...globals.node, + }, + }, + rules: { + ...tsPlugin.configs.recommended.rules, + ...tsPlugin.configs["recommended-requiring-type-checking"].rules, + "@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_" }], + "no-unused-vars": "off", + "@typescript-eslint/triple-slash-reference": "off", + }, + }, { files: ["**/*.{ts,tsx}"], plugins: { "@typescript-eslint": tsPlugin }, diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 748e56aad..a4d869dba 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -12,6 +12,7 @@ "@vercel/style-guide": "^6.0.0", "eslint-config-turbo": "^2.6.1", "eslint-config-prettier": "^10.1.8", + "eslint-config-next": "^16.0.5", "eslint-plugin-only-warn": "^1.1.0", "@typescript-eslint/parser": "^8.44.1", "@typescript-eslint/eslint-plugin": "^8.44.1", From a0b334f3d045b6ef75135d1578cb0142f2ab5523 Mon Sep 17 00:00:00 2001 From: PelayoFelgueroso Date: Tue, 2 Dec 2025 13:37:37 +0100 Subject: [PATCH 2/5] Revert example change --- apps/website/screens/components/footer/code/FooterCodePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/website/screens/components/footer/code/FooterCodePage.tsx b/apps/website/screens/components/footer/code/FooterCodePage.tsx index 63eb5d359..a4666a0f1 100644 --- a/apps/website/screens/components/footer/code/FooterCodePage.tsx +++ b/apps/website/screens/components/footer/code/FooterCodePage.tsx @@ -78,7 +78,7 @@ const sections = [ - logos + logo From 1ba71783fdcf6f735768de30bb7b0404fa251ada Mon Sep 17 00:00:00 2001 From: PelayoFelgueroso Date: Tue, 2 Dec 2025 13:38:07 +0100 Subject: [PATCH 3/5] Try if it works in /lib --- packages/lib/src/footer/Footer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lib/src/footer/Footer.tsx b/packages/lib/src/footer/Footer.tsx index 577dfe1c5..2579e8d8e 100644 --- a/packages/lib/src/footer/Footer.tsx +++ b/packages/lib/src/footer/Footer.tsx @@ -189,7 +189,7 @@ const Copyright = styled.div<{ width: number }>` width: 100%; box-sizing: border-box; overflow: hidden; - grid-column-start: 3; + grid-column-start: 6; ${(props) => getResponsiveStyles.isMediumScreen(props.width) && From f2a58310df92d815dd198f01e4e667a324097eb5 Mon Sep 17 00:00:00 2001 From: PelayoFelgueroso Date: Tue, 2 Dec 2025 13:38:33 +0100 Subject: [PATCH 4/5] Revert change --- packages/lib/src/footer/Footer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lib/src/footer/Footer.tsx b/packages/lib/src/footer/Footer.tsx index 2579e8d8e..577dfe1c5 100644 --- a/packages/lib/src/footer/Footer.tsx +++ b/packages/lib/src/footer/Footer.tsx @@ -189,7 +189,7 @@ const Copyright = styled.div<{ width: number }>` width: 100%; box-sizing: border-box; overflow: hidden; - grid-column-start: 6; + grid-column-start: 3; ${(props) => getResponsiveStyles.isMediumScreen(props.width) && From ea2003aa4e992823741cf98994286ce7e37e8ad1 Mon Sep 17 00:00:00 2001 From: PelayoFelgueroso Date: Tue, 2 Dec 2025 13:46:07 +0100 Subject: [PATCH 5/5] Remove unused package --- packages/eslint-config/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index a4d869dba..584c47348 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -9,7 +9,6 @@ "react-internal.js" ], "devDependencies": { - "@vercel/style-guide": "^6.0.0", "eslint-config-turbo": "^2.6.1", "eslint-config-prettier": "^10.1.8", "eslint-config-next": "^16.0.5",