diff --git a/.changeset/healthy-chicken-end.md b/.changeset/healthy-chicken-end.md new file mode 100644 index 0000000000..733d9b63d9 --- /dev/null +++ b/.changeset/healthy-chicken-end.md @@ -0,0 +1,6 @@ +--- +"gitbook-v2": patch +"gitbook": patch +--- + +Fix invalid HTML on an Announcement banner without a CTA. diff --git a/packages/gitbook-v2/src/middleware.ts b/packages/gitbook-v2/src/middleware.ts index 916d53d61d..98f9440d45 100644 --- a/packages/gitbook-v2/src/middleware.ts +++ b/packages/gitbook-v2/src/middleware.ts @@ -104,6 +104,7 @@ async function serveSiteRoutes(requestURL: URL, request: NextRequest) { const resolve = ADAPTIVE_CONTENT_HOSTS.includes(siteRequestURL.hostname) ? resolvePublishedContentByUrl : getPublishedContentByURL; + const siteURLData = await throwIfDataError( resolve({ url: siteRequestURL.toString(), @@ -290,7 +291,7 @@ async function serveSiteRoutes(requestURL: URL, request: NextRequest) { return writeResponseCookies(response, cookies); }; - // For https://preview/ requests, + // For https://preview/ requests, if (siteRequestURL.hostname === 'preview') { return serveWithQueryAPIToken( // We scope the API token to the site ID. diff --git a/packages/gitbook/src/components/Announcement/AnnouncementBanner.tsx b/packages/gitbook/src/components/Announcement/AnnouncementBanner.tsx index 522bde0ca3..c9d9c674c4 100644 --- a/packages/gitbook/src/components/Announcement/AnnouncementBanner.tsx +++ b/packages/gitbook/src/components/Announcement/AnnouncementBanner.tsx @@ -18,35 +18,18 @@ export function AnnouncementBanner(props: { }) { const { announcement, contentRef } = props; - const hasLink = announcement.link && contentRef?.href; + const hasLink = contentRef?.href; const closeable = announcement.style !== 'danger'; - - const Tag = hasLink ? Link : 'div'; const style = BANNER_STYLES[announcement.style]; return (
- ) : null}
- + {closeable ? (