Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/canary' into feature/GCOM-1229-s…
Browse files Browse the repository at this point in the history
…upport-all-customizable-options
  • Loading branch information
Jessevdpoel committed Jan 3, 2024
2 parents cfa7bd6 + b442855 commit 099e0ec
Show file tree
Hide file tree
Showing 217 changed files with 4,670 additions and 1,369 deletions.
5 changes: 5 additions & 0 deletions .changeset/chilly-plants-destroy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/hygraph-dynamic-rows-ui': patch
---

Fix eslint errors in Dynamic Rows UI package
5 changes: 5 additions & 0 deletions .changeset/dull-jobs-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/hygraph-dynamic-rows': patch
---

enabled multiple rows per Dynamic Row
5 changes: 5 additions & 0 deletions .changeset/famous-impalas-destroy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-ui': patch
---

Added info icon for Snackbar when severity is set to info
5 changes: 5 additions & 0 deletions .changeset/fresh-pens-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-config': patch
---

Created ./devcontainer/devcontainer.json to automatically run Graphcommerce after opening Codespaces
6 changes: 6 additions & 0 deletions .changeset/old-cycles-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@graphcommerce/magento-review': patch
'@graphcommerce/next-ui': patch
---

Fixed schema-dts dependency issue
5 changes: 5 additions & 0 deletions .changeset/plenty-icons-cough.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-ui': patch
---

Added ‘disableBackdropClick’ prop to MessageSnackbar to allow page interaction without closing the snackbar
5 changes: 5 additions & 0 deletions .changeset/poor-badgers-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/mollie-magento-payment': patch
---

Fixed the issue where a guest returned to a empty cart after a canceled payment with Mollie
18 changes: 17 additions & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,28 @@
"@graphcommerce/next-config": "7.0.1",
"@graphcommerce/prettier-config-pwa": "7.0.1",
"@graphcommerce/typescript-config-pwa": "7.0.1",
"@graphcommerce/magento-recently-viewed-products": "7.1.0-canary.44"
"@graphcommerce/magento-recently-viewed-products": "7.1.0-canary.44",
"@graphcommerce/hygraph-dynamic-rows-ui": "7.1.0-canary.23"
},
"changesets": [
"afraid-baboons-move",
"brown-planes-retire",
"chilled-pens-mate",
"chilly-brooms-move",
"chilly-plants-destroy",
"curvy-grapes-accept",
"curvy-hairs-suffer",
"dull-jobs-flash",
"eleven-hats-kneel",
"empty-ads-run",
"famous-impalas-destroy",
"fifty-impalas-hug",
"fifty-parents-move",
"fifty-taxis-speak",
"flat-emus-look",
"forty-rocks-bow",
"fresh-games-roll",
"fresh-pens-hide",
"fresh-ways-hide",
"friendly-dogs-shop",
"friendly-islands-cough",
Expand All @@ -104,13 +109,18 @@
"mean-clocks-share",
"new-crews-promise",
"odd-poets-greet",
"old-cycles-enjoy",
"plenty-icons-cough",
"poor-badgers-heal",
"pretty-hairs-prove",
"quick-queens-rush",
"quiet-tomatoes-melt",
"red-ghosts-cry",
"red-gifts-listen",
"red-poems-kick",
"rich-beans-grin",
"rich-guests-applaud",
"rotten-balloons-think",
"selfish-peas-fold",
"serious-fishes-do",
"serious-wasps-itch",
Expand All @@ -119,7 +129,11 @@
"sharp-apes-burn",
"sharp-shrimps-flow",
"shiny-bikes-kiss",
"shiny-radios-cover",
"short-toys-cry",
"silver-bears-kneel",
"six-horses-repeat",
"slow-candles-remember",
"slow-flies-scream",
"soft-readers-camp",
"soft-trees-leave",
Expand All @@ -133,10 +147,12 @@
"tall-tips-float",
"tame-dots-call",
"thick-cougars-cheer",
"thirty-spiders-battle",
"three-dogs-clap",
"tricky-spoons-lick",
"twelve-deers-begin",
"two-years-relate",
"wild-ways-sin",
"wise-wombats-remain"
]
}
5 changes: 5 additions & 0 deletions .changeset/pretty-hairs-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/magento-graphcms': patch
---

Added .graphqlrc.yml for graphql file autocompletion
5 changes: 5 additions & 0 deletions .changeset/rotten-balloons-think.md
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions .changeset/shiny-radios-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-ui': patch
---

Added DismissibleSnackbar component to allow messages to be shown only once
5 changes: 5 additions & 0 deletions .changeset/short-toys-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/hygraph-dynamic-rows-ui': minor
---

Add Dynamic Row UI for property UI field through a custom Hygraph application
6 changes: 6 additions & 0 deletions .changeset/silver-bears-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@graphcommerce/googletagmanager': minor
'@graphcommerce/googleanalytics': minor
---

Made all magento dependencies optional in the googleanalytics and googletagmanager packages
5 changes: 5 additions & 0 deletions .changeset/slow-candles-remember.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-ui': patch
---

If there is an open menu in an overlay, pressing the escape button now closes the menu instead of the overlay.
6 changes: 6 additions & 0 deletions .changeset/thirty-spiders-battle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@graphcommerce/magento-graphcms': patch
'@graphcommerce/next-ui': patch
---

Implemented Message variant for RowColumnOne to show an important message which, after dismissing, will not show again
5 changes: 5 additions & 0 deletions .changeset/wild-ways-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-ui': patch
---

Change the critical css injection location to be in the head instead of `<style>` tags in the body. It has a number of negative consequences, such as the famous "flash of unstyled content" (FOUC) and the re-paint and re-layout required.
35 changes: 35 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/alpine
// Configuring Codespaces with 16 GB ram is recommended
{
"image": "mcr.microsoft.com/devcontainers/base:alpine",
"features": {
"ghcr.io/cirolosapio/devcontainers-features/alpine-node:0": {
"lts": true,
"corepack": true
}
},
"waitFor": "updateContentCommand",
"updateContentCommand": "cd examples/magento-graphcms && yarn install",
"postAttachCommand": "cd examples/magento-graphcms && yarn dev",
"customizations": {
"vscode": {
"settings": {},
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"GraphQL.vscode-graphql",
"mikestead.DotENV",
"mrorz.language-gettext",
"redhat.vscode-yaml"
]
}
},
"portsAttributes": {
"3000": {
"label": "Graphcommerce",
"onAutoForward": "notify"
}
},
"forwardPorts": [3000]
}
24 changes: 24 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# Change Log

## 7.1.0-canary.65

## 7.1.0-canary.64

## 7.1.0-canary.63

## 7.1.0-canary.62

## 7.1.0-canary.61

## 7.1.0-canary.60

## 7.1.0-canary.59

## 7.1.0-canary.58

## 7.1.0-canary.57

## 7.1.0-canary.56

## 7.1.0-canary.55

## 7.1.0-canary.54

## 7.1.0-canary.53

### Patch Changes
Expand Down
45 changes: 45 additions & 0 deletions docs/hygraph/property-picker.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Hygraph Dynamic Rows

As you might have learned, Dynamic Rows enable the addition of rows across
multiple pages through rule-based relationships, rather than manually adding a
row to each page. These rules hinge on shared attributes among the pages, with a
category being a typical example of such an attribute. To enable the Dynamic Row
UI Extension, follow the installation instructions as below.

> Installation
>
> [Click here to install the Dynamic Row UI Extension](https://app.hygraph.com/apps/dynamic-row-property-picker/new)
<img width="1792" alt="image" src="https://github.com/graphcommerce-org/graphcommerce/assets/49681263/3226eedb-e58c-4d3f-9516-14ff6ed56f24">

## Enabling the Application

Once you click the link and authorize the application, you'll be taken to the
app's configuration page. On this page, you can switch the application on or off
as needed.

<img width="1792" alt="image" src="https://github.com/graphcommerce-org/graphcommerce/assets/49681263/ec9b55f6-14f6-466e-8a31-0b893ffe1297">

## Enabling the field

Now to enable the field, go to your Hygraph schema. Under components you should
have a `Text` and `Number` component. Each of these have a field with api ID
`property`. You will have to delete this field in both components. This will
result in current field data being lost, so in case you are migrating to the
extended UI, make sure to have a copy of those fields somewhere else.

> Note
>
> Make sure you migrated your schema to Graphcommerce 7.0 with
> [our Hygraph-CLI.](./cli.md)
Replace the existing fields with the new `Property picker` field in the right sidebar
(it should be under `Slug` and above `Rich text`). While adding the
`Property picker` field make sure that you make it `required`.

<img width="1792" alt="image" src="https://github.com/graphcommerce-org/graphcommerce/assets/49681263/9206f86d-477c-4eaf-bec6-1648874bee5e">

## Start building with your new Dynamic Rows UI!

If you have any questions about the feature, please reach out to us in our Slack
channel.
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.53",
"version": "7.1.0-canary.65",
"sideEffects": true,
"peerDependencies": {
"@graphcommerce/prettier-config-pwa": "^7.1.0-canary.53"
"@graphcommerce/prettier-config-pwa": "^7.1.0-canary.65"
},
"prettier": "@graphcommerce/prettier-config-pwa"
}
17 changes: 17 additions & 0 deletions examples/magento-graphcms/.graphqlrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
projects:
Project:
schema:
- .mesh/schema.graphql
- node_modules/@graphcommerce/graphql/apollo-client.graphql
- node_modules/@graphcommerce/graphql-codegen-near-operation-file/src/directive/env.graphqls
- node_modules/@graphcommerce/graphql-codegen-near-operation-file/src/directive/injectable.graphqls
documents:
- ./components/**/*.graphql
- ./graphql/**/*.graphql
- node_modules/@graphcommerce/**/*.graphql
extensions:
languageService:
useSchemaFileDefinitions: true
endpoints:
default:
url: http://localhost:3000/api/graphql/
32 changes: 32 additions & 0 deletions examples/magento-graphcms/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
# Change Log

## 7.1.0-canary.65

## 7.1.0-canary.64

## 7.1.0-canary.63

## 7.1.0-canary.62

## 7.1.0-canary.61

## 7.1.0-canary.60

## 7.1.0-canary.59

## 7.1.0-canary.58

## 7.1.0-canary.57

### Patch Changes

- [#2122](https://github.com/graphcommerce-org/graphcommerce/pull/2122) [`7750f7253`](https://github.com/graphcommerce-org/graphcommerce/commit/7750f7253ded34acb4cd8b75598bf0ad1bca6d5c) - Added .graphqlrc.yml for graphql file autocompletion ([@bramvanderholst](https://github.com/bramvanderholst))

## 7.1.0-canary.56

## 7.1.0-canary.55

### Patch Changes

- [#2004](https://github.com/graphcommerce-org/graphcommerce/pull/2004) [`53947d39f`](https://github.com/graphcommerce-org/graphcommerce/commit/53947d39f2f3ee578c14903c96a2b356d99d9475) - Implemented Message variant for RowColumnOne to show an important message which, after dismissing, will not show again ([@bramvanderholst](https://github.com/bramvanderholst))

## 7.1.0-canary.54

## 7.1.0-canary.53

## 7.1.0-canary.52
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
fragment RowColumnOne on RowColumnOne {
id
rowColumnOneVariant
colOne {
raw
}
Expand Down
Loading

0 comments on commit 099e0ec

Please sign in to comment.