@graphcommerce/magento-store 6.0.2-canary.7 → 6.0.2-canary.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 6.0.2-canary.9
+
+### Patch Changes
+
+- [#1875](https://github.com/graphcommerce-org/graphcommerce/pull/1875) [`4325f6556`](https://github.com/graphcommerce-org/graphcommerce/commit/4325f6556308fe96e262e03935f37dc252f72c2e) - When trying to redirect it would do another call to fetch the config while that was already done previously ([@paales](https://github.com/paales))
+
+## 6.0.2-canary.8
+
 ## 6.0.2-canary.7
 
 ## 6.0.2-canary.6

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-store",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "6.0.2-canary.7",
+  "version": "6.0.2-canary.9",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,15 +12,15 @@
     }
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "6.0.2-canary.7",
-    "@graphcommerce/prettier-config-pwa": "6.0.2-canary.7",
-    "@graphcommerce/typescript-config-pwa": "6.0.2-canary.7"
+    "@graphcommerce/eslint-config-pwa": "6.0.2-canary.9",
+    "@graphcommerce/prettier-config-pwa": "6.0.2-canary.9",
+    "@graphcommerce/typescript-config-pwa": "6.0.2-canary.9"
   },
   "dependencies": {
-    "@graphcommerce/graphql": "6.0.2-canary.7",
-    "@graphcommerce/graphql-mesh": "6.0.2-canary.7",
-    "@graphcommerce/image": "6.0.2-canary.7",
-    "@graphcommerce/next-ui": "6.0.2-canary.7"
+    "@graphcommerce/graphql": "6.0.2-canary.9",
+    "@graphcommerce/graphql-mesh": "6.0.2-canary.9",
+    "@graphcommerce/image": "6.0.2-canary.9",
+    "@graphcommerce/next-ui": "6.0.2-canary.9"
   },
   "peerDependencies": {
     "@lingui/react": "^3.13.2",

package/utils/redirectOrNotFound.ts

@@ -1,8 +1,13 @@
 import { ParsedUrlQuery } from 'querystring'
-import { ApolloClient, flushMeasurePerf, NormalizedCacheObject } from '@graphcommerce/graphql'
+import {
+  ApolloClient,
+  ApolloQueryResult,
+  flushMeasurePerf,
+  NormalizedCacheObject,
+} from '@graphcommerce/graphql'
 import { nonNullable, isTypename } from '@graphcommerce/next-ui'
 import { Redirect } from 'next'
-import { StoreConfigDocument } from '../StoreConfig.gql'
+import { StoreConfigQuery } from '../StoreConfig.gql'
 import { defaultLocale } from '../localeToStore'
 import { HandleRedirectDocument } from './HandleRedirect.gql'
 
@@ -39,6 +44,7 @@ const redirect = (from: string, to: string, permanent: boolean, locale?: string)
 
 export async function redirectOrNotFound(
   client: ApolloClient<NormalizedCacheObject>,
+  config: Promise<ApolloQueryResult<StoreConfigQuery>> | ApolloQueryResult<StoreConfigQuery>,
   params?: ParsedUrlQuery,
   locale?: string,
 ): RedirectOr404Return {
@@ -49,14 +55,13 @@ export async function redirectOrNotFound(
 
   try {
     // Get the configured suffixes from the store config
-    const { product_url_suffix: prodSuffix, category_url_suffix: catSuffix } =
-      (await client.query({ query: StoreConfigDocument })).data.storeConfig ?? {}
+    const { product_url_suffix, category_url_suffix } = (await config).data.storeConfig ?? {}
 
     const candidates = new Set([from])
 
     // If the incomming URL contains a suffix, we check if the URL without the suffix exists
     // if the incomming URL does not contain a suffix, we check if the URL with the suffix exists
-    const suffixes = [prodSuffix, catSuffix].filter(nonNullable)
+    const suffixes = [product_url_suffix, category_url_suffix].filter(nonNullable)
     suffixes.forEach((suffix) => {
       candidates.add(from.endsWith(suffix) ? from.slice(0, -suffix.length) : `${from}${suffix}`)
     })