Skip to content

Commit 8b9f0b6

Browse files
sxzzsxzz
committed
chore: upgrade eslint config
1 parent 2c89da9 commit 8b9f0b6

File tree

10 files changed

+396
-354
lines changed

10 files changed

+396
-354
lines changed

‎.eslintignore‎

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

‎.prettierignore‎

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

‎.prettierrc‎

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

‎.vscode/settings.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"editor.formatOnSave": true,
33
"unocss.root": "./playground",
4-
"eslint.experimental.useFlatConfig": true,
5-
"eslint.options": {
6-
"overrideConfigFile": "./eslint.config.mjs"
7-
}
4+
"eslint.experimental.useFlatConfig": true
85
}

‎eslint.config.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
const { sxzz } = require('@sxzz/eslint-config')
2+
module.exports = sxzz()

‎eslint.config.mjs‎

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

‎package.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"access": "public"
6666
},
6767
"scripts": {
68-
"lint": "ESLINT_USE_FLAT_CONFIG=true eslint -c eslint.config.mjs --cache .",
69-
"lint:fix": "pnpm run lint -- --fix",
68+
"lint": "eslint --cache .",
69+
"lint:fix": "pnpm run lint --fix",
7070
"build": "tsup && tsx scripts/postbuild.mts",
7171
"dev": "pnpm run -C playground dev",
7272
"test": "vitest",
@@ -85,15 +85,16 @@
8585
"unplugin": "^1.3.1"
8686
},
8787
"devDependencies": {
88-
"@sxzz/eslint-config": "^3.0.0",
88+
"@sxzz/eslint-config": "^3.1.0",
89+
"@sxzz/prettier-config": "^1.0.2",
8990
"@types/benchmark": "^2.1.2",
9091
"@types/jsesc": "^3.0.1",
91-
"@types/node": "^18.16.18",
92-
"@types/react": "^18.2.12",
92+
"@types/node": "^20.3.1",
93+
"@types/react": "^18.2.14",
9394
"benchmark": "^2.1.4",
9495
"bumpp": "^9.1.1",
9596
"eslint": "^8.43.0",
96-
"eslint-define-config": "^1.20.0",
97+
"eslint-define-config": "^1.21.0",
9798
"fast-glob": "^3.2.12",
9899
"prettier": "^2.8.8",
99100
"tsup": "^7.0.0",
@@ -104,5 +105,6 @@
104105
},
105106
"engines": {
106107
"node": ">=16.14.0"
107-
}
108+
},
109+
"prettier": "@sxzz/prettier-config"
108110
}

‎playground/index.html‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<link rel="icon" href="/favicon.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<title>JSX to String</title>
8+
</head>
39

4-
<head>
5-
<meta charset="UTF-8" />
6-
<link rel="icon" href="/favicon.ico" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>JSX to String</title>
9-
</head>
10-
11-
<body class="font-sans dark:text-white dark:bg-hex-121212">
12-
<div id="app"></div>
13-
<script>
14-
(function () {
15-
const prefersDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
16-
const setting = localStorage.getItem('color-schema') || 'auto'
17-
if (setting === 'dark' || (prefersDark && setting !== 'light'))
18-
document.documentElement.classList.toggle('dark', true)
19-
})()
20-
</script>
21-
<script type="module" src="/src/main.ts"></script>
22-
</body>
23-
10+
<body class="font-sans dark:text-white dark:bg-hex-121212">
11+
<div id="app"></div>
12+
<script>
13+
;(function () {
14+
const prefersDark =
15+
window.matchMedia &&
16+
window.matchMedia('(prefers-color-scheme: dark)').matches
17+
const setting = localStorage.getItem('color-schema') || 'auto'
18+
if (setting === 'dark' || (prefersDark && setting !== 'light'))
19+
document.documentElement.classList.toggle('dark', true)
20+
})()
21+
</script>
22+
<script type="module" src="/src/main.ts"></script>
23+
</body>
2424
</html>

‎playground/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"vercel-build": "pnpm run -C .. build && pnpm build"
1212
},
1313
"dependencies": {
14-
"@unocss/reset": "^0.53.1",
14+
"@unocss/reset": "^0.53.3",
1515
"@vueuse/core": "^10.2.0",
1616
"unplugin-jsx-string": "workspace:*",
1717
"vue": "^3.3.4"
@@ -20,10 +20,10 @@
2020
"@iconify-json/carbon": "^1.1.18",
2121
"@vitejs/plugin-vue": "^4.2.3",
2222
"@vue/runtime-core": "^3.3.4",
23-
"unocss": "^0.53.1",
23+
"unocss": "^0.53.3",
2424
"unplugin-auto-import": "^0.16.4",
2525
"unplugin-vue-components": "^0.25.1",
2626
"vite": "^4.3.9",
27-
"vue-tsc": "^1.8.0"
27+
"vue-tsc": "^1.8.1"
2828
}
2929
}

0 commit comments

Comments
 (0)