Merge branch 'main' into renovate/@theguildcomponents-+-nextra

# Conflicts: # pnpm-lock.yaml
the-guild-org · Dec 20, 2024 · 3b27662 · 3b27662
2 parents 7fe38a4 + 2433027
commit 3b27662
Show file tree

Hide file tree

Showing 11 changed files with 173 additions and 148 deletions.
diff --git a/.changeset/fast-drinks-itch.md b/.changeset/fast-drinks-itch.md
@@ -0,0 +1,5 @@
+---
+'@theguild/components': patch
+---
+
+exports `convertToPageMap`, `mergeMetaWithPageMap`, `normalizePageMap`, `evaluate` from nextra
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "the-guild-docs-monorepo",
   "type": "module",
   "private": true,
-  "packageManager": "pnpm@9.15.0",
+  "packageManager": "pnpm@9.15.1",
   "scripts": {
     "build": "turbo run build --filter=!website",
     "build-example": "turbo run build --filter=website",
@@ -36,7 +36,7 @@
     "@theguild/prettier-config": "3.0.0",
     "@theguild/tailwind-config": "0.6.2",
     "@types/jest-image-snapshot": "6.4.0",
-    "@types/react": "18.3.17",
+    "@types/react": "18.3.18",
     "@types/react-paginate": "7.1.4",
     "@types/webpack": "5.28.5",
     "css-loader": "7.1.2",

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -55,8 +55,8 @@
     "@radix-ui/react-navigation-menu": "^1.2.0",
     "clsx": "2.1.1",
     "fuzzy": "0.1.3",
-    "nextra": "4.0.0-app-router.39",
-    "nextra-theme-docs": "4.0.0-app-router.39",
+    "nextra": "4.0.0-app-router.41",
+    "nextra-theme-docs": "4.0.0-app-router.41",
     "react-paginate": "8.2.0",
     "react-player": "2.16.0",
     "semver": "^7.3.8",
@@ -67,7 +67,7 @@
     "@theguild/editor": "workspace:*",
     "@theguild/tailwind-config": "0.6.2",
     "@types/dedent": "0.7.2",
-    "@types/react": "18.3.17",
+    "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "@types/semver": "7.5.8",
     "dedent": "1.5.3",

diff --git a/packages/components/src/server/index.ts b/packages/components/src/server/index.ts
@@ -5,7 +5,14 @@ export { MDXRemote } from 'nextra/mdx-remote';
 
 export { fetchFilePathsFromGitHub } from 'nextra/fetch-filepaths-from-github';
 export { compileMdx } from 'nextra/compile';
-export { getPageMap, createIndexPage } from 'nextra/page-map';
+export {
+  getPageMap,
+  createIndexPage,
+  convertToPageMap,
+  mergeMetaWithPageMap,
+  normalizePageMap,
+} from 'nextra/page-map';
+export { evaluate } from 'nextra/evaluate';
 export { fetchPackageInfo } from './npm.js';
 export { sharedMetaItems } from './shared-meta-items';
 

diff --git a/packages/components/src/server/next.config.ts b/packages/components/src/server/next.config.ts
@@ -76,7 +76,7 @@ export const defaultNextraOptions: NextraConfig = {
   defaultShowCopyCode: true,
   whiteListTagsStyling: ['iframe', 'video', 'source'],
   search: {
-    codeblocks: true,
+    codeblocks: false,
   },
   mdxOptions: {
     // Check front matter only in production (when Webpack is used)

diff --git a/packages/components/src/server/theme-layout.tsx b/packages/components/src/server/theme-layout.tsx
@@ -1,5 +1,6 @@
 import { ComponentProps, FC, ReactNode } from 'react';
 import { Metadata } from 'next';
+import { PageMapItem } from 'nextra';
 import { Layout, Navbar } from 'nextra-theme-docs';
 import { Head } from 'nextra/components';
 import { getPageMap } from 'nextra/page-map';
@@ -72,6 +73,7 @@ export const GuildLayout: FC<{
    * Nextra's Docs Theme `<Navbar>` component props
    */
   navbarProps: NavbarProps;
+  pageMap?: PageMapItem[];
 }> = async ({
   children,
   websiteName,
@@ -81,8 +83,9 @@ export const GuildLayout: FC<{
   logo,
   layoutProps,
   navbarProps,
+  ...props
 }) => {
-  const [meta, ...pageMap] = await getPageMap();
+  const [meta, ...pageMap] = props.pageMap || (await getPageMap());
 
   const pageMapWithCompanyMenu = [
     {

diff --git a/packages/og-image/package.json b/packages/og-image/package.json
@@ -16,9 +16,9 @@
     "yoga-wasm-web": "0.3.3"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "4.20241216.0",
-    "@types/react": "18.3.17",
+    "@cloudflare/workers-types": "4.20241218.0",
+    "@types/react": "18.3.18",
     "typescript": "5.7.2",
-    "wrangler": "3.97.0"
+    "wrangler": "3.98.0"
   }
 }
diff --git a/packages/remark-mermaid/package.json b/packages/remark-mermaid/package.json
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@types/mdast": "4.0.4",
-    "nextra": "4.0.0-app-router.39",
+    "nextra": "4.0.0-app-router.41",
     "react": "18.3.1",
     "unified": "11.0.5"
   },

diff --git a/packages/remark-npm2yarn/package.json b/packages/remark-npm2yarn/package.json
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@types/mdast": "4.0.4",
-    "nextra": "4.0.0-app-router.39",
+    "nextra": "4.0.0-app-router.41",
     "unified": "11.0.5"
   },
   "publishConfig": {