diff --git a/src/client/index.tsx b/src/client/index.tsx index 7b6b6b1c..7fea2c69 100644 --- a/src/client/index.tsx +++ b/src/client/index.tsx @@ -7,7 +7,7 @@ import "bootstrap/js/dist/collapse"; import "bootstrap/js/dist/dropdown"; import { HistoryService } from "../shared/services/HistoryService"; -const site = window.isoData.site_res; +const site = JSON.parse(window.isoData).site_res; initializeSite(site); const wrapper = ( diff --git a/src/server/index.tsx b/src/server/index.tsx index f55d68c2..73b3d7a1 100644 --- a/src/server/index.tsx +++ b/src/server/index.tsx @@ -26,7 +26,6 @@ import { favIconUrl, initializeSite, isAuthPath, - md, } from "../shared/utils"; const server = express(); @@ -354,10 +353,8 @@ async function createSsrHtml(root: string, isoData: IsoDataOptionalSite) { - - + + ${erudaStr} diff --git a/src/shared/interfaces.ts b/src/shared/interfaces.ts index 3b64f605..0d846d82 100644 --- a/src/shared/interfaces.ts +++ b/src/shared/interfaces.ts @@ -22,7 +22,7 @@ export interface ILemmyConfig { declare global { interface Window { - isoData: IsoData; + isoData: string; lemmyConfig?: ILemmyConfig; } } diff --git a/src/shared/utils.ts b/src/shared/utils.ts index 7c0e6e26..870bed72 100644 --- a/src/shared/utils.ts +++ b/src/shared/utils.ts @@ -1164,7 +1164,7 @@ export function isBrowser() { export function setIsoData(context: any): IsoData { // If its the browser, you need to deserialize the data from the window if (isBrowser()) { - return window.isoData; + return JSON.parse(window.isoData); } else return context.router.staticContext; }