@graphcommerce/magento-store 8.1.0-canary.9 → 9.0.0-canary.101

package/CHANGELOG.md

@@ -1,5 +1,209 @@
 # Change Log
 
+## 9.0.0-canary.101
+
+## 9.0.0-canary.100
+
+## 9.0.0-canary.99
+
+## 9.0.0-canary.98
+
+## 9.0.0-canary.97
+
+## 9.0.0-canary.96
+
+## 9.0.0-canary.95
+
+## 9.0.0-canary.94
+
+## 9.0.0-canary.93
+
+## 9.0.0-canary.92
+
+## 9.0.0-canary.91
+
+### Patch Changes
+
+- [#2367](https://github.com/graphcommerce-org/graphcommerce/pull/2367) [`71d412d`](https://github.com/graphcommerce-org/graphcommerce/commit/71d412d202bc94a0e676745547de5d809a7a850b) - When a user access a category page which is beyond the available total_pages, the user will be redirected to the last available page. ([@paales](https://github.com/paales))
+
+## 9.0.0-canary.90
+
+## 9.0.0-canary.89
+
+## 9.0.0-canary.88
+
+## 9.0.0-canary.87
+
+## 9.0.0-canary.86
+
+## 9.0.0-canary.85
+
+## 9.0.0-canary.84
+
+## 9.0.0-canary.83
+
+### Patch Changes
+
+- [#2374](https://github.com/graphcommerce-org/graphcommerce/pull/2374) [`e61e1f4`](https://github.com/graphcommerce-org/graphcommerce/commit/e61e1f4fb1086f7a6341b42502135abf1839e43d) - Default to permanent redirects unless specified ([@hnsr](https://github.com/hnsr))
+
+## 9.0.0-canary.82
+
+## 9.0.0-canary.81
+
+### Minor Changes
+
+- [#2373](https://github.com/graphcommerce-org/graphcommerce/pull/2373) [`53ffc91`](https://github.com/graphcommerce-org/graphcommerce/commit/53ffc91f9bfbe1183c002c62b1fe0c3f415d7b94) - Handle the case where one switches from using the default .html URL suffix, to not using one ([@hnsr](https://github.com/hnsr))
+
+## 9.0.0-canary.80
+
+## 9.0.0-canary.79
+
+## 9.0.0-canary.78
+
+## 9.0.0-canary.77
+
+## 9.0.0-canary.76
+
+## 9.0.0-canary.75
+
+## 9.0.0-canary.74
+
+## 9.0.0-canary.73
+
+## 9.0.0-canary.72
+
+## 9.0.0-canary.71
+
+## 9.0.0-canary.70
+
+## 9.0.0-canary.69
+
+## 9.0.0-canary.68
+
+## 9.0.0-canary.67
+
+## 9.0.0-canary.66
+
+## 9.0.0-canary.65
+
+## 9.0.0-canary.64
+
+## 9.0.0-canary.63
+
+## 9.0.0-canary.62
+
+## 9.0.0-canary.61
+
+### Minor Changes
+
+- [#2327](https://github.com/graphcommerce-org/graphcommerce/pull/2327) [`be719fc`](https://github.com/graphcommerce-org/graphcommerce/commit/be719fc465c8804ddcb720a93813262e3a292b69) - Implement CancelOrder mutation, add cancel order overlay to account section ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 9.0.0-canary.60
+
+## 9.0.0-canary.59
+
+## 9.0.0-canary.58
+
+## 9.0.0-canary.57
+
+## 9.0.0-canary.56
+
+## 9.0.0-canary.55
+
+## 9.0.0-canary.54
+
+## 8.1.0-canary.53
+
+## 8.1.0-canary.52
+
+## 8.1.0-canary.51
+
+## 8.1.0-canary.50
+
+## 8.1.0-canary.49
+
+## 8.1.0-canary.48
+
+## 8.1.0-canary.47
+
+## 8.1.0-canary.46
+
+## 8.1.0-canary.45
+
+## 8.1.0-canary.44
+
+## 8.1.0-canary.43
+
+## 8.1.0-canary.42
+
+## 8.1.0-canary.41
+
+## 8.1.0-canary.40
+
+## 8.1.0-canary.39
+
+## 8.1.0-canary.38
+
+## 8.1.0-canary.37
+
+## 8.1.0-canary.36
+
+## 8.1.0-canary.35
+
+### Minor Changes
+
+- [#2301](https://github.com/graphcommerce-org/graphcommerce/pull/2301) [`47bb47b`](https://github.com/graphcommerce-org/graphcommerce/commit/47bb47bac4b3689a6859afbc587274d813e0b072) - Implement confirm email functionality ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 8.1.0-canary.34
+
+## 8.1.0-canary.33
+
+## 8.1.0-canary.32
+
+## 8.1.0-canary.31
+
+## 8.1.0-canary.30
+
+## 8.1.0-canary.29
+
+## 8.1.0-canary.28
+
+## 8.1.0-canary.27
+
+## 8.1.0-canary.26
+
+## 8.1.0-canary.25
+
+## 8.1.0-canary.24
+
+## 8.1.0-canary.23
+
+## 8.1.0-canary.22
+
+## 8.1.0-canary.21
+
+## 8.1.0-canary.20
+
+## 8.1.0-canary.19
+
+## 8.1.0-canary.18
+
+## 8.1.0-canary.17
+
+## 8.1.0-canary.16
+
+## 8.1.0-canary.15
+
+## 8.1.0-canary.14
+
+## 8.1.0-canary.13
+
+## 8.1.0-canary.12
+
+## 8.1.0-canary.11
+
+## 8.1.0-canary.10
+
 ## 8.1.0-canary.9
 
 ## 8.1.0-canary.8
@@ -80,8 +284,7 @@
 
 ### Patch Changes
 
-- [#2187](https://github.com/graphcommerce-org/graphcommerce/pull/2187) [`61f90af`](https://github.com/graphcommerce-org/graphcommerce/commit/61f90afc8bc229b2cd4793f724509783af138deb) - redirectOrNotFound would log the incorrect request URL
-  ([@paales](https://github.com/paales))
+- [#2187](https://github.com/graphcommerce-org/graphcommerce/pull/2187) [`61f90af`](https://github.com/graphcommerce-org/graphcommerce/commit/61f90afc8bc229b2cd4793f724509783af138deb) - redirectOrNotFound would log the incorrect request URL ([@paales](https://github.com/paales))
 
 ## 8.0.1-canary.4
 
@@ -95,18 +298,15 @@
 
 ### Patch Changes
 
-- [#2187](https://github.com/graphcommerce-org/graphcommerce/pull/2187) [`61f90af`](https://github.com/graphcommerce-org/graphcommerce/commit/61f90afc8bc229b2cd4793f724509783af138deb) - redirectOrNotFound would log the incorrect request URL
-  ([@paales](https://github.com/paales))
+- [#2187](https://github.com/graphcommerce-org/graphcommerce/pull/2187) [`61f90af`](https://github.com/graphcommerce-org/graphcommerce/commit/61f90afc8bc229b2cd4793f724509783af138deb) - redirectOrNotFound would log the incorrect request URL ([@paales](https://github.com/paales))
 
 ## 8.0.0
 
 ### Patch Changes
 
-- [#2067](https://github.com/graphcommerce-org/graphcommerce/pull/2067) [`3406794`](https://github.com/graphcommerce-org/graphcommerce/commit/340679434e0ff1033c8158ef03a091e06e20e6a9) - Prevent HandleRedirect errors by filtering out empty URL values from the candidates array.
-  ([@carlocarels90](https://github.com/carlocarels90))
+- [#2067](https://github.com/graphcommerce-org/graphcommerce/pull/2067) [`3406794`](https://github.com/graphcommerce-org/graphcommerce/commit/340679434e0ff1033c8158ef03a091e06e20e6a9) - Prevent HandleRedirect errors by filtering out empty URL values from the candidates array. ([@carlocarels90](https://github.com/carlocarels90))
 
-- [#2140](https://github.com/graphcommerce-org/graphcommerce/pull/2140) [`b34d85c`](https://github.com/graphcommerce-org/graphcommerce/commit/b34d85c8c5403c6f49b506b714ee314b8344fd99) - Solve incorrect redirect when locale has own domain
-  ([@hnsr](https://github.com/hnsr))
+- [#2140](https://github.com/graphcommerce-org/graphcommerce/pull/2140) [`b34d85c`](https://github.com/graphcommerce-org/graphcommerce/commit/b34d85c8c5403c6f49b506b714ee314b8344fd99) - Solve incorrect redirect when locale has own domain ([@hnsr](https://github.com/hnsr))
 
 ## 8.0.0-canary.100
 
@@ -150,8 +350,7 @@
 
 ### Patch Changes
 
-- [#2140](https://github.com/graphcommerce-org/graphcommerce/pull/2140) [`b34d85c`](https://github.com/graphcommerce-org/graphcommerce/commit/b34d85c8c5403c6f49b506b714ee314b8344fd99) - Fix incorrect redirect when locale has own domain
-  ([@hnsr](https://github.com/hnsr))
+- [#2140](https://github.com/graphcommerce-org/graphcommerce/pull/2140) [`b34d85c`](https://github.com/graphcommerce-org/graphcommerce/commit/b34d85c8c5403c6f49b506b714ee314b8344fd99) - Fix incorrect redirect when locale has own domain ([@hnsr](https://github.com/hnsr))
 
 ## 8.0.0-canary.80
 
@@ -1296,31 +1495,31 @@
   All occurences of `<Trans>` and `t` need to be replaced:
 
   ```tsx
-  import { Trans, t } from "@lingui/macro";
+  import { Trans, t } from '@lingui/macro'
 
   function MyComponent() {
-    const foo = "bar";
+    const foo = 'bar'
     return (
       <div aria-label={t`Account ${foo}`}>
         <Trans>My Translation {foo}</Trans>
       </div>
-    );
+    )
   }
   ```
 
   Needs to be replaced with:
 
   ```tsx
-  import { Trans } from "@lingui/react";
-  import { i18n } from "@lingui/core";
+  import { Trans } from '@lingui/react'
+  import { i18n } from '@lingui/core'
 
   function MyComponent() {
-    const foo = "bar";
+    const foo = 'bar'
     return (
       <div aria-label={i18n._(/* i18n */ `Account {foo}`, { foo })}>
-        <Trans key="My Translation {foo}" values={{ foo }}></Trans>
+        <Trans key='My Translation {foo}' values={{ foo }}></Trans>
       </div>
-    );
+    )
   }
   ```
 
@@ -1457,11 +1656,11 @@
       defaultProps: {
         round: true,
         formatOptions: {
-          style: "decimal",
+          style: 'decimal',
         },
       },
     },
-  });
+  })
   ```
 
 ### Patch Changes

package/Money.tsx

@@ -1,50 +1,29 @@
 import { useQuery } from '@graphcommerce/graphql'
-import { ExtendableComponent, useNumberFormat } from '@graphcommerce/next-ui'
-import { useThemeProps } from '@mui/material'
-import { useMemo } from 'react'
+import { CurrencyFormat, CurrencyFormatProps } from '@graphcommerce/next-ui'
 import { MoneyFragment } from './Money.gql'
 import { StoreConfigDocument } from './StoreConfig.gql'
 
 type OverridableProps = {
-  // eslint-disable-next-line react/no-unused-prop-types
   round?: boolean
-  /** @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat#parameters */
-  // eslint-disable-next-line react/no-unused-prop-types
-  formatOptions?: Intl.NumberFormatOptions
+  formatOptions?: Omit<CurrencyFormatProps, 'currency'>
 }
 
 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 })
-
+  const { currency, value, round = false, formatOptions } = props
   const { data: config } = useQuery(StoreConfigDocument)
-
   const digits = (value ?? 0) % 1 !== 0
 
-  const options: Intl.NumberFormatOptions = useMemo(
-    () => ({
-      style: 'currency',
-      currency: currency ?? config?.storeConfig?.base_currency_code ?? '',
-      ...(round && !digits && { minimumFractionDigits: 0 }),
-      ...(round && digits && { minimumFractionDigits: 2 }),
-      ...(!round && { minimumFractionDigits: 2 }),
-      ...formatOptions,
-    }),
-    [config?.storeConfig?.base_currency_code, currency, digits, formatOptions, round],
-  )
-  const numberFormatter = useNumberFormat(options)
-
   if (typeof value === 'undefined' || value === null) return null
 
-  return <>{numberFormatter.format(value)}</>
+  return (
+    <CurrencyFormat
+      currency={currency ?? config?.storeConfig?.base_currency_code ?? ''}
+      maximumFractionDigits={round && !digits ? 0 : 2}
+      {...formatOptions}
+    >
+      {value}
+    </CurrencyFormat>
+  )
 }

package/StoreConfigFragment.graphql

@@ -1,4 +1,4 @@
-fragment StoreConfigFragment on StoreConfig @injectable {
+fragment StoreConfigFragment on StoreConfig {
   website_name
   store_code
   store_name
@@ -30,4 +30,9 @@ fragment StoreConfigFragment on StoreConfig @injectable {
   grid_per_page
   grid_per_page_values
   list_per_page
+  create_account_confirmation
+  order_cancellation_enabled
+  order_cancellation_reasons {
+    description
+  }
 }

package/index.ts

@@ -1,7 +1,6 @@
 export * from './components/GlobalHead/GlobalHead'
 export * from './hooks/useFindCountry'
 export * from './hooks/useFindRegion'
-export * from './link/createStoreLink'
 export * from './localeToStore'
 export * from './Money'
 export * from './Money.gql'

package/package.json

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

package/plugins/magentoStoreGraphqlConfig.ts

@@ -1,13 +1,39 @@
-import type { graphqlConfig as graphqlConfigType } from '@graphcommerce/graphql'
+import { setContext, type graphqlConfig as graphqlConfigType } from '@graphcommerce/graphql'
 import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
-import { createStoreLink } from '../link/createStoreLink'
 
 export const config: PluginConfig = {
   type: 'function',
   module: '@graphcommerce/graphql',
 }
 
+declare module '@graphcommerce/graphql/config' {
+  interface PreviewData {
+    magentoPreviewVersion?: string
+  }
+}
+
 export const graphqlConfig: FunctionPlugin<typeof graphqlConfigType> = (prev, conf) => {
   const results = prev(conf)
-  return { ...results, links: [...results.links, createStoreLink(conf.storefront.locale)] }
+
+  const previewVersion = conf.previewData?.magentoPreviewVersion
+
+  return {
+    ...results,
+    links: [
+      ...results.links,
+      setContext((_, context) => {
+        if (!context.headers) context.headers = {}
+        context.headers.store = conf.storefront.magentoStoreCode
+        if (conf.preview) {
+          // To disable caching from the backend, we provide a bogus cache ID.
+          context.headers['x-magento-cache-id'] =
+            `random-cache-id${Math.random().toString(36).slice(2)}`
+          if (previewVersion) {
+            context.headers['preview-version'] = previewVersion
+          }
+        }
+        return context
+      }),
+    ],
+  }
 }

package/utils/redirectOrNotFound.ts

@@ -23,6 +23,25 @@ const notFound = (from: string, reason: string) => {
   return { notFound: true, revalidate: 60 * 20 } as const
 }
 
+const urlPrefix = (locale?: string) => {
+  const localeHasDomain = Boolean(storefrontConfig(locale)?.domain)
+  return localeHasDomain || locale === defaultLocale() ? '' : `/${locale}`
+}
+
+export const redirectTo = (
+  to: string,
+  permanent: boolean,
+  locale?: string,
+): { redirect: Redirect; revalidate?: number | boolean } => {
+  console.log(
+    `[redirectTo]: ${permanent ? 'Permanent' : 'Temporary'} redirect to ${urlPrefix(locale)}${to}`,
+  )
+  return {
+    redirect: { destination: `${urlPrefix(locale)}${to}`, permanent },
+    revalidate: 60 * 20,
+  }
+}
+
 const redirect = (from: string, to: string, permanent: boolean, locale?: string) => {
   const localeHasDomain = Boolean(storefrontConfig(locale)?.domain)
   const prefix = localeHasDomain || locale === defaultLocale() ? '' : `/${locale}`
@@ -68,6 +87,11 @@ export async function redirectOrNotFound(
       candidates.add(from.endsWith(suffix) ? from.slice(0, -suffix.length) : `${from}${suffix}`)
     })
 
+    // Handle the case where we transition from using the default .html suffix, to not using one
+    if (from.endsWith('.html')) {
+      candidates.add(from.slice(0, -('.html'.length)))
+    }
+
     const routePromises = [...candidates].filter(Boolean).map(
       async (url) =>
         (
@@ -100,8 +124,8 @@ export async function redirectOrNotFound(
         ? routeData.route.relative_url
         : undefined
 
-    // There is a URL, so we need to check if it can be found in the database.
-    const permanent = routeData.route?.redirect_code === 301
+    // For implicit redirects, always use permanent, otherwise use the given redirect type
+    const permanent = !routeData.route?.redirect_code || routeData.route?.redirect_code === 301
 
     if (
       isTypename(routeData.route, [

package/link/createStoreLink.ts

@@ -1,10 +0,0 @@
-import { setContext } from '@graphcommerce/graphql'
-import { localeToStore } from '../localeToStore'
-
-/** Apollo link to set the store header in the context */
-export const createStoreLink = (locale?: string) =>
-  setContext((_, context) => {
-    if (!context.headers) context.headers = {}
-    context.headers.store = localeToStore(locale)
-    return context
-  })