Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into ocavue/vuedts
Browse files Browse the repository at this point in the history
  • Loading branch information
ocavue committed Nov 1, 2024
2 parents d230ef9 + 747019e commit c7e2d07
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 9 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

## [2.10.3](https://github.com/ocavue/eslint-config/compare/v2.10.2...v2.10.3) (2024-10-13)


### Bug Fixes

* disable buggy rule `import/no-duplicates` ([f614b1e](https://github.com/ocavue/eslint-config/commit/f614b1ef3e014d8973357c3e30b947b235714cfe))

## [2.10.2](https://github.com/ocavue/eslint-config/compare/v2.10.1...v2.10.2) (2024-10-13)


### Bug Fixes

* disable buggy rule `import/no-duplicates` ([909727d](https://github.com/ocavue/eslint-config/commit/909727d9c92f7d69f04b157f5dda0a7d75c96d00))

## [2.10.1](https://github.com/ocavue/eslint-config/compare/v2.10.0...v2.10.1) (2024-10-12)


### Bug Fixes

* pass correct resolver settings to eslint-plugin-import-x ([#137](https://github.com/ocavue/eslint-config/issues/137)) ([b71c566](https://github.com/ocavue/eslint-config/commit/b71c566c0840eee72d1bce913337ec350e2f43e4))
* remove compatibility code for eslint-plugin-react-hooks ([#141](https://github.com/ocavue/eslint-config/issues/141)) ([5512ea1](https://github.com/ocavue/eslint-config/commit/5512ea16121bf7794a6aeee1d5cad9ba6d540bad))

## [2.10.0](https://github.com/ocavue/eslint-config/compare/v2.9.0...v2.10.0) (2024-10-11)


Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ocavue/eslint-config",
"type": "module",
"version": "2.10.0",
"version": "2.10.3",
"packageManager": "[email protected]",
"description": "",
"author": "ocavue <[email protected]>",
Expand Down Expand Up @@ -32,7 +32,6 @@
},
"dependencies": {
"@eslint-types/unicorn": "^52.0.0",
"@eslint/compat": "^1.2.0",
"@eslint/js": "^9.12.0",
"@eslint/markdown": "^6.2.0",
"eslint-config-flat-gitignore": "^0.3.0",
Expand Down
3 changes: 0 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/imports.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ export function imports() {
'import/no-mutable-exports': 'warn',
'import/no-useless-path-segments': 'warn',
'import/newline-after-import': 'warn',
'import/no-duplicates': ['warn', { 'prefer-inline': true }],
// Disable `no-duplicates` because of the following bug
// https://github.com/un-ts/eslint-plugin-import-x/issues/167
// 'import/no-duplicates': [
// 'warn',
// { 'prefer-inline': true },
// ],
'import/order': [
'warn',
{
Expand Down
4 changes: 1 addition & 3 deletions src/react.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// @ts-check

import { fixupPluginRules } from '@eslint/compat'

import reactPlugin from 'eslint-plugin-react'
import reactHooksPlugin from 'eslint-plugin-react-hooks'

Expand Down Expand Up @@ -33,7 +31,7 @@ export function react() {
name: 'react-hooks',
files: [GLOB_TS, GLOB_TSX],
plugins: {
'react-hooks': fixupPluginRules(reactHooksPlugin),
'react-hooks': reactHooksPlugin,
},
rules: {
'react-hooks/rules-of-hooks': 'error',
Expand Down

0 comments on commit c7e2d07

Please sign in to comment.