diff --git a/apps/phone/package.json b/apps/phone/package.json index 056e707dc..f0903bd4f 100644 --- a/apps/phone/package.json +++ b/apps/phone/package.json @@ -84,7 +84,7 @@ "scripts": { "i18n:missing": "node --experimental-json-modules i18n.missingKeys.js", "dev:old": "cross-env IS_BROWSER_DEV=1 webpack serve --config config/webpack.dev.js --mode development", - "dev": "cross-env IS_BROWSER_DEV=1 vite", + "dev": "cross-env VITE_REACT_APP_IN_GAME=false vite", "build": "webpack --config config/webpack.production.js --mode production --progress --color", "dev:game": "cross-env REACT_APP_IN_GAME=1 BROWSER=none webpack --config config/webpack.dev.js --mode development --watch --progress" }, diff --git a/apps/phone/src/common/hooks/useExternalApps.tsx b/apps/phone/src/common/hooks/useExternalApps.tsx index 78ffbed94..1134b4f29 100644 --- a/apps/phone/src/common/hooks/useExternalApps.tsx +++ b/apps/phone/src/common/hooks/useExternalApps.tsx @@ -11,6 +11,7 @@ import { __federation_method_unwrapDefault, // @ts-ignore - This is Vite federation magic } from '__federation__'; +import { EnvMode } from '@utils/config'; const useExternalAppsAction = () => { const loadScript = async (url: string) => { @@ -36,7 +37,7 @@ const useExternalAppsAction = () => { const generateAppConfig = async (appName: string): Promise => { try { - const IN_GAME = import.meta.env.PROD || import.meta.env.REACT_APP_IN_GAME; + const IN_GAME = import.meta.env.PROD || import.meta.env.MODE === EnvMode.GAME; const url = IN_GAME ? `https://cfx-nui-${appName}/web/dist/remoteEntry.js` : 'http://localhost:4173/assets/remoteEntry.js'; diff --git a/apps/phone/src/utils/config.ts b/apps/phone/src/utils/config.ts index e74d67569..791ec844d 100644 --- a/apps/phone/src/utils/config.ts +++ b/apps/phone/src/utils/config.ts @@ -15,3 +15,9 @@ export const fetchConfig = async (): Promise => { return deepMergeObjects({}, defaultConfig, config); }; + +export enum EnvMode { + GAME = 'game', + DEV = 'dev', + PROD = 'production', +}