From 458deeac32026948a4dc39733770ecec38e69033 Mon Sep 17 00:00:00 2001 From: fonghehe <331002675@qq.com> Date: Sun, 30 Oct 2022 08:48:26 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 +- .env.development | 3 + .env.production | 5 +- .env.test | 2 - build/utils.ts | 27 ++++++++ build/vite/plugins/autoImport.ts | 4 +- build/vite/plugins/component.ts | 1 + build/vite/plugins/index.ts | 11 +++- build/vite/plugins/progress.ts | 1 + build/vite/plugins/styleImport.ts | 4 +- package.json | 4 +- types/auto-imports.d.ts | 4 ++ types/global.d.ts | 16 +---- vite.config.ts | 10 ++- yarn.lock | 102 ++++++++++++++++-------------- 15 files changed, 119 insertions(+), 79 deletions(-) create mode 100644 .env.development create mode 100644 build/utils.ts diff --git a/.env b/.env index e3e89cf..f061d5d 100644 --- a/.env +++ b/.env @@ -1,2 +1,4 @@ VITE_TOKEN_KEY=tokenKey -VITE_URL_PREFIX=/api \ No newline at end of file + +VITE_URL_PREFIX=/api + diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..2fc12b5 --- /dev/null +++ b/.env.development @@ -0,0 +1,3 @@ +VITE_USE_MOCK=true + +VITE_USE_ERUDA=true \ No newline at end of file diff --git a/.env.production b/.env.production index e3e89cf..86d6c1c 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,3 @@ -VITE_TOKEN_KEY=tokenKey -VITE_URL_PREFIX=/api \ No newline at end of file +VITE_USE_MOCK=false + +VITE_USE_ERUDA=false \ No newline at end of file diff --git a/.env.test b/.env.test index e3e89cf..e69de29 100644 --- a/.env.test +++ b/.env.test @@ -1,2 +0,0 @@ -VITE_TOKEN_KEY=tokenKey -VITE_URL_PREFIX=/api \ No newline at end of file diff --git a/build/utils.ts b/build/utils.ts new file mode 100644 index 0000000..4e6311b --- /dev/null +++ b/build/utils.ts @@ -0,0 +1,27 @@ +// Read all environment variable configuration files to process.env +export function wrapperEnv(envConf: Recordable): ViteEnv { + const ret: any = {}; + + for (const envName of Object.keys(envConf)) { + let realName = envConf[envName].replace(/\\n/g, '\n'); + realName = realName === 'true' ? true : realName === 'false' ? false : realName; + + if (envName === 'VITE_PORT') { + realName = Number(realName); + } + if (envName === 'VITE_PROXY' && realName) { + try { + realName = JSON.parse(realName.replace(/'/g, '"')); + } catch (error) { + realName = ''; + } + } + ret[envName] = realName; + if (typeof realName === 'string') { + process.env[envName] = realName; + } else if (typeof realName === 'object') { + process.env[envName] = JSON.stringify(realName); + } + } + return ret; +} diff --git a/build/vite/plugins/autoImport.ts b/build/vite/plugins/autoImport.ts index 59c0912..033ad86 100644 --- a/build/vite/plugins/autoImport.ts +++ b/build/vite/plugins/autoImport.ts @@ -4,7 +4,7 @@ */ import AutoImport from 'unplugin-auto-import/vite'; -import { ElementPlusResolver, VarletUIResolver } from 'unplugin-vue-components/resolvers'; +import { VarletUIResolver, VantResolver } from 'unplugin-vue-components/resolvers'; export const AutoImportDeps = () => { return AutoImport({ @@ -17,6 +17,6 @@ export const AutoImportDeps = () => { '@vueuse/core': [], }, ], - resolvers: [ElementPlusResolver(), VarletUIResolver()], + resolvers: [VarletUIResolver(), VantResolver()], }); }; diff --git a/build/vite/plugins/component.ts b/build/vite/plugins/component.ts index 6d94505..f4898ce 100644 --- a/build/vite/plugins/component.ts +++ b/build/vite/plugins/component.ts @@ -5,6 +5,7 @@ import Components from 'unplugin-vue-components/vite'; import { VueUseComponentsResolver, VantResolver, VarletUIResolver } from 'unplugin-vue-components/resolvers'; + export const AutoRegistryComponents = () => { return Components({ // dirs: ['src/components'], diff --git a/build/vite/plugins/index.ts b/build/vite/plugins/index.ts index 48339c2..e33164a 100644 --- a/build/vite/plugins/index.ts +++ b/build/vite/plugins/index.ts @@ -20,7 +20,9 @@ import { ConfigStyleImport } from './styleImport'; import { ConfigImageminPlugin } from './imagemin'; import { ConfigVisualizerConfig } from './visualizer'; -export function createVitePlugins(isBuild: boolean) { +export function createVitePlugins(env: ViteEnv, isBuild: boolean) { + const { VITE_USE_MOCK, VITE_USE_ERUDA } = env; + const vitePlugins: (Plugin | Plugin[])[] = [ // vue支持 vue(), @@ -52,12 +54,14 @@ export function createVitePlugins(isBuild: boolean) { vitePlugins.push(ConfigStyleImport()); // eruda - vitePlugins.push(ConfigEruda()); + VITE_USE_ERUDA && vitePlugins.push(ConfigEruda()); // rollup-plugin-visualizer vitePlugins.push(ConfigVisualizerConfig()); + // vite-plugin-mock - vitePlugins.push(ConfigMockPlugin(isBuild)); + VITE_USE_MOCK && vitePlugins.push(ConfigMockPlugin(isBuild)); + if (isBuild) { // vite-plugin-imagemin vitePlugins.push(ConfigImageminPlugin()); @@ -65,5 +69,6 @@ export function createVitePlugins(isBuild: boolean) { // vite-plugin-svg-icons vitePlugins.push(ConfigSvgIconsPlugin(isBuild)); } + return vitePlugins; } diff --git a/build/vite/plugins/progress.ts b/build/vite/plugins/progress.ts index 9f88811..7cf4a21 100644 --- a/build/vite/plugins/progress.ts +++ b/build/vite/plugins/progress.ts @@ -5,6 +5,7 @@ import { Plugin } from 'vite'; import progress from 'vite-plugin-progress'; + export const ConfigProgressPlugin = () => { return progress() as Plugin; }; diff --git a/build/vite/plugins/styleImport.ts b/build/vite/plugins/styleImport.ts index bac14e3..3638392 100644 --- a/build/vite/plugins/styleImport.ts +++ b/build/vite/plugins/styleImport.ts @@ -3,7 +3,7 @@ * @description 按需引入样式文件 */ -import { createStyleImportPlugin, Lib } from 'vite-plugin-style-import'; +import { createStyleImportPlugin, Lib, VantResolve } from 'vite-plugin-style-import'; function NutuiResolve(): Lib { return { @@ -17,6 +17,6 @@ function NutuiResolve(): Lib { export const ConfigStyleImport = () => { return createStyleImportPlugin({ - resolves: [NutuiResolve()], + resolves: [NutuiResolve(), VantResolve()], }); }; diff --git a/package.json b/package.json index c364340..234d9ec 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "vue-router": "^4.1.6" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.41.0", - "@typescript-eslint/parser": "^5.41.0", + "@typescript-eslint/eslint-plugin": "^5.42.0", + "@typescript-eslint/parser": "^5.42.0", "@vitejs/plugin-legacy": "^2.3.0", "@vitejs/plugin-vue": "^3.2.0", "@vitejs/plugin-vue-jsx": "^2.1.0", diff --git a/types/auto-imports.d.ts b/types/auto-imports.d.ts index f87d6a3..4702f25 100644 --- a/types/auto-imports.d.ts +++ b/types/auto-imports.d.ts @@ -29,6 +29,8 @@ declare global { const nextTick: typeof import('vue')['nextTick']; const onActivated: typeof import('vue')['onActivated']; const onBeforeMount: typeof import('vue')['onBeforeMount']; + const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']; + const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']; const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']; const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']; const onDeactivated: typeof import('vue')['onDeactivated']; @@ -45,6 +47,7 @@ declare global { const readonly: typeof import('vue')['readonly']; const ref: typeof import('vue')['ref']; const resolveComponent: typeof import('vue')['resolveComponent']; + const resolveDirective: typeof import('vue')['resolveDirective']; const setActivePinia: typeof import('pinia')['setActivePinia']; const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix']; const shallowReactive: typeof import('vue')['shallowReactive']; @@ -59,6 +62,7 @@ declare global { const useAttrs: typeof import('vue')['useAttrs']; const useCssModule: typeof import('vue')['useCssModule']; const useCssVars: typeof import('vue')['useCssVars']; + const useLink: typeof import('vue-router')['useLink']; const useRoute: typeof import('vue-router')['useRoute']; const useRouter: typeof import('vue-router')['useRouter']; const useSlots: typeof import('vue')['useSlots']; diff --git a/types/global.d.ts b/types/global.d.ts index 5373c58..f0676e9 100644 --- a/types/global.d.ts +++ b/types/global.d.ts @@ -50,20 +50,8 @@ declare global { } declare interface ViteEnv { - VITE_PORT: number; - VITE_USE_MOCK: boolean; - VITE_USE_PWA: boolean; - VITE_PUBLIC_PATH: string; - VITE_PROXY: [string, string][]; - VITE_GLOB_APP_TITLE: string; - VITE_GLOB_APP_SHORT_NAME: string; - VITE_USE_CDN: boolean; - VITE_DROP_CONSOLE: boolean; - VITE_BUILD_COMPRESS: 'gzip' | 'brotli' | 'none'; - VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE: boolean; - VITE_LEGACY: boolean; - VITE_USE_IMAGEMIN: boolean; - VITE_GENERATE_UI: string; + VITE_USE_MOCK: Boolean; + VITE_USE_ERUDA: Boolean; } declare function parseInt(s: string | number, radix?: number): number; diff --git a/vite.config.ts b/vite.config.ts index 78cb2c4..c2ef170 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,15 +1,19 @@ import { createVitePlugins } from './build/vite/plugins'; import { resolve } from 'path'; -import { ConfigEnv, UserConfigExport } from 'vite'; +import { ConfigEnv, loadEnv, UserConfigExport } from 'vite'; +import { wrapperEnv } from './build/utils'; const pathResolve = (dir: string) => { return resolve(process.cwd(), '.', dir); }; // https://vitejs.dev/config/ -export default function ({ command }: ConfigEnv): UserConfigExport { +export default function ({ command, mode }: ConfigEnv): UserConfigExport { const isProduction = command === 'build'; const root = process.cwd(); + const env = loadEnv(mode, root); + const viteEnv = wrapperEnv(env); + return { root, resolve: { @@ -34,7 +38,7 @@ export default function ({ command }: ConfigEnv): UserConfigExport { host: true, hmr: true, }, - plugins: createVitePlugins(isProduction), + plugins: createVitePlugins(viteEnv, isProduction), build: { minify: 'terser', terserOptions: { diff --git a/yarn.lock b/yarn.lock index 0623f9c..ce3af1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -874,86 +874,87 @@ resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8" integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ== -"@typescript-eslint/eslint-plugin@^5.41.0": - version "5.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.41.0.tgz#f8eeb1c6bb2549f795f3ba71aec3b38d1ab6b1e1" - integrity sha512-DXUS22Y57/LAFSg3x7Vi6RNAuLpTXwxB9S2nIA7msBb/Zt8p7XqMwdpdc1IU7CkOQUPgAqR5fWvxuKCbneKGmA== +"@typescript-eslint/eslint-plugin@^5.42.0": + version "5.42.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.0.tgz#36a8c0c379870127059889a9cc7e05c260d2aaa5" + integrity sha512-5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ== dependencies: - "@typescript-eslint/scope-manager" "5.41.0" - "@typescript-eslint/type-utils" "5.41.0" - "@typescript-eslint/utils" "5.41.0" + "@typescript-eslint/scope-manager" "5.42.0" + "@typescript-eslint/type-utils" "5.42.0" + "@typescript-eslint/utils" "5.42.0" debug "^4.3.4" ignore "^5.2.0" + natural-compare-lite "^1.4.0" regexpp "^3.2.0" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.41.0": - version "5.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.41.0.tgz#0414a6405007e463dc527b459af1f19430382d67" - integrity sha512-HQVfix4+RL5YRWZboMD1pUfFN8MpRH4laziWkkAzyO1fvNOY/uinZcvo3QiFJVS/siNHupV8E5+xSwQZrl6PZA== +"@typescript-eslint/parser@^5.42.0": + version "5.42.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.42.0.tgz#be0ffbe279e1320e3d15e2ef0ad19262f59e9240" + integrity sha512-Ixh9qrOTDRctFg3yIwrLkgf33AHyEIn6lhyf5cCfwwiGtkWhNpVKlEZApi3inGQR/barWnY7qY8FbGKBO7p3JA== dependencies: - "@typescript-eslint/scope-manager" "5.41.0" - "@typescript-eslint/types" "5.41.0" - "@typescript-eslint/typescript-estree" "5.41.0" + "@typescript-eslint/scope-manager" "5.42.0" + "@typescript-eslint/types" "5.42.0" + "@typescript-eslint/typescript-estree" "5.42.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.41.0": - version "5.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.41.0.tgz#28e3a41d626288d0628be14cf9de8d49fc30fadf" - integrity sha512-xOxPJCnuktUkY2xoEZBKXO5DBCugFzjrVndKdUnyQr3+9aDWZReKq9MhaoVnbL+maVwWJu/N0SEtrtEUNb62QQ== +"@typescript-eslint/scope-manager@5.42.0": + version "5.42.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.42.0.tgz#e1f2bb26d3b2a508421ee2e3ceea5396b192f5ef" + integrity sha512-l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow== dependencies: - "@typescript-eslint/types" "5.41.0" - "@typescript-eslint/visitor-keys" "5.41.0" + "@typescript-eslint/types" "5.42.0" + "@typescript-eslint/visitor-keys" "5.42.0" -"@typescript-eslint/type-utils@5.41.0": - version "5.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.41.0.tgz#2371601171e9f26a4e6da918a7913f7266890cdf" - integrity sha512-L30HNvIG6A1Q0R58e4hu4h+fZqaO909UcnnPbwKiN6Rc3BUEx6ez2wgN7aC0cBfcAjZfwkzE+E2PQQ9nEuoqfA== +"@typescript-eslint/type-utils@5.42.0": + version "5.42.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.42.0.tgz#4206d7192d4fe903ddf99d09b41d4ac31b0b7dca" + integrity sha512-HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg== dependencies: - "@typescript-eslint/typescript-estree" "5.41.0" - "@typescript-eslint/utils" "5.41.0" + "@typescript-eslint/typescript-estree" "5.42.0" + "@typescript-eslint/utils" "5.42.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.41.0": - version "5.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.41.0.tgz#6800abebc4e6abaf24cdf220fb4ce28f4ab09a85" - integrity sha512-5BejraMXMC+2UjefDvrH0Fo/eLwZRV6859SXRg+FgbhA0R0l6lDqDGAQYhKbXhPN2ofk2kY5sgGyLNL907UXpA== +"@typescript-eslint/types@5.42.0": + version "5.42.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.42.0.tgz#5aeff9b5eced48f27d5b8139339bf1ef805bad7a" + integrity sha512-t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw== -"@typescript-eslint/typescript-estree@5.41.0": - version "5.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.41.0.tgz#bf5c6b3138adbdc73ba4871d060ae12c59366c61" - integrity sha512-SlzFYRwFSvswzDSQ/zPkIWcHv8O5y42YUskko9c4ki+fV6HATsTODUPbRbcGDFYP86gaJL5xohUEytvyNNcXWg== +"@typescript-eslint/typescript-estree@5.42.0": + version "5.42.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.0.tgz#2592d24bb5f89bf54a63384ff3494870f95b3fd8" + integrity sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg== dependencies: - "@typescript-eslint/types" "5.41.0" - "@typescript-eslint/visitor-keys" "5.41.0" + "@typescript-eslint/types" "5.42.0" + "@typescript-eslint/visitor-keys" "5.42.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.41.0": - version "5.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.41.0.tgz#f41ae5883994a249d00b2ce69f4188f3a23fa0f9" - integrity sha512-QlvfwaN9jaMga9EBazQ+5DDx/4sAdqDkcs05AsQHMaopluVCUyu1bTRUVKzXbgjDlrRAQrYVoi/sXJ9fmG+KLQ== +"@typescript-eslint/utils@5.42.0": + version "5.42.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.42.0.tgz#f06bd43b9a9a06ed8f29600273240e84a53f2f15" + integrity sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ== dependencies: "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.41.0" - "@typescript-eslint/types" "5.41.0" - "@typescript-eslint/typescript-estree" "5.41.0" + "@typescript-eslint/scope-manager" "5.42.0" + "@typescript-eslint/types" "5.42.0" + "@typescript-eslint/typescript-estree" "5.42.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.41.0": - version "5.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.41.0.tgz#d3510712bc07d5540160ed3c0f8f213b73e3bcd9" - integrity sha512-vilqeHj267v8uzzakbm13HkPMl7cbYpKVjgFWZPIOHIJHZtinvypUhJ5xBXfWYg4eFKqztbMMpOgFpT9Gfx4fw== +"@typescript-eslint/visitor-keys@5.42.0": + version "5.42.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.0.tgz#ee8d62d486f41cfe646632fab790fbf0c1db5bb0" + integrity sha512-QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg== dependencies: - "@typescript-eslint/types" "5.41.0" + "@typescript-eslint/types" "5.42.0" eslint-visitor-keys "^3.3.0" "@vant/icons@^1.8.0": @@ -5641,6 +5642,11 @@ nanomatch@^1.2.1, nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +natural-compare-lite@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" + integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"