@graphcommerce/next-ui 8.0.0-canary.77 → 8.0.0-canary.79

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## 8.0.0-canary.79
+
+### Patch Changes
+
+- [#2137](https://github.com/graphcommerce-org/graphcommerce/pull/2137) [`df507b1`](https://github.com/graphcommerce-org/graphcommerce/commit/df507b194c67eef7b02df858c07938bb308b5397) - Don't render pseudo-locale in HTML lang attribute
+  ([@hnsr](https://github.com/hnsr))
+
+## 8.0.0-canary.78
+
+### Patch Changes
+
+- [#2135](https://github.com/graphcommerce-org/graphcommerce/pull/2135) [`7b017f5`](https://github.com/graphcommerce-org/graphcommerce/commit/7b017f58ba3be587d20a7f52c84b2907d52fe201) - Fix incorrect canonical URLs when i18n domain routing is used
+  ([@hnsr](https://github.com/hnsr))
+
 ## 8.0.0-canary.77
 
 ### Patch Changes

package/PageMeta/PageMeta.tsx

@@ -60,18 +60,25 @@ export function canonicalize(router: PartialNextRouter, incoming?: Canonical) {
     const curLocale = router.locale
 
     // Copied from here https://github.com/vercel/next.js/blob/213c42f446874d29d07fa2cca6e6b11fc9c3b711/packages/next/client/link.tsx#L512
-    const localeDomain =
-      router.isLocaleDomain &&
-      getDomainLocale(as, curLocale, router && router.locales, router.domainLocales)
-
-    href = localeDomain || addBasePath(addLocale(as, curLocale, router.defaultLocale))
-
-    let siteUrl =
-      storefrontConfig(router.locale)?.canonicalBaseUrl ||
-      import.meta.graphCommerce.canonicalBaseUrl
-    if (siteUrl.endsWith('/')) siteUrl = siteUrl.slice(0, -1)
-
-    canonical = `${siteUrl}${href}`
+    const localeDomain = getDomainLocale(
+      as,
+      curLocale,
+      router && router.locales,
+      router.domainLocales,
+    )
+
+    if (localeDomain) {
+      canonical = localeDomain
+    } else {
+      href = addBasePath(addLocale(as, curLocale, router.defaultLocale))
+
+      let siteUrl =
+        storefrontConfig(router.locale)?.canonicalBaseUrl ||
+        import.meta.graphCommerce.canonicalBaseUrl
+      if (siteUrl.endsWith('/')) siteUrl = siteUrl.slice(0, -1)
+
+      canonical = `${siteUrl}${href}`
+    }
   }
 
   if (!canonical.startsWith('http')) {

package/hooks/useDateTimeFormat.ts

@@ -1,3 +1,4 @@
+import { normalizeLocale } from '@graphcommerce/lingui-next'
 import { useRouter } from 'next/router'
 import { useMemo } from 'react'
 
@@ -6,12 +7,9 @@ export type DateTimeFormatProps = Intl.DateTimeFormatOptions
 export function useDateTimeFormat(props?: DateTimeFormatProps) {
   const { locale } = useRouter()
 
-  // Remove optional dialect from locale, which Intl.NumberFormat does not support.
-  const strippedLocale = locale?.split('-', 2).join('-')
-
   const formatter = useMemo(
-    () => new Intl.DateTimeFormat(strippedLocale, props),
-    [strippedLocale, props],
+    () => new Intl.DateTimeFormat(normalizeLocale(locale), props),
+    [locale, props],
   )
   return formatter
 }

package/hooks/useNumberFormat.ts

@@ -1,3 +1,4 @@
+import { normalizeLocale } from '@graphcommerce/lingui-next'
 import { useRouter } from 'next/router'
 import { useMemo } from 'react'
 
@@ -6,12 +7,9 @@ export type NumberFormatProps = Intl.NumberFormatOptions
 export function useNumberFormat(props?: NumberFormatProps) {
   const { locale } = useRouter()
 
-  // Remove optional dialect from locale, which Intl.NumberFormat does not support.
-  const strippedLocale = locale?.split('-', 2).join('-')
-
   const formatter = useMemo(
-    () => new Intl.NumberFormat(strippedLocale, props),
-    [strippedLocale, props],
+    () => new Intl.NumberFormat(normalizeLocale(locale), props),
+    [locale, props],
   )
   return formatter
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-ui",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.0-canary.77",
+  "version": "8.0.0-canary.79",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -26,13 +26,14 @@
     "typescript": "5.3.3"
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/framer-next-pages": "^8.0.0-canary.77",
-    "@graphcommerce/framer-scroller": "^8.0.0-canary.77",
-    "@graphcommerce/framer-utils": "^8.0.0-canary.77",
-    "@graphcommerce/image": "^8.0.0-canary.77",
-    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.77",
+    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.79",
+    "@graphcommerce/framer-next-pages": "^8.0.0-canary.79",
+    "@graphcommerce/framer-scroller": "^8.0.0-canary.79",
+    "@graphcommerce/framer-utils": "^8.0.0-canary.79",
+    "@graphcommerce/image": "^8.0.0-canary.79",
+    "@graphcommerce/lingui-next": "^8.0.0-canary.79",
+    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.79",
+    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.79",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",