Merge branch 'main' into samy/rnd-6373-make-server-actions-work-by-pa…

…ssing-published-content-url

packages/gitbook-v2/src/app/utils.ts

@@ -32,13 +32,6 @@ export function getStaticSiteContext(params: RouteLayoutParams) {
             redirectOnError: false,
         }
     );
-
-    context.imageResizer = createImageResizer({
-        host,
-        linker: context.linker,
-    });
-
-    return context;
 }
 
 /**
@@ -64,13 +57,6 @@ export async function getDynamicSiteContext(params: RouteLayoutParams) {
             redirectOnError: true,
         }
     );
-
-    context.imageResizer = createImageResizer({
-        host,
-        linker: context.linker,
-    });
-
-    return context;
 }
 
 /**

packages/gitbook-v2/src/lib/context.ts

@@ -16,8 +16,8 @@ import { type GitBookDataFetcher, createDataFetcher } from '@v2/lib/data';
 import { redirect } from 'next/navigation';
 import { assert } from 'ts-essentials';
 import { GITBOOK_API_TOKEN, GITBOOK_API_URL, GITBOOK_URL } from './env';
-import { type ImageResizer, createNoopImageResizer } from './images';
-import { type GitBookSpaceLinker, appendPrefixToLinker, createLinker } from './links';
+import { type ImageResizer, createImageResizer } from './images';
+import { type GitBookSpaceLinker, appendBasePathToLinker, createLinker } from './links';
 
 /**
  * Generic context when rendering content.
@@ -119,7 +119,6 @@ export function getBaseContext(input: {
         apiToken: input.apiToken ?? GITBOOK_API_TOKEN,
         apiEndpoint: input.apiEndpoint ?? GITBOOK_API_URL,
     });
-    const imageResizer = createNoopImageResizer();
     const gitbookURL = new URL(GITBOOK_URL);
 
     const linker =
@@ -142,10 +141,18 @@ export function getBaseContext(input: {
         };
     }
 
+    const imageResizer = createImageResizer({
+        host: urlMode === 'url-host' ? url.host : gitbookURL.host,
+
+        // To ensure image resizing work for proxied sites,
+        // we serve images from the root of the site.
+        linker: appendBasePathToLinker(linker, url.pathname),
+    });
+
     return {
         dataFetcher,
-        imageResizer,
         linker,
+        imageResizer,
     };
 }
 

packages/gitbook/src/middleware.ts

@@ -30,8 +30,9 @@ import {
     normalizeVisitorAuthURL,
 } from '@/lib/visitor-token';
 
+import { joinPath, normalizePathname } from '@/lib/paths';
+import { getProxyModeBasePath } from '@/lib/proxy';
 import { MiddlewareHeaders } from '@v2/lib/middleware';
-import { joinPath } from './lib/paths';
 
 export const config = {
     matcher: