Merge branch 'vue-h5-template' into vue-h5-template

.vscode/extensions.json

@@ -1,3 +1,5 @@
 {
-  "recommendations": ["johnsoncodehk.volar"]
+  "recommendations": [
+    "vue.volar"
+  ]
 }

build/vite/plugins/index.ts

@@ -7,6 +7,7 @@ import type { PluginOption } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';
 import vueSetupExtend from 'vite-plugin-vue-setup-extend-plus';
+
 import { ConfigSvgIconsPlugin } from './svgIcons';
 import { AutoRegistryComponents } from './component';
 import { AutoImportDeps } from './autoImport';
@@ -28,7 +29,7 @@ export function createVitePlugins(env: ViteEnv, isBuild: boolean) {
     // JSX支持
     vueJsx(),
     // setup语法糖组件名支持
-    vueSetupExtend(),
+    // vueSetupExtend(),
   ];
 
   // 自动按需引入组件

package.json

@@ -14,61 +14,62 @@
     "commit": "git add . && git-cz"
   },
   "dependencies": {
-    "@nutui/nutui": "^4.0.5",
-    "@varlet/ui": "^2.9.6",
-    "@vueuse/core": "10.0.2",
-    "@vueuse/integrations": "10.0.2",
-    "axios": "1.3.5",
+    "@nutui/icons-vue": "^0.0.26",
+    "@nutui/nutui": "^4.0.6",
+    "@varlet/ui": "^2.10.1",
+    "@vueuse/core": "10.1.2",
+    "@vueuse/integrations": "10.1.2",
+    "axios": "1.4.0",
     "dayjs": "^1.11.7",
     "mitt": "^3.0.0",
-    "pinia": "^2.0.34",
+    "pinia": "^2.0.35",
     "pinia-plugin-persistedstate": "^3.1.0",
     "universal-cookie": "^4.0.4",
-    "vant": "^4.2.0",
+    "vant": "^4.3.1",
     "vue": "^3.2.47",
     "vue-i18n": "^9.2.2",
     "vue-router": "^4.1.6"
   },
   "devDependencies": {
-    "@vitejs/plugin-legacy": "^4.0.2",
-    "@vitejs/plugin-vue": "^4.1.0",
+    "@vitejs/plugin-legacy": "^4.0.3",
+    "@vitejs/plugin-vue": "^4.2.1",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
     "@vue/eslint-config-prettier": "^7.1.0",
-    "@vue/eslint-config-typescript": "^11.0.2",
+    "@vue/eslint-config-typescript": "^11.0.3",
     "@vue/test-utils": "^2.3.2",
-    "@vue/tsconfig": "^0.1.3",
+    "@vue/tsconfig": "^0.3.2",
     "amfe-flexible": "^2.2.1",
     "autoprefixer": "^10.4.14",
     "cnjm-postcss-px-to-viewport": "^1.0.0",
-    "consola": "^3.0.2",
+    "consola": "^3.1.0",
     "cross-env": "^7.0.3",
     "eruda": "^3.0.0",
-    "eslint": "^8.38.0",
+    "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-vue": "^9.11.0",
     "git-cz": "^4.9.0",
     "husky": "8.0.3",
-    "jsdom": "^21.1.1",
-    "lint-staged": "13.2.1",
+    "jsdom": "^22.0.0",
+    "lint-staged": "13.2.2",
     "mockjs": "^1.1.0",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.22",
+    "postcss": "^8.4.23",
     "postcss-html": "1.5.0",
     "postcss-less": "^6.0.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "rollup-plugin-visualizer": "^5.9.0",
-    "stylelint": "^15.5.0",
+    "stylelint": "^15.6.1",
     "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-recommended": "^12.0.0",
     "stylelint-config-recommended-vue": "^1.4.0",
     "stylelint-config-standard": "^33.0.0",
     "stylelint-order": "^6.0.3",
-    "terser": "^5.16.9",
-    "typescript": "^4.9.5",
+    "terser": "^5.17.1",
+    "typescript": "^5.0.0",
     "unplugin-auto-import": "^0.15.3",
     "unplugin-vue-components": "^0.24.1",
-    "vite": "^4.2.1",
+    "vite": "^4.3.5",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eruda": "^1.0.1",
     "vite-plugin-imagemin": "^0.6.1",
@@ -78,9 +79,9 @@
     "vite-plugin-restart": "^0.3.1",
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-vue-setup-extend-plus": "^0.1.0",
-    "vitest": "^0.30.1",
-    "vue-eslint-parser": "^9.1.1",
-    "vue-tsc": "^1.2.0"
+    "vitest": "^0.31.0",
+    "vue-eslint-parser": "^9.2.0",
+    "vue-tsc": "^1.5.0"
   },
   "husky": {
     "hooks": {

src/router/routes.ts

@@ -56,6 +56,12 @@ export const routes = [
       keepAlive: true,
     },
   },
+  // 匹配不到重定向会主页
+  {
+    // 找不到路由重定向到404页面
+    path: '/:pathMatch(.*)',
+    redirect: '/Home',
+  },
 ];
 
 export default routes;