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

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

修复合并代码导致的冲突 (#2905)
* fix: 合并代码导致的问题，升级vite 4.4.0 * fix: stylelint
xingyu · GitHub
1 parent 1262e130
Showing 7 changed files with 16 additions and 19 deletions
apps/test-server/package.json
internal/eslint-config/package.json
internal/stylelint-config/package.json
internal/ts-config/package.json
internal/vite-config/package.json
internal/vite-config/src/plugins/index.ts
package.json
@@ -24,7 +24,7 @@
     "@types/koa": "^2.13.6",
     "@types/koa-bodyparser": "^5.0.2",
     "@types/koa-router": "^7.4.4",
-    "@types/node": "^20.3.3",
+    "@types/node": "^20.4.0",
     "nodemon": "^2.0.22",
     "pm2": "^5.3.0",
     "rimraf": "^5.0.1",
@@ -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",
@@ -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"
@@ -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"
   }
 }
@@ -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",
@@ -2,7 +2,6 @@ import vue from &#39;@vitejs/plugin-vue&#39;;
 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';
@@ -29,7 +29,7 @@
     "lint": "turbo run lint",
     "lint:eslint": "eslint --cache --max-warnings 0  \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
     "lint:prettier": "prettier --write .",
-    "lint:stylelint": "stylelint \"**/*.{vue,css,less.scss}\" --fix --cache --cache-location node_modules/.cache/stylelint/",
+    "lint:stylelint": "stylelint \"**/*.{vue,css,less,scss}\" --fix --cache --cache-location node_modules/.cache/stylelint/",
     "prepare": "husky install",
     "preview": "npm run build && vite preview",
     "reinstall": "rimraf pnpm-lock.yaml && rimraf package.lock.json && rimraf node_modules && npm run bootstrap",
@@ -101,12 +101,10 @@
     "vue": "^3.3.4",
     "vue-i18n": "^9.2.2",
     "vue-json-pretty": "^2.2.4",
-    "vue-router": "^4.2.2",
+    "vue-router": "^4.2.3",
     "vue-types": "^5.1.0",
     "vuedraggable": "^4.1.0",
-
     "vxe-table": "^4.4.5",
-
     "vxe-table-plugin-export-xlsx": "^3.0.4",
     "xe-utils": "^3.5.11",
     "xlsx": "^0.18.5"
@@ -114,7 +112,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.6.6",
     "@commitlint/config-conventional": "^17.6.6",
-    "@iconify/json": "^2.2.85",
+    "@iconify/json": "^2.2.87",
     "@purge-icons/generated": "^0.9.0",
     "@types/codemirror": "^5.60.8",
     "@types/crypto-js": "^4.1.1",
@@ -139,14 +137,14 @@
     "husky": "^8.0.3",
     "lint-staged": "13.2.3",
     "prettier": "^2.8.8",
-    "prettier-plugin-packagejson": "^2.4.3",
+    "prettier-plugin-packagejson": "^2.4.4",
     "rimraf": "^5.0.1",
     "turbo": "^1.10.7",
     "typescript": "^5.1.6",
     "unbuild": "^1.2.1",
-    "vite": "^4.3.9",
+    "vite": "^4.4.0",
     "vite-plugin-mock": "^2.9.6",
-    "vue-tsc": "^1.8.3"
+    "vue-tsc": "^1.8.4"
   },
   "packageManager": "pnpm@8.1.0",
   "engines": {