From a95ba47b743215df25e35e3c65a16570f573a14d Mon Sep 17 00:00:00 2001 From: jinmao88 <50581550+jinmao88@users.noreply.github.com> Date: Thu, 10 Aug 2023 15:09:38 +0800 Subject: [PATCH] fix: ci --- internal/vite-config/src/plugins/appConfig.ts | 2 +- src/utils/env.ts | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/internal/vite-config/src/plugins/appConfig.ts b/internal/vite-config/src/plugins/appConfig.ts index 98594b1a..70a2a5c2 100644 --- a/internal/vite-config/src/plugins/appConfig.ts +++ b/internal/vite-config/src/plugins/appConfig.ts @@ -73,7 +73,7 @@ async function createAppConfigPlugin({ * Get the configuration file variable name * @param env */ -const getVariableName = (title: string) => { +export const getVariableName = (title: string) => { function strToHex(str: string) { const result: string[] = []; for (let i = 0; i < str.length; ++i) { diff --git a/src/utils/env.ts b/src/utils/env.ts index 2efa69be..b19ca069 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -1,18 +1,6 @@ import type { GlobEnvConfig } from '/#/config'; import pkg from '../../package.json'; - -const getVariableName = (title: string) => { - function strToHex(str: string) { - const result: string[] = []; - for (let i = 0; i < str.length; ++i) { - const hex = str.charCodeAt(i).toString(16); - result.push(('000' + hex).slice(-4)); - } - return result.join('').toUpperCase(); - } - - return `__PRODUCTION__${strToHex(title) || '__APP'}__CONF__`.toUpperCase().replace(/\s/g, ''); -}; +import { getVariableName } from '@vben/vite-config/src/plugins/appConfig'; export function getCommonStoragePrefix() { const { VITE_GLOB_APP_TITLE } = getAppEnvConfig(); @@ -26,7 +14,7 @@ export function getStorageShortName() { export function getAppEnvConfig() { console.log(import.meta.env.VITE_GLOB_APP_TITLE); - // __PRODUCTION__005600620065006E002000410064006D0069006E__CONF__ + const ENV_NAME = getVariableName(import.meta.env.VITE_GLOB_APP_TITLE); console.log(ENV_NAME); const ENV = import.meta.env.DEV