@graphcommerce/next-ui 4.2.1 → 4.2.2

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 4.2.2
+
+### Patch Changes
+
+- [#1296](https://github.com/ho-nl/m2-pwa/pull/1296)
+  [`a9cff2ce6`](https://github.com/ho-nl/m2-pwa/commit/a9cff2ce63fce5b86e9fd6bf63c10c782326d50e)
+  Thanks [@paales](https://github.com/paales)! - Make sure the page is max height when no menuFab or
+  cartFab is present
+
+* [#1296](https://github.com/ho-nl/m2-pwa/pull/1296)
+  [`8473123fa`](https://github.com/ho-nl/m2-pwa/commit/8473123fa7d3f3eb1d282d9b4205c803a88010ea)
+  Thanks [@paales](https://github.com/paales)! - implement handling for canonical URLs based on
+  NEXT_PUBLIC_SITE_URL
+
+- [#1296](https://github.com/ho-nl/m2-pwa/pull/1296)
+  [`50e205c51`](https://github.com/ho-nl/m2-pwa/commit/50e205c51f4d0d67d41d22fd70e8ed9a0996489e)
+  Thanks [@paales](https://github.com/paales)! - make sure the scroll performance of galleries in
+  safari is better
+
 ## 4.2.1
 
 ### Patch Changes

package/PageMeta/index.tsx

@@ -1,5 +1,12 @@
 import { usePageContext } from '@graphcommerce/framer-next-pages'
+import {
+  resolveHref,
+  getDomainLocale,
+  addBasePath,
+  addLocale,
+} from 'next/dist/shared/lib/router/router'
 import Head from 'next/head'
+import { useRouter } from 'next/router'
 
 // https://developers.google.com/search/docs/advanced/robots/robots_meta_tag#directives
 export type MetaRobots =
@@ -15,19 +22,60 @@ export type MetaRobots =
   | `max-video-preview:${number}`
 type MetaRobotsAll = ['all' | 'none']
 
+type Canonical = `http://${string}` | `https://${string}` | `/${string}` | string
+
 export type PageMetaProps = {
   title: string
-  canonical?: `http://${string}` | `https://${string}` | string
+  canonical?: Canonical
   metaDescription?: string
   metaRobots?: MetaRobotsAll | MetaRobots[]
 }
 
+export function useCanonical(incomming?: Canonical) {
+  const router = useRouter()
+  let canonical = incomming
+
+  if (!canonical) return canonical
+
+  if (canonical?.startsWith('/')) {
+    if (!process.env.NEXT_PUBLIC_SITE_URL) {
+      if (process.env.NODE_ENV !== 'production') {
+        throw Error('NEXT_PUBLIC_SITE_URL is not defined in .env')
+      }
+    }
+
+    let [href, as] = resolveHref(router, canonical, true)
+
+    const curLocale = router.locale
+
+    // Copied from here https://github.com/vercel/next.js/blob/canary/packages/next/client/link.tsx#L313-L327
+    const localeDomain =
+      router &&
+      router.isLocaleDomain &&
+      getDomainLocale(as, curLocale, router && router.locales, router && router.domainLocales)
+
+    href = localeDomain || addBasePath(addLocale(as, curLocale, router && router.defaultLocale))
+
+    canonical = `${process.env.NEXT_PUBLIC_SITE_URL}${href}`
+  }
+
+  if (canonical && !(canonical ?? 'http').startsWith('http')) {
+    if (process.env.NODE_ENV !== 'production') {
+      throw new Error(
+        `canonical must start with '/', 'http://' or 'https://', '${canonical}' given`,
+      )
+    }
+    canonical = undefined
+  }
+
+  return canonical
+}
+
 export function PageMeta(props: PageMetaProps) {
   const { active } = usePageContext()
-  const { title, canonical, metaDescription, metaRobots = ['all'] } = props
+  const { title, canonical: canonicalBare, metaDescription, metaRobots = ['all'] } = props
 
-  if (!(canonical ?? 'http').startsWith('http'))
-    throw new Error(`canonical must start with http:// or https://, '${canonical}' given`)
+  const canonical = useCanonical(canonicalBare)
 
   if (!active) return null
   return (

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-ui",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "author": "",
   "license": "MIT",
   "sideEffects": false,