修复合并代码导致的冲突 (#2905)

* fix: 合并代码导致的问题,升级vite 4.4.0

* fix: stylelint
This commit is contained in:
xingyu
2023-07-07 07:06:36 +08:00
committed by GitHub
parent 1262e13067
commit c6e135195a
22 changed files with 1307 additions and 1500 deletions

View File

@@ -36,8 +36,8 @@
"stub": "pnpm unbuild --stub"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.60.1",
"@typescript-eslint/parser": "^5.60.1",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",

View File

@@ -36,12 +36,12 @@
"postcss-less": "^6.0.0",
"postcss-scss": "^4.0.6",
"prettier": "^2.8.8",
"stylelint": "^15.9.0",
"stylelint": "^15.10.1",
"stylelint-config-property-sort-order-smacss": "^9.1.0",
"stylelint-config-recommended": "^12.0.0",
"stylelint-config-recommended": "^13.0.0",
"stylelint-config-recommended-scss": "^12.0.0",
"stylelint-config-recommended-vue": "^1.4.0",
"stylelint-config-standard": "^33.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-config-standard-scss": "^10.0.0",
"stylelint-order": "^6.0.3",
"stylelint-prettier": "^3.0.0"

View File

@@ -19,7 +19,7 @@
"node-server.json"
],
"dependencies": {
"@types/node": "^20.3.3",
"vite": "^4.3.9"
"@types/node": "^20.4.0",
"vite": "^4.4.0"
}
}

View File

@@ -32,7 +32,7 @@
},
"dependencies": {
"@ant-design/colors": "^7.0.0",
"vite": "^4.3.9"
"vite": "^4.4.0"
},
"devDependencies": {
"@types/fs-extra": "^11.0.1",
@@ -49,7 +49,7 @@
"sass": "^1.63.6",
"unocss": "^0.53.4",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-dts": "^3.0.2",
"vite-plugin-dts": "^3.1.0",
"vite-plugin-html": "^3.2.0",
"vite-plugin-mock": "^2.9.6",
"vite-plugin-purge-icons": "^0.9.2",

View File

@@ -2,7 +2,6 @@ import vue from '@vitejs/plugin-vue';
import vueJsx from '@vitejs/plugin-vue-jsx';
import { type PluginOption } from 'vite';
import purgeIcons from 'vite-plugin-purge-icons';
import vueSetupExtend from 'vite-plugin-vue-setup-extend';
import { createAppConfigPlugin } from './appConfig';
import { configCompressPlugin } from './compress';