Merge branch 'canary' into feature/GCOM-1304-normalize-locale-html-lang

# Conflicts: # packages/magento-product-configurable/package.json # packages/next-ui/package.json # yarn.lock
graphcommerce-org · Jan 15, 2024 · 6227343 · 6227343
2 parents f952fc2 + 7e8556e
commit 6227343
Show file tree

Hide file tree

Showing 153 changed files with 1,482 additions and 1,313 deletions.
diff --git a/.changeset/few-bats-sit.md b/.changeset/few-bats-sit.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-ui': patch
+---
+
+Fix incorrect canonical URLs when i18n domain routing is used
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -91,6 +91,7 @@
     "empty-ads-run",
     "famous-impalas-destroy",
     "fast-moles-explain",
+    "few-bats-sit",
     "fifty-impalas-hug",
     "fifty-parents-move",
     "fifty-taxis-speak",

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Change Log
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ## 8.0.0-canary.76

diff --git a/docs/package.json b/docs/package.json
@@ -2,10 +2,10 @@
   "name": "@graphcommerce/docs",
   "homepage": "https://www.graphcommerce.org/docs",
   "repository": "github:graphcommerce-org/graphcommerce/docs",
-  "version": "8.0.0-canary.77",
+  "version": "8.0.0-canary.78",
   "sideEffects": true,
   "peerDependencies": {
-    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.77"
+    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.78"
   },
   "prettier": "@graphcommerce/prettier-config-pwa"
 }
diff --git a/examples/magento-graphcms/CHANGELOG.md b/examples/magento-graphcms/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Change Log
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ## 8.0.0-canary.76

diff --git a/examples/magento-graphcms/graphcommerce.config.js.example b/examples/magento-graphcms/graphcommerce.config.js.example
@@ -9,7 +9,10 @@ const config = {
   hygraphEndpoint: 'https://eu-central-1.cdn.hygraph.com/content/ckhx7xadya6xs01yxdujt8i80/master',
   magentoEndpoint: 'https://backend.reachdigital.dev/graphql',
   canonicalBaseUrl: 'https://graphcommerce.vercel.app',
-  storefront: [{ locale: 'en', magentoStoreCode: 'en_US' }],
+  storefront: [
+    { locale: 'en', magentoStoreCode: 'en_US', defaultLocale: true },
+    { locale: 'nl', magentoStoreCode: 'nl_NL' },
+  ],
   recentlyViewedProducts: {
     enabled: true,
   },

diff --git a/examples/magento-graphcms/package.json b/examples/magento-graphcms/package.json
@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-graphcms",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.0-canary.77",
+  "version": "8.0.0-canary.78",
   "private": true,
   "sideEffects": false,
   "engines": {
@@ -21,53 +21,53 @@
   "dependencies": {
     "@apollo/client": "~3.8.8",
     "@ducanh2912/next-pwa": "9.7.2",
-    "@graphcommerce/cli": "8.0.0-canary.77",
-    "@graphcommerce/demo-magento-graphcommerce": "8.0.0-canary.77",
-    "@graphcommerce/ecommerce-ui": "8.0.0-canary.77",
-    "@graphcommerce/framer-next-pages": "8.0.0-canary.77",
-    "@graphcommerce/framer-scroller": "8.0.0-canary.77",
-    "@graphcommerce/framer-utils": "8.0.0-canary.77",
-    "@graphcommerce/googleanalytics": "8.0.0-canary.77",
-    "@graphcommerce/googlerecaptcha": "8.0.0-canary.77",
-    "@graphcommerce/googletagmanager": "8.0.0-canary.77",
-    "@graphcommerce/graphcms-ui": "8.0.0-canary.77",
-    "@graphcommerce/graphql": "8.0.0-canary.77",
-    "@graphcommerce/graphql-mesh": "8.0.0-canary.77",
-    "@graphcommerce/hygraph-cli": "8.0.0-canary.77",
-    "@graphcommerce/hygraph-dynamic-rows": "8.0.0-canary.77",
-    "@graphcommerce/image": "8.0.0-canary.77",
-    "@graphcommerce/lingui-next": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart-billing-address": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart-checkout": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart-coupon": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart-email": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart-items": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart-payment-method": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart-shipping-address": "8.0.0-canary.77",
-    "@graphcommerce/magento-cart-shipping-method": "8.0.0-canary.77",
-    "@graphcommerce/magento-category": "8.0.0-canary.77",
-    "@graphcommerce/magento-cms": "8.0.0-canary.77",
-    "@graphcommerce/magento-compare": "8.0.0-canary.77",
-    "@graphcommerce/magento-customer": "8.0.0-canary.77",
-    "@graphcommerce/magento-graphql": "8.0.0-canary.77",
-    "@graphcommerce/magento-newsletter": "8.0.0-canary.77",
-    "@graphcommerce/magento-payment-included": "8.0.0-canary.77",
-    "@graphcommerce/magento-product": "8.0.0-canary.77",
-    "@graphcommerce/magento-product-bundle": "8.0.0-canary.77",
-    "@graphcommerce/magento-product-configurable": "8.0.0-canary.77",
-    "@graphcommerce/magento-product-downloadable": "8.0.0-canary.77",
-    "@graphcommerce/magento-product-grouped": "8.0.0-canary.77",
-    "@graphcommerce/magento-product-simple": "8.0.0-canary.77",
-    "@graphcommerce/magento-product-virtual": "8.0.0-canary.77",
-    "@graphcommerce/magento-recently-viewed-products": "8.0.0-canary.77",
-    "@graphcommerce/magento-review": "8.0.0-canary.77",
-    "@graphcommerce/magento-search": "8.0.0-canary.77",
-    "@graphcommerce/magento-store": "8.0.0-canary.77",
-    "@graphcommerce/magento-wishlist": "8.0.0-canary.77",
-    "@graphcommerce/next-config": "8.0.0-canary.77",
-    "@graphcommerce/next-ui": "8.0.0-canary.77",
-    "@graphcommerce/react-hook-form": "8.0.0-canary.77",
+    "@graphcommerce/cli": "8.0.0-canary.78",
+    "@graphcommerce/demo-magento-graphcommerce": "8.0.0-canary.78",
+    "@graphcommerce/ecommerce-ui": "8.0.0-canary.78",
+    "@graphcommerce/framer-next-pages": "8.0.0-canary.78",
+    "@graphcommerce/framer-scroller": "8.0.0-canary.78",
+    "@graphcommerce/framer-utils": "8.0.0-canary.78",
+    "@graphcommerce/googleanalytics": "8.0.0-canary.78",
+    "@graphcommerce/googlerecaptcha": "8.0.0-canary.78",
+    "@graphcommerce/googletagmanager": "8.0.0-canary.78",
+    "@graphcommerce/graphcms-ui": "8.0.0-canary.78",
+    "@graphcommerce/graphql": "8.0.0-canary.78",
+    "@graphcommerce/graphql-mesh": "8.0.0-canary.78",
+    "@graphcommerce/hygraph-cli": "8.0.0-canary.78",
+    "@graphcommerce/hygraph-dynamic-rows": "8.0.0-canary.78",
+    "@graphcommerce/image": "8.0.0-canary.78",
+    "@graphcommerce/lingui-next": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart-billing-address": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart-checkout": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart-coupon": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart-email": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart-items": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart-payment-method": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart-shipping-address": "8.0.0-canary.78",
+    "@graphcommerce/magento-cart-shipping-method": "8.0.0-canary.78",
+    "@graphcommerce/magento-category": "8.0.0-canary.78",
+    "@graphcommerce/magento-cms": "8.0.0-canary.78",
+    "@graphcommerce/magento-compare": "8.0.0-canary.78",
+    "@graphcommerce/magento-customer": "8.0.0-canary.78",
+    "@graphcommerce/magento-graphql": "8.0.0-canary.78",
+    "@graphcommerce/magento-newsletter": "8.0.0-canary.78",
+    "@graphcommerce/magento-payment-included": "8.0.0-canary.78",
+    "@graphcommerce/magento-product": "8.0.0-canary.78",
+    "@graphcommerce/magento-product-bundle": "8.0.0-canary.78",
+    "@graphcommerce/magento-product-configurable": "8.0.0-canary.78",
+    "@graphcommerce/magento-product-downloadable": "8.0.0-canary.78",
+    "@graphcommerce/magento-product-grouped": "8.0.0-canary.78",
+    "@graphcommerce/magento-product-simple": "8.0.0-canary.78",
+    "@graphcommerce/magento-product-virtual": "8.0.0-canary.78",
+    "@graphcommerce/magento-recently-viewed-products": "8.0.0-canary.78",
+    "@graphcommerce/magento-review": "8.0.0-canary.78",
+    "@graphcommerce/magento-search": "8.0.0-canary.78",
+    "@graphcommerce/magento-store": "8.0.0-canary.78",
+    "@graphcommerce/magento-wishlist": "8.0.0-canary.78",
+    "@graphcommerce/next-config": "8.0.0-canary.78",
+    "@graphcommerce/next-ui": "8.0.0-canary.78",
+    "@graphcommerce/react-hook-form": "8.0.0-canary.78",
     "@lingui/core": "4.6.0",
     "@lingui/macro": "4.6.0",
     "@lingui/react": "4.6.0",
@@ -90,9 +90,9 @@
     "webpack": "5.89.0"
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "8.0.0-canary.77",
-    "@graphcommerce/prettier-config-pwa": "8.0.0-canary.77",
-    "@graphcommerce/typescript-config-pwa": "8.0.0-canary.77",
+    "@graphcommerce/eslint-config-pwa": "8.0.0-canary.78",
+    "@graphcommerce/prettier-config-pwa": "8.0.0-canary.78",
+    "@graphcommerce/typescript-config-pwa": "8.0.0-canary.78",
     "@lingui/cli": "4.6.0",
     "@playwright/test": "1.40.1",
     "@types/node": "^18",

diff --git a/packages/address-fields-nl/CHANGELOG.md b/packages/address-fields-nl/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @graphcommerce/address-fields-nl
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ## 8.0.0-canary.76

diff --git a/packages/address-fields-nl/package.json b/packages/address-fields-nl/package.json
@@ -2,7 +2,7 @@
   "name": "@graphcommerce/address-fields-nl",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.0-canary.77",
+  "version": "8.0.0-canary.78",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,14 +12,14 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^8.0.0-canary.77",
-    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/graphql": "^8.0.0-canary.77",
-    "@graphcommerce/magento-customer": "^8.0.0-canary.77",
-    "@graphcommerce/magento-store": "^8.0.0-canary.77",
-    "@graphcommerce/next-ui": "^8.0.0-canary.77",
-    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.77",
+    "@graphcommerce/ecommerce-ui": "^8.0.0-canary.78",
+    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/graphql": "^8.0.0-canary.78",
+    "@graphcommerce/magento-customer": "^8.0.0-canary.78",
+    "@graphcommerce/magento-store": "^8.0.0-canary.78",
+    "@graphcommerce/next-ui": "^8.0.0-canary.78",
+    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.78",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

diff --git a/packages/algolia-search/CHANGELOG.md b/packages/algolia-search/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @graphcommerce/algolia-search
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ## 8.0.0-canary.76

diff --git a/packages/algolia-search/package.json b/packages/algolia-search/package.json
@@ -2,7 +2,7 @@
   "name": "@graphcommerce/algolia-search",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.0-canary.77",
+  "version": "8.0.0-canary.78",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -16,17 +16,17 @@
     "react-instantsearch-hooks-web": "^6.47.3"
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^8.0.0-canary.77",
-    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/graphql": "^8.0.0-canary.77",
-    "@graphcommerce/graphql-mesh": "^8.0.0-canary.77",
-    "@graphcommerce/magento-product": "^8.0.0-canary.77",
-    "@graphcommerce/magento-search": "^8.0.0-canary.77",
-    "@graphcommerce/magento-store": "^8.0.0-canary.77",
-    "@graphcommerce/next-config": "^8.0.0-canary.77",
-    "@graphcommerce/next-ui": "^8.0.0-canary.77",
-    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.77",
+    "@graphcommerce/ecommerce-ui": "^8.0.0-canary.78",
+    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/graphql": "^8.0.0-canary.78",
+    "@graphcommerce/graphql-mesh": "^8.0.0-canary.78",
+    "@graphcommerce/magento-product": "^8.0.0-canary.78",
+    "@graphcommerce/magento-search": "^8.0.0-canary.78",
+    "@graphcommerce/magento-store": "^8.0.0-canary.78",
+    "@graphcommerce/next-config": "^8.0.0-canary.78",
+    "@graphcommerce/next-ui": "^8.0.0-canary.78",
+    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.78",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @graphcommerce/cli
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ## 8.0.0-canary.76

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -2,7 +2,7 @@
   "name": "@graphcommerce/cli",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.0-canary.77",
+  "version": "8.0.0-canary.78",
   "scripts": {
     "dev": "tsc --preserveWatchOutput --watch",
     "build": "tsc",
@@ -38,11 +38,11 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/hygraph-cli": "^8.0.0-canary.77",
-    "@graphcommerce/next-config": "^8.0.0-canary.77",
-    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.77",
+    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/hygraph-cli": "^8.0.0-canary.78",
+    "@graphcommerce/next-config": "^8.0.0-canary.78",
+    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.78",
     "graphql": "^16.7.1",
     "react": "^18.2.0"
   },

diff --git a/packages/demo-magento-graphcommerce/CHANGELOG.md b/packages/demo-magento-graphcommerce/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @graphcommerce/demo-magento-graphcommerce
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ## 8.0.0-canary.76

diff --git a/packages/demo-magento-graphcommerce/package.json b/packages/demo-magento-graphcommerce/package.json
@@ -2,7 +2,7 @@
   "name": "@graphcommerce/demo-magento-graphcommerce",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.0-canary.77",
+  "version": "8.0.0-canary.78",
   "sideEffects": false,
   "scripts": {
     "dev": "tsc -W"
@@ -15,14 +15,14 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/framer-scroller": "^8.0.0-canary.77",
-    "@graphcommerce/magento-product": "^8.0.0-canary.77",
-    "@graphcommerce/magento-product-configurable": "^8.0.0-canary.77",
-    "@graphcommerce/magento-recently-viewed-products": "^8.0.0-canary.77",
-    "@graphcommerce/next-ui": "^8.0.0-canary.77",
-    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.77",
+    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/framer-scroller": "^8.0.0-canary.78",
+    "@graphcommerce/magento-product": "^8.0.0-canary.78",
+    "@graphcommerce/magento-product-configurable": "^8.0.0-canary.78",
+    "@graphcommerce/magento-recently-viewed-products": "^8.0.0-canary.78",
+    "@graphcommerce/next-ui": "^8.0.0-canary.78",
+    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.78",
     "@mui/material": "^5.10.16",
     "framer-motion": "^10.0.0",
     "next": "*",

diff --git a/packages/ecommerce-ui/CHANGELOG.md b/packages/ecommerce-ui/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @graphcommerce/ecommerce-ui
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ### Patch Changes

diff --git a/packages/ecommerce-ui/package.json b/packages/ecommerce-ui/package.json
@@ -2,7 +2,7 @@
   "name": "@graphcommerce/ecommerce-ui",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.0.0-canary.77",
+  "version": "8.0.0-canary.78",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,12 +12,12 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/graphql": "^8.0.0-canary.77",
-    "@graphcommerce/next-ui": "^8.0.0-canary.77",
-    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.77",
-    "@graphcommerce/react-hook-form": "^8.0.0-canary.77",
-    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.77",
+    "@graphcommerce/eslint-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/graphql": "^8.0.0-canary.78",
+    "@graphcommerce/next-ui": "^8.0.0-canary.78",
+    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.78",
+    "@graphcommerce/react-hook-form": "^8.0.0-canary.78",
+    "@graphcommerce/typescript-config-pwa": "^8.0.0-canary.78",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

diff --git a/packages/framer-next-pages/CHANGELOG.md b/packages/framer-next-pages/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Change Log
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ## 8.0.0-canary.76

diff --git a/packages/framer-next-pages/example/CHANGELOG.md b/packages/framer-next-pages/example/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Change Log
 
+## 8.0.0-canary.78
+
 ## 8.0.0-canary.77
 
 ## 8.0.0-canary.76