Merge branch 'main' into v3

This commit is contained in:
CharleeWa 2024-06-17 16:38:00 +08:00
commit d79d4eb2ae
3 changed files with 1963 additions and 1590 deletions

32
.vscode/settings.json vendored
View File

@ -1,6 +1,6 @@
{
// Enable the ESlint flat config support
"eslint.experimental.useFlatConfig": true,
// For VS Code ESLint works
"eslint.runtime": "node",
// Disable the default formatter, use eslint instead
"prettier.enable": false,
@ -12,13 +12,6 @@
"source.organizeImports": "never"
},
// Disable the MD033 rule
"markdownlint.config": {
"default": true,
"MD033": false,
"MD041": false
},
// Silent the stylistic rules in you IDE, but still auto fix them
"eslint.rules.customizations": [
{ "rule": "style/*", "severity": "off" },
@ -43,7 +36,17 @@
"markdown",
"json",
"jsonc",
"yaml"
"yaml",
"toml",
"xml",
"gql",
"graphql",
"astro",
"css",
"less",
"scss",
"pcss",
"postcss"
],
// Specify the UI library you need to prompt
@ -58,5 +61,12 @@
"i18n-ally.localesPaths": [
"src/locales"
],
"i18n-ally.keystyle": "nested"
"i18n-ally.keystyle": "nested",
// Markdownlint rules
"markdownlint.config": {
"default": true,
"MD033": false,
"MD041": false
}
}

View File

@ -17,10 +17,10 @@
"prepare": "husky"
},
"dependencies": {
"@unhead/vue": "^1.9.11",
"@unhead/vue": "^1.9.13",
"@vant/touch-emulator": "^1.4.0",
"@vant/use": "^1.6.0",
"@vueuse/core": "^10.10.0",
"@vueuse/core": "^10.11.0",
"axios": "^1.7.2",
"echarts": "^5.5.0",
"lodash-es": "^4.17.21",
@ -29,50 +29,50 @@
"pinia-plugin-persistedstate": "^3.2.1",
"resize-detector": "^0.3.0",
"store": "^2.0.12",
"vant": "^4.9.0",
"vant": "^4.9.1",
"vconsole": "^3.15.1",
"vue": "^3.4.27",
"vue": "^3.4.29",
"vue-i18n": "^9.13.1",
"vue-router": "^4.3.2"
"vue-router": "^4.3.3"
},
"devDependencies": {
"@antfu/eslint-config": "2.19.1",
"@iconify-json/carbon": "^1.1.34",
"@antfu/eslint-config": "2.21.1",
"@iconify-json/carbon": "^1.1.35",
"@intlify/unplugin-vue-i18n": "^4.0.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.12.13",
"@types/node": "^20.14.2",
"@types/nprogress": "^0.2.3",
"@types/store": "^2.0.5",
"@unocss/eslint-plugin": "0.60.3",
"@unocss/preset-rem-to-px": "0.60.3",
"@vitejs/plugin-legacy": "^5.4.0",
"@vitejs/plugin-vue": "^5.0.4",
"@unocss/eslint-plugin": "0.61.0",
"@unocss/preset-rem-to-px": "0.61.0",
"@vitejs/plugin-legacy": "^5.4.1",
"@vitejs/plugin-vue": "^5.0.5",
"autoprefixer": "^10.4.19",
"bumpp": "^9.4.1",
"consola": "^3.2.3",
"cross-env": "^7.0.3",
"eslint": "npm:eslint-ts-patch@9.2.0-6",
"eslint-plugin-format": "^0.1.1",
"eslint-ts-patch": "9.2.0-6",
"eslint": "npm:eslint-ts-patch@9.4.0-0",
"eslint-plugin-format": "^0.1.2",
"eslint-ts-patch": "9.4.0-0",
"husky": "^9.0.11",
"less": "^4.2.0",
"mockjs": "^1.1.0",
"postcss-mobile-forever": "^4.1.4",
"rollup": "^4.18.0",
"terser": "^5.31.0",
"terser": "^5.31.1",
"typescript": "^5.4.5",
"unocss": "0.60.3",
"unocss": "0.61.0",
"unplugin-auto-import": "^0.17.6",
"unplugin-vue-components": "^0.27.0",
"unplugin-vue-router": "^0.9.0",
"vite": "^5.2.12",
"unplugin-vue-router": "^0.9.1",
"vite": "^5.3.1",
"vite-plugin-mock-dev-server": "^1.5.0",
"vite-plugin-pwa": "^0.20.0",
"vite-plugin-sitemap": "^0.6.2",
"vite-plugin-vconsole": "^2.1.1",
"vite-plugin-vue-devtools": "^7.2.1",
"vite-plugin-vue-devtools": "^7.3.0",
"vitest": "^1.6.0",
"vue-tsc": "^2.0.19"
"vue-tsc": "^2.0.21"
},
"pnpm": {
"peerDependencyRules": {

File diff suppressed because it is too large Load Diff