(#34): Remove uri-parameter-dependent asset prefix, let next.config.j…

…s handle it. Remove client rendered _draft, leave all rendering to SSR for now. Client uses useRouter, which appears to handle calls from XP proxy badly, specifically sets asPath wrong and causes error.
enonic · Sep 14, 2021 · 2b042dd · 2b042dd
1 parent 86d0731
commit 2b042dd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 135 deletions.
diff --git a/src/components/ClientSideBasePage.tsx b/src/components/ClientSideBasePage.tsx
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -1,38 +1,8 @@
 import '../styles/globals.css'
-import type { AppProps } from 'next/app'
-import Head from 'next/head'
+import type {AppProps} from 'next/app'
 
-
-function MyApp({ Component, pageProps }: AppProps) {
-    let host = pageProps.__host;
-
-
-    if (host) {
-        delete pageProps.__host;
-
-    } else if ('undefined' !== typeof window) {
-        console.log('Hostin?');
-        const urlParams = new URLSearchParams(window.location.search);
-        // @ts-ignore
-        if (urlParams && urlParams.get('__fromXp__') !== undefined) {
-            console.log('Hostin')
-            host = window.location.origin;
-        }
-    }
-
-    console.log(host);
-
-    if (host) {
-        return <>
-            <Head>
-                <base href={host} />
-            </Head>
-            <Component {...pageProps} />
-        </>;
-
-    } else {
-        return <Component {...pageProps} />
-    }
+function MyApp({Component, pageProps}: AppProps) {
+    return <Component {...pageProps} />
 }
 
 export default MyApp
diff --git a/src/pages/_draft/[[...contentPath]].tsx b/src/pages/_draft/[[...contentPath]].tsx
@@ -14,14 +14,22 @@ const fetchContent = buildContentFetcher({
 const BRANCH = 'draft';
 
 ////////////////////////////////////////////////////////////////////////////////////////////// SSR: uncomment this instead of CLIENT below
-/*
 
 import BasePage from "../../components/BasePage";
 
 type Context = {
     // this type is purposefully naive. Please make sure to update this with a more
     // accurate model before using it.
-    params: { contentPath: string[] };
+    params: { contentPath: string[] }
+    /*req: {
+    headers: {
+        host: string,
+        referer?: string
+    },
+    __NEXT_INIT_QUERY?: {
+        __fromXp__?: any
+    }
+    }*/
 };
 
 export const getServerSideProps = async ({params}: Context) => {
@@ -31,15 +39,3 @@ export const getServerSideProps = async ({params}: Context) => {
 };
 
 export default BasePage;
-
-*/
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////// CLIENT: uncomment this instead of SSR above
-
-
-import ClientSideBasePage from "../../components/ClientSideBasePage";
-
-const ClientSidePage = () => <ClientSideBasePage branch={BRANCH} fetchContent={fetchContent} />;
-export default ClientSidePage;
diff --git a/src/pages/_master/[[...contentPath]].tsx b/src/pages/_master/[[...contentPath]].tsx
@@ -20,52 +20,22 @@ type Context = {
     // this type is purposefully naive. Please make sure to update this with a more
     // accurate model before using it.
     params: { contentPath: string[] }
-    req: {
+    /*req: {
         headers: {
             host: string,
             referer?: string
         },
         __NEXT_INIT_QUERY?: {
             __fromXp__?: any
         }
-    }
+    }*/
 };
 
-const getHost = (context: Context) => {
-    if (context?.req?.__NEXT_INIT_QUERY?.__fromXp__ !== undefined) {
-        console.log('Hostin')
-        const host = context?.req?.headers?.host;
-        const splitReferer = (context?.req?.headers?.referer || '').split('://');
-        const protocol = (splitReferer || [])[0] || 'http';     // Defaults to http, assuming http auto-upgrades to https on most servers?
-        return `${protocol}://${host}`
-    }
-
-    return undefined;
-}
 
 export const getServerSideProps = async (context: Context) => {
-    const host = getHost(context);
-
-    return (host)
-        ? {
-            props: {
-                ...await fetchContent(context.params.contentPath, BRANCH),
-                __host: host
-            }
-        }
-        : {
-            props: await fetchContent(context.params.contentPath, BRANCH)
-        }
+    return {
+        props: await fetchContent(context.params.contentPath, BRANCH)
+    }
 };
 
 export default BasePage;
-
-
-////////////////////////////////////////////////////////////////////////////////////////////// CLIENT: uncomment this instead of SSR above
-/*
-
-import ClientSideBasePage from "../../components/ClientSideBasePage";
-
-const ClientSidePage = () => <ClientSideBasePage branch={BRANCH} fetchContent={fetchContent} />;
-export default ClientSidePage;
-*/