Просмотр исходного кода

fix: 修复VITE_GLOB_APP_TITLE中不能存在-的问题#1522 (#2794)

* fix #1522

fix #1522

* fix #1522

fix #1522

* fix #1522

fix #1522
xiaoWangSec 1 год назад
Родитель
Сommit
0347c83620
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      internal/vite-config/src/plugins/appConfig.ts
  2. 1 1
      src/hooks/setting/index.ts
  3. 1 1
      src/utils/env.ts

+ 1 - 1
internal/vite-config/src/plugins/appConfig.ts

@@ -28,7 +28,7 @@ async function createAppConfigPlugin({
     name: PLUGIN_NAME,
     async configResolved(_config) {
       let appTitle = _config?.env?.VITE_GLOB_APP_TITLE ?? '';
-      appTitle = appTitle.replace(/\s/g, '_');
+      appTitle = appTitle.replace(/\s/g, '_').replace(/-/g, '_');
       publicPath = _config.base;
       source = await getConfigSource(appTitle);
     },

+ 1 - 1
src/hooks/setting/index.ts

@@ -10,7 +10,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
   const glob: Readonly<GlobConfig> = {
     title: VITE_GLOB_APP_TITLE,
     apiUrl: VITE_GLOB_API_URL,
-    shortName: VITE_GLOB_APP_TITLE.replace(/\s/g, '_'),
+    shortName: VITE_GLOB_APP_TITLE.replace(/\s/g, '_').replace(/-/g, '_'),
     urlPrefix: VITE_GLOB_API_URL_PREFIX,
     uploadUrl: VITE_GLOB_UPLOAD_URL,
   };

+ 1 - 1
src/utils/env.ts

@@ -2,7 +2,7 @@ import type { GlobEnvConfig } from '/#/config';
 import pkg from '../../package.json';
 
 const getVariableName = (title: string) => {
-  return `__PRODUCTION__${title.replace(/\s/g, '_') || '__APP'}__CONF__`
+  return `__PRODUCTION__${title.replace(/\s/g, '_').replace(/-/g, '_') || '__APP'}__CONF__`
     .toUpperCase()
     .replace(/\s/g, '');
 };