Always use localhost:3000 for preview

vivid-planet · Aug 1, 2024 · 2ad4763 · 2ad4763
1 parent 998c85f
commit 2ad4763
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/admin/src/App.tsx b/admin/src/App.tsx
@@ -67,12 +67,11 @@ export function App() {
                                 // In a deployed setting, we use one preview URL for all scopes.
                                 // Locally, we use the site URL for each scope because setting the necessary cookies for the preview doesn't work on localhost.
                                 // see https://github.com/vivid-planet/comet-starter/pull/283/files#r1696858091 for more infos
-                                const previewUrl = process.env.NODE_ENV === "development" ? siteConfig.url : config.previewUrl;
                                 return {
                                     url: siteConfig.url,
                                     preloginEnabled: siteConfig.preloginEnabled || false,
-                                    blockPreviewBaseUrl: `${previewUrl}/block-preview`,
-                                    sitePreviewApiUrl: `${previewUrl}/api/site-preview`,
+                                    blockPreviewBaseUrl: `${config.previewUrl}/block-preview`,
+                                    sitePreviewApiUrl: `${config.previewUrl}/api/site-preview`,
                                 };
                             },
                         }}

diff --git a/site/src/middleware.ts b/site/src/middleware.ts
@@ -26,6 +26,15 @@ export async function middleware(request: NextRequest) {
         return NextResponse.next({ request: { headers } });
     }
 
+    // Site-Preview
+    const sitePreviewParams = await previewParams({ skipDraftModeCheck: true });
+
+    if (sitePreviewParams?.scope) {
+        const siteConfig = getSiteConfigForScope(sitePreviewParams.scope as ContentScope);
+        headers.set("x-forwarded-host", siteConfig.domains.main);
+        return NextResponse.rewrite(createRewriteUrl(request, siteConfig.domain), { request: { headers } });
+    }
+
     const siteConfig = getSiteConfigs().find((siteConfig) => siteConfig.domains.main === host || siteConfig.domains.preliminary === host);
     if (!siteConfig) {
         // Redirect to Main Host
@@ -37,15 +46,6 @@ export async function middleware(request: NextRequest) {
             return NextResponse.redirect(redirectSiteConfig.url);
         }
 
-        // Site-Preview
-        const sitePreviewParams = await previewParams({ skipDraftModeCheck: true });
-
-        if (sitePreviewParams?.scope) {
-            const siteConfig = getSiteConfigForScope(sitePreviewParams.scope as ContentScope);
-            headers.set("x-forwarded-host", siteConfig.domains.main);
-            return NextResponse.rewrite(createRewriteUrl(request, siteConfig.domain), { request: { headers } });
-        }
-
         throw new Error(`Cannot get siteConfig for host ${host}`);
     }