diff --git a/.github/workflows/demo-deploy.yml b/.github/workflows/demo-deploy.yml index 2317a9e15..852160f9f 100644 --- a/.github/workflows/demo-deploy.yml +++ b/.github/workflows/demo-deploy.yml @@ -39,6 +39,7 @@ jobs: VITE_API_BASE_URL: "https://api.monorepo.prefabs.tech" VITE_APP_TITLE: 'React Demo' VITE_APP_VERSION: ${{ steps.package-version.outputs.current-version}} + VITE_APP_BASE_PATH=: '/react/' VITE_APP_BUILD: 'develop' VITE_APP_COPYRIGHT_HOLDER: 'Prefabs Tech' VITE_APP_COPYRIGHT_HOLDER_URL: 'https://prefabs.tech' diff --git a/apps/demo/.env.example b/apps/demo/.env.example index 2d6839d73..ab52e0e7c 100644 --- a/apps/demo/.env.example +++ b/apps/demo/.env.example @@ -7,6 +7,7 @@ VITE_APP_NAME=$npm_package_name VITE_APP_PORT=20083 VITE_APP_TITLE="Prefabs Tech Demo App" VITE_APP_VERSION=$npm_package_version +VITE_APP_BASE_PATH= VITE_FEATURE_SHOW_VERSION=1 VITE_LOCAL_STORAGE_NAMESPACE="demo_app__" diff --git a/apps/demo/src/Routers.tsx b/apps/demo/src/Routers.tsx index fc1790ed3..1bf999f01 100644 --- a/apps/demo/src/Routers.tsx +++ b/apps/demo/src/Routers.tsx @@ -95,7 +95,7 @@ const router = createBrowserRouter( }, ], { - basename: "/react/", + basename: import.meta.env.VITE_APP_BASE_PATH, }, ); diff --git a/apps/demo/src/config.ts b/apps/demo/src/config.ts index eb3cf5fa6..97c7b59ba 100644 --- a/apps/demo/src/config.ts +++ b/apps/demo/src/config.ts @@ -38,7 +38,7 @@ const config: AppConfig = { localeSwitcher: { showBadge: true, }, - logo: "/react/logo.png", + logo: `${(import.meta.env.VITE_APP_BASE_PATH || "").replace(/\/$/, "")}/logo.png`, mainMenu: [ { name: "header.menu.ui", diff --git a/apps/demo/vite.config.ts b/apps/demo/vite.config.ts index 92973a9b9..e7735c0bb 100644 --- a/apps/demo/vite.config.ts +++ b/apps/demo/vite.config.ts @@ -10,7 +10,7 @@ export default defineConfig(({ mode }) => { process.env = { ...process.env, ...loadEnv(mode, process.cwd()) }; return { - base: "/react/", + base: process.env.VITE_APP_BASE_PATH, plugins: [ react(), createHtmlPlugin({