diff --git a/package.json b/package.json index 033dc06..e22ae8e 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@iconify/iconify": "^3.1.1", "@videojs-player/vue": "^1.0.0", "@vue/runtime-core": "^3.3.8", - "@vueuse/core": "^10.6.0", + "@vueuse/core": "^10.6.1", "@zxcvbn-ts/core": "^3.0.4", "ant-design-vue": "^4.0.7", "axios": "^1.6.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93dd64d..d25cd6a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ dependencies: specifier: ^3.3.8 version: 3.3.8 '@vueuse/core': - specifier: ^10.6.0 - version: 10.6.0(vue@3.3.8) + specifier: ^10.6.1 + version: 10.6.1(vue@3.3.8) '@zxcvbn-ts/core': specifier: ^3.0.4 version: 3.0.4 @@ -3382,24 +3382,24 @@ packages: /@vue/shared@3.3.8: resolution: {integrity: sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==} - /@vueuse/core@10.6.0(vue@3.3.8): - resolution: {integrity: sha512-+Yee+g9+9BEbvkyGdn4Bf4yZx9EfocAytpV2ZlrlP7xcz+qznLmZIDqDroTvc5vtMkWZicisgEv8dt3+jL+HQg==} + /@vueuse/core@10.6.1(vue@3.3.8): + resolution: {integrity: sha512-Pc26IJbqgC9VG1u6VY/xrXXfxD33hnvxBnKrLlA2LJlyHII+BSrRoTPJgGYq7qZOu61itITFUnm6QbacwZ4H8Q==} dependencies: '@types/web-bluetooth': 0.0.20 - '@vueuse/metadata': 10.6.0 - '@vueuse/shared': 10.6.0(vue@3.3.8) + '@vueuse/metadata': 10.6.1 + '@vueuse/shared': 10.6.1(vue@3.3.8) vue-demi: 0.14.6(vue@3.3.8) transitivePeerDependencies: - '@vue/composition-api' - vue dev: false - /@vueuse/metadata@10.6.0: - resolution: {integrity: sha512-mzKHkHoiK6xVz01VzQjM2l6ofUanEaofgEGPgDHcAzlvOTccPRTIdEuzneOUTYxgfm1vkDikS6rtrEw/NYlaTQ==} + /@vueuse/metadata@10.6.1: + resolution: {integrity: sha512-qhdwPI65Bgcj23e5lpGfQsxcy0bMjCAsUGoXkJ7DsoeDUdasbZ2DBa4dinFCOER3lF4gwUv+UD2AlA11zdzMFw==} dev: false - /@vueuse/shared@10.6.0(vue@3.3.8): - resolution: {integrity: sha512-0t4MVE18sO+/4Gh0jfeOXBTjKeV4606N9kIrDOLPjFl8Rwnlodn+QC5A4LfJuysK7aOsTMjF3KnzNeueaI0xlQ==} + /@vueuse/shared@10.6.1(vue@3.3.8): + resolution: {integrity: sha512-TECVDTIedFlL0NUfHWncf3zF9Gc4VfdxfQc8JFwoVZQmxpONhLxFrlm0eHQeidHj4rdTPL3KXJa0TZCk1wnc5Q==} dependencies: vue-demi: 0.14.6(vue@3.3.8) transitivePeerDependencies: diff --git a/src/utils/env.ts b/src/utils/env.ts index 0035f89..45e1db9 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -1,5 +1,4 @@ import pkg from '../../package.json' -import { getConfigFileName } from '../../build/getConfigFileName' import type { GlobEnvConfig } from '@/types/config' import { warn } from '@/utils/log' @@ -15,12 +14,7 @@ export function getStorageShortName() { } export function getAppEnvConfig() { - const ENV_NAME = getConfigFileName(import.meta.env) - - // Get the global configuration (the configuration will be extracted independently when packaging) - const ENV = (import.meta.env.DEV - ? (import.meta.env as unknown as GlobEnvConfig) - : window[ENV_NAME as any]) as unknown as GlobEnvConfig + const ENV = import.meta.env as unknown as GlobEnvConfig const { VITE_GLOB_APP_TITLE,