Merge branch 'canary' into feature/GCOM-1260

# Conflicts:
#	examples/magento-graphcms/components/GraphCMS/RowRenderer.tsx
#	examples/magento-graphcms/package.json
#	examples/magento-graphcms/pages/product/[url].tsx
#	examples/magento-graphcms/pages/product/bundle/[url].tsx
#	examples/magento-graphcms/pages/product/configurable/[url].tsx
#	examples/magento-graphcms/pages/product/downloadable/[url].tsx
#	examples/magento-graphcms/pages/product/grouped/[url].tsx
#	examples/magento-graphcms/pages/product/virtual/[url].tsx
#	yarn.lock

.changeset/bright-lizards-double.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+Updated dependencies. Fixed trace-to-tree.mjs to debug build perf and added trace-to-event-format.mjs for compatibility with about://tracing.

.changeset/four-peaches-bake.md

@@ -0,0 +1,5 @@
+---
+"@graphcommerce/magento-cart": patch
+---
+
+When signing in the cartFab would not always properly reflect the current items in the cart

.changeset/friendly-rings-roll.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-compare': patch
+---
+
+Fix compare button hover state on product page

.changeset/giant-years-worry.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-cart-items': minor
+---
+
+Add crosssells to cart

.changeset/happy-mails-tickle.md

@@ -0,0 +1,6 @@
+---
+'@graphcommerce/magento-product': minor
+'@graphcommerce/next-ui': minor
+---
+
+Added lazy hydration to improve total blocking time. Added LazyHydrate component which can be wrapped around other components you want to lazy hydrate.

.changeset/little-waves-bow.md

@@ -0,0 +1,11 @@
+---
+'@graphcommerce/magento-product-configurable': minor
+'@graphcommerce/magento-product-virtual': minor
+'@graphcommerce/magento-product-bundle': minor
+'@graphcommerce/magento-product-simple': minor
+'@graphcommerce/magento-cart-items': minor
+'@graphcommerce/googleanalytics': minor
+'@graphcommerce/magento-product': minor
+---
+
+Created UI for all customizable options except for the file upload customizable option

.changeset/long-toys-applaud.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-recently-viewed-products': patch
+---
+
+When multiple variations of a single configurable product were viewed the RecentlyViewedProducts component it would keep showing a loading state.

.changeset/old-bears-push.md

@@ -0,0 +1,5 @@
+---
+"@graphcommerce/magento-product": major
+---
+
+Removed legacyProductRoute from GraphCommerce

.changeset/orange-zoos-jump.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-ui': patch
+---
+
+Removed the 'NoSSR' functionality from `<WaitForQueries/>` component as it slows down rendering. The 'feature' was necessary for the following use case: When hydrating a component that was server rendered and was living inside a `<Suspense />` component. It would cause an hydration error and this was the workaround. With useSuspenseQuery and React 18, this problem will not occur.

.changeset/perfect-pumas-invent.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-customer': patch
+---
+
+Fixed bug which caused region to not be set properly if user swapped countries in the checkout process.

.changeset/pre.json

@@ -79,6 +79,7 @@
   },
   "changesets": [
     "afraid-baboons-move",
+    "bright-lizards-double",
     "brown-planes-retire",
     "chilled-pens-mate",
     "chilly-brooms-move",
@@ -94,32 +95,45 @@
     "fifty-taxis-speak",
     "flat-emus-look",
     "forty-rocks-bow",
+    "four-peaches-bake",
     "fresh-games-roll",
     "fresh-pens-hide",
     "fresh-ways-hide",
     "friendly-dogs-shop",
     "friendly-islands-cough",
+    "friendly-rings-roll",
     "fuzzy-clocks-hug",
     "fuzzy-rings-hug",
+    "giant-years-worry",
     "great-fans-thank",
+    "happy-mails-tickle",
     "itchy-snakes-film",
     "lazy-seahorses-rhyme",
     "little-shirts-film",
+    "little-waves-bow",
     "long-llamas-cheer",
+    "long-toys-applaud",
     "mean-clocks-share",
     "new-crews-promise",
     "odd-poets-greet",
+    "old-bears-push",
     "old-cycles-enjoy",
+    "orange-zoos-jump",
+    "perfect-pumas-invent",
     "plenty-icons-cough",
     "poor-badgers-heal",
     "pretty-hairs-prove",
     "quick-queens-rush",
+    "quiet-boats-leave",
+    "quiet-cheetahs-build",
     "quiet-tomatoes-melt",
     "red-ghosts-cry",
     "red-gifts-listen",
     "red-poems-kick",
     "rich-beans-grin",
     "rich-guests-applaud",
+    "rotten-balloons-think",
+    "rude-bags-draw",
     "selfish-peas-fold",
     "serious-fishes-do",
     "serious-wasps-itch",
@@ -137,6 +151,7 @@
     "soft-readers-camp",
     "soft-trees-leave",
     "spicy-squids-compete",
+    "spotty-pens-explain",
     "strong-ants-confess",
     "stupid-ears-wink",
     "stupid-mice-check",

.changeset/quiet-boats-leave.md

@@ -0,0 +1,6 @@
+---
+'@graphcommerce/magento-customer': patch
+'@graphcommerce/magento-cart': patch
+---
+
+Added user session reevaluation after unathenticated call. Queries will be paused untill user has signed in again

.changeset/quiet-cheetahs-build.md

@@ -0,0 +1,6 @@
+---
+"@graphcommerce/magento-recently-viewed-products": patch
+"@graphcommerce/magento-product": patch
+---
+
+Remove marginBottom from ProductScroller by default and let implementor set the margin

.changeset/rotten-balloons-think.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-category': patch
+---
+
+Fixed a bug where pagination would be added when navigating to a subcategory from a paginated page

.changeset/rude-bags-draw.md

@@ -0,0 +1,5 @@
+---
+"@graphcommerce/magento-customer": patch
+---
+
+Created a debug.sessions config that allows debugging sessions. Enable with GC_DEBUG_SESSIONS=1 in your env or modify your graphcommerce.config.js

.changeset/spotty-pens-explain.md

@@ -0,0 +1,5 @@
+---
+"@graphcommerce/magento-product-configurable": patch
+---
+
+Spread product back into products instead of only adding items

.gitignore

@@ -1,5 +1,8 @@
 # dependencies
 node_modules
+/.pnp
+.pnp.js
+.swc
 
 # testing
 /coverage

docs/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 8.0.0-canary.74
+
+## 8.0.0-canary.73
+
+## 8.0.0-canary.72
+
+## 8.0.0-canary.71
+
+## 8.0.0-canary.70
+
+## 8.0.0-canary.69
+
+## 7.1.0-canary.68
+
+## 7.1.0-canary.67
+
+## 7.1.0-canary.66
+
+## 7.1.0-canary.65
+
 ## 7.1.0-canary.64
 
 ## 7.1.0-canary.63
@@ -939,31 +959,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>
-    )
+    );
   }
   ```
 

docs/framework/config.md

@@ -303,6 +303,10 @@ Debug configuration for GraphCommerce
 
 Reports which plugins are enabled or disabled.
 
+#### sessions: boolean
+
+Enable debugging interface to debug sessions
+
 #### webpackCircularDependencyPlugin: boolean
 
 Cyclic dependencies can cause memory issues and other strange bugs.

docs/package.json

@@ -2,10 +2,10 @@
   "name": "@graphcommerce/docs",
   "homepage": "https://www.graphcommerce.org/docs",
   "repository": "github:graphcommerce-org/graphcommerce/docs",
-  "version": "7.1.0-canary.64",
+  "version": "8.0.0-canary.74",
   "sideEffects": true,
   "peerDependencies": {
-    "@graphcommerce/prettier-config-pwa": "^7.1.0-canary.64"
+    "@graphcommerce/prettier-config-pwa": "^8.0.0-canary.74"
   },
   "prettier": "@graphcommerce/prettier-config-pwa"
 }

docs/upgrading/graphcommerce-5-to-6.md

@@ -21,9 +21,8 @@ The route for the product has changed from `/product/[url]`,
 `/product/configurable/[url]`, etc. to `/p/[url]` by default. This is a
 singlular product page for all product types.
 
-You can keep using the old behavior by setting
-[legacyProductRoute](../framework/config.md#legacyproductroute-boolean) to true.
-This legacy routing will be removed in a future version.
+~~You can keep using the old behavior by setting `legacyProductRoute` to true.~~
+The legacy routing has been removed in GraphCommerce 8.
 
 You can also change the product route from `/p/[url]` to something else by
 configuring [productRoute](../framework/config.md#productroute-string)

docs/upgrading/graphcommerce-7-to-8.md

@@ -0,0 +1,18 @@
+# Upgrading from GraphCommerce 6 to 7
+
+Depending on the amounts of customisations you've made, there are some manual
+steps. Please follow the regular [upgrade steps first](./readme.md).
+
+1. [`legacyProductRoute` is removed](#legacyproductroute-is-removed)
+2. [Upgrading your Hygraph schema](#upgrading-your-hygraph-schema)
+
+## `legacyProductRoute` is removed
+
+🟠 Only required if you've used the legacyProductRoute
+
+Remove all `/pages/product/*` routes.
+
+## Upgrading your Hygraph schema
+
+Upgrade your Hygraph schema with the [Hygraph migration cli](../hygraph/cli.md).
+Select `graphcommerce7to8` as version.

examples/magento-graphcms/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 8.0.0-canary.74
+
+## 8.0.0-canary.73
+
+## 8.0.0-canary.72
+
+## 8.0.0-canary.71
+
+## 8.0.0-canary.70
+
+## 8.0.0-canary.69
+
+## 7.1.0-canary.68
+
+## 7.1.0-canary.67
+
+## 7.1.0-canary.66
+
+## 7.1.0-canary.65
+
 ## 7.1.0-canary.64
 
 ## 7.1.0-canary.63
@@ -3594,31 +3614,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>
-    )
+    );
   }
   ```
 

examples/magento-graphcms/components/Layout/LayoutNavigation.tsx

@@ -21,11 +21,13 @@ import {
   NavigationOverlay,
   useNavigationSelection,
   useMemoDeep,
+  LazyHydrate,
 } from '@graphcommerce/next-ui'
 import { i18n } from '@lingui/core'
 import { Trans } from '@lingui/react'
 import { Divider, Fab } from '@mui/material'
 import { useRouter } from 'next/router'
+import { useState } from 'react'
 import { Footer } from './Footer'
 import { LayoutQuery } from './Layout.gql'
 import { Logo } from './Logo'

examples/magento-graphcms/components/ProductListItems/CategoryFilterLayout.tsx

@@ -37,7 +37,7 @@ export function CategoryFilterLayout(props: ProductListFilterLayoutProps) {
 
   const { total_count, sort_fields, page_info } = products
 
-  const items = <ProductListItems items={products.items} loadingEager={2} title={title} />
+  const items = <ProductListItems items={products.items} loadingEager={6} title={title} />
 
   if (import.meta.graphCommerce.productFiltersPro) {
     const horizontalFilters = (

examples/magento-graphcms/components/ProductListItems/SearchFilterLayout.tsx

@@ -31,7 +31,7 @@ export function SearchFilterLayout(props: ProductListFilterLayoutProps) {
     <ProductListItemsBase
       renderers={productListRenderer}
       items={products.items}
-      loadingEager={2}
+      loadingEager={6}
       title={title}
     />
   )