@graphcommerce/magento-store 6.2.0-canary.8 → 6.2.0-canary.80

package/CHANGELOG.md

@@ -1,5 +1,161 @@
 # Change Log
 
+## 6.2.0-canary.80
+
+## 6.2.0-canary.79
+
+## 6.2.0-canary.78
+
+## 6.2.0-canary.77
+
+## 6.2.0-canary.76
+
+## 6.2.0-canary.75
+
+## 6.2.0-canary.74
+
+## 6.2.0-canary.73
+
+## 6.2.0-canary.72
+
+## 6.2.0-canary.71
+
+## 6.2.0-canary.70
+
+## 6.2.0-canary.69
+
+## 6.2.0-canary.68
+
+## 6.2.0-canary.67
+
+## 6.2.0-canary.66
+
+## 6.2.0-canary.65
+
+## 6.2.0-canary.64
+
+## 6.2.0-canary.63
+
+## 6.2.0-canary.62
+
+## 6.2.0-canary.61
+
+## 6.2.0-canary.60
+
+## 6.2.0-canary.59
+
+## 6.2.0-canary.58
+
+## 6.2.0-canary.57
+
+## 6.2.0-canary.56
+
+## 6.2.0-canary.55
+
+### Patch Changes
+
+- [#1967](https://github.com/graphcommerce-org/graphcommerce/pull/1967) [`888fe88e6`](https://github.com/graphcommerce-org/graphcommerce/commit/888fe88e644d94621d54a268dbaafc7ff5467c93) - Fix bug where product urls ending with a suffix would not be redirected ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 6.2.0-canary.54
+
+## 6.2.0-canary.53
+
+## 6.2.0-canary.52
+
+## 6.2.0-canary.51
+
+## 6.2.0-canary.50
+
+### Minor Changes
+
+- [`e55d8c390`](https://github.com/graphcommerce-org/graphcommerce/commit/e55d8c390d90b4bb7bab11c6a99027ac72bd7e3e) - Created a new sidebar layout system, can be configured with productFiltersLayout in the graphcommerce.config.js ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.49
+
+## 6.2.0-canary.48
+
+### Minor Changes
+
+- [#1961](https://github.com/graphcommerce-org/graphcommerce/pull/1961) [`4a759c662`](https://github.com/graphcommerce-org/graphcommerce/commit/4a759c66215eaa69edc342b898e05e8f92c3ba9a) - Add Open Graph meta tags to all pages ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 6.2.0-canary.47
+
+## 6.2.0-canary.46
+
+## 6.2.0-canary.45
+
+## 6.2.0-canary.44
+
+## 6.2.0-canary.43
+
+## 6.2.0-canary.42
+
+## 6.2.0-canary.41
+
+## 6.2.0-canary.40
+
+## 6.2.0-canary.39
+
+## 6.2.0-canary.38
+
+## 6.2.0-canary.37
+
+## 6.2.0-canary.36
+
+## 6.2.0-canary.35
+
+## 6.2.0-canary.34
+
+## 6.2.0-canary.33
+
+## 6.2.0-canary.32
+
+## 6.2.0-canary.31
+
+## 6.2.0-canary.30
+
+## 6.2.0-canary.29
+
+## 6.2.0-canary.28
+
+## 6.2.0-canary.27
+
+## 6.2.0-canary.26
+
+## 6.2.0-canary.25
+
+## 6.2.0-canary.24
+
+## 6.2.0-canary.23
+
+## 6.2.0-canary.22
+
+## 6.2.0-canary.21
+
+## 6.2.0-canary.20
+
+## 6.2.0-canary.19
+
+## 6.2.0-canary.18
+
+## 6.2.0-canary.17
+
+## 6.2.0-canary.16
+
+## 6.2.0-canary.15
+
+## 6.2.0-canary.14
+
+## 6.2.0-canary.13
+
+## 6.2.0-canary.12
+
+## 6.2.0-canary.11
+
+## 6.2.0-canary.10
+
+## 6.2.0-canary.9
+
 ## 6.2.0-canary.8
 
 ## 6.2.0-canary.7

package/PageMeta.tsx

@@ -5,10 +5,7 @@ import {
 } from '@graphcommerce/next-ui'
 import { StoreConfigDocument } from './StoreConfig.gql'
 
-type PageMetaProps = Pick<
-  NextPageMetaProps,
-  'title' | 'metaDescription' | 'metaRobots' | 'children'
-> & {
+type PageMetaProps = Omit<NextPageMetaProps, 'canonical'> & {
   canonical?: string
 }
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-store",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "6.2.0-canary.8",
+  "version": "6.2.0-canary.80",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,19 +12,20 @@
     }
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "6.2.0-canary.8",
-    "@graphcommerce/prettier-config-pwa": "6.2.0-canary.8",
-    "@graphcommerce/typescript-config-pwa": "6.2.0-canary.8"
+    "@graphcommerce/eslint-config-pwa": "6.2.0-canary.80",
+    "@graphcommerce/prettier-config-pwa": "6.2.0-canary.80",
+    "@graphcommerce/typescript-config-pwa": "6.2.0-canary.80"
   },
   "dependencies": {
-    "@graphcommerce/graphql": "6.2.0-canary.8",
-    "@graphcommerce/graphql-mesh": "6.2.0-canary.8",
-    "@graphcommerce/image": "6.2.0-canary.8",
-    "@graphcommerce/next-ui": "6.2.0-canary.8"
+    "@graphcommerce/graphql": "6.2.0-canary.80",
+    "@graphcommerce/graphql-mesh": "6.2.0-canary.80",
+    "@graphcommerce/image": "6.2.0-canary.80",
+    "@graphcommerce/next-ui": "6.2.0-canary.80"
   },
   "peerDependencies": {
-    "@lingui/react": "^3.13.2",
-    "@lingui/core": "^3.13.2",
+    "@lingui/react": "^4.2.1",
+    "@lingui/core": "^4.2.1",
+    "@lingui/macro": "^4.2.1",
     "@mui/material": "^5.10.16",
     "next": "^13.2.0",
     "react": "^18.2.0",

package/plugins/magentoStoreGraphqlConfig.ts

@@ -5,10 +5,9 @@ import { createStoreLink } from '../link/createStoreLink'
 export const func = 'graphqlConfig'
 export const exported = '@graphcommerce/graphql/config'
 
-const magentoStoreGraphqlConfig: MethodPlugin<typeof graphqlConfig> = (prev, config) =>
-  prev({
-    ...config,
-    links: [...(config.links ?? []), createStoreLink(config.storefront.locale)],
-  })
+const magentoStoreGraphqlConfig: MethodPlugin<typeof graphqlConfig> = (prev, config) => {
+  const results = prev(config)
+  return { ...results, links: [...results.links, createStoreLink(config.storefront.locale)] }
+}
 
 export const plugin = magentoStoreGraphqlConfig

package/utils/redirectOrNotFound.ts

@@ -9,7 +9,7 @@ import { nonNullable, isTypename } from '@graphcommerce/next-ui'
 import { Redirect } from 'next'
 import { StoreConfigQuery } from '../StoreConfig.gql'
 import { defaultLocale } from '../localeToStore'
-import { HandleRedirectDocument } from './HandleRedirect.gql'
+import { HandleRedirectDocument, HandleRedirectQuery } from './HandleRedirect.gql'
 
 export type RedirectOr404Return = Promise<
   | { redirect: Redirect; revalidate?: number | boolean }
@@ -77,8 +77,16 @@ export async function redirectOrNotFound(
         ).data,
     )
 
-    const routeData = (await Promise.all(routePromises)).find(nonNullable)
+    const routeDataArray = (await Promise.all(routePromises)).filter(nonNullable)
 
+    const routeData: HandleRedirectQuery = Object.assign(
+      {},
+      ...routeDataArray.map((result) => {
+        if (!result.route) delete result.route
+        if (!result.products) delete result.products
+        return result
+      }),
+    )
     if (!routeData?.route)
       return notFound(
         from,