📦 Upgrade to v0.9.0 (#16)

jupyter-book · Apr 20, 2024 · 8615840 · 8615840
1 parent 21987a9
commit 8615840
Show file tree

Hide file tree

Showing 7 changed files with 1,079 additions and 980 deletions.
diff --git a/theme/app/root.tsx b/theme/app/root.tsx
@@ -1,4 +1,4 @@
-import type { LinksFunction, MetaFunction, LoaderFunction } from '@remix-run/node';
+import type { LinksFunction, V2_MetaFunction, LoaderFunction } from '@remix-run/node';
 import tailwind from '~/styles/app.css';
 import { getConfig } from '~/utils/loaders.server';
 import type { SiteLoader } from '@myst-theme/common';
@@ -11,7 +11,7 @@ import {
 } from '@myst-theme/site';
 export { AppCatchBoundary as CatchBoundary } from '@myst-theme/site';
 
-export const meta: MetaFunction = ({ data }) => {
+export const meta: V2_MetaFunction = ({ data }) => {
   return getMetaTagsForSite({
     title: data?.config?.title,
     twitter: data?.config?.twitter,

diff --git a/theme/app/routes/$project.($slug).tsx b/theme/app/routes/$project.($slug).tsx
@@ -1,4 +1,4 @@
-import type { LoaderFunction, MetaFunction } from '@remix-run/node';
+import type { LoaderFunction, V2_MetaFunction } from '@remix-run/node';
 import type { PageLoader } from '@myst-theme/common';
 import {
   useOutlineHeight,
@@ -11,23 +11,23 @@ import {
 import { FrontmatterBlock } from '@myst-theme/frontmatter';
 import { ComputeOptionsProvider, ThebeLoaderAndServer } from '@myst-theme/jupyter';
 import { useLoaderData } from '@remix-run/react';
-import type { SiteManifest } from 'myst-config';
 import { ProjectProvider, ReferencesProvider, useThemeTop } from '@myst-theme/providers';
 import { getPage } from '~/utils/loaders.server';
 import { ArticleWithProviders } from '../components/Page';
 import type { GenericParent } from 'myst-common';
 
-export const meta: MetaFunction = (args) => {
-  const config = (args.parentsData?.['routes/$project']?.config ??
-    args.parentsData?.root?.config) as SiteManifest | undefined;
-  const data = args.data as PageLoader | undefined;
-  if (!config || !data || !data.frontmatter) return {};
+export const meta: V2_MetaFunction = ({ data, location }) => {
+  if (!data) return [];
+  const siteTitle = 'MyST Markdown';
+  const page = data.frontmatter;
   return getMetaTagsForArticle({
     origin: '',
-    url: args.location.pathname,
-    title: `${data.frontmatter.title} - ${config?.title}`,
-    description: data.frontmatter.description,
-    image: (data.frontmatter.thumbnailOptimized || data.frontmatter.thumbnail) ?? undefined,
+    url: location.pathname,
+    title: page?.title ? `${page.title}${siteTitle ? ` - ${siteTitle}` : ''}` : siteTitle,
+    description: page?.description ?? undefined,
+    image: page?.thumbnailOptimized || page?.thumbnail,
+    twitter: 'mystmarkdown',
+    keywords: page?.keywords ?? [],
   });
 };
 

diff --git a/theme/app/routes/_index.tsx b/theme/app/routes/_index.tsx
@@ -1,24 +1,25 @@
-import type { LinksFunction, LoaderFunction, MetaFunction } from '@remix-run/node';
+import type { LinksFunction, LoaderFunction, V2_MetaFunction } from '@remix-run/node';
 import type { PageLoader } from '@myst-theme/common';
 import { getMetaTagsForArticle, KatexCSS, ArticlePage } from '@myst-theme/site';
 import { ComputeOptionsProvider, ThebeLoaderAndServer } from '@myst-theme/jupyter';
 import { getPage } from '~/utils/loaders.server';
 import { useLoaderData } from '@remix-run/react';
-import type { SiteManifest } from 'myst-config';
 import { ArticleAndNavigation, HeaderSection, NavigationAndFooter } from '../components/Page';
 import { Error404 } from '../components/Error404';
 import { ProjectProvider } from '@myst-theme/providers';
 
-export const meta: MetaFunction = (args) => {
-  const config = args.parentsData?.root?.config as SiteManifest | undefined;
-  const data = args.data as PageLoader | undefined;
-  if (!config || !data || !data.frontmatter) return {};
+export const meta: V2_MetaFunction = ({ data, location }) => {
+  if (!data) return [];
+  const siteTitle = 'MyST Markdown';
+  const page = data.frontmatter;
   return getMetaTagsForArticle({
     origin: '',
-    url: args.location.pathname,
-    title: `${data.frontmatter.title} - ${config?.title}`,
-    description: data.frontmatter.description,
-    image: (data.frontmatter.thumbnailOptimized || data.frontmatter.thumbnail) ?? undefined,
+    url: location.pathname,
+    title: page?.title ? `${page.title}${siteTitle ? ` - ${siteTitle}` : ''}` : siteTitle,
+    description: page?.description ?? undefined,
+    image: page?.thumbnailOptimized || page?.thumbnail,
+    twitter: 'mystmarkdown',
+    keywords: page?.keywords ?? [],
   });
 };
 

diff --git a/theme/app/routes/overview.($slug).tsx b/theme/app/routes/overview.($slug).tsx
@@ -1,6 +1,6 @@
-import type { LoaderFunction } from '@remix-run/node';
+import type { LoaderFunction, V2_MetaFunction } from '@remix-run/node';
 import type { PageLoader } from '@myst-theme/common';
-import { ArticlePage } from '@myst-theme/site';
+import { ArticlePage, getMetaTagsForArticle } from '@myst-theme/site';
 import { ComputeOptionsProvider, ThebeLoaderAndServer } from '@myst-theme/jupyter';
 import { getPage } from '../utils/loaders.server';
 import { NavLink, useLoaderData } from '@remix-run/react';
@@ -11,6 +11,21 @@ import { Error404 } from '../components/Error404';
 
 const baseurl = 'overview';
 
+export const meta: V2_MetaFunction = ({ data, location }) => {
+  if (!data) return [];
+  const siteTitle = 'MyST Markdown';
+  const page = data.frontmatter;
+  return getMetaTagsForArticle({
+    origin: '',
+    url: location.pathname,
+    title: page?.title ? `${page.title}${siteTitle ? ` - ${siteTitle}` : ''}` : siteTitle,
+    description: page?.description ?? undefined,
+    image: page?.thumbnailOptimized || page?.thumbnail,
+    twitter: 'mystmarkdown',
+    keywords: page?.keywords ?? [],
+  });
+};
+
 export const loader: LoaderFunction = async ({ params, request }) => {
   const { slug } = params;
   const page = await getPage({ name: 'overview', slug });