Merge branch 'master' into agnostic

pages/[...pages].tsx

@@ -3,14 +3,14 @@ import type {
   GetStaticPropsContext,
   InferGetStaticPropsType,
 } from 'next'
+import { Text } from '@components/ui'
+import { Layout } from '@components/common'
 import getSlug from '@lib/get-slug'
 import { missingLocaleInPages } from '@lib/usage-warns'
-import { Layout } from '@components/common'
-import { Text } from '@components/ui'
 import { getConfig } from '@framework/api'
 import getPage from '@framework/api/operations/get-page'
 import getAllPages from '@framework/api/operations/get-all-pages'
-import { defatultPageProps } from '@lib/defaults'
+import { defaultPageProps } from '@lib/defaults'
 
 export async function getStaticProps({
   preview,
@@ -34,7 +34,7 @@ export async function getStaticProps({
   }
 
   return {
-    props: { ...defatultPageProps, pages, page },
+    props: { ...defaultPageProps, pages, page },
     revalidate: 60 * 60, // Every hour
   }
 }

pages/_document.tsx

@@ -1,10 +1,4 @@
-import Document, {
-  DocumentContext,
-  Head,
-  Html,
-  Main,
-  NextScript,
-} from 'next/document'
+import Document, { Head, Html, Main, NextScript } from 'next/document'
 
 class MyDocument extends Document {
   render() {

pages/wishlist.tsx

@@ -6,8 +6,12 @@ import { Layout } from '@components/common'
 import { Heart } from '@components/icons'
 import { Text, Container } from '@components/ui'
 import { WishlistCard } from '@components/wishlist'
+<<<<<<< HEAD
 import { defatultPageProps } from '@lib/defaults'
 import { useCustomer } from '@framework/customer'
+=======
+import { defaultPageProps } from '@lib/defaults'
+>>>>>>> master
 
 export async function getStaticProps({
   preview,
@@ -16,7 +20,7 @@ export async function getStaticProps({
   const config = getConfig({ locale })
   const { pages } = await getAllPages({ config, preview })
   return {
-    props: { ...defatultPageProps, pages },
+    props: { ...defaultPageProps, pages },
   }
 }