@graphcommerce/magento-store 4.0.2 → 4.1.1

package/CHANGELOG.md

@@ -1,5 +1,74 @@
 # Change Log
 
+## 4.1.1
+
+### Patch Changes
+
+- [#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
+
+- Updated dependencies
+  [[`a9cff2ce6`](https://github.com/ho-nl/m2-pwa/commit/a9cff2ce63fce5b86e9fd6bf63c10c782326d50e),
+  [`8473123fa`](https://github.com/ho-nl/m2-pwa/commit/8473123fa7d3f3eb1d282d9b4205c803a88010ea),
+  [`50e205c51`](https://github.com/ho-nl/m2-pwa/commit/50e205c51f4d0d67d41d22fd70e8ed9a0996489e)]:
+  - @graphcommerce/next-ui@4.2.2
+
+## 4.1.0
+
+### Minor Changes
+
+- [#1285](https://github.com/ho-nl/m2-pwa/pull/1285)
+  [`ed9703b06`](https://github.com/ho-nl/m2-pwa/commit/ed9703b062d23ee01b1605ff9917c0ac3247fc25)
+  Thanks [@paales](https://github.com/paales)! - Added the ability to configure `defaultProps` for
+  the <Money/> component.
+
+  ```ts
+  // For example in examples/magento-graphcms/theme.ts
+
+  const createOverrides = (theme: Theme): Components => ({
+    Money: {
+      defaultProps: {
+        round: true,
+        formatOptions: {
+          style: 'decimal',
+        },
+      },
+    },
+  })
+  ```
+
+### Patch Changes
+
+- [#1285](https://github.com/ho-nl/m2-pwa/pull/1285)
+  [`c85294ba6`](https://github.com/ho-nl/m2-pwa/commit/c85294ba6d742ce78c074559a1e95409b25a5017)
+  Thanks [@paales](https://github.com/paales)! - upgraded dependencies
+
+- Updated dependencies
+  [[`c85294ba6`](https://github.com/ho-nl/m2-pwa/commit/c85294ba6d742ce78c074559a1e95409b25a5017)]:
+  - @graphcommerce/next-ui@4.1.3
+
+## 4.0.3
+
+### Patch Changes
+
+- [`973ff8645`](https://github.com/ho-nl/m2-pwa/commit/973ff86452a70ade9f4db13fdda6e963d7220e96)
+  Thanks [@paales](https://github.com/paales)! - made packages public
+
+* [#1278](https://github.com/ho-nl/m2-pwa/pull/1278)
+  [`81ea406d5`](https://github.com/ho-nl/m2-pwa/commit/81ea406d54d6b5c662c030a7fea444abc4117a20)
+  Thanks [@ErwinOtten](https://github.com/ErwinOtten)! - Upgraded dependencies to the latest version
+
+* Updated dependencies
+  [[`973ff8645`](https://github.com/ho-nl/m2-pwa/commit/973ff86452a70ade9f4db13fdda6e963d7220e96),
+  [`81ea406d5`](https://github.com/ho-nl/m2-pwa/commit/81ea406d54d6b5c662c030a7fea444abc4117a20),
+  [`3a719c88c`](https://github.com/ho-nl/m2-pwa/commit/3a719c88cad1eab58602de28c41adc0fc4827e1d),
+  [`5ffcb56bf`](https://github.com/ho-nl/m2-pwa/commit/5ffcb56bfcbe49ebeaf24f9341e819a145ab9a14)]:
+  - @graphcommerce/graphql@3.0.3
+  - @graphcommerce/image@3.1.0
+  - @graphcommerce/next-ui@4.1.2
+
 ## 4.0.2
 
 ### Patch Changes

package/Money.tsx

@@ -1,11 +1,30 @@
 import { useQuery } from '@graphcommerce/graphql'
-import React, { useMemo } from 'react'
+import { ExtendableComponent } from '@graphcommerce/next-ui'
+import { useThemeProps } from '@mui/material'
+import { useMemo } from 'react'
 import { MoneyFragment } from './Money.gql'
 import { StoreConfigDocument } from './StoreConfig.gql'
 
-export type MoneyProps = MoneyFragment & { round?: boolean }
+type OverridableProps = {
+  round?: boolean
+  /** @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#parameters */
+  formatOptions?: Intl.NumberFormatOptions
+}
+
+export type MoneyProps = MoneyFragment & OverridableProps
+
+const name = 'Money'
+
+/** Expose the component to be exendable in your theme.components */
+declare module '@mui/material/styles/components' {
+  interface Components {
+    Money?: Pick<ExtendableComponent<OverridableProps>, 'defaultProps'>
+  }
+}
+
+export function Money(props: MoneyProps) {
+  const { currency, value, round = false, formatOptions } = useThemeProps({ name, props })
 
-export function Money({ currency, value, round = false }: MoneyProps) {
   const { data: config } = useQuery(StoreConfigDocument)
   const locale = config?.storeConfig?.locale
 
@@ -18,8 +37,9 @@ export function Money({ currency, value, round = false }: MoneyProps) {
       style: 'currency',
       currency: currency ?? config?.storeConfig?.base_currency_code ?? '',
       ...(digits && { minimumFractionDigits: 0 }),
+      ...formatOptions,
     })
-  }, [config?.storeConfig?.base_currency_code, currency, digits, locale])
+  }, [config?.storeConfig?.base_currency_code, currency, digits, formatOptions, locale])
 
   if (!numberFormatter || !value) return null
 

package/PageMeta.tsx

@@ -10,7 +10,7 @@ type PageMetaProps = Pick<NextPageMetaProps, 'title' | 'metaDescription' | 'meta
 }
 
 export function PageMeta(props: PageMetaProps) {
-  const { title, canonical = '', ...pageMetaProps } = props
+  const { title, canonical, ...pageMetaProps } = props
   const config = useQuery(StoreConfigDocument)
 
   const prefix = config.data?.storeConfig?.title_prefix ?? ''
@@ -23,14 +23,10 @@ export function PageMeta(props: PageMetaProps) {
   if (separator && suffix) pageTitle += ` ${separator}`
   if (suffix) pageTitle += ` ${suffix}`
 
-  const urlPath = ((canonical ?? '').startsWith('/') && canonical?.substr(1)) || canonical
-
   return (
     <NextPageMeta
       title={pageTitle ?? ''}
-      canonical={
-        urlPath ? `${config.data?.storeConfig?.secure_base_link_url ?? ''}${urlPath}` : undefined
-      }
+      canonical={canonical ? `/${canonical}` : canonical}
       {...pageMetaProps}
     />
   )

package/StoreConfig.graphql

@@ -19,6 +19,7 @@ query StoreConfig {
     category_url_suffix
     product_url_suffix
     secure_base_link_url
+    secure_base_url
 
     root_category_uid
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-store",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,16 +12,16 @@
     }
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^4.0.2",
-    "@graphcommerce/prettier-config-pwa": "^4.0.1",
-    "@graphcommerce/typescript-config-pwa": "^4.0.1",
+    "@graphcommerce/eslint-config-pwa": "^4.0.4",
+    "@graphcommerce/prettier-config-pwa": "^4.0.2",
+    "@graphcommerce/typescript-config-pwa": "^4.0.2",
     "@playwright/test": "^1.19.1"
   },
   "dependencies": {
-    "@graphcommerce/graphql": "^3.0.2",
-    "@graphcommerce/image": "^3.0.2",
-    "@graphcommerce/next-ui": "^4.1.1",
-    "type-fest": "^2.11.2"
+    "@graphcommerce/graphql": "^3.0.3",
+    "@graphcommerce/image": "^3.1.0",
+    "@graphcommerce/next-ui": "^4.2.2",
+    "type-fest": "^2.12.0"
   },
   "peerDependencies": {
     "@lingui/macro": "^3.13.2",