upstream #1

Merged
jblu merged 1007 commits from upstream into main 2024-11-04 22:35:57 -06:00
2 changed files with 10 additions and 12 deletions
Showing only changes of commit 49a558d5ff - Show all commits

View File

@ -6,19 +6,20 @@ import { DefaultSeo } from 'next-seo'
import Head from 'next/head' import Head from 'next/head'
import SEO from '@/components/SEO' import SEO from '@/components/SEO'
import LayoutWrapper from '@/components/LayoutWrapper'
import MDXComponents from '@/components/MDXComponents' import MDXComponents from '@/components/MDXComponents'
export default function App({ Component, pageProps }) { export default function App({ Component, pageProps }) {
return ( return (
<ThemeProvider attribute="class"> <ThemeProvider attribute="class">
<MDXProvider components={MDXComponents}> <MDXProvider components={MDXComponents}>
<div className="antialiased">
<Head> <Head>
<meta content="width=device-width, initial-scale=1" name="viewport" /> <meta content="width=device-width, initial-scale=1" name="viewport" />
</Head> </Head>
<DefaultSeo {...SEO} /> <DefaultSeo {...SEO} />
<LayoutWrapper>
<Component {...pageProps} /> <Component {...pageProps} />
</div> </LayoutWrapper>
</MDXProvider> </MDXProvider>
</ThemeProvider> </ThemeProvider>
) )

View File

@ -1,5 +1,4 @@
import Document, { Html, Head, Main, NextScript } from 'next/document' import Document, { Html, Head, Main, NextScript } from 'next/document'
import LayoutWrapper from '@/components/LayoutWrapper'
class MyDocument extends Document { class MyDocument extends Document {
render() { render() {
return ( return (
@ -54,11 +53,9 @@ class MyDocument extends Document {
crossorigin="anonymous" crossorigin="anonymous"
></script> ></script>
</Head> </Head>
<body className="bg-white dark:bg-gray-900 text-black dark:text-white"> <body className="bg-white text-black dark:bg-gray-900 dark:text-white antialiased">
<LayoutWrapper>
<Main /> <Main />
<NextScript /> <NextScript />
</LayoutWrapper>
</body> </body>
</Html> </Html>
) )