Refactor getContentPointer usage into getSiteContentPointer (#2519)

Author: taranvohra

bun.lockb

@@ -16,7 +16,7 @@
  "clean": "rm -rf ./.next && rm -rf ./public/~gitbook/static"
  },
  "dependencies": {
- "@gitbook/api": "0.60.0",
+ "@gitbook/api": "0.64.1",
  "@gitbook/cache-do": "workspace:*",
  "@gitbook/emoji-codepoints": "workspace:*",
  "@gitbook/icons": "workspace:*",

packages/gitbook/package.json

@@ -1,14 +1,11 @@
 import { getSpaceLanguage, t } from '@/intl/server';
 import { getSiteLayoutData, getSpaceLayoutData } from '@/lib/api';
+import { getSiteContentPointer } from '@/lib/pointer';
 import { tcls } from '@/lib/tailwind';
 
-import { getContentPointer } from '../../fetch';
-
 export default async function NotFound() {
- const pointer = getContentPointer();
- const { customization } = await ('siteId' in pointer
- ? getSiteLayoutData(pointer)
- : getSpaceLayoutData(pointer.spaceId));
+ const pointer = getSiteContentPointer();
+ const { customization } = await getSiteLayoutData(pointer);
 
  const language = getSpaceLanguage(customization);
 

packages/gitbook/src/app/(space)/(content)/ClientContexts.tsx renamed to packages/gitbook/src/app/(site)/(content)/ClientContexts.tsx

@@ -65,7 +65,7 @@ export default async function Page(props: {
  const withPageFeedback = customization.feedback.enabled;
 
  const contentRefContext: ContentRefContext = {
- siteContext: 'siteId' in contentPointer ? contentPointer : null,
+ siteContext: contentPointer,
  space,
  revisionId: contentTarget.revisionId,
  pages,
@@ -80,7 +80,7 @@ export default async function Page(props: {
  <div className={tcls('flex', 'flex-row')}>
  <PageBody
  space={space}
- contentPointer={contentPointer}
+ pointer={contentPointer}
  contentTarget={contentTarget}
  customization={customization}
  context={contentRefContext}

packages/gitbook/src/app/(space)/(content)/RocketLoaderDetector.tsx renamed to packages/gitbook/src/app/(site)/(content)/RocketLoaderDetector.tsx

@@ -3,22 +3,20 @@ import { NextRequest } from 'next/server';
 
 import { getCollection, getSite, getSpace } from '@/lib/api';
 import { absoluteHref } from '@/lib/links';
+import { getSiteContentPointer } from '@/lib/pointer';
 import { isSpaceIndexable } from '@/lib/seo';
 
-import { getContentPointer } from '../../fetch';
-
 export const runtime = 'edge';
 
 /**
  * Generate a robots.txt for the current space.
  */
 export async function GET(req: NextRequest) {
- const pointer = getContentPointer();
- const space = await getSpace(
- pointer.spaceId,
- 'siteId' in pointer ? pointer.siteShareKey : undefined,
- );
- const site = 'siteId' in pointer ? await getSite(pointer.organizationId, pointer.siteId) : null;
+ const pointer = getSiteContentPointer();
+ const [site, space] = await Promise.all([
+ getSite(pointer.organizationId, pointer.siteId),
+ getSpace(pointer.spaceId, pointer.siteShareKey),
+ ]);
 
  const lines = [
  `User-agent: *`,