@graphcommerce/next-ui 6.0.0-canary.42 → 6.0.0-canary.44

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 6.0.0-canary.44
+
+### Patch Changes
+
+- [#1842](https://github.com/graphcommerce-org/graphcommerce/pull/1842) [`7b67d84bd`](https://github.com/graphcommerce-org/graphcommerce/commit/7b67d84bd269c3fc91afbd69f6683c5d12808d36) - Renamed i18n to storefront in configuration ([@paales](https://github.com/paales))
+
+## 6.0.0-canary.43
+
 ## 6.0.0-canary.42
 
 ## 6.0.0-canary.41

package/PageMeta/PageMeta.tsx

@@ -7,7 +7,7 @@ import { resolveHref } from 'next/dist/shared/lib/router/utils/resolve-href'
 import Head from 'next/head'
 import { useRouter } from 'next/router'
 import type {} from '@graphcommerce/next-config'
-import { i18nConfig } from '../hooks'
+import { storefrontConfig } from '../hooks'
 
 // https://developers.google.com/search/docs/advanced/robots/robots_meta_tag#directives
 export type MetaRobots =
@@ -64,7 +64,8 @@ export function canonicalize(router: PartialNextRouter, incoming?: Canonical) {
     href = localeDomain || addBasePath(addLocale(as, curLocale, router.defaultLocale))
 
     let siteUrl =
-      i18nConfig(router.locale)?.canonicalBaseUrl || import.meta.graphCommerce.canonicalBaseUrl
+      storefrontConfig(router.locale)?.canonicalBaseUrl ||
+      import.meta.graphCommerce.canonicalBaseUrl
     if (siteUrl.endsWith('/')) siteUrl = siteUrl.slice(0, -1)
 
     canonical = `${siteUrl}${href}`

package/hooks/index.ts

@@ -1,6 +1,6 @@
 export * from './useDateTimeFormat'
-export * from './useI18nConfig'
 export * from './useMatchMedia'
 export * from './useMemoDeep'
 export * from './useNumberFormat'
+export * from './useStorefrontConfig'
 export * from './useUrlQuery'

package/hooks/useStorefrontConfig.ts

@@ -0,0 +1,18 @@
+import { useRouter } from 'next/router'
+
+export const storefrontAll = import.meta.graphCommerce.storefront
+
+/** Get the current storefront config based on the provided locale */
+export const storefrontConfig = (locale?: string | undefined) =>
+  storefrontAll.find((l) => l.locale === locale)
+
+export const storefrontConfigDefault = () =>
+  storefrontAll.find((l) => l.defaultLocale) ?? storefrontAll[0]
+
+/** Automatically selects the correct storefront config based on the current locale */
+export function useStorefrontConfig(locale?: string | undefined) {
+  const routerLocale = useRouter().locale
+  const config = storefrontConfig(locale ?? routerLocale)
+  if (!config) throw Error(`No storefront config found for locale ${locale}`)
+  return config
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-ui",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "6.0.0-canary.42",
+  "version": "6.0.0-canary.44",
   "author": "",
   "license": "MIT",
   "sideEffects": false,
@@ -18,18 +18,18 @@
     "@emotion/react": "^11.10.6",
     "@emotion/server": "^11.4.0",
     "@emotion/styled": "^11.10.6",
-    "@graphcommerce/framer-next-pages": "6.0.0-canary.42",
-    "@graphcommerce/framer-scroller": "6.0.0-canary.42",
-    "@graphcommerce/framer-utils": "6.0.0-canary.42",
-    "@graphcommerce/image": "6.0.0-canary.42",
+    "@graphcommerce/framer-next-pages": "6.0.0-canary.44",
+    "@graphcommerce/framer-scroller": "6.0.0-canary.44",
+    "@graphcommerce/framer-utils": "6.0.0-canary.44",
+    "@graphcommerce/image": "6.0.0-canary.44",
     "cookie": "^0.5.0",
     "react-is": "^18.2.0",
     "schema-dts": "^1.1.0"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "6.0.0-canary.42",
-    "@graphcommerce/prettier-config-pwa": "6.0.0-canary.42",
-    "@graphcommerce/typescript-config-pwa": "6.0.0-canary.42",
+    "@graphcommerce/eslint-config-pwa": "6.0.0-canary.44",
+    "@graphcommerce/prettier-config-pwa": "6.0.0-canary.44",
+    "@graphcommerce/typescript-config-pwa": "6.0.0-canary.44",
     "@types/cookie": "^0.5.1",
     "@types/react-is": "^17.0.3",
     "typescript": "4.9.5"

package/hooks/useI18nConfig.ts

@@ -1,17 +0,0 @@
-import type {} from '@graphcommerce/next-config'
-import { useRouter } from 'next/router'
-
-export const i18nAll = import.meta.graphCommerce.i18n
-
-/** Get the current i18n config based on the provided locale */
-export const i18nConfig = (locale?: string | undefined) => i18nAll.find((l) => l.locale === locale)
-
-export const i18nConfigDefault = () => i18nAll.find((l) => l.defaultLocale) ?? i18nAll[0]
-
-/** Automatically selects the correct i18n config based on the current locale */
-export function useI18nConfig(locale?: string | undefined) {
-  const routerLocale = useRouter().locale
-  const config = i18nConfig(locale ?? routerLocale)
-  if (!config) throw Error(`No i18n config found for locale ${locale}`)
-  return config
-}