Skip to content

Commit

Permalink
Merge branch 'canary' into feature/localstorage-snackbar
Browse files Browse the repository at this point in the history
  • Loading branch information
bramvanderholst committed Nov 24, 2023
2 parents 338c16b + 63cc9b6 commit a48ee6c
Show file tree
Hide file tree
Showing 241 changed files with 5,049 additions and 2,273 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-baboons-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/magento-graphcms': patch
---

Added ProductScroller component with built-in skeleton loader
5 changes: 5 additions & 0 deletions .changeset/chilled-pens-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/graphcms-ui': patch
---

Add alt text to image inside rich text
5 changes: 4 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@
"snapshot": {
"useCalculatedVersion": true,
"prereleaseTemplate": "{tag}-{datetime}-{commit}"
}
},
"autoBumpPeerDependentsInSameChangeset": true,
"autoBumpPeerDependentsCondition": "out-of-range",
"autoBumpPeerDependentsStrategy": "follow"
}
5 changes: 5 additions & 0 deletions .changeset/fifty-impalas-hug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-ui': patch
---

Fixed ItemScroller component className. Changed from SidebarSlider to ItemScroller
5 changes: 5 additions & 0 deletions .changeset/fifty-taxis-speak.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/magento-graphcms': patch
---

Added recently viewed products to product pages
5 changes: 5 additions & 0 deletions .changeset/great-fans-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-config': patch
---

When releasing there will be changes to the yarn.lock file, but those weren't committed.
5 changes: 5 additions & 0 deletions .changeset/long-llamas-cheer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/magento-recently-viewed-products': minor
---

Added recently viewed products hook and render component
9 changes: 9 additions & 0 deletions .changeset/mean-clocks-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@graphcommerce/magento-cart-shipping-address': patch
'@graphcommerce/magento-cart-shipping-method': patch
'@graphcommerce/magento-cart-payment-method': patch
'@graphcommerce/magento-product-bundle': patch
'@graphcommerce/magento-cart-pickup': patch
---

Disabled Ripple on all ActionCard ‘Select’ and ‘Change’ so the rendering is more subtle during checkout.
5 changes: 5 additions & 0 deletions .changeset/odd-poets-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/magento-product': patch
---

Removed unwanted space below ProductListItem images caused by line-height. Images are now perfectly square as expected.
18 changes: 17 additions & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,21 @@
"@graphcommerce/graphql-codegen-relay-optimizer-plugin": "7.0.1",
"@graphcommerce/next-config": "7.0.1",
"@graphcommerce/prettier-config-pwa": "7.0.1",
"@graphcommerce/typescript-config-pwa": "7.0.1"
"@graphcommerce/typescript-config-pwa": "7.0.1",
"@graphcommerce/magento-recently-viewed-products": "7.1.0-canary.44"
},
"changesets": [
"afraid-baboons-move",
"brown-planes-retire",
"chilled-pens-mate",
"chilly-brooms-move",
"curvy-grapes-accept",
"curvy-hairs-suffer",
"eleven-hats-kneel",
"empty-ads-run",
"fifty-impalas-hug",
"fifty-parents-move",
"fifty-taxis-speak",
"flat-emus-look",
"forty-rocks-bow",
"fresh-games-roll",
Expand All @@ -91,10 +96,15 @@
"friendly-islands-cough",
"fuzzy-clocks-hug",
"fuzzy-rings-hug",
"great-fans-thank",
"itchy-snakes-film",
"lazy-seahorses-rhyme",
"little-shirts-film",
"long-llamas-cheer",
"mean-clocks-share",
"new-crews-promise",
"odd-poets-greet",
"quick-queens-rush",
"quiet-tomatoes-melt",
"red-ghosts-cry",
"red-gifts-listen",
Expand All @@ -105,13 +115,19 @@
"serious-fishes-do",
"serious-wasps-itch",
"seven-seas-shop",
"shaggy-singers-flash",
"sharp-apes-burn",
"sharp-shrimps-flow",
"shiny-bikes-kiss",
"six-horses-repeat",
"slow-flies-scream",
"soft-readers-camp",
"soft-trees-leave",
"spicy-squids-compete",
"strong-ants-confess",
"stupid-ears-wink",
"stupid-mice-check",
"tall-candles-watch",
"tall-poems-reflect",
"tall-spies-reflect",
"tall-tips-float",
Expand Down
5 changes: 5 additions & 0 deletions .changeset/quick-queens-rush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/next-config': patch
---

Node.js version of gitpod updated to node 18
5 changes: 5 additions & 0 deletions .changeset/shaggy-singers-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/magento-cart-shipping-address': patch
---

Fixed bug where if the customer created a new address during checkout it would not be persisted when navigating back from the payment step.
5 changes: 5 additions & 0 deletions .changeset/soft-readers-camp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/docs': patch
---

Clarify texts by adding formatting and correcting spelling.
5 changes: 5 additions & 0 deletions .changeset/soft-trees-leave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/ecommerce-ui': minor
---

Only show network errors in development mode.
14 changes: 14 additions & 0 deletions .changeset/spicy-squids-compete.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
'@graphcommerce/magento-cart-email': minor
'@graphcommerce/magento-customer': minor
---

---

'@graphcommerce/magento-cart-email': minor '@graphcommerce/magento-customer': minor

---

Added a new enableGuestCheckoutLogin configuration: During customer login, GraphCommerce queries Magento to determine whether the customer account already exists or not. If not, the sign-up form is shown instead.

To restore previous behavior, set enableGuestCheckoutLogin to true. For Magento versions, 2.4.7, 2.4.6-p1 and up, 2.4.5-p3 and up, 2.4.4-p4 and up, the following setting must be set to Yes: `Stores -> Configuration -> Sales -> Checkout -> Checkout Options -> Enable Guest Checkout Login`
5 changes: 5 additions & 0 deletions .changeset/stupid-ears-wink.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphcommerce/graphql-codegen-markdown-docs': patch
---

Render framework/config.md more nicely, so that we follow a more typescript-esque style, inline enums.
6 changes: 6 additions & 0 deletions .changeset/tall-candles-watch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@graphcommerce/magento-graphcms': patch
'@graphcommerce/magento-product': patch
---

Added Skeleton render type to productListRenderer
4 changes: 3 additions & 1 deletion .github/workflows/merge-main-to-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ jobs:
timeout-minutes: 2
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set Git config
run: |
git config --local user.email "[email protected]"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,25 @@ jobs:
published: ${{ steps.changesets.outputs.published }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: canary
- uses: actions/setup-node@v3
with:
cache: yarn
node-version: 18
registry-url: 'https://registry.npmjs.org'
scope: '@graphcommerce'
- uses: bahmutov/npm-install@v1
with:
useRollingCache: true
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: yarn install && yarn postinstall
run: yarn install && yarn postinstall
- name: set pre canary
run: 'yarn changeset pre enter canary'
continue-on-error: true
- name: run changeset version and commit
run: |
yarn changeset version
yarn install
git pull
git add .
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
Expand Down Expand Up @@ -63,6 +62,7 @@ jobs:
run: |
yarn changeset pre exit
yarn changeset version
yarn install
git add .
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/release-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@ jobs:
published: ${{ steps.changesets.outputs.published }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
cache: yarn
node-version: 18
registry-url: 'https://registry.npmjs.org'
scope: '@graphcommerce'
- uses: bahmutov/npm-install@v1
with:
useRollingCache: true
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: yarn install && yarn postinstall
run: yarn install && yarn postinstall
- name: set version variables
id: vars
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tasks:
- before: nvm install 16
- before: nvm install 18
init: |
cd examples/magento-graphcms
yarn
Expand Down
Loading

0 comments on commit a48ee6c

Please sign in to comment.