+
{page.title}
- )
+ );
}
type FlatPageEntry = { page: RevisionPageDocument | RevisionPageGroup; depth: number };
@@ -87,12 +102,17 @@ type FlatPageEntry = { page: RevisionPageDocument | RevisionPageGroup; depth: nu
* Compute the ordered flat set of pages to render.
*/
function selectPages(revision: Revision, params: PDFSearchParams): FlatPageEntry[] {
- const flattenPage = (page: RevisionPageDocument | RevisionPageGroup, depth: number): FlatPageEntry[] => {
+ const flattenPage = (
+ page: RevisionPageDocument | RevisionPageGroup,
+ depth: number,
+ ): FlatPageEntry[] => {
return [
{ page, depth },
- ...page.pages.flatMap((child) => child.type === 'link' ? [] : flattenPage(child, depth + 1)),
+ ...page.pages.flatMap((child) =>
+ child.type === 'link' ? [] : flattenPage(child, depth + 1),
+ ),
];
- }
+ };
if (params.page) {
const found = resolvePageId(revision, params.page);
@@ -107,6 +127,5 @@ function selectPages(revision: Revision, params: PDFSearchParams): FlatPageEntry
return flattenPage(found.page, 0);
}
- return revision.pages.flatMap((page) => page.type === 'link' ? [] : flattenPage(page, 0));
+ return revision.pages.flatMap((page) => (page.type === 'link' ? [] : flattenPage(page, 0)));
}
-
diff --git a/src/app/[spaceId]/[[...pathname]]/page.tsx b/src/app/[spaceId]/[[...pathname]]/page.tsx
index 193943f4b..fda08e280 100644
--- a/src/app/[spaceId]/[[...pathname]]/page.tsx
+++ b/src/app/[spaceId]/[[...pathname]]/page.tsx
@@ -1,5 +1,5 @@
import { SpaceContent } from '@/components/SpaceContent';
-import { pageHref } from '@/lib/links';
+import { PageHrefContext, absoluteHref, pageHref } from '@/lib/links';
import { Metadata } from 'next';
import { notFound, redirect } from 'next/navigation';
import { PagePathParams, fetchPageData, getPagePath } from '../fetch';
@@ -12,11 +12,12 @@ export default async function Page(props: { params: PagePathParams }) {
const { params } = props;
const { space, revision, page, ancestors } = await fetchPageData(props.params);
+ const linksContext: PageHrefContext = {};
if (!page) {
notFound();
} else if (page.path !== getPagePath(params)) {
- redirect(pageHref(page.path));
+ redirect(pageHref(page, linksContext));
}
const {
@@ -45,7 +46,7 @@ export async function generateMetadata({ params }: { params: PagePathParams }):
description: page.description,
generator: 'GitBook',
openGraph: {
- images: [pageHref('.gitbook/ogimage/' + page.id)],
+ images: [absoluteHref('.gitbook/ogimage/' + page.id)],
},
robots: space.visibility === 'public' ? 'index, follow' : 'noindex, nofollow',
diff --git a/src/app/[spaceId]/sitemap.xml/route.ts b/src/app/[spaceId]/sitemap.xml/route.ts
index 513087979..fd8c834c0 100644
--- a/src/app/[spaceId]/sitemap.xml/route.ts
+++ b/src/app/[spaceId]/sitemap.xml/route.ts
@@ -30,14 +30,14 @@ export async function GET(req: NextRequest, { params }: { params: SpaceParams })
url: {
loc: pageHref(page.path),
priority: normalizedPriority,
- ...(lastModified ? {
- // lastmod format is YYYY-MM-DD
- lastmod: new Date(lastModified)
- .toISOString()
- .split('T')[0],
- } : {})
- }
- }
+ ...(lastModified
+ ? {
+ // lastmod format is YYYY-MM-DD
+ lastmod: new Date(lastModified).toISOString().split('T')[0],
+ }
+ : {}),
+ },
+ };
});
const xml = jsontoxml(
@@ -56,7 +56,7 @@ export async function GET(req: NextRequest, { params }: { params: SpaceParams })
{
xmlHeader: true,
prettyPrint: true,
- }
+ },
);
return new Response(xml, {
@@ -69,14 +69,17 @@ export async function GET(req: NextRequest, { params }: { params: SpaceParams })
type FlatPageEntry = { page: RevisionPageDocument; depth: number };
function flattenPages(revision: Revision): FlatPageEntry[] {
- const flattenPage = (page: RevisionPageDocument | RevisionPageGroup, depth: number): FlatPageEntry[] => {
+ const flattenPage = (
+ page: RevisionPageDocument | RevisionPageGroup,
+ depth: number,
+ ): FlatPageEntry[] => {
return [
...(page.type === 'document' ? [{ page, depth }] : []),
- ...page.pages.flatMap((child) => child.type === 'link' ? [] : flattenPage(child, depth + 1)),
+ ...page.pages.flatMap((child) =>
+ child.type === 'link' ? [] : flattenPage(child, depth + 1),
+ ),
];
- }
+ };
- return revision.pages.flatMap((page) => page.type === 'link' ? [] : flattenPage(page, 0));
+ return revision.pages.flatMap((page) => (page.type === 'link' ? [] : flattenPage(page, 0)));
}
-
-
diff --git a/src/components/DocumentView/Heading.tsx b/src/components/DocumentView/Heading.tsx
index 1e79d7fda..7979c997d 100644
--- a/src/components/DocumentView/Heading.tsx
+++ b/src/components/DocumentView/Heading.tsx
@@ -4,14 +4,15 @@ import { BlockProps } from './Block';
import { Inlines } from './Inlines';
import { DocumentBlockHeading } from '@gitbook/api';
import { getBlockTextStyle } from './spacing';
+import { pageLocalId } from '@/lib/links';
export function Heading(props: BlockProps
) {
- const { block, style, ...contextProps } = props;
+ const { block, style, context, ...rest } = props;
const textStyle = getBlockTextStyle(block);
const Tag = TAGS[block.type];
- const id = block.meta?.id ?? '';
+ const id = pageLocalId(context.page, block.meta?.id ?? '', context);
return (
@@ -56,7 +57,7 @@ export function Heading(props: BlockProps) {