AJR/TechRadarAJR
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(codegen): PUBLIC_URL fallback

Browse Source
This commit is contained in:
Bastian Ike
2022-12-16 13:07:36 +01:00
committed by Bastian
parent aeb2092e3d
commit 4686cc2e3d
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/App.tsx
View File

@@ -8,7 +8,7 @@ import {
useParams,
} from "react-router-dom";
import { ConfigData } from "../config";
import { ConfigData, publicUrl } from "../config";
import { Messages, MessagesProvider } from "../context/MessagesContext";
import { useSearchParamState } from "../hooks/use-search-param-state";
import { Item, filteredOnly, getTags } from "../model";
@@ -90,20 +90,20 @@ interface Data {
export default function App() {
const data = useFetch<Data>(
`${process.env.PUBLIC_URL}/rd.json?${process.env.REACT_APP_BUILDHASH}`
`${publicUrl}rd.json?${process.env.REACT_APP_BUILDHASH}`
);
const messages = useFetch<Messages>(
`${process.env.PUBLIC_URL}/messages.json?${process.env.REACT_APP_BUILDHASH}`
`${publicUrl}messages.json?${process.env.REACT_APP_BUILDHASH}`
);
const config = useFetch<ConfigData>(
`${process.env.PUBLIC_URL}/config.json?${process.env.REACT_APP_BUILDHASH}`
`${publicUrl}config.json?${process.env.REACT_APP_BUILDHASH}`
);
if (data && config) {
const { items, releases } = data;
return (
<MessagesProvider messages={messages}>
<BrowserRouter basename={`${process.env.PUBLIC_URL}`}>
<BrowserRouter basename={`${publicUrl}`}>
<Routes>
<Route
path={"/*"}

4
src/config.ts
View File

@@ -38,8 +38,10 @@ export function isMobileViewport() {
return width < 1200;
}
export const publicUrl = (process.env.PUBLIC_URL || "").replace(/\/$/, '') + "/";
export function assetUrl(file: string) {
return process.env.PUBLIC_URL + "/" + file;
return publicUrl + file;
}
export function translate(config: ConfigData, key: string) {