@graphcommerce/magento-store 9.0.0-canary.99 → 9.0.0

package/Money.tsx

@@ -1,6 +1,7 @@
 import { useQuery } from '@graphcommerce/graphql'
-import { CurrencyFormat, CurrencyFormatProps } from '@graphcommerce/next-ui'
-import { MoneyFragment } from './Money.gql'
+import type { CurrencyFormatProps } from '@graphcommerce/next-ui'
+import { CurrencyFormat } from '@graphcommerce/next-ui'
+import type { MoneyFragment } from './Money.gql'
 import { StoreConfigDocument } from './StoreConfig.gql'
 
 type OverridableProps = {
@@ -12,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/PageMeta.tsx

@@ -1,11 +1,9 @@
 import { useQuery } from '@graphcommerce/graphql'
-import {
-  PageMeta as NextPageMeta,
-  PageMetaProps as NextPageMetaProps,
-} from '@graphcommerce/next-ui'
+import type { PageMetaProps as NextPageMetaProps } from '@graphcommerce/next-ui'
+import { PageMeta as NextPageMeta } from '@graphcommerce/next-ui'
 import { StoreConfigDocument } from './StoreConfig.gql'
 
-type PageMetaProps = Omit<NextPageMetaProps, 'canonical'> & {
+export type PageMetaProps = Omit<NextPageMetaProps, 'canonical'> & {
   canonical?: string
 }
 

package/components/GlobalHead/GlobalHead.tsx

@@ -1,8 +1,6 @@
 import { useQuery } from '@graphcommerce/graphql'
-import {
-  GlobalHead as GlobalHeadBase,
-  GlobalHeadProps as GlobalHeadPropsBase,
-} from '@graphcommerce/next-ui'
+import type { GlobalHeadProps as GlobalHeadPropsBase } from '@graphcommerce/next-ui'
+import { GlobalHead as GlobalHeadBase } from '@graphcommerce/next-ui'
 import { StoreConfigDocument } from '../../StoreConfig.gql'
 
 export type GlobalHeadProps = Omit<GlobalHeadPropsBase, 'name'>

package/components/StoreSwitcherButton/StoreSwitcherButton.tsx

@@ -1,12 +1,13 @@
 import { useQuery } from '@graphcommerce/graphql'
 import { FlagAvatar, extendableComponent } from '@graphcommerce/next-ui'
-import { Button, SxProps, Theme } from '@mui/material'
+import type { SxProps, Theme } from '@mui/material'
+import { Button } from '@mui/material'
 import { useRouter } from 'next/router'
 import { StoreConfigDocument } from '../../StoreConfig.gql'
 
 export type StoreSwitcherButtonProps = { sx?: SxProps<Theme> }
 
-const name = 'StoreSwitcherButton' as const
+const name = 'StoreSwitcherButton'
 const parts = ['root', 'avatar'] as const
 const { classes } = extendableComponent(name, parts)
 

package/components/StoreSwitcherList/StoreSwitcherList.tsx

@@ -1,17 +1,10 @@
 /* eslint-disable spaced-comment */
-import { extendableComponent, FlagAvatar, NextLink } from '@graphcommerce/next-ui'
-import {
-  List,
-  ListItemText,
-  Collapse,
-  ListItemAvatar,
-  SxProps,
-  Theme,
-  ListItemButton,
-} from '@mui/material'
+import { FlagAvatar, NextLink, extendableComponent } from '@graphcommerce/next-ui'
+import type { SxProps, Theme } from '@mui/material'
+import { Collapse, List, ListItemAvatar, ListItemButton, ListItemText } from '@mui/material'
 import React from 'react'
 import { localeToStore, storeToLocale } from '../../localeToStore'
-import { StoreSwitcherListQuery } from './StoreSwitcherList.gql'
+import type { StoreSwitcherListQuery } from './StoreSwitcherList.gql'
 
 type Store = NonNullable<NonNullable<StoreSwitcherListQuery['availableStores']>[0]>
 
@@ -20,7 +13,7 @@ export type StoreSwitcherListProps = {
   sx?: SxProps<Theme>
 } & StoreSwitcherListQuery
 
-const name = 'StoreSwitcherList' as const
+const name = 'StoreSwitcherList'
 const parts = ['list', 'listItem', 'listItemIndented', 'avatar'] as const
 const { classes } = extendableComponent(name, parts)
 

package/hooks/useFindCountry.ts

@@ -1,5 +1,6 @@
 import { useQuery } from '@graphcommerce/graphql'
-import { CountryRegionsDocument, CountryRegionsQuery } from '../queries/CountryRegions.gql'
+import type { CountryRegionsQuery } from '../queries/CountryRegions.gql'
+import { CountryRegionsDocument } from '../queries/CountryRegions.gql'
 
 export function useFindCountry(
   countryCode?: string | null,

package/hooks/useFindRegion.ts

@@ -1,6 +1,10 @@
-import { Maybe, Region } from '@graphcommerce/graphql-mesh'
+import type { Maybe, Region } from '@graphcommerce/graphql-mesh'
 import { useFindCountry } from './useFindCountry'
 
+/**
+ * @deprecated
+ * @public
+ */
 export function useFindRegion(
   countryCode?: Maybe<string>,
   regionId?: Maybe<number>,

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.99",
+  "version": "9.0.0",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,13 +12,13 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.0.0-canary.99",
-    "@graphcommerce/graphql": "^9.0.0-canary.99",
-    "@graphcommerce/graphql-mesh": "^9.0.0-canary.99",
-    "@graphcommerce/image": "^9.0.0-canary.99",
-    "@graphcommerce/next-ui": "^9.0.0-canary.99",
-    "@graphcommerce/prettier-config-pwa": "^9.0.0-canary.99",
-    "@graphcommerce/typescript-config-pwa": "^9.0.0-canary.99",
+    "@graphcommerce/eslint-config-pwa": "^9.0.0",
+    "@graphcommerce/graphql": "^9.0.0",
+    "@graphcommerce/graphql-mesh": "^9.0.0",
+    "@graphcommerce/image": "^9.0.0",
+    "@graphcommerce/next-ui": "^9.0.0",
+    "@graphcommerce/prettier-config-pwa": "^9.0.0",
+    "@graphcommerce/typescript-config-pwa": "^9.0.0",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

package/test/apolloClientStore.fixture.ts

@@ -1,6 +1,8 @@
 /* eslint-disable import/no-extraneous-dependencies */
+
 /* eslint-disable no-empty-pattern */
-import { ApolloClient, NormalizedCacheObject, InMemoryCache } from '@graphcommerce/graphql'
+import type { NormalizedCacheObject } from '@graphcommerce/graphql'
+import { ApolloClient, InMemoryCache } from '@graphcommerce/graphql'
 import { test as base } from '@playwright/test'
 import { localeToStore } from '../localeToStore'
 

package/utils/redirectOrNotFound.ts

@@ -1,15 +1,12 @@
-import { ParsedUrlQuery } from 'querystring'
-import {
-  ApolloClient,
-  ApolloQueryResult,
-  flushMeasurePerf,
-  NormalizedCacheObject,
-} from '@graphcommerce/graphql'
-import { nonNullable, isTypename, storefrontConfig } from '@graphcommerce/next-ui'
-import { Redirect } from 'next'
-import { StoreConfigQuery } from '../StoreConfig.gql'
+import type { ApolloClient, ApolloQueryResult, NormalizedCacheObject } from '@graphcommerce/graphql'
+import { flushMeasurePerf } from '@graphcommerce/graphql'
+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 { HandleRedirectDocument, HandleRedirectQuery } from './HandleRedirect.gql'
+import type { HandleRedirectQuery } from './HandleRedirect.gql'
+import { HandleRedirectDocument } from './HandleRedirect.gql'
 
 export type RedirectOr404Return = Promise<
   | { redirect: Redirect; revalidate?: number | boolean }
@@ -18,8 +15,7 @@ export type RedirectOr404Return = Promise<
 
 const notFound = (from: string, reason: string) => {
   flushMeasurePerf()
-  // eslint-disable-next-line no-console
-  console.log(`[redirectOrNotFound: /${from}] ${reason}`)
+  console.info(`[redirectOrNotFound: /${from}] ${reason}`)
   return { notFound: true, revalidate: 60 * 20 } as const
 }
 
@@ -33,7 +29,7 @@ export const redirectTo = (
   permanent: boolean,
   locale?: string,
 ): { redirect: Redirect; revalidate?: number | boolean } => {
-  console.log(
+  console.info(
     `[redirectTo]: ${permanent ? 'Permanent' : 'Temporary'} redirect to ${urlPrefix(locale)}${to}`,
   )
   return {
@@ -49,8 +45,7 @@ const redirect = (from: string, to: string, permanent: boolean, locale?: string)
 
   flushMeasurePerf()
 
-  // eslint-disable-next-line no-console
-  console.log(
+  console.info(
     `[redirectOrNotFound: ${prefix ? `/${prefix}` : ''}/${from}] ${
       permanent ? 'Permanent' : 'Temporary'
     } redirect to ${destination}`,
@@ -89,7 +84,7 @@ export async function redirectOrNotFound(
 
     // 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)))
+      candidates.add(from.slice(0, -'.html'.length))
     }
 
     const routePromises = [...candidates].filter(Boolean).map(
@@ -143,20 +138,19 @@ export async function redirectOrNotFound(
 
       const url_key = routeData.route?.url_key
       if (!routeData.products?.items?.find((i) => i?.url_key === url_key))
-        return notFound(from, `Route found, but product isn't returned from products query`)
+        return notFound(from, "Route found, but product isn't returned from products query")
 
       return redirect(from, `${productRoute}${url_key}`, true, locale)
     }
 
     if (redirectUrl) return redirect(from, `/${redirectUrl}`, permanent, locale)
 
-    return notFound(from, `Route found, but no redirect URL`)
+    return notFound(from, 'Route found, but no redirect URL')
   } catch (e) {
     if (e instanceof Error) {
       return notFound(from, `Error while redirecting: ${e.message}`)
     }
-    // eslint-disable-next-line no-console
-    console.log(e)
-    return notFound(from, `Error while redirecting`)
+    console.info(e)
+    return notFound(from, 'Error while redirecting')
   }
 }

package/plugins/magentoStoreGraphqlConfig.ts

@@ -1,39 +0,0 @@
-import { setContext, type graphqlConfig as graphqlConfigType } from '@graphcommerce/graphql'
-import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
-
-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)
-
-  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
-      }),
-    ],
-  }
-}