Skip to content

Commit 6758552

Browse files
authored
fix: support ignorePatterns in both rule options or config file (#8)
1 parent a2bbc6d commit 6758552

16 files changed

Lines changed: 954 additions & 789 deletions

File tree

.github/workflows/autofix.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ jobs:
2222

2323
- run: pnpm install --frozen-lockfile
2424
- run: pnpm run build
25+
- run: pnpm run format
2526
- run: pnpm run lint --fix
2627

27-
- uses: autofix-ci/action@v1.3.2
28+
- uses: autofix-ci/action@v1.3.3
2829
with:
2930
commit-message: 'chore: autofix by ci'

.oxfmtrc.json renamed to .oxfmtrc.jsonc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"htmlWhitespaceSensitivity": "css",
1010
"ignorePatterns": [
1111
"**/node_modules/**",
12-
"**/dist/**",
1312
"pnpm-lock.yaml",
1413
"**/*.min.*",
15-
"**/tests/fixtures/**",
16-
"dts/rule-options.d.ts"
14+
"**/dist/**",
15+
"**/fixtures/**",
16+
"dts/rule-options.d.ts",
1717
],
1818
"insertFinalNewline": true,
1919
"jsxSingleQuote": true,
@@ -22,15 +22,15 @@
2222
{
2323
"files": ["**/*.{css,scss}"],
2424
"options": {
25-
"singleQuote": false
26-
}
25+
"singleQuote": false,
26+
},
2727
},
2828
{
2929
"files": ["**/*.html"],
3030
"options": {
31-
"singleAttributePerLine": false
32-
}
33-
}
31+
"singleAttributePerLine": false,
32+
},
33+
},
3434
],
3535
"printWidth": 80,
3636
"proseWrap": "preserve",
@@ -41,5 +41,5 @@
4141
"tabWidth": 2,
4242
"trailingComma": "all",
4343
"useTabs": false,
44-
"vueIndentScriptAndStyle": false
44+
"vueIndentScriptAndStyle": false,
4545
}

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"javascriptreact",
2323
"typescriptreact"
2424
],
25-
"typescript.experimental.useTsgo": true,
25+
"js/ts.experimental.useTsgo": true,
2626
"cSpell.words": [
2727
"bumpp",
2828
"changelogithub",

eslint.config.mjs

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,18 @@
11
// @ts-check
22

3-
import { defineESLintConfig, GLOB_ALL_SRC } from '@ntnyq/eslint-config'
4-
import { plugin as pluginOxfmt } from 'eslint-plugin-oxfmt'
3+
import { defineESLintConfig } from '@ntnyq/eslint-config'
54

6-
export default defineESLintConfig(
7-
{
8-
ignores: ['**/dts/rule-options.d.ts'],
9-
oxfmt: false,
10-
prettier: false,
11-
perfectionist: {
12-
all: true,
13-
},
14-
test: {
15-
overridesVitestRules: {
16-
// in favor of eslint-vitest-rule-tester
17-
'vitest/no-standalone-expect': 'off',
18-
},
19-
},
5+
export default defineESLintConfig({
6+
ignores: ['**/dts/rule-options.d.ts'],
7+
oxfmt: true,
8+
prettier: false,
9+
perfectionist: {
10+
all: true,
2011
},
21-
[
22-
{
23-
files: [...GLOB_ALL_SRC],
24-
plugins: {
25-
oxfmt: pluginOxfmt,
26-
},
27-
rules: {
28-
'oxfmt/oxfmt': 'error',
29-
},
12+
test: {
13+
overridesVitestRules: {
14+
// in favor of eslint-vitest-rule-tester
15+
'vitest/no-standalone-expect': 'off',
3016
},
31-
],
32-
)
17+
},
18+
})

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "eslint-plugin-oxfmt",
33
"type": "module",
44
"version": "0.1.1",
5-
"packageManager": "pnpm@10.30.3",
5+
"packageManager": "pnpm@10.32.1",
66
"description": "An ESLint plugin for formatting code with oxfmt.",
77
"keywords": [
88
"eslint",
@@ -64,28 +64,28 @@
6464
},
6565
"dependencies": {
6666
"generate-differences": "^0.1.1",
67-
"load-oxfmt-config": "^0.1.1",
67+
"load-oxfmt-config": "^0.2.0",
6868
"picomatch": "^4.0.3",
6969
"synckit": "^0.11.12"
7070
},
7171
"devDependencies": {
72-
"@ntnyq/eslint-config": "^6.0.0-beta.11",
72+
"@ntnyq/eslint-config": "^6.0.0-beta.13",
7373
"@types/json-schema": "^7.0.15",
74-
"@types/node": "^25.3.2",
75-
"@typescript/native-preview": "^7.0.0-dev.20260227.1",
74+
"@types/node": "^25.4.0",
75+
"@typescript/native-preview": "^7.0.0-dev.20260312.1",
7676
"bumpp": "^10.4.1",
77-
"eslint": "^10.0.2",
77+
"eslint": "^10.0.3",
7878
"eslint-parser-plain": "^0.1.1",
7979
"eslint-plugin-oxfmt": "workspace:*",
8080
"eslint-typegen": "^2.3.1",
8181
"eslint-vitest-rule-tester": "^3.1.0",
8282
"husky": "^9.1.7",
8383
"nano-staged": "^0.9.0",
8484
"npm-run-all2": "^8.0.4",
85-
"oxfmt": "^0.35.0",
85+
"oxfmt": "^0.39.0",
8686
"show-invisibles": "^0.0.2",
8787
"tinyglobby": "^0.2.15",
88-
"tsdown": "^0.21.0-beta.2",
88+
"tsdown": "^0.21.2",
8989
"tsx": "^4.21.0",
9090
"typescript": "^5.9.3",
9191
"vitest": "^4.0.18"

0 commit comments

Comments
 (0)