Skip to content

Commit 4ce5543

Browse files
committed
chore: merge eslint and prettier to oxlint and oxfmt
1 parent 1a32d8e commit 4ce5543

File tree

132 files changed

+706
-982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+706
-982
lines changed

.idea/OxcSettings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/OxfmtSettings.xml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/prettier.xml

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.oxfmtrc.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"ignorePatterns": [],
4+
"sortImports": {
5+
"newlinesBetween": false,
6+
"groups": [
7+
"type-import",
8+
["value-builtin", "value-external"],
9+
"type-internal",
10+
"value-internal",
11+
["type-parent", "type-sibling", "type-index"],
12+
["value-parent", "value-sibling", "value-index"],
13+
{ "newlinesBetween": true },
14+
"style",
15+
{ "newlinesBetween": true },
16+
"unknown"
17+
]
18+
},
19+
"sortTailwindcss": {
20+
"stylesheet": "./website/src/root.css",
21+
"functions": ["tx", "tv"],
22+
"preserveWhitespace": true
23+
}
24+
}

.prettierignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

.prettierrc.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

.vscode/extensions.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
"recommendations": [
33
"unifiedjs.vscode-mdx",
44
"editorconfig.editorconfig",
5-
"dbaeumer.vscode-eslint",
6-
"esbenp.prettier-vscode",
75
"bradlc.vscode-tailwindcss",
8-
"vitest.explorer"
6+
"vitest.explorer",
7+
"oxc.oxc-vscode"
98
]
109
}

.vscode/settings.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
2-
"eslint.useFlatConfig": true,
3-
"eslint.useESLintClass": true,
4-
"editor.defaultFormatter": "esbenp.prettier-vscode",
5-
"prettier.requireConfig": true,
6-
"prettier.printWidth": 120,
2+
"editor.defaultFormatter": "oxc.oxc-vscode",
73
"editor.formatOnSave": true,
84
"files.associations": {
95
"*.css": "tailwindcss"
@@ -33,5 +29,7 @@
3329
"package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb, bun.lock, .editorconfig, lefthook.*, .pnpm*, .commitlint*, .npm*, .eslint*, eslint*, .prettier*",
3430
"vite.config.*": "vitest.config.*, tsdown.config.*, react-router.config.*",
3531
"README*": "LICENSE*, README.*, CODE_OF_CONDUCT*, CONTRIBUTING*, CHANGELOG*"
36-
}
32+
},
33+
"prettier.enable": false,
34+
"eslint.enable": false
3735
}

lefthook.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
pre-commit:
22
parallel: true
33
commands:
4-
eslint-react-ui:
4+
lint-react-ui:
55
root: "packages/react-ui/"
66
glob: "*.{js,jsx,ts,tsx}"
7-
run: npx --no -- eslint --fix {staged_files}
8-
eslint-website:
7+
run: npx --no -- oxlint --fix {staged_files}
8+
lint-website:
99
root: "website/"
1010
glob: "*.{js,jsx,ts,tsx}"
11-
run: npx --no -- eslint --fix {staged_files}
12-
prettier:
11+
run: npx --no -- oxlint --fix {staged_files}
12+
format:
1313
glob: "*.{js,jsx,ts,tsx,json}"
14-
run: npx --no -- prettier --write {staged_files}
14+
run: npx --no -- oxfmt {staged_files}
1515

1616
commit-msg:
1717
parallel: true

0 commit comments

Comments
 (0)