diff --git a/README.md b/README.md index 845c2810..f4e97757 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ | 框架 | 说明 | 版本 | | --- | --- | --- | | [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.47 | -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.2.1 | +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.3.0 | | [ant-design-vue](https://antdv.com/) | ant-design-vue | 3.2.17 | | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.0.4 | | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.34 | diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts index 0008dd50..f423358a 100644 --- a/build/vite/plugin/index.ts +++ b/build/vite/plugin/index.ts @@ -17,7 +17,7 @@ import { configSvgIconsPlugin } from './svgSprite' export async function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) { const { VITE_BUILD_COMPRESS, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE } = viteEnv - const vitePlugins: (PluginOption | PluginOption[])[] = [ + const vitePlugins: PluginOption[] = [ // have to vue(), // have to diff --git a/package.json b/package.json index a16db792..57950b2f 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "terser": "^5.16.8", "typescript": "^5.0.4", "unplugin-vue-setup-extend-plus": "^1.0.0", - "vite": "^4.2.1", + "vite": "^4.3.0-beta.5", "vite-plugin-compression": "^0.5.1", "vite-plugin-mkcert": "^1.14.0", "vite-plugin-progress": "^0.0.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d0f17de0..f6043c5f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -149,10 +149,10 @@ devDependencies: version: 5.57.1(eslint@8.38.0)(typescript@5.0.4) '@vitejs/plugin-vue': specifier: ^4.1.0 - version: 4.1.0(vite@4.2.1)(vue@3.2.47) + version: 4.1.0(vite@4.3.0-beta.5)(vue@3.2.47) '@vitejs/plugin-vue-jsx': specifier: ^3.0.1 - version: 3.0.1(vite@4.2.1)(vue@3.2.47) + version: 3.0.1(vite@4.3.0-beta.5)(vue@3.2.47) '@vue/compiler-sfc': specifier: ^3.2.47 version: 3.2.47 @@ -253,38 +253,38 @@ devDependencies: specifier: ^1.0.0 version: 1.0.0 vite: - specifier: ^4.2.1 - version: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + specifier: ^4.3.0-beta.5 + version: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) vite-plugin-compression: specifier: ^0.5.1 - version: 0.5.1(vite@4.2.1) + version: 0.5.1(vite@4.3.0-beta.5) vite-plugin-mkcert: specifier: ^1.14.0 - version: 1.14.0(vite@4.2.1) + version: 1.14.0(vite@4.3.0-beta.5) vite-plugin-progress: specifier: ^0.0.7 - version: 0.0.7(vite@4.2.1) + version: 0.0.7(vite@4.3.0-beta.5) vite-plugin-purge-icons: specifier: ^0.9.2 - version: 0.9.2(vite@4.2.1) + version: 0.9.2(vite@4.3.0-beta.5) vite-plugin-pwa: specifier: ^0.14.7 - version: 0.14.7(vite@4.2.1)(workbox-build@6.5.4)(workbox-window@6.5.4) + version: 0.14.7(vite@4.3.0-beta.5)(workbox-build@6.5.4)(workbox-window@6.5.4) vite-plugin-style-import: specifier: ^2.0.0 - version: 2.0.0(vite@4.2.1) + version: 2.0.0(vite@4.3.0-beta.5) vite-plugin-svg-icons: specifier: ^2.0.1 - version: 2.0.1(vite@4.2.1) + version: 2.0.1(vite@4.3.0-beta.5) vite-plugin-windicss: specifier: ^1.8.10 - version: 1.8.10(vite@4.2.1) + version: 1.8.10(vite@4.3.0-beta.5) vite-vue-plugin-html: specifier: ^1.0.1 - version: 1.0.1(rollup@3.20.2)(vite@4.2.1) + version: 1.0.1(rollup@3.20.2)(vite@4.3.0-beta.5) vite-vue-plugin-theme: specifier: ^1.0.0 - version: 1.0.0(vite@4.2.1) + version: 1.0.0(vite@4.3.0-beta.5) vue-eslint-parser: specifier: ^9.1.1 version: 9.1.1(eslint@8.38.0) @@ -2672,7 +2672,7 @@ packages: eslint-visitor-keys: 3.4.0 dev: true - /@vitejs/plugin-vue-jsx@3.0.1(vite@4.2.1)(vue@3.2.47): + /@vitejs/plugin-vue-jsx@3.0.1(vite@4.3.0-beta.5)(vue@3.2.47): resolution: {integrity: sha512-+Jb7ggL48FSPS1uhPnJbJwWa9Sr90vQ+d0InW+AhBM22n+cfuYqJZDckBc+W3QSHe1WDvewMZfa4wZOtk5pRgw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -2682,20 +2682,20 @@ packages: '@babel/core': 7.21.4 '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.21.4) '@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.21.4) - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) vue: 3.2.47 transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue@4.1.0(vite@4.2.1)(vue@3.2.47): + /@vitejs/plugin-vue@4.1.0(vite@4.3.0-beta.5)(vue@3.2.47): resolution: {integrity: sha512-++9JOAFdcXI3lyer9UKUV4rfoQ3T1RN8yDqoCLar86s0xQct5yblxAE+yWgRnU5/0FOlVCpTZpYSBV/bGWrSrQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) vue: 3.2.47 dev: true @@ -8452,7 +8452,7 @@ packages: diff-match-patch: 1.0.5 dev: false - /vite-plugin-compression@0.5.1(vite@4.2.1): + /vite-plugin-compression@0.5.1(vite@4.3.0-beta.5): resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==} peerDependencies: vite: '>=2.0.0' @@ -8460,12 +8460,12 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-mkcert@1.14.0(vite@4.2.1): + /vite-plugin-mkcert@1.14.0(vite@4.3.0-beta.5): resolution: {integrity: sha512-TXLqRYeKKv2kGIpDVMXPLAlTQLXfZ5/VtC4VVhV0ky2vKt5W/TDvFKpmelQPmn0IB7uz9KXvQj8Op+pkT9Ln9A==} engines: {node: '>=v16.7.0'} peerDependencies: @@ -8475,13 +8475,13 @@ packages: axios: 1.3.5(debug@4.3.4) debug: 4.3.4 picocolors: 1.0.0 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) transitivePeerDependencies: - encoding - supports-color dev: true - /vite-plugin-progress@0.0.7(vite@4.2.1): + /vite-plugin-progress@0.0.7(vite@4.3.0-beta.5): resolution: {integrity: sha512-zyvKdcc/X+6hnw3J1HVV1TKrlFKC4Rh8GnDnWG/2qhRXjqytTcM++xZ+SAPnoDsSyWl8O93ymK0wZRgHAoglEQ==} engines: {node: '>=14', pnpm: '>=7.0.0'} peerDependencies: @@ -8490,10 +8490,10 @@ packages: picocolors: 1.0.0 progress: 2.0.3 rd: 2.0.1 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) dev: true - /vite-plugin-purge-icons@0.9.2(vite@4.2.1): + /vite-plugin-purge-icons@0.9.2(vite@4.3.0-beta.5): resolution: {integrity: sha512-vxJEMyNyckqLr/4HPsW9P6BMLUvOVMvjjFz3jLl4Wke1KWE8ITJUxIUwodxaOmEp9L2lxVk5an3TYeycZCfqFw==} engines: {node: '>= 12'} peerDependencies: @@ -8502,13 +8502,13 @@ packages: '@purge-icons/core': 0.9.1 '@purge-icons/generated': 0.9.0 rollup-plugin-purge-icons: 0.9.1 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) transitivePeerDependencies: - encoding - supports-color dev: true - /vite-plugin-pwa@0.14.7(vite@4.2.1)(workbox-build@6.5.4)(workbox-window@6.5.4): + /vite-plugin-pwa@0.14.7(vite@4.3.0-beta.5)(workbox-build@6.5.4)(workbox-window@6.5.4): resolution: {integrity: sha512-dNJaf0fYOWncmjxv9HiSa2xrSjipjff7IkYE5oIUJ2x5HKu3cXgA8LRgzOwTc5MhwyFYRSU0xyN0Phbx3NsQYw==} peerDependencies: vite: ^3.1.0 || ^4.0.0 @@ -8520,14 +8520,14 @@ packages: fast-glob: 3.2.12 pretty-bytes: 6.1.0 rollup: 3.20.2 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) workbox-build: 6.5.4 workbox-window: 6.5.4 transitivePeerDependencies: - supports-color dev: true - /vite-plugin-style-import@2.0.0(vite@4.2.1): + /vite-plugin-style-import@2.0.0(vite@4.3.0-beta.5): resolution: {integrity: sha512-qtoHQae5dSUQPo/rYz/8p190VU5y19rtBaeV7ryLa/AYAU/e9CG89NrN/3+k7MR8mJy/GPIu91iJ3zk9foUOSA==} peerDependencies: vite: '>=2.0.0' @@ -8539,10 +8539,10 @@ packages: fs-extra: 10.1.0 magic-string: 0.25.9 pathe: 0.2.0 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) dev: true - /vite-plugin-svg-icons@2.0.1(vite@4.2.1): + /vite-plugin-svg-icons@2.0.1(vite@4.3.0-beta.5): resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==} peerDependencies: vite: '>=2.0.0' @@ -8555,12 +8555,12 @@ packages: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) transitivePeerDependencies: - supports-color dev: true - /vite-plugin-windicss@1.8.10(vite@4.2.1): + /vite-plugin-windicss@1.8.10(vite@4.3.0-beta.5): resolution: {integrity: sha512-scywsuzo46lcTBohspmF0WiwhWEte6p+OUVrX4yr7VMRvLHMHVfLtJReyD5pppjijG7YOwVsZn7XBWWZtF658Q==} peerDependencies: vite: ^2.0.1 || ^3.0.0 || ^4.0.0 @@ -8568,13 +8568,13 @@ packages: '@windicss/plugin-utils': 1.8.10 debug: 4.3.4 kolorist: 1.7.0 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) windicss: 3.5.6 transitivePeerDependencies: - supports-color dev: true - /vite-vue-plugin-html@1.0.1(rollup@3.20.2)(vite@4.2.1): + /vite-vue-plugin-html@1.0.1(rollup@3.20.2)(vite@4.3.0-beta.5): resolution: {integrity: sha512-jbN7p8pOR0aiYndFuPgyQwRAyEp8kIoy6EL741wMh3nDLVjHn4Atfby0k0Jg0aDfWCjoAc9paKdoLoEqOAC9PA==} peerDependencies: vite: '>=4.2.0' @@ -8591,12 +8591,12 @@ packages: html-minifier-terser: 7.1.0 node-html-parser: 6.1.5 pathe: 1.1.0 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) transitivePeerDependencies: - rollup dev: true - /vite-vue-plugin-theme@1.0.0(vite@4.2.1): + /vite-vue-plugin-theme@1.0.0(vite@4.3.0-beta.5): resolution: {integrity: sha512-+2JcZSoxZadD5Vk/8aQGEwtyFsK6PZRkp7UZooM2xnFUP7IQKLWv7rKUytzcqDvs8u8gIIbX5RzaUClp8erCag==} peerDependencies: vite: '>=4.2.0' @@ -8609,13 +8609,13 @@ packages: esbuild-plugin-alias: 0.2.1 picocolors: 1.0.0 tinycolor2: 1.6.0 - vite: 4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) + vite: 4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8) transitivePeerDependencies: - supports-color dev: true - /vite@4.2.1(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8): - resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==} + /vite@4.3.0-beta.5(@types/node@18.15.7)(less@4.1.3)(terser@5.16.8): + resolution: {integrity: sha512-ZqmNx6paOy7W2A7L3+JRtZMYcjbQtCmxHOaeh+sQ0QXqXaJDOuwVAXq3Iobr1yskPMr3ekAtYIJfoGDpzWarNA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -8643,7 +8643,6 @@ packages: esbuild: 0.17.15 less: 4.1.3 postcss: 8.4.21 - resolve: 1.22.1 rollup: 3.20.2 terser: 5.16.8 optionalDependencies: diff --git a/src/router/helper/routeHelper.ts b/src/router/helper/routeHelper.ts index 0779f08b..2d12bfce 100644 --- a/src/router/helper/routeHelper.ts +++ b/src/router/helper/routeHelper.ts @@ -1,10 +1,9 @@ import type { AppRouteModule, AppRouteRecordRaw } from '@/router/types' -import type { Router, RouteRecordNormalized } from 'vue-router' - import { getParentLayout, LAYOUT, EXCEPTION_COMPONENT } from '@/router/constant' +import type { Router, RouteRecordNormalized } from 'vue-router' +import { createRouter, createWebHashHistory } from 'vue-router' import { cloneDeep, omit } from 'lodash-es' import { warn } from '@/utils/log' -import { createRouter, createWebHashHistory } from 'vue-router' import { isUrl } from '@/utils/is' export type LayoutMapKey = 'LAYOUT'