From db880d647fdb92c05e2521e10312c3546c6b6aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samy=20Pess=C3=A9?= Date: Tue, 8 Apr 2025 01:09:48 +0200 Subject: [PATCH] Cleanup --- .../src/lib/images/createImageResizer.ts | 1 - packages/gitbook-v2/src/lib/images/signatures.ts | 3 --- packages/gitbook/src/routes/ogimage.tsx | 15 ++------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/packages/gitbook-v2/src/lib/images/createImageResizer.ts b/packages/gitbook-v2/src/lib/images/createImageResizer.ts index 991cc2cf5..b8173b9ed 100644 --- a/packages/gitbook-v2/src/lib/images/createImageResizer.ts +++ b/packages/gitbook-v2/src/lib/images/createImageResizer.ts @@ -81,7 +81,6 @@ export function createImageResizer({ searchParams.set('sign', cachedSignature.signature); searchParams.set('sv', cachedSignature.version); - searchParams.set('sid', imagesContextId); return `${url}?${searchParams.toString()}`; }; diff --git a/packages/gitbook-v2/src/lib/images/signatures.ts b/packages/gitbook-v2/src/lib/images/signatures.ts index f2a0a94bc..21834a69c 100644 --- a/packages/gitbook-v2/src/lib/images/signatures.ts +++ b/packages/gitbook-v2/src/lib/images/signatures.ts @@ -72,9 +72,6 @@ const generateSignatureV2: SignFn = async (input) => { .join(':'); const signature = fnv1a(all, { utf8Buffer: fnv1aUtf8Buffer }).toString(16); - - console.log(`generateSignatureV2: "${all}" -> "${signature}"`); - return signature; }; diff --git a/packages/gitbook/src/routes/ogimage.tsx b/packages/gitbook/src/routes/ogimage.tsx index 35961d99a..f6f04db6f 100644 --- a/packages/gitbook/src/routes/ogimage.tsx +++ b/packages/gitbook/src/routes/ogimage.tsx @@ -10,7 +10,6 @@ import { filterOutNullable } from '@/lib/typescript'; import { getCacheTag } from '@gitbook/cache-tags'; import type { GitBookSiteContext } from '@v2/lib/context'; import { getCloudflareContext } from '@v2/lib/data/cloudflare'; -import { GITBOOK_RUNTIME } from '@v2/lib/env'; import { getResizedImageURL } from '@v2/lib/images'; const googleFontsMap: { [fontName in CustomizationDefaultFont]: string } = { @@ -116,18 +115,8 @@ export async function serveOGImage(baseContext: GitBookSiteContext, params: Page body: baseColors[useLightTheme ? 'dark' : 'light'], // Invert text on background }; - // For Cloudflare, we use absolute URLs from the root of the site instead - // to avoid issues with worker to worker requests in the same zone. - const gridWhitePath = 'images/ogimage-grid-white.png'; - const gridDarkPath = 'images/ogimage-grid-black.png'; - const gridWhite = - GITBOOK_RUNTIME === 'cloudflare' - ? linker.toAbsoluteURL(`/~gitbook/static/${gridWhitePath}`) - : getAssetURL(gridWhitePath); - const gridBlack = - GITBOOK_RUNTIME === 'cloudflare' - ? linker.toAbsoluteURL(`/~gitbook/static/${gridDarkPath}`) - : getAssetURL(gridDarkPath); + const gridWhite = getAssetURL('images/ogimage-grid-white.png'); + const gridBlack = getAssetURL('images/ogimage-grid-black.png'); let gridAsset = useLightTheme ? gridBlack : gridWhite;