- {resolved.icon}
+ {target.icon}
) : null}
- {resolved.text}
+{target.text}
- {!isSamePage && resolved.href ? ( + {!isSamePage && target.href ? ( ) : null} - {resolved.subText ? ( -{resolved.subText}
+ {target.subText ? ( +{target.subText}
) : null} - {hasAISummary && 'page' in context && 'page' in inline.data.ref ? ( + {aiSummary ? (
+ Unexpected error with integration {block.data.integration}:{' '}
+ {initialResponse.error.message}
+
+
+ );
+ }
+ const initialOutput = initialResponse.data;
+ if (initialOutput.type === 'complete') {
return null;
}
diff --git a/packages/gitbook/src/components/DocumentView/Integration/render.ts b/packages/gitbook/src/components/DocumentView/Integration/render.ts
new file mode 100644
index 000000000..4e683e0dc
--- /dev/null
+++ b/packages/gitbook/src/components/DocumentView/Integration/render.ts
@@ -0,0 +1,34 @@
+import type { RenderIntegrationUI } from '@gitbook/api';
+import type { GitBookBaseContext } from '@v2/lib/context';
+import { ignoreDataFetcherErrors } from '@v2/lib/data';
+
+/**
+ * Render an integration UI while ignoring some errors.
+ */
+export async function fetchSafeIntegrationUI(
+ context: GitBookBaseContext,
+ {
+ integrationName,
+ request,
+ }: {
+ integrationName: string;
+ request: RenderIntegrationUI;
+ }
+) {
+ const output = await ignoreDataFetcherErrors(
+ context.dataFetcher.renderIntegrationUi({
+ integrationName,
+ request,
+ }),
+
+ // The API can respond with certain errors that are expected to happen.
+ [
+ 404, // Integration has been uninstalled
+ 400, // Integration is rejecting its own request
+ 422, // Integration is triggering an invalid request, failing at the validation step
+ 502, // Integration is failing in an unexpected way
+ ]
+ );
+
+ return output;
+}
diff --git a/packages/gitbook/src/components/DocumentView/Integration/server-actions.tsx b/packages/gitbook/src/components/DocumentView/Integration/server-actions.tsx
index 54180e5c8..91d1e0e73 100644
--- a/packages/gitbook/src/components/DocumentView/Integration/server-actions.tsx
+++ b/packages/gitbook/src/components/DocumentView/Integration/server-actions.tsx
@@ -4,9 +4,9 @@ import { getV1BaseContext } from '@/lib/v1';
import { isV2 } from '@/lib/v2';
import type { RenderIntegrationUI } from '@gitbook/api';
import { ContentKitOutput } from '@gitbook/react-contentkit';
-import { throwIfDataError } from '@v2/lib/data';
import { getServerActionBaseContext } from '@v2/lib/server-actions';
import { contentKitServerContext } from './contentkit';
+import { fetchSafeIntegrationUI } from './render';
/**
* Server action to render an integration UI request from
-
);
});
+
+function highlightQueryInBody(body: string, query: string) {
+ const idx = body.toLocaleLowerCase().indexOf(query.toLocaleLowerCase());
+
+ // Ensure the query to be highlighted is visible in the body.
+ return (
+
);
}
diff --git a/packages/gitbook/src/routes/ogimage.tsx b/packages/gitbook/src/routes/ogimage.tsx
index e55dcfc2d..4d8a83b2c 100644
--- a/packages/gitbook/src/routes/ogimage.tsx
+++ b/packages/gitbook/src/routes/ogimage.tsx
@@ -1,23 +1,33 @@
import { CustomizationDefaultFont, CustomizationHeaderPreset } from '@gitbook/api';
import { colorContrast } from '@gitbook/colors';
import { type FontWeight, getDefaultFont } from '@gitbook/fonts';
+import { direction } from 'direction';
+import { imageSize } from 'image-size';
import { redirect } from 'next/navigation';
import { ImageResponse } from 'next/og';
import { type PageParams, fetchPageData } from '@/components/SitePage';
import { getFontSourcesToPreload } from '@/fonts/custom';
import { getAssetURL } from '@/lib/assets';
+import { getExtension } from '@/lib/paths';
import { filterOutNullable } from '@/lib/typescript';
import { getCacheTag } from '@gitbook/cache-tags';
import type { GitBookSiteContext } from '@v2/lib/context';
-import { getResizedImageURL } from '@v2/lib/images';
+import {
+ type ResizeImageOptions,
+ SizableImageAction,
+ checkIsSizableImageURL,
+ getResizedImageURL,
+ resizeImage,
+} from '@v2/lib/images';
+import { SiteDefaultIcon } from './icon';
/**
* Render the OpenGraph image for a site content.
*/
export async function serveOGImage(baseContext: GitBookSiteContext, params: PageParams) {
const { context, pageTarget } = await fetchPageData(baseContext, params);
- const { customization, site, linker, imageResizer } = context;
+ const { customization, site, imageResizer } = context;
const page = pageTarget?.page;
// If user configured a custom social preview, we redirect to it.
@@ -31,7 +41,6 @@ export async function serveOGImage(baseContext: GitBookSiteContext, params: Page
}
// Compute all text to load only the necessary fonts
- const contentTitle = customization.header.logo ? '' : site.title;
const pageTitle = page
? page.title.length > 64
? `${page.title.slice(0, 64)}...`
@@ -45,13 +54,13 @@ export async function serveOGImage(baseContext: GitBookSiteContext, params: Page
: '';
// Load the fonts
- const { fontFamily, fonts } = await (async () => {
+ const fontLoader = async () => {
// google fonts
if (typeof customization.styling.font === 'string') {
const fontFamily = customization.styling.font ?? CustomizationDefaultFont.Inter;
const regularText = pageDescription;
- const boldText = `${contentTitle}${pageTitle}`;
+ const boldText = `${site.title} ${pageTitle}`;
const fonts = (
await Promise.all([
@@ -85,7 +94,7 @@ export async function serveOGImage(baseContext: GitBookSiteContext, params: Page
).filter(filterOutNullable);
return { fontFamily: 'CustomFont', fonts };
- })();
+ };
const theme = customization.themes.default;
const useLightTheme = theme === 'light';
@@ -139,32 +148,55 @@ export async function serveOGImage(baseContext: GitBookSiteContext, params: Page
break;
}
- const favicon = await (async () => {
- if ('icon' in customization.favicon)
- return (
-
+
-
+ ![Logo]()
+
) : (
-
+
,
@@ -287,38 +315,12 @@ async function loadCustomFont(input: { url: string; weight: 400 | 700 }) {
};
}
-/**
- * Temporary function to log some data on Cloudflare.
- * TODO: remove this when we found the issue
- */
-function logOnCloudflareOnly(message: string) {
- if (process.env.DEBUG_CLOUDFLARE === 'true') {
- // biome-ignore lint/suspicious/noConsole:
{favicon}
-
)}
@@ -212,10 +238,12 @@ export async function serveOGImage(baseContext: GitBookSiteContext, params: Page