@graphcommerce/magento-store 9.0.0-canary.103 → 9.0.0-canary.105

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 9.0.0-canary.105
+
+## 9.0.0-canary.104
+
 ## 9.0.0-canary.103
 
 ## 9.0.0-canary.91
@@ -470,7 +474,7 @@
   All occurences of `<Trans>` and `t` need to be replaced:
 
   ```tsx
-  import { Trans, t } from '@lingui/macro'
+  import { t, Trans } from '@lingui/macro'
 
   function MyComponent() {
     const foo = 'bar'
@@ -485,8 +489,8 @@
   Needs to be replaced with:
 
   ```tsx
-  import { Trans } from '@lingui/react'
   import { i18n } from '@lingui/core'
+  import { Trans } from '@lingui/react'
 
   function MyComponent() {
     const foo = 'bar'

package/Money.tsx

@@ -13,18 +13,19 @@ export type MoneyProps = MoneyFragment & OverridableProps
 
 export function Money(props: MoneyProps) {
   const { currency, value, round = false, formatOptions } = props
-  const { data: config } = useQuery(StoreConfigDocument)
+  const baseCurrencyCode = useQuery(StoreConfigDocument).data?.storeConfig?.base_currency_code
   const digits = (value ?? 0) % 1 !== 0
+  const maximumFractionDigits = round && !digits ? 0 : 2
+  const currencyCode = currency ?? baseCurrencyCode ?? ''
 
   if (typeof value === 'undefined' || value === null) return null
 
   return (
     <CurrencyFormat
-      currency={currency ?? config?.storeConfig?.base_currency_code ?? ''}
-      maximumFractionDigits={round && !digits ? 0 : 2}
+      currency={currencyCode}
+      maximumFractionDigits={maximumFractionDigits}
       {...formatOptions}
-    >
-      {value}
-    </CurrencyFormat>
+      value={value}
+    />
   )
 }

package/components/StoreSwitcherList/StoreSwitcherList.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable spaced-comment */
-import { extendableComponent, FlagAvatar, NextLink } from '@graphcommerce/next-ui'
+import { FlagAvatar, NextLink, extendableComponent } from '@graphcommerce/next-ui'
 import type { SxProps, Theme } from '@mui/material'
-import { List, ListItemText, Collapse, ListItemAvatar, ListItemButton } from '@mui/material'
+import { Collapse, List, ListItemAvatar, ListItemButton, ListItemText } from '@mui/material'
 import React from 'react'
 import { localeToStore, storeToLocale } from '../../localeToStore'
 import type { StoreSwitcherListQuery } from './StoreSwitcherList.gql'

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-store",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.103",
+  "version": "9.0.0-canary.105",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,13 +12,13 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.103",
-    "@graphcommerce/graphql": "^9.0.0-canary.103",
-    "@graphcommerce/graphql-mesh": "^9.0.0-canary.103",
-    "@graphcommerce/image": "^9.0.0-canary.103",
-    "@graphcommerce/next-ui": "^9.0.0-canary.103",
-    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.103",
-    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.103",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.105",
+    "@graphcommerce/graphql": "^9.0.0-canary.105",
+    "@graphcommerce/graphql-mesh": "^9.0.0-canary.105",
+    "@graphcommerce/image": "^9.0.0-canary.105",
+    "@graphcommerce/next-ui": "^9.0.0-canary.105",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.105",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.105",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

package/plugins/magentoStoreGraphqlConfig.ts

@@ -1,4 +1,4 @@
-import { setContext, type graphqlConfig as graphqlConfigType } from '@graphcommerce/graphql'
+import { type graphqlConfig as graphqlConfigType, setContext } from '@graphcommerce/graphql'
 import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
 
 export const config: PluginConfig = {

package/test/apolloClientStore.fixture.ts

@@ -1,4 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
+
 /* eslint-disable no-empty-pattern */
 import type { NormalizedCacheObject } from '@graphcommerce/graphql'
 import { ApolloClient, InMemoryCache } from '@graphcommerce/graphql'

package/utils/redirectOrNotFound.ts

@@ -1,8 +1,8 @@
-import type { ParsedUrlQuery } from 'querystring'
 import type { ApolloClient, ApolloQueryResult, NormalizedCacheObject } from '@graphcommerce/graphql'
 import { flushMeasurePerf } from '@graphcommerce/graphql'
-import { nonNullable, isTypename, storefrontConfig } from '@graphcommerce/next-ui'
+import { isTypename, nonNullable, storefrontConfig } from '@graphcommerce/next-ui'
 import type { Redirect } from 'next'
+import type { ParsedUrlQuery } from 'querystring'
 import type { StoreConfigQuery } from '../StoreConfig.gql'
 import { defaultLocale } from '../localeToStore'
 import type { HandleRedirectQuery } from './HandleRedirect.gql'