Skip to content

Commit

Permalink
Merge branch 'canary' into feature/GCOM-1229-support-all-customizable…
Browse files Browse the repository at this point in the history
…-options
  • Loading branch information
paales committed Jan 4, 2024
2 parents 099e0ec + ba6b27b commit da1ce74
Show file tree
Hide file tree
Showing 224 changed files with 5,204 additions and 5,664 deletions.
5 changes: 5 additions & 0 deletions .changeset/bright-lizards-double.md
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 5 additions & 0 deletions .changeset/four-peaches-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphcommerce/magento-cart": patch
---

When signing in the cartFab would not always properly reflect the current items in the cart
5 changes: 5 additions & 0 deletions .changeset/giant-years-worry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/magento-cart-items': minor
---

Add crosssells to cart
5 changes: 5 additions & 0 deletions .changeset/long-toys-applaud.md
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 5 additions & 0 deletions .changeset/old-bears-push.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphcommerce/magento-product": major
---

Removed legacyProductRoute from GraphCommerce
5 changes: 5 additions & 0 deletions .changeset/orange-zoos-jump.md
Original file line number Diff line number Diff line change
@@ -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.
9 changes: 9 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
},
"changesets": [
"afraid-baboons-move",
"bright-lizards-double",
"brown-planes-retire",
"chilled-pens-mate",
"chilly-brooms-move",
Expand All @@ -94,33 +95,41 @@
"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",
"fuzzy-clocks-hug",
"fuzzy-rings-hug",
"giant-years-worry",
"great-fans-thank",
"itchy-snakes-film",
"lazy-seahorses-rhyme",
"little-shirts-film",
"long-llamas-cheer",
"long-toys-applaud",
"mean-clocks-share",
"new-crews-promise",
"odd-poets-greet",
"old-bears-push",
"old-cycles-enjoy",
"orange-zoos-jump",
"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",
Expand Down
6 changes: 6 additions & 0 deletions .changeset/quiet-boats-leave.md
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions .changeset/quiet-cheetahs-build.md
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions .changeset/rude-bags-draw.md
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# dependencies
node_modules
/.pnp
.pnp.js
.swc

# testing
/coverage
Expand Down
24 changes: 16 additions & 8 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## 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
Expand Down Expand Up @@ -941,31 +949,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>
)
);
}
```

Expand Down
4 changes: 4 additions & 0 deletions docs/framework/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,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.
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "@graphcommerce/docs",
"homepage": "https://www.graphcommerce.org/docs",
"repository": "github:graphcommerce-org/graphcommerce/docs",
"version": "7.1.0-canary.65",
"version": "8.0.0-canary.69",
"sideEffects": true,
"peerDependencies": {
"@graphcommerce/prettier-config-pwa": "^7.1.0-canary.65"
"@graphcommerce/prettier-config-pwa": "^8.0.0-canary.69"
},
"prettier": "@graphcommerce/prettier-config-pwa"
}
5 changes: 2 additions & 3 deletions docs/upgrading/graphcommerce-5-to-6.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 18 additions & 0 deletions docs/upgrading/graphcommerce-7-to-8.md
Original file line number Diff line number Diff line change
@@ -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.
24 changes: 16 additions & 8 deletions examples/magento-graphcms/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## 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
Expand Down Expand Up @@ -3596,31 +3604,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>
)
);
}
```

Expand Down
3 changes: 3 additions & 0 deletions examples/magento-graphcms/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ const nextConfig = {
maxInactiveAge: 1000 * 60 * 10,
pagesBufferLength: 10,
},
experimental: {
scrollRestoration: true,
},
optimizeFonts: false,
images: {
imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
Expand Down
Loading

0 comments on commit da1ce74

Please sign in to comment.