Demo Site: don't exclude middleware for /api/... requests (#3086)

vivid-planet · Jan 14, 2025 · dab3213 · dab3213
1 parent 9f69e7b
commit dab3213
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx
@@ -68,7 +68,7 @@ export function App() {
                                         siteConfig.scope.domain === "secondary"
                                             ? `${siteConfig.url}/block-preview`
                                             : `${siteConfig.url}/block-preview/${scope.domain}/${scope.language}`,
-                                    sitePreviewApiUrl: `${siteConfig.url}/api/site-preview`,
+                                    sitePreviewApiUrl: `${siteConfig.url}/site-preview`,
                                 };
                             },
                         }}

diff --git a/demo/site/src/app/api/status/route.tsx → ...ite/src/app/[domain]/api/status/route.tsx b/demo/site/src/app/api/status/route.tsx → ...ite/src/app/[domain]/api/status/route.tsx
diff --git a/demo/site/src/app/api/site-preview/route.ts → demo/site/src/app/site-preview/route.ts b/demo/site/src/app/api/site-preview/route.ts → demo/site/src/app/site-preview/route.ts
diff --git a/demo/site/src/middleware.ts b/demo/site/src/middleware.ts
@@ -1,10 +1,10 @@
 import { withAdminRedirectMiddleware } from "./middleware/adminRedirect";
-import { withBlockPreviewMiddleware } from "./middleware/blockPreview";
 import { chain } from "./middleware/chain";
 import { withCspHeadersMiddleware } from "./middleware/cspHeaders";
 import { withDamRewriteMiddleware } from "./middleware/damRewrite";
 import { withDomainRewriteMiddleware } from "./middleware/domainRewrite";
 import { withPredefinedPagesMiddleware } from "./middleware/predefinedPages";
+import { withPreviewMiddleware } from "./middleware/preview";
 import { withRedirectToMainHostMiddleware } from "./middleware/redirectToMainHost";
 import { withSitePreviewMiddleware } from "./middleware/sitePreview";
 
@@ -14,7 +14,7 @@ export default chain([
     withAdminRedirectMiddleware,
     withDamRewriteMiddleware,
     withCspHeadersMiddleware, // order matters: after redirects (that don't need csp headers), before everything else that needs csp headers
-    withBlockPreviewMiddleware,
+    withPreviewMiddleware,
     withPredefinedPagesMiddleware,
     withDomainRewriteMiddleware, // must be last (rewrites all urls)
 ]);
@@ -23,14 +23,13 @@ export const config = {
     matcher: [
         /*
          * Match all request paths except for the ones starting with:
-         * - api (API routes)
          * - _next/static (static files)
          * - _next/image (image optimization files)
          * - favicon.ico, favicon.svg, favicon.png
          * - manifest.json
          * - robots.txt
          */
-        "/((?!api|_next/static|_next/image|favicon.ico|favicon.svg|favicon.png|manifest.json|robots.txt).*)",
+        "/((?!_next/static|_next/image|favicon.ico|favicon.svg|favicon.png|manifest.json|robots.txt).*)",
     ],
     // TODO find a better solution for this (https://nextjs.org/docs/messages/edge-dynamic-code-evaluation)
     unstable_allowDynamic: [

diff --git a/demo/site/src/middleware/blockPreview.ts → demo/site/src/middleware/preview.ts b/demo/site/src/middleware/blockPreview.ts → demo/site/src/middleware/preview.ts
@@ -2,9 +2,9 @@ import { NextRequest, NextResponse } from "next/server";
 
 import { CustomMiddleware } from "./chain";
 
-export function withBlockPreviewMiddleware(middleware: CustomMiddleware) {
+export function withPreviewMiddleware(middleware: CustomMiddleware) {
     return async (request: NextRequest) => {
-        if (request.nextUrl.pathname.startsWith("/block-preview/")) {
+        if (request.nextUrl.pathname.startsWith("/block-preview/") || request.nextUrl.pathname.startsWith("/site-preview/")) {
             // don't apply any other middlewares
             return NextResponse.next();
         }