diff --git a/build/index.ts b/build/index.ts index 2805485..462e70e 100644 --- a/build/index.ts +++ b/build/index.ts @@ -27,9 +27,4 @@ const warpperEnv = (envConf: Recordable): ViteEnv => { return ret; }; -/** 获取环境变量 */ -const loadEnv = (): ViteEnv => { - return import.meta.env; -}; - -export { warpperEnv, loadEnv }; +export { warpperEnv }; diff --git a/package.json b/package.json index e55ba83..236a5ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pure-admin-thin", - "version": "3.9.5", + "version": "3.9.6", "private": true, "scripts": { "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite", @@ -38,14 +38,14 @@ "axios": "^1.2.0", "dayjs": "^1.11.6", "echarts": "^5.4.0", - "element-plus": "^2.2.26", + "element-plus": "^2.2.27", "element-resize-detector": "^1.2.4", "js-cookie": "^3.0.1", "mitt": "^3.0.0", "mockjs": "^1.1.0", "nprogress": "^0.2.0", "path": "^0.12.7", - "pinia": "^2.0.27", + "pinia": "^2.0.28", "qs": "^6.11.0", "responsive-storage": "^2.1.0", "vue": "^3.2.45", @@ -67,9 +67,8 @@ "@types/qs": "^6.9.7", "@typescript-eslint/eslint-plugin": "^5.42.1", "@typescript-eslint/parser": "^5.42.1", - "@vitejs/plugin-legacy": "^2.3.1", - "@vitejs/plugin-vue": "^3.2.0", - "@vitejs/plugin-vue-jsx": "^2.1.1", + "@vitejs/plugin-vue": "^4.0.0", + "@vitejs/plugin-vue-jsx": "^3.0.0", "@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-typescript": "^11.0.2", "autoprefixer": "^10.4.13", @@ -99,10 +98,10 @@ "stylelint-order": "^5.0.0", "svgo": "^3.0.2", "tailwindcss": "^3.2.4", - "terser": "^5.15.1", + "terser": "^5.16.1", "typescript": "^4.9.3", - "unplugin-vue-define-options": "^1.0.0", - "vite": "3.1.8", + "unplugin-vue-define-options": "^1.1.1", + "vite": "^4.0.2", "vite-plugin-cdn-import": "^0.3.5", "vite-plugin-compression": "^0.5.1", "vite-plugin-mock": "^2.9.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9216d4b..2f21464 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,9 +18,8 @@ specifiers: "@types/qs": ^6.9.7 "@typescript-eslint/eslint-plugin": ^5.42.1 "@typescript-eslint/parser": ^5.42.1 - "@vitejs/plugin-legacy": ^2.3.1 - "@vitejs/plugin-vue": ^3.2.0 - "@vitejs/plugin-vue-jsx": ^2.1.1 + "@vitejs/plugin-vue": ^4.0.0 + "@vitejs/plugin-vue-jsx": ^3.0.0 "@vue/eslint-config-prettier": ^7.0.0 "@vue/eslint-config-typescript": ^11.0.2 "@vueuse/core": ^9.6.0 @@ -32,7 +31,7 @@ specifiers: cssnano: ^5.1.14 dayjs: ^1.11.6 echarts: ^5.4.0 - element-plus: ^2.2.26 + element-plus: ^2.2.27 element-resize-detector: ^1.2.4 eslint: ^8.8.0 eslint-plugin-prettier: ^4.0.0 @@ -45,7 +44,7 @@ specifiers: nprogress: ^0.2.0 path: ^0.12.7 picocolors: ^1.0.0 - pinia: ^2.0.27 + pinia: ^2.0.28 postcss: ^8.4.18 postcss-html: ^1.5.0 postcss-import: ^15.0.0 @@ -66,10 +65,10 @@ specifiers: stylelint-order: ^5.0.0 svgo: ^3.0.2 tailwindcss: ^3.2.4 - terser: ^5.15.1 + terser: ^5.16.1 typescript: ^4.9.3 - unplugin-vue-define-options: ^1.0.0 - vite: 3.1.8 + unplugin-vue-define-options: ^1.1.1 + vite: ^4.0.2 vite-plugin-cdn-import: ^0.3.5 vite-plugin-compression: ^0.5.1 vite-plugin-mock: ^2.9.6 @@ -82,8 +81,8 @@ specifiers: vue-types: ^4.2.1 dependencies: - "@pureadmin/descriptions": 1.1.1_element-plus@2.2.26 - "@pureadmin/table": 1.9.0_element-plus@2.2.26 + "@pureadmin/descriptions": 1.1.1_element-plus@2.2.27 + "@pureadmin/table": 1.9.0_element-plus@2.2.27 "@pureadmin/utils": 1.8.5_echarts@5.4.1+vue@3.2.45 "@vueuse/core": 9.6.0_vue@3.2.45 "@vueuse/motion": 2.0.0-beta.12_vue@3.2.45 @@ -91,7 +90,7 @@ dependencies: axios: 1.2.1 dayjs: 1.11.7 echarts: 5.4.1 - element-plus: 2.2.26_vue@3.2.45 + element-plus: 2.2.27_vue@3.2.45 element-resize-detector: 1.2.4 js-cookie: 3.0.1 mitt: 3.0.0 @@ -120,9 +119,8 @@ devDependencies: "@types/qs": 6.9.7 "@typescript-eslint/eslint-plugin": 5.46.1_imrg37k3svwu377c6q7gkarwmi "@typescript-eslint/parser": 5.46.1_ha6vam6werchizxrnqvarmz2zu - "@vitejs/plugin-legacy": 2.3.1_terser@5.16.1+vite@3.1.8 - "@vitejs/plugin-vue": 3.2.0_vite@3.1.8+vue@3.2.45 - "@vitejs/plugin-vue-jsx": 2.1.1_vite@3.1.8+vue@3.2.45 + "@vitejs/plugin-vue": 4.0.0_vite@4.0.2+vue@3.2.45 + "@vitejs/plugin-vue-jsx": 3.0.0_vite@4.0.2+vue@3.2.45 "@vue/eslint-config-prettier": 7.0.0_wdw3qg4p7crmsoaizcyntelyni "@vue/eslint-config-typescript": 11.0.2_4ajq2belonl3hwwudzbg7tkiqi autoprefixer: 10.4.13_postcss@8.4.20 @@ -154,11 +152,11 @@ devDependencies: tailwindcss: 3.2.4_postcss@8.4.20 terser: 5.16.1 typescript: 4.9.4 - unplugin-vue-define-options: 1.0.0 - vite: 3.1.8_sass@1.56.2+terser@5.16.1 + unplugin-vue-define-options: 1.1.1_vue@3.2.45 + vite: 4.0.2_fgfkqxcefcouvwljpt4dl27fkq vite-plugin-cdn-import: 0.3.5 - vite-plugin-compression: 0.5.1_vite@3.1.8 - vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@3.1.8 + vite-plugin-compression: 0.5.1_vite@4.0.2 + vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@4.0.2 vite-plugin-remove-console: 1.3.0 vite-svg-loader: 3.6.0 vue-eslint-parser: 9.1.0_eslint@8.29.0 @@ -214,7 +212,7 @@ packages: convert-source-map: 1.9.0 debug: 4.3.4 gensync: 1.0.0-beta.2 - json5: 2.2.1 + json5: 2.2.2 semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -502,14 +500,6 @@ packages: - supports-color dev: true - /@babel/standalone/7.20.6: - resolution: - { - integrity: sha512-u5at/CbBLETf7kx2LOY4XdhseD79Y099WZKAOMXeT8qvd9OSR515my2UNBBLY4qIht/Qi9KySeQHQwQwxJN4Sw== - } - engines: { node: ">=6.9.0" } - dev: true - /@babel/template/7.18.10: resolution: { @@ -794,10 +784,10 @@ packages: - typescript dev: true - /@esbuild/android-arm/0.15.18: + /@esbuild/android-arm/0.16.9: resolution: { - integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw== + integrity: sha512-kW5ccqWHVOOTGUkkJbtfoImtqu3kA1PFkivM+9QPFSHphPfPBlBalX9eDRqPK+wHCqKhU48/78T791qPgC9e9A== } engines: { node: ">=12" } cpu: [arm] @@ -806,10 +796,118 @@ packages: dev: true optional: true - /@esbuild/linux-loong64/0.15.18: + /@esbuild/android-arm64/0.16.9: resolution: { - integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ== + integrity: sha512-ndIAZJUeLx4O+4AJbFQCurQW4VRUXjDsUvt1L+nP8bVELOWdmdCEOtlIweCUE6P+hU0uxYbEK2AEP0n5IVQvhg== + } + engines: { node: ">=12" } + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-x64/0.16.9: + resolution: + { + integrity: sha512-UbMcJB4EHrAVOnknQklREPgclNU2CPet2h+sCBCXmF2mfoYWopBn/CfTfeyOkb/JglOcdEADqAljFndMKnFtOw== + } + engines: { node: ">=12" } + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-arm64/0.16.9: + resolution: + { + integrity: sha512-d7D7/nrt4CxPul98lx4PXhyNZwTYtbdaHhOSdXlZuu5zZIznjqtMqLac8Bv+IuT6SVHiHUwrkL6ywD7mOgLW+A== + } + engines: { node: ">=12" } + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/darwin-x64/0.16.9: + resolution: + { + integrity: sha512-LZc+Wlz06AkJYtwWsBM3x2rSqTG8lntDuftsUNQ3fCx9ZttYtvlDcVtgb+NQ6t9s6K5No5zutN3pcjZEC2a4iQ== + } + engines: { node: ">=12" } + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-arm64/0.16.9: + resolution: + { + integrity: sha512-gIj0UQZlQo93CHYouHKkpzP7AuruSaMIm1etcWIxccFEVqCN1xDr6BWlN9bM+ol/f0W9w3hx3HDuEwcJVtGneQ== + } + engines: { node: ">=12" } + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/freebsd-x64/0.16.9: + resolution: + { + integrity: sha512-GNors4vaMJ7lzGOuhzNc7jvgsQZqErGA8rsW+nck8N1nYu86CvsJW2seigVrQQWOV4QzEP8Zf3gm+QCjA2hnBQ== + } + engines: { node: ">=12" } + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm/0.16.9: + resolution: + { + integrity: sha512-cNx1EF99c2t1Ztn0lk9N+MuwBijGF8mH6nx9GFsB3e0lpUpPkCE/yt5d+7NP9EwJf5uzqdjutgVYoH1SNqzudA== + } + engines: { node: ">=12" } + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-arm64/0.16.9: + resolution: + { + integrity: sha512-YPxQunReYp8RQ1FvexFrOEqqf+nLbS3bKVZF5FRT2uKM7Wio7BeATqAwO02AyrdSEntt3I5fhFsujUChIa8CZg== + } + engines: { node: ">=12" } + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ia32/0.16.9: + resolution: + { + integrity: sha512-zb12ixDIKNwFpIqR00J88FFitVwOEwO78EiUi8wi8FXlmSc3GtUuKV/BSO+730Kglt0B47+ZrJN1BhhOxZaVrw== + } + engines: { node: ">=12" } + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.16.9: + resolution: + { + integrity: sha512-X8te4NLxtHiNT6H+4Pfm5RklzItA1Qy4nfyttihGGX+Koc53Ar20ViC+myY70QJ8PDEOehinXZj/F7QK3A+MKQ== } engines: { node: ">=12" } cpu: [loong64] @@ -818,6 +916,138 @@ packages: dev: true optional: true + /@esbuild/linux-mips64el/0.16.9: + resolution: + { + integrity: sha512-ZqyMDLt02c5smoS3enlF54ndK5zK4IpClLTxF0hHfzHJlfm4y8IAkIF8LUW0W7zxcKy7oAwI7BRDqeVvC120SA== + } + engines: { node: ">=12" } + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-ppc64/0.16.9: + resolution: + { + integrity: sha512-k+ca5W5LDBEF3lfDwMV6YNXwm4wEpw9krMnNvvlNz3MrKSD2Eb2c861O0MaKrZkG/buTQAP4vkavbLwgIe6xjg== + } + engines: { node: ">=12" } + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-riscv64/0.16.9: + resolution: + { + integrity: sha512-GuInVdogjmg9DhgkEmNipHkC+3tzkanPJzgzTC2ihsvrruLyFoR1YrTGixblNSMPudQLpiqkcwGwwe0oqfrvfA== + } + engines: { node: ">=12" } + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-s390x/0.16.9: + resolution: + { + integrity: sha512-49wQ0aYkvwXonGsxc7LuuLNICMX8XtO92Iqmug5Qau0kpnV6SP34jk+jIeu4suHwAbSbRhVFtDv75yRmyfQcHw== + } + engines: { node: ">=12" } + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-x64/0.16.9: + resolution: + { + integrity: sha512-Nx4oKEAJ6EcQlt4dK7qJyuZUoXZG7CAeY22R7rqZijFzwFfMOD+gLP56uV7RrV86jGf8PeRY8TBsRmOcZoG42w== + } + engines: { node: ">=12" } + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@esbuild/netbsd-x64/0.16.9: + resolution: + { + integrity: sha512-d0WnpgJ+FTiMZXEQ1NOv9+0gvEhttbgKEvVqWWAtl1u9AvlspKXbodKHzQ5MLP6YV1y52Xp+p8FMYqj8ykTahg== + } + engines: { node: ">=12" } + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/openbsd-x64/0.16.9: + resolution: + { + integrity: sha512-jccK11278dvEscHFfMk5EIPjF4wv1qGD0vps7mBV1a6TspdR36O28fgPem/SA/0pcsCPHjww5ouCLwP+JNAFlw== + } + engines: { node: ">=12" } + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /@esbuild/sunos-x64/0.16.9: + resolution: + { + integrity: sha512-OetwTSsv6mIDLqN7I7I2oX9MmHGwG+AP+wKIHvq+6sIHwcPPJqRx+DJB55jy9JG13CWcdcQno/7V5MTJ5a0xfQ== + } + engines: { node: ">=12" } + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-arm64/0.16.9: + resolution: + { + integrity: sha512-tKSSSK6unhxbGbHg+Cc+JhRzemkcsX0tPBvG0m5qsWbkShDK9c+/LSb13L18LWVdOQZwuA55Vbakxmt6OjBDOQ== + } + engines: { node: ">=12" } + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-ia32/0.16.9: + resolution: + { + integrity: sha512-ZTQ5vhNS5gli0KK8I6/s6+LwXmNEfq1ftjnSVyyNm33dBw8zDpstqhGXYUbZSWWLvkqiRRjgxgmoncmi6Yy7Ng== + } + engines: { node: ">=12" } + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@esbuild/win32-x64/0.16.9: + resolution: + { + integrity: sha512-C4ZX+YFIp6+lPrru3tpH6Gaapy8IBRHw/e7l63fzGDhn/EaiGpQgbIlT5paByyy+oMvRFQoxxyvC4LE0AjJMqQ== + } + engines: { node: ">=12" } + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: { @@ -1016,7 +1246,7 @@ packages: fastq: 1.14.0 dev: true - /@pureadmin/descriptions/1.1.1_element-plus@2.2.26: + /@pureadmin/descriptions/1.1.1_element-plus@2.2.27: resolution: { integrity: sha512-4BHLKomLU/LxGs5EUA+h+aKNrJEkhrU6+QE8VoWfJZ8VTU6ddvFLT/Pi4WuO5CWNXM9ZjqvHLFFVwEPlKntqtg== @@ -1025,11 +1255,11 @@ packages: element-plus: ^2.0.0 dependencies: "@element-plus/icons-vue": 2.0.10_vue@3.2.45 - element-plus: 2.2.26_vue@3.2.45 + element-plus: 2.2.27_vue@3.2.45 vue: 3.2.45 dev: false - /@pureadmin/table/1.9.0_element-plus@2.2.26: + /@pureadmin/table/1.9.0_element-plus@2.2.27: resolution: { integrity: sha512-3cGbQc5QV0E7i1h0QZJWVuwJKXn1Kk2Ae6T/Z/pxEVRbwE0L+vixI/x9WO31/yZEL7qNz2lD+OIOtUU+HjTbYA== @@ -1037,7 +1267,7 @@ packages: peerDependencies: element-plus: ^2.0.0 dependencies: - element-plus: 2.2.26_vue@3.2.45 + element-plus: 2.2.27_vue@3.2.45 vue: 3.2.45 dev: false @@ -1118,6 +1348,23 @@ packages: picomatch: 2.3.1 dev: true + /@rollup/pluginutils/5.0.2: + resolution: + { + integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA== + } + engines: { node: ">=14.0.0" } + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + "@types/estree": 1.0.0 + estree-walker: 2.0.2 + picomatch: 2.3.1 + dev: true + /@sxzz/popperjs-es/2.11.7: resolution: { @@ -1423,55 +1670,36 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@vitejs/plugin-legacy/2.3.1_terser@5.16.1+vite@3.1.8: + /@vitejs/plugin-vue-jsx/3.0.0_vite@4.0.2+vue@3.2.45: resolution: { - integrity: sha512-J5KaGBlSt2tEYPVjM/C8dA6DkRzkFkbPe+Xb4IX5G+XOV5OGbVAfkMjKywdrkO3gGynO8S98i71Lmsff4cWkCQ== + integrity: sha512-vurkuzgac5SYuxd2HUZqAFAWGTF10diKBwJNbCvnWijNZfXd+7jMtqjPFbGt7idOJUn584fP1Ar9j/GN2jQ3Ew== } engines: { node: ^14.18.0 || >=16.0.0 } peerDependencies: - terser: ^5.4.0 - vite: ^3.0.0 - dependencies: - "@babel/standalone": 7.20.6 - core-js: 3.26.1 - magic-string: 0.26.7 - regenerator-runtime: 0.13.11 - systemjs: 6.13.0 - terser: 5.16.1 - vite: 3.1.8_sass@1.56.2+terser@5.16.1 - dev: true - - /@vitejs/plugin-vue-jsx/2.1.1_vite@3.1.8+vue@3.2.45: - resolution: - { - integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA== - } - engines: { node: ^14.18.0 || >=16.0.0 } - peerDependencies: - vite: ^3.0.0 + vite: ^4.0.0 vue: ^3.0.0 dependencies: "@babel/core": 7.20.5 "@babel/plugin-transform-typescript": 7.20.2_@babel+core@7.20.5 "@vue/babel-plugin-jsx": 1.1.1_@babel+core@7.20.5 - vite: 3.1.8_sass@1.56.2+terser@5.16.1 + vite: 4.0.2_fgfkqxcefcouvwljpt4dl27fkq vue: 3.2.45 transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue/3.2.0_vite@3.1.8+vue@3.2.45: + /@vitejs/plugin-vue/4.0.0_vite@4.0.2+vue@3.2.45: resolution: { - integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw== + integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA== } engines: { node: ^14.18.0 || >=16.0.0 } peerDependencies: - vite: ^3.0.0 + vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 3.1.8_sass@1.56.2+terser@5.16.1 + vite: 4.0.2_fgfkqxcefcouvwljpt4dl27fkq vue: 3.2.45 dev: true @@ -1530,16 +1758,23 @@ packages: "@volar/vue-language-core": 1.0.13 dev: true - /@vue-macros/common/0.13.4: + /@vue-macros/common/0.13.5_vue@3.2.45: resolution: { - integrity: sha512-mQooO33XcY4kQyKBrbGfdIPPsYhpcfmH75SQnXx2vNsNLSNvhLuDaIIV0fhMJ0HV5Z02V9Ka1gx7v1g5bk9Q0A== + integrity: sha512-i8BqdPsc+CR9p9KqwGi7QLmLkT+E1rN6qdw5wYI6BIdrayjyxCCoKyRsCoxA2gooZ1UCW75yknmc89zg8yco+w== } engines: { node: ">=14.19.0" } + peerDependencies: + vue: ^2.7.0 || ^3.2.25 + peerDependenciesMeta: + vue: + optional: true dependencies: "@babel/types": 7.20.5 "@vue/compiler-sfc": 3.2.45 - magic-string: 0.26.7 + local-pkg: 0.4.2 + magic-string: 0.27.0 + vue: 3.2.45 dev: true /@vue/babel-helper-vue-transform-on/1.0.2: @@ -2574,14 +2809,6 @@ packages: } dev: true - /core-js/3.26.1: - resolution: - { - integrity: sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA== - } - requiresBuild: true - dev: true - /cosmiconfig/7.1.0: resolution: { @@ -3089,10 +3316,10 @@ packages: } dev: true - /element-plus/2.2.26_vue@3.2.45: + /element-plus/2.2.27_vue@3.2.45: resolution: { - integrity: sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg== + integrity: sha512-P04HDOZBYDdvlYuleuCZRULzAc5xJVOBfLDK9xWxVo0vyo8ntdaXS5sTU+/76vrNzuO3FhLn9kvrsbiJEVa1jg== } peerDependencies: vue: ^3.2.0 @@ -3184,246 +3411,6 @@ packages: is-arrayish: 0.2.1 dev: true - /esbuild-android-64/0.15.18: - resolution: - { - integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA== - } - engines: { node: ">=12" } - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - - /esbuild-android-arm64/0.15.18: - resolution: - { - integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ== - } - engines: { node: ">=12" } - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - - /esbuild-darwin-64/0.15.18: - resolution: - { - integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg== - } - engines: { node: ">=12" } - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /esbuild-darwin-arm64/0.15.18: - resolution: - { - integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA== - } - engines: { node: ">=12" } - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /esbuild-freebsd-64/0.15.18: - resolution: - { - integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA== - } - engines: { node: ">=12" } - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - /esbuild-freebsd-arm64/0.15.18: - resolution: - { - integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA== - } - engines: { node: ">=12" } - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - /esbuild-linux-32/0.15.18: - resolution: - { - integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg== - } - engines: { node: ">=12" } - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /esbuild-linux-64/0.15.18: - resolution: - { - integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw== - } - engines: { node: ">=12" } - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /esbuild-linux-arm/0.15.18: - resolution: - { - integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA== - } - engines: { node: ">=12" } - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /esbuild-linux-arm64/0.15.18: - resolution: - { - integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug== - } - engines: { node: ">=12" } - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /esbuild-linux-mips64le/0.15.18: - resolution: - { - integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ== - } - engines: { node: ">=12" } - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /esbuild-linux-ppc64le/0.15.18: - resolution: - { - integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w== - } - engines: { node: ">=12" } - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /esbuild-linux-riscv64/0.15.18: - resolution: - { - integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg== - } - engines: { node: ">=12" } - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /esbuild-linux-s390x/0.15.18: - resolution: - { - integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ== - } - engines: { node: ">=12" } - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /esbuild-netbsd-64/0.15.18: - resolution: - { - integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg== - } - engines: { node: ">=12" } - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - - /esbuild-openbsd-64/0.15.18: - resolution: - { - integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ== - } - engines: { node: ">=12" } - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - - /esbuild-sunos-64/0.15.18: - resolution: - { - integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw== - } - engines: { node: ">=12" } - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - - /esbuild-windows-32/0.15.18: - resolution: - { - integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ== - } - engines: { node: ">=12" } - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /esbuild-windows-64/0.15.18: - resolution: - { - integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw== - } - engines: { node: ">=12" } - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /esbuild-windows-arm64/0.15.18: - resolution: - { - integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ== - } - engines: { node: ">=12" } - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild/0.11.3: resolution: { @@ -3433,37 +3420,37 @@ packages: requiresBuild: true dev: true - /esbuild/0.15.18: + /esbuild/0.16.9: resolution: { - integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q== + integrity: sha512-gkH83yHyijMSZcZFs1IWew342eMdFuWXmQo3zkDPTre25LIPBJsXryg02M3u8OpTwCJdBkdaQwqKkDLnAsAeLQ== } engines: { node: ">=12" } hasBin: true requiresBuild: true optionalDependencies: - "@esbuild/android-arm": 0.15.18 - "@esbuild/linux-loong64": 0.15.18 - esbuild-android-64: 0.15.18 - esbuild-android-arm64: 0.15.18 - esbuild-darwin-64: 0.15.18 - esbuild-darwin-arm64: 0.15.18 - esbuild-freebsd-64: 0.15.18 - esbuild-freebsd-arm64: 0.15.18 - esbuild-linux-32: 0.15.18 - esbuild-linux-64: 0.15.18 - esbuild-linux-arm: 0.15.18 - esbuild-linux-arm64: 0.15.18 - esbuild-linux-mips64le: 0.15.18 - esbuild-linux-ppc64le: 0.15.18 - esbuild-linux-riscv64: 0.15.18 - esbuild-linux-s390x: 0.15.18 - esbuild-netbsd-64: 0.15.18 - esbuild-openbsd-64: 0.15.18 - esbuild-sunos-64: 0.15.18 - esbuild-windows-32: 0.15.18 - esbuild-windows-64: 0.15.18 - esbuild-windows-arm64: 0.15.18 + "@esbuild/android-arm": 0.16.9 + "@esbuild/android-arm64": 0.16.9 + "@esbuild/android-x64": 0.16.9 + "@esbuild/darwin-arm64": 0.16.9 + "@esbuild/darwin-x64": 0.16.9 + "@esbuild/freebsd-arm64": 0.16.9 + "@esbuild/freebsd-x64": 0.16.9 + "@esbuild/linux-arm": 0.16.9 + "@esbuild/linux-arm64": 0.16.9 + "@esbuild/linux-ia32": 0.16.9 + "@esbuild/linux-loong64": 0.16.9 + "@esbuild/linux-mips64el": 0.16.9 + "@esbuild/linux-ppc64": 0.16.9 + "@esbuild/linux-riscv64": 0.16.9 + "@esbuild/linux-s390x": 0.16.9 + "@esbuild/linux-x64": 0.16.9 + "@esbuild/netbsd-x64": 0.16.9 + "@esbuild/openbsd-x64": 0.16.9 + "@esbuild/sunos-x64": 0.16.9 + "@esbuild/win32-arm64": 0.16.9 + "@esbuild/win32-ia32": 0.16.9 + "@esbuild/win32-x64": 0.16.9 dev: true /escalade/3.1.1: @@ -4643,10 +4630,10 @@ packages: } dev: true - /json5/2.2.1: + /json5/2.2.2: resolution: { - integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + integrity: sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== } engines: { node: ">=6" } hasBin: true @@ -4768,6 +4755,14 @@ packages: wrap-ansi: 7.0.0 dev: true + /local-pkg/0.4.2: + resolution: + { + integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg== + } + engines: { node: ">=14" } + dev: true + /locate-path/5.0.0: resolution: { @@ -4893,14 +4888,14 @@ packages: dependencies: sourcemap-codec: 1.4.8 - /magic-string/0.26.7: + /magic-string/0.27.0: resolution: { - integrity: sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow== + integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== } engines: { node: ">=12" } dependencies: - sourcemap-codec: 1.4.8 + "@jridgewell/sourcemap-codec": 1.4.14 dev: true /make-error/1.3.6: @@ -6274,13 +6269,6 @@ packages: strip-indent: 3.0.0 dev: true - /regenerator-runtime/0.13.11: - resolution: - { - integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== - } - dev: true - /regexpp/3.2.0: resolution: { @@ -6421,12 +6409,12 @@ packages: yargs: 17.6.2 dev: true - /rollup/2.78.1: + /rollup/3.7.5: resolution: { - integrity: sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg== + integrity: sha512-z0ZbqHBtS/et2EEUKMrAl2CoSdwN7ZPzL17UMiKN9RjjqHShTlv7F9J6ZJZJNREYjBh3TvBrdfjkFDIXFNeuiQ== } - engines: { node: ">=10.0.0" } + engines: { node: ">=14.18.0", npm: ">=8.0.0" } hasBin: true optionalDependencies: fsevents: 2.3.2 @@ -7026,13 +7014,6 @@ packages: picocolors: 1.0.0 dev: true - /systemjs/6.13.0: - resolution: - { - integrity: sha512-P3cgh2bpaPvAO2NE3uRp/n6hmk4xPX4DQf+UzTlCAycssKdqhp6hjw+ENWe+aUS7TogKRFtptMosTSFeC6R55g== - } - dev: true - /table/6.8.1: resolution: { @@ -7288,17 +7269,20 @@ packages: engines: { node: ">= 0.8" } dev: true - /unplugin-vue-define-options/1.0.0: + /unplugin-vue-define-options/1.1.1_vue@3.2.45: resolution: { - integrity: sha512-j90zM7NhZXBL5uMlHKzSOjvU98lFcIErdgAhj7bEEdvZarkwOkEUgMFsZDwStN9FEcMAiS/BTvcyGfItu3ry/g== + integrity: sha512-E9xCSAQgiGMRaQXBWw7KwXiisPwqO/NfV06TpzEb884U77nlOaSQg1TGxw5YoXMcn1Wu/+bmGyR6V9nIIlLEgQ== } engines: { node: ">=14.19.0" } dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 + "@rollup/pluginutils": 5.0.2 + "@vue-macros/common": 0.13.5_vue@3.2.45 ast-walker-scope: 0.3.1 unplugin: 1.0.1 + transitivePeerDependencies: + - rollup + - vue dev: true /unplugin/1.0.1: @@ -7396,7 +7380,7 @@ packages: - rollup dev: true - /vite-plugin-compression/0.5.1_vite@3.1.8: + /vite-plugin-compression/0.5.1_vite@4.0.2: resolution: { integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg== @@ -7407,12 +7391,12 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 3.1.8_sass@1.56.2+terser@5.16.1 + vite: 4.0.2_fgfkqxcefcouvwljpt4dl27fkq transitivePeerDependencies: - supports-color dev: true - /vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@3.1.8: + /vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@4.0.2: resolution: { integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg== @@ -7432,7 +7416,7 @@ packages: fast-glob: 3.2.12 mockjs: 1.1.0 path-to-regexp: 6.2.1 - vite: 3.1.8_sass@1.56.2+terser@5.16.1 + vite: 4.0.2_fgfkqxcefcouvwljpt4dl27fkq transitivePeerDependencies: - rollup - supports-color @@ -7455,32 +7439,39 @@ packages: svgo: 2.8.0 dev: true - /vite/3.1.8_sass@1.56.2+terser@5.16.1: + /vite/4.0.2_fgfkqxcefcouvwljpt4dl27fkq: resolution: { - integrity: sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg== + integrity: sha512-QJaY3R+tFlTagH0exVqbgkkw45B+/bXVBzF2ZD1KB5Z8RiAoiKo60vSUf6/r4c2Vh9jfGBKM4oBI9b4/1ZJYng== } engines: { node: ^14.18.0 || >=16.0.0 } hasBin: true peerDependencies: + "@types/node": ">= 14" less: "*" sass: "*" stylus: "*" + sugarss: "*" terser: ^5.4.0 peerDependenciesMeta: + "@types/node": + optional: true less: optional: true sass: optional: true stylus: optional: true + sugarss: + optional: true terser: optional: true dependencies: - esbuild: 0.15.18 + "@types/node": 18.11.14 + esbuild: 0.16.9 postcss: 8.4.20 resolve: 1.22.1 - rollup: 2.78.1 + rollup: 3.7.5 sass: 1.56.2 terser: 5.16.1 optionalDependencies: diff --git a/public/serverConfig.json b/public/serverConfig.json index 08b1aa5..26c1d3e 100644 --- a/public/serverConfig.json +++ b/public/serverConfig.json @@ -1,5 +1,5 @@ { - "Version": "3.9.5", + "Version": "3.9.6", "Title": "PureAdmin", "FixedHeader": true, "HiddenSideBar": false, diff --git a/src/config/index.ts b/src/config/index.ts index 2fe1e80..9b0a372 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1,9 +1,8 @@ import { App } from "vue"; import axios from "axios"; -import { loadEnv } from "@build/index"; let config: object = {}; -const { VITE_PUBLIC_PATH } = loadEnv(); +const { VITE_PUBLIC_PATH } = import.meta.env; const setConfig = (cfg?: unknown) => { config = Object.assign(config, cfg); diff --git a/src/layout/components/notice/index.vue b/src/layout/components/notice/index.vue index 1985b29..ea0502f 100644 --- a/src/layout/components/notice/index.vue +++ b/src/layout/components/notice/index.vue @@ -70,14 +70,8 @@ notices.value.map(v => (noticesNum.value += v.list.length)); height: 1px; } - // 如果上面的 notices 长度大于 3 请注释掉下面代码 :deep(.el-tabs__nav-wrap) { padding: 0 36px 0 36px; } - - // 如果上面的 notices 长度大于 3 请注释掉下面代码 - :deep(.el-tabs__active-bar) { - margin: 0 36px 0 36px; - } } diff --git a/src/main.ts b/src/main.ts index 163ab4f..60db439 100644 --- a/src/main.ts +++ b/src/main.ts @@ -15,6 +15,8 @@ import { injectResponsiveStorage } from "@/utils/responsive"; import "./style/reset.scss"; // 导入公共样式 import "./style/index.scss"; +// 一定要在main.ts中导入tailwind.css,防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题 +import "./style/tailwind.css"; import "element-plus/dist/index.css"; // 导入字体图标 import "./assets/iconfont/iconfont.js"; diff --git a/src/router/utils.ts b/src/router/utils.ts index bd6aeb0..990a9ff 100644 --- a/src/router/utils.ts +++ b/src/router/utils.ts @@ -8,7 +8,6 @@ import { } from "vue-router"; import { router } from "./index"; import { isProxy, toRaw } from "vue"; -import { loadEnv } from "../../build"; import { useTimeoutFn } from "@vueuse/core"; import { RouteConfigs } from "@/layout/types"; import { @@ -324,7 +323,7 @@ function addAsyncRoutes(arrRoutes: Array) { /** 获取路由历史模式 https://next.router.vuejs.org/zh/guide/essentials/history-mode.html */ function getHistoryMode(): RouterHistory { - const routerHistory = loadEnv().VITE_ROUTER_HISTORY; + const routerHistory = import.meta.env.VITE_ROUTER_HISTORY; // len为1 代表只有历史模式 为2 代表历史模式中存在base参数 https://next.router.vuejs.org/zh/api/#%E5%8F%82%E6%95%B0-1 const historyMode = routerHistory.split(","); const leftMode = historyMode[0]; diff --git a/src/style/index.scss b/src/style/index.scss index 7f062d8..96b3a64 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -3,7 +3,6 @@ @import "./element-plus.scss"; @import "./sidebar.scss"; @import "./dark.scss"; -@import "./tailwind.css"; /* 自定义全局 CssVar */ :root {