🐛 Undefined config in metadata (#366)

jupyter-book · Apr 19, 2024 · 36282f2 · 36282f2
1 parent 9810bf7
commit 36282f2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.changeset/curly-bananas-search.md b/.changeset/curly-bananas-search.md
@@ -0,0 +1,6 @@
+---
+'@myst-theme/article': patch
+'@myst-theme/book': patch
+---
+
+Bug in page frontmatter being undefined
diff --git a/themes/article/app/routes/$.tsx b/themes/article/app/routes/$.tsx
@@ -23,20 +23,18 @@ export const meta: V2_MetaFunction = ({ data, matches, location }) => {
   const config: SiteManifest = data.config;
   const project: ManifestProject = data.project;
   const page: PageLoader['frontmatter'] = data.page.frontmatter;
-
+  const siteTitle = config?.title ?? project?.title ?? '';
   return getMetaTagsForArticle({
     origin: '',
     url: location.pathname,
-    title: page.title
-      ? `${page.title} - ${config?.title ?? project.title}`
-      : `${config?.title ?? project.title}`,
-    description: page.description ?? project.description ?? config.description ?? undefined,
+    title: page?.title ? `${page.title}${siteTitle ? ` - ${siteTitle}` : ''}` : siteTitle,
+    description: page?.description ?? project?.description ?? config?.description ?? undefined,
     image:
-      (page.thumbnailOptimized || page.thumbnail) ??
-      (project.thumbnailOptimized || project.thumbnail) ??
+      (page?.thumbnailOptimized || page?.thumbnail) ??
+      (project?.thumbnailOptimized || project?.thumbnail) ??
       undefined,
     twitter: config?.options?.twitter,
-    keywords: page.keywords ?? project.keywords ?? config.keywords ?? [],
+    keywords: page?.keywords ?? project?.keywords ?? config?.keywords ?? [],
   });
 };
 

diff --git a/themes/book/app/routes/$.tsx b/themes/book/app/routes/$.tsx
@@ -39,19 +39,19 @@ export const meta: V2_MetaFunction = ({ data, matches, location }) => {
   const project: ManifestProject = data.project;
   const page: PageLoader['frontmatter'] = data.page.frontmatter;
 
+  const siteTitle = config?.title ?? project?.title ?? '';
+
   return getMetaTagsForArticle({
     origin: '',
     url: location.pathname,
-    title: page.title
-      ? `${page.title} - ${config?.title ?? project.title}`
-      : `${config?.title ?? project.title}`,
-    description: page.description ?? project.description ?? config.description ?? undefined,
+    title: page?.title ? `${page.title}${siteTitle ? ` - ${siteTitle}` : ''}` : siteTitle,
+    description: page?.description ?? project?.description ?? config?.description ?? undefined,
     image:
-      (page.thumbnailOptimized || page.thumbnail) ??
-      (project.thumbnailOptimized || project.thumbnail) ??
+      (page?.thumbnailOptimized || page?.thumbnail) ??
+      (project?.thumbnailOptimized || project?.thumbnail) ??
       undefined,
     twitter: config?.options?.twitter,
-    keywords: page.keywords ?? project.keywords ?? config.keywords ?? [],
+    keywords: page?.keywords ?? project?.keywords ?? config?.keywords ?? [],
   });
 };