Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions apps/captainofbass.com/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ export default [
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'react-hooks/rules-of-hooks': 'warn',
'@next/next/no-html-link-for-pages': 'warn',
'react/no-unescaped-entities': 'warn'
'@next/next/no-html-link-for-pages': 'warn'
}
}
]
3 changes: 1 addition & 2 deletions apps/mikeallisonjs.com/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ export default [
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'react-hooks/rules-of-hooks': 'warn',
'@next/next/no-html-link-for-pages': 'warn',
'react/no-unescaped-entities': 'warn'
'@next/next/no-html-link-for-pages': 'warn'
}
}
]
3 changes: 1 addition & 2 deletions apps/sltdnb.com/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ export default [
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-explicit-any': 'warn',
'react-hooks/rules-of-hooks': 'warn',
'@next/next/no-html-link-for-pages': 'warn',
'react/no-unescaped-entities': 'warn'
'@next/next/no-html-link-for-pages': 'warn'
}
}
]
466 changes: 248 additions & 218 deletions bun.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"@types/node": "^24.0.0",
"@types/react": "19.2.14",
"@types/react-dom": "19.2.3",
"@typescript-eslint/eslint-plugin": "^8.26.1",
"@typescript-eslint/parser": "^8.26.1",
"@typescript-eslint/eslint-plugin": "^8.59.1",
"@typescript-eslint/parser": "^8.59.1",
"@mikeallisonjs/eslint-config": "workspace:*",
"@mikeallisonjs/typescript-config": "workspace:*",
"dotenv-cli": "^11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/base.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import js from '@eslint/js'
import eslintConfigPrettier from 'eslint-config-prettier'
import pluginImport from 'eslint-plugin-import'
import pluginImport from 'eslint-plugin-import-x'
import onlyWarn from 'eslint-plugin-only-warn'
import prettierPlugin from 'eslint-plugin-prettier'
import tseslint from 'typescript-eslint'
Expand Down
14 changes: 5 additions & 9 deletions packages/eslint-config/next.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import js from '@eslint/js'
import pluginNext from '@next/eslint-plugin-next'
import eslintReact from '@eslint-react/eslint-plugin'
import eslintConfigPrettier from 'eslint-config-prettier'
import pluginReact from 'eslint-plugin-react'
import pluginReactHooks from 'eslint-plugin-react-hooks'
import globals from 'globals'
import tseslint from 'typescript-eslint'
Expand All @@ -19,12 +19,12 @@ export const nextJsConfig = [
js.configs.recommended,
eslintConfigPrettier,
...tseslint.configs.recommended,
eslintReact.configs.recommended,
{
...pluginReact.configs.flat.recommended,
languageOptions: {
...pluginReact.configs.flat.recommended.languageOptions,
globals: {
...globals.serviceworker
...globals.serviceworker,
...globals.browser
}
}
},
Expand All @@ -48,12 +48,8 @@ export const nextJsConfig = [
plugins: {
'react-hooks': pluginReactHooks
},
settings: { react: { version: 'detect' } },
rules: {
...pluginReactHooks.configs.recommended.rules,
// React scope no longer necessary with new JSX transform.
'react/react-in-jsx-scope': 'off',
'react/prop-types': 'off'
...pluginReactHooks.configs.recommended.rules
}
},
{
Expand Down
14 changes: 7 additions & 7 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
"./prettier": "./prettier.config.js"
},
"devDependencies": {
"@eslint-react/eslint-plugin": "^5.7.1",
"@next/eslint-plugin-next": "^16.0.0",
"@typescript-eslint/eslint-plugin": "^8.24.1",
"@typescript-eslint/parser": "^8.24.1",
"eslint": "^9.20.1",
"@typescript-eslint/eslint-plugin": "^8.59.1",
"@typescript-eslint/parser": "^8.59.1",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.0.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-import-x": "^4.16.2",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-only-warn": "^1.1.0",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-only-warn": "^1.2.1",
"eslint-plugin-react-hooks": "^5.1.0",
"globals": "^17.0.0",
"prettier": "^3.5.3",
"typescript": "^6.0.0",
"typescript-eslint": "^8.24.1"
"typescript-eslint": "^8.59.1"
},
"dependencies": {
"eslint-plugin-prettier": "^5.2.6"
Expand Down
9 changes: 2 additions & 7 deletions packages/eslint-config/react-internal.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import js from "@eslint/js"
import eslintReact from "@eslint-react/eslint-plugin"
import eslintConfigPrettier from "eslint-config-prettier"
import pluginReact from "eslint-plugin-react"
import pluginReactHooks from "eslint-plugin-react-hooks"
import globals from "globals"
import tseslint from "typescript-eslint"
Expand All @@ -16,10 +16,9 @@ export const config = [
js.configs.recommended,
eslintConfigPrettier,
...tseslint.configs.recommended,
pluginReact.configs.flat.recommended,
eslintReact.configs.recommended,
{
languageOptions: {
...pluginReact.configs.flat.recommended.languageOptions,
globals: {
...globals.serviceworker,
...globals.browser,
Expand All @@ -30,12 +29,8 @@ export const config = [
plugins: {
"react-hooks": pluginReactHooks,
},
settings: { react: { version: "detect" } },
rules: {
...pluginReactHooks.configs.recommended.rules,
// React scope no longer necessary with new JSX transform.
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
},
},
]
8 changes: 7 additions & 1 deletion packages/ui/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ export default [
...config,
{
rules: {
'import/order': 'off'
'import/order': 'off',
// Disable React 19 migration hints for shadcn UI components
'@eslint-react/no-context-provider': 'off',
'@eslint-react/no-use-context': 'off',
'@eslint-react/set-state-in-effect': 'off',
'@eslint-react/use-state': 'off',
'@eslint-react/dom-no-dangerously-set-innerhtml': 'off'
}
}
]