Merge branch 'canary' into fix/windows-install

# Conflicts: # yarn.lock
graphcommerce-org · Nov 23, 2023 · 34a1dfb · 34a1dfb
2 parents 1b8baf7 + 8402562
commit 34a1dfb
Show file tree

Hide file tree

Showing 179 changed files with 2,755 additions and 1,684 deletions.
diff --git a/.changeset/chilled-pens-mate.md b/.changeset/chilled-pens-mate.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/graphcms-ui': patch
+---
+
+Add alt text to image inside rich text
diff --git a/.changeset/great-fans-thank.md b/.changeset/great-fans-thank.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+When releasing there will be changes to the yarn.lock file, but those weren't committed.
diff --git a/.changeset/mean-clocks-share.md b/.changeset/mean-clocks-share.md
@@ -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.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -79,6 +79,7 @@
   "changesets": [
     "afraid-baboons-move",
     "brown-planes-retire",
+    "chilled-pens-mate",
     "chilly-brooms-move",
     "curvy-grapes-accept",
     "curvy-hairs-suffer",
@@ -95,12 +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",
@@ -111,11 +115,13 @@
     "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-trees-leave",
     "strong-ants-confess",
     "stupid-ears-wink",
     "stupid-mice-check",

diff --git a/.changeset/quick-queens-rush.md b/.changeset/quick-queens-rush.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+Node.js version of gitpod updated to node 18
diff --git a/.changeset/shaggy-singers-flash.md b/.changeset/shaggy-singers-flash.md
@@ -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.
diff --git a/.changeset/soft-trees-leave.md b/.changeset/soft-trees-leave.md
@@ -0,0 +1,5 @@
+---
+'@graphcommerce/ecommerce-ui': minor
+---
+
+Only show network errors in development mode.
diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml
@@ -30,6 +30,7 @@ jobs:
       - 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"
@@ -61,6 +62,7 @@ jobs:
         run: |
           yarn changeset pre exit
           yarn changeset version
+          yarn install
           git add .
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,5 +1,5 @@
 tasks:
-  - before: nvm install 16
+  - before: nvm install 18
     init: |
       cd examples/magento-graphcms
       yarn

diff --git a/.yarn/releases/yarn-4.0.1.cjs → .yarn/releases/yarn-4.0.2.cjs b/.yarn/releases/yarn-4.0.1.cjs → .yarn/releases/yarn-4.0.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,3 +1,5 @@
+enableImmutableInstalls: false
+
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## 7.1.0-canary.51
+
+## 7.1.0-canary.50
+
+## 7.1.0-canary.49
+
+## 7.1.0-canary.48
+
+## 7.1.0-canary.47
+
+## 7.1.0-canary.46
+
 ## 7.1.0-canary.45
 
 ## 7.1.0-canary.38

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": "7.1.0-canary.45",
+  "version": "7.1.0-canary.51",
   "sideEffects": true,
   "peerDependencies": {
-    "@graphcommerce/prettier-config-pwa": "^7.1.0-canary.45"
+    "@graphcommerce/prettier-config-pwa": "^7.1.0-canary.51"
   },
   "prettier": "@graphcommerce/prettier-config-pwa"
 }
diff --git a/examples/magento-graphcms/CHANGELOG.md b/examples/magento-graphcms/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## 7.1.0-canary.51
+
+## 7.1.0-canary.50
+
+## 7.1.0-canary.49
+
+## 7.1.0-canary.48
+
+## 7.1.0-canary.47
+
+## 7.1.0-canary.46
+
 ## 7.1.0-canary.45
 
 ### Patch Changes

diff --git a/examples/magento-graphcms/locales/de.po b/examples/magento-graphcms/locales/de.po
@@ -307,6 +307,9 @@ msgstr "Ungültige E-Mail-Adresse"
 msgid "Invalid phone number"
 msgstr "Ungültige Telefonnummer"
 
+msgid "It appears you are offline, please try again later."
+msgstr "Es scheint, dass Sie offline sind, bitte versuchen Sie es später erneut."
+
 msgid "Last Name"
 msgstr "Nachname"
 
@@ -421,15 +424,15 @@ msgstr "Bestellen Sie vor 22:00 Uhr"
 msgid "Order date"
 msgstr "Auftragsdatum"
 
+msgid "Order details"
+msgstr "Bestelldetails"
+
 msgid "Order not found"
 msgstr "Bestellung nicht gefunden"
 
 msgid "Order number"
 msgstr "Bestellnummer"
 
-msgid "Order status"
-msgstr "Bestellstatus"
-
 msgid "Order summary"
 msgstr "Bestellübersicht"
 
@@ -619,6 +622,12 @@ msgstr "Abonnieren Sie unseren Newsletter und bleiben Sie auf dem Laufenden"
 msgid "Some items in your cart contain errors, please update or remove them, then try again."
 msgstr "Einige Artikel im Warenkorb enthalten Fehler, bitte aktualisieren oder entfernen Sie diese, und versuchen Sie es erneut."
 
+msgid "Something went wrong"
+msgstr "Etwas ist schief gelaufen"
+
+msgid "Something went wrong on the server, please try again later."
+msgstr "Auf dem Server ist ein Fehler aufgetreten, bitte versuchen Sie es später erneut."
+
 msgid "Sort"
 msgstr "Sortieren"
 

diff --git a/examples/magento-graphcms/locales/en.po b/examples/magento-graphcms/locales/en.po
@@ -307,6 +307,9 @@ msgstr "Invalid email address"
 msgid "Invalid phone number"
 msgstr "Invalid phone number"
 
+msgid "It appears you are offline, please try again later."
+msgstr "It appears you are offline, please try again later."
+
 msgid "Last Name"
 msgstr "Last Name"
 
@@ -421,15 +424,15 @@ msgstr "Order before 22:00"
 msgid "Order date"
 msgstr "Order date"
 
+msgid "Order details"
+msgstr "Order details"
+
 msgid "Order not found"
 msgstr "Order not found"
 
 msgid "Order number"
 msgstr "Order number"
 
-msgid "Order status"
-msgstr "Order status"
-
 msgid "Order summary"
 msgstr "Order summary"
 
@@ -619,6 +622,12 @@ msgstr "Sign up for our newsletter and stay updated"
 msgid "Some items in your cart contain errors, please update or remove them, then try again."
 msgstr "Some items in your cart contain errors, please update or remove them, then try again."
 
+msgid "Something went wrong"
+msgstr "Something went wrong"
+
+msgid "Something went wrong on the server, please try again later."
+msgstr "Something went wrong on the server, please try again later."
+
 msgid "Sort"
 msgstr "Sort"
 

diff --git a/examples/magento-graphcms/locales/es.po b/examples/magento-graphcms/locales/es.po
@@ -307,6 +307,9 @@ msgstr "Dirección de correo electrónico no válida"
 msgid "Invalid phone number"
 msgstr "Número de teléfono no válido"
 
+msgid "It appears you are offline, please try again later."
+msgstr "Parece que estás desconectado, por favor inténtalo de nuevo más tarde."
+
 msgid "Last Name"
 msgstr "Apellido"
 
@@ -421,15 +424,15 @@ msgstr "Pedido antes de las 22:00"
 msgid "Order date"
 msgstr "Besteldatum"
 
+msgid "Order details"
+msgstr "Detalles del pedido"
+
 msgid "Order not found"
 msgstr "fecha de orden"
 
 msgid "Order number"
 msgstr "Número de pedido"
 
-msgid "Order status"
-msgstr "Estado del pedido"
-
 msgid "Order summary"
 msgstr "Resumen del pedido"
 
@@ -619,6 +622,12 @@ msgstr "Regístrese para nuestro boletín y manténgase actualizado"
 msgid "Some items in your cart contain errors, please update or remove them, then try again."
 msgstr "Algunos artículos de su carrito contienen errores, actualícelos o elimínelos y vuelva a intentarlo."
 
+msgid "Something went wrong"
+msgstr "Algo salió mal"
+
+msgid "Something went wrong on the server, please try again later."
+msgstr "Algo salió mal en el servidor, por favor inténtelo de nuevo más tarde."
+
 msgid "Sort"
 msgstr "Ordenar"
 

diff --git a/examples/magento-graphcms/locales/fr.po b/examples/magento-graphcms/locales/fr.po
@@ -307,6 +307,9 @@ msgstr "Adresse email invalide"
 msgid "Invalid phone number"
 msgstr "Numéro de téléphone invalide"
 
+msgid "It appears you are offline, please try again later."
+msgstr "Il semble que vous soyez hors ligne, veuillez réessayer plus tard."
+
 msgid "Last Name"
 msgstr "Nom"
 
@@ -421,15 +424,15 @@ msgstr "Commandez avant 22:00"
 msgid "Order date"
 msgstr "Date de commande"
 
+msgid "Order details"
+msgstr "Détails de la commande"
+
 msgid "Order not found"
 msgstr "Commande non trouvée"
 
 msgid "Order number"
 msgstr "Numéro de commande"
 
-msgid "Order status"
-msgstr "Statut de la commande"
-
 msgid "Order summary"
 msgstr "Résumé de la commande"
 
@@ -619,6 +622,12 @@ msgstr "Inscrivez-vous à notre newsletter et restez à jour"
 msgid "Some items in your cart contain errors, please update or remove them, then try again."
 msgstr "Certains articles de votre panier contiennent des erreurs, veuillez les mettre à jour ou les supprimer, puis réessayer."
 
+msgid "Something went wrong"
+msgstr "Quelque chose s'est mal passé"
+
+msgid "Something went wrong on the server, please try again later."
+msgstr "Quelque chose s'est mal passé sur le serveur, veuillez réessayer plus tard."
+
 msgid "Sort"
 msgstr "Trier"
 

diff --git a/examples/magento-graphcms/locales/it.po b/examples/magento-graphcms/locales/it.po
@@ -307,6 +307,9 @@ msgstr "Indirizzo email non valido"
 msgid "Invalid phone number"
 msgstr "Numero di telefono non valido"
 
+msgid "It appears you are offline, please try again later."
+msgstr "Sembra che tu sia offline, riprova più tardi."
+
 msgid "Last Name"
 msgstr "Cognome"
 
@@ -421,15 +424,15 @@ msgstr "Ordina prima delle 22:00"
 msgid "Order date"
 msgstr "data dell'ordine"
 
+msgid "Order details"
+msgstr "Dettagli dell'ordine"
+
 msgid "Order not found"
 msgstr "Ordine non trovato"
 
 msgid "Order number"
 msgstr "Numero ordine"
 
-msgid "Order status"
-msgstr "Stato ordine"
-
 msgid "Order summary"
 msgstr "Riepilogo ordine"
 
@@ -619,6 +622,12 @@ msgstr "Iscriviti alla nostra newsletter e rimani aggiornato"
 msgid "Some items in your cart contain errors, please update or remove them, then try again."
 msgstr "Alcuni articoli nel tuo carrello contengono errori, aggiorna o rimuovi e riprova."
 
+msgid "Something went wrong"
+msgstr "Qualcosa è andato storto"
+
+msgid "Something went wrong on the server, please try again later."
+msgstr "Qualcosa è andato storto sul server, riprova più tardi."
+
 msgid "Sort"
 msgstr "Ordinare"