Skip to content

Commit 167cf31

Browse files
Set base in vite
1 parent 40e87d6 commit 167cf31

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

web/src/index.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@ import App from './App';
88
const headElement = document.head as HTMLElement & { dataset: DOMStringMap };
99
headElement.dataset['apisource'] = import.meta.env.VITE_DEFAULT_APISOURCE || 'LocalWeb';
1010

11-
const baseUrl = document.getElementsByTagName('base')[0]?.getAttribute('href') || undefined;
1211

1312
const container = document.getElementById('root');
1413
const root = createRoot(container!);
15-
let normalizedBaseUrl = baseUrl;
16-
if (normalizedBaseUrl && normalizedBaseUrl.endsWith('/') && normalizedBaseUrl !== '/') {
17-
normalizedBaseUrl = normalizedBaseUrl.substring(0, normalizedBaseUrl.length - 1);
18-
}
14+
// Derive basename from BASE_URL (set at build time)
15+
const baseUrl = import.meta.env.BASE_URL;
16+
const normalizedBaseUrl = baseUrl && baseUrl.endsWith('/') && baseUrl !== '/' ? baseUrl.substring(0, baseUrl.length - 1) : baseUrl;
1917

2018
root.render(
2119
<StrictMode>
22-
<BrowserRouter basename={baseUrl}>
20+
<BrowserRouter basename={normalizedBaseUrl}>
2321
<App />
2422
</BrowserRouter>
2523
</StrictMode>

web/src/main.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ import App from './App.tsx'
88
const headElement = document.head as HTMLElement & { dataset: DOMStringMap };
99
headElement.dataset['apisource'] = import.meta.env.VITE_DEFAULT_APISOURCE || 'LocalWeb';
1010

11-
const baseUrl = document.getElementsByTagName('base')[0]?.getAttribute('href') || undefined;
11+
// const baseUrl = document.getElementsByTagName('base')[0]?.getAttribute('href') || undefined;
12+
// Derive basename from BASE_URL (set at build time)
13+
const basename = import.meta.env.BASE_URL === './' ? '/' : import.meta.env.BASE_URL;
1214

1315
createRoot(document.getElementById('root')!).render(
1416
<StrictMode>
15-
<BrowserRouter basename={baseUrl}>
17+
<BrowserRouter basename={basename}>
1618
<App />
1719
</BrowserRouter>
1820
</StrictMode>,

web/vite.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import react from '@vitejs/plugin-react'
44
// https://vite.dev/config/
55
export default defineConfig({
66
plugins: [react()],
7+
base: 'CodeConverter/',
78
test: {
89
environment: 'jsdom',
910
},

0 commit comments

Comments
 (0)