Keystaticification 🚀 of docs/

docs/app/(site)/blog/[post]/page.tsx

@@ -2,7 +2,7 @@ import { type Tag, transform } from '@markdoc/markdoc'
 import { notFound } from 'next/navigation'
 
 import { getOgAbsoluteUrl } from '../../../../lib/og-util'
-import { reader } from '../../../../lib/keystatic-reader'
+import { reader } from '../../../../keystatic/reader'
 import { baseMarkdocConfig } from '../../../../markdoc/config'
 import { type EntryWithResolvedLinkedFiles } from '@keystatic/core/reader'
 import type keystaticConfig from '../../../../keystatic.config'

docs/app/(site)/blog/page.tsx

@@ -1,7 +1,6 @@
 import { parse, format } from 'date-fns'
 
-import { reader } from '../../../lib/keystatic-reader'
-import { siteBaseUrl } from '../../../lib/og-util'
+import { reader } from '../../../keystatic/reader'
 import ClientPage from './page-client'
 import { type Metadata } from 'next'
 

docs/app/(site)/docs/[...rest]/page-client.tsx

@@ -5,7 +5,7 @@ import { useParams } from 'next/navigation'
 import { type Document } from './page'
 
 import { extractHeadings, Markdoc } from '../../../../components/Markdoc'
-import { DocsPage } from '../../../../components/Page'
+
 import { Heading } from '../../../../components/docs/Heading'
 
 export default function PageClient ({ document }: { document: Document }) {
@@ -17,17 +17,14 @@ export default function PageClient ({ document }: { document: Document }) {
   ]
 
   return (
-    <DocsPage
-      headings={headings}
-      editPath={`docs/${(params?.rest as string[]).join('/')}.md`}
-    >
+    <>
       <Heading level={1} id="title">
         {document.title}
       </Heading>
 
       {document.content.children.map((child, i) => (
         <Markdoc key={i} content={child} />
       ))}
-    </DocsPage>
+    </>
   )
 }

docs/app/(site)/docs/[...rest]/page.tsx

@@ -1,11 +1,13 @@
 import { notFound } from 'next/navigation'
 import { type Tag, transform } from '@markdoc/markdoc'
 
-import { reader } from '../../../../lib/keystatic-reader'
+import { reader } from '../../../../keystatic/reader'
 import { baseMarkdocConfig } from '../../../../markdoc/config'
 import PageClient from './page-client'
 import { type EntryWithResolvedLinkedFiles } from '@keystatic/core/reader'
 import type keystaticConfig from '../../../../keystatic.config'
+import { DocsLayout } from '../../../../components/docs/DocsLayout'
+import { extractHeadings } from '../../../../components/Markdoc'
 
 export type Document = NonNullable<
   Pick<
@@ -22,16 +24,20 @@ export default async function DocPage ({ params }) {
   })
   if (!doc) return notFound()
 
+  const transformedDoc: Document = {
+    ...doc,
+    content: transform(doc.content.node, baseMarkdocConfig) as Tag,
+  }
+
+  const headings = [
+    { id: 'title', depth: 1, label: transformedDoc.title },
+    // ...extractHeadings(transformedDoc.content),
+  ]
+
   return (
-    <PageClient
-      document={JSON.parse(
-        JSON.stringify({
-          ...doc,
-          // Prepare content for Markdoc renderer
-          content: transform(doc.content.node, baseMarkdocConfig),
-        })
-      )}
-    />
+    <DocsLayout headings={headings} editPath={`docs/${(params?.rest as string[]).join('/')}.md`}>
+      <PageClient document={JSON.parse(JSON.stringify(transformedDoc))} />
+    </DocsLayout>
   )
 }
 

docs/app/(site)/docs/config/overview/page-client.tsx

@@ -5,19 +5,13 @@
 import { CommunitySlackCTA } from '../../../../../components/docs/CommunitySlackCTA'
 import { Type } from '../../../../../components/primitives/Type'
 import { Well } from '../../../../../components/primitives/Well'
-import { DocsPage } from '../../../../../components/Page'
 import { useMediaQuery } from '../../../../../lib/media'
 
 export default function Docs () {
   const mq = useMediaQuery()
 
   return (
-    <DocsPage
-      noRightNav
-      noProse
-      isIndexPage
-      editPath="docs/config/overview.tsx"
-    >
+    <>
       <Type as="h1" look="heading64">
         Configuration Overview
       </Type>
@@ -60,6 +54,6 @@ export default function Docs () {
           and one-time authentication tokens.
         </Well>
       </div>
-    </DocsPage>
+    </>
   )
 }

docs/app/(site)/docs/config/overview/page.tsx

@@ -1,3 +1,4 @@
+import { DocsLayout } from '../../../../../components/docs/DocsLayout'
 import PageClient from './page-client'
 
 export const metadata = {
@@ -6,5 +7,9 @@ export const metadata = {
 }
 
 export default function Docs () {
-  return <PageClient />
+  return (
+    <DocsLayout noRightNav noProse isIndexPage editPath="docs/config/overview.tsx">
+      <PageClient />
+    </DocsLayout>
+  )
 }