Skip to content

Commit

Permalink
Merge branch 'hakadao:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MengNianxiaoyao authored Apr 23, 2024
2 parents 86423ee + 18e77fd commit aeb6e15
Show file tree
Hide file tree
Showing 7 changed files with 693 additions and 399 deletions.
48 changes: 44 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,48 @@
{
// Enable the ESlint flat config support
"eslint.experimental.useFlatConfig": true,

// Disable the default formatter, use eslint instead
"prettier.enable": false,
"editor.formatOnSave": false,

// Auto fix
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
},

// Silent the stylistic rules in you IDE, but still auto fix them
"eslint.rules.customizations": [
{ "rule": "style/*", "severity": "off" },
{ "rule": "format/*", "severity": "off" },
{ "rule": "*-indent", "severity": "off" },
{ "rule": "*-spacing", "severity": "off" },
{ "rule": "*-spaces", "severity": "off" },
{ "rule": "*-order", "severity": "off" },
{ "rule": "*-dangle", "severity": "off" },
{ "rule": "*-newline", "severity": "off" },
{ "rule": "*quotes", "severity": "off" },
{ "rule": "*semi", "severity": "off" }
],

// Enable eslint for all supported languages
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"vue",
"html",
"markdown",
"json",
"jsonc",
"yaml",
"toml",
"gql",
"graphql"
],

"cSpell.words": [
"WATCHLATER",
"bewly",
Expand All @@ -10,10 +54,6 @@
],
"typescript.tsdk": "node_modules/typescript/lib",
"vite.autoStart": false,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.experimental.useFlatConfig": true,
"files.associations": {
"*.css": "postcss"
},
Expand Down
4 changes: 2 additions & 2 deletions eslint.config.js → eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const antfu = require('@antfu/eslint-config').default
import antfu from '@antfu/eslint-config'

module.exports = antfu({
export default antfu({
jsonc: false,
rules: {
'vue/max-attributes-per-line': [
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"start:firefox": "web-ext run --source-dir ./extension-firefox --target=firefox-desktop",
"clear": "rimraf extension extension.*",
"clear-firefox": "rimraf extension-firefox extension-firefox.*",
"lint": "eslint .",
"lint": "eslint",
"lint:fix": "eslint --fix",
"test": "vitest test",
"postinstall": "npx simple-git-hooks"
},
Expand All @@ -46,7 +47,7 @@
"vuedraggable": "^4.1.0"
},
"devDependencies": {
"@antfu/eslint-config": "^2.6.4",
"@antfu/eslint-config": "^2.15.0",
"@ffflorian/jszip-cli": "^3.6.2",
"@iconify/json": "^2.2.201",
"@iconify/vue": "^4.1.1",
Expand All @@ -66,7 +67,7 @@
"chokidar": "^3.6.0",
"cross-env": "^7.0.3",
"crx": "^5.0.1",
"eslint": "^8.56.0",
"eslint": "^9.1.0",
"esno": "^4.0.0",
"fs-extra": "^10.1.0",
"jsdom": "^20.0.3",
Expand Down
Loading

0 comments on commit aeb6e15

Please sign in to comment.