Merge remote-tracking branch 'origin/fix/multisafepay' into remove-is…

…suers-from-ideal

.changeset/beige-suns-know.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/react-hook-form': patch
+---
+
+Remove dependency on Magento for @graphcommerec/react-hook-form

.changeset/brave-penguins-love.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-cms': patch
+---
+
+Convert home to render the home CmsPage and add page/[…url] route for additional pages.

.changeset/clean-houses-notice.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-payment-multisafepay': patch
+---
+
+Remove issuers field from MultiSafePay in preparation for iDeal 2. Please not that this change requires an upgrade to the Magento module as well.

.changeset/cold-eggs-visit.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+When a dependency is optional or has peerDependenciesMeta set to optional, make sure it doesn't crash when it is not found when calling resolveDependenciesSync

.changeset/cold-readers-design.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-cart-checkout': patch
+---
+
+Prevent rendering "You have not placed an order" before the router resolves.

.changeset/eighty-pianos-protect.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+Remove redirects for `/product/$type/[url]` routes, those haven't been used for years anymore.

.changeset/gentle-rules-learn.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-cms': patch
+---
+
+Added support for loading CMS Pages from Magento

.changeset/gold-eels-report.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/hygraph-ui': patch
+---
+
+Prepare the RichTex for embed and code-block

.changeset/green-guests-kick.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/hygraph-ui': patch
+---
+
+Forward `<Asset unoptimized />` component to `<Image />`

.changeset/hip-buckets-raise.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-ui': patch
+---
+
+Nesting multiple Containers will not increase the padding, will only be applied once.

.changeset/late-paws-smell.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+Solve issue where withGraphCommerce had a hard dependency on Magento specific configurations

.changeset/lemon-sloths-approve.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-cart-coupon': patch
+---
+
+Forward props to CouponAccordion

.changeset/mighty-swans-return.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/algolia-insights': patch
+---
+
+Solve issue where the useSendEventAlgolia hook would sometimes throw an error during purchase

.changeset/pre.json

@@ -90,16 +90,37 @@
     "@graphcommerce/typescript-config-pwa": "9.0.3"
   },
   "changesets": [
+    "beige-suns-know",
+    "brave-penguins-love",
+    "cold-eggs-visit",
+    "cold-readers-design",
+    "eighty-pianos-protect",
     "empty-files-stare",
     "four-needles-invent",
     "funny-crabs-fix",
+    "gentle-rules-learn",
+    "gold-eels-report",
     "gorgeous-baboons-learn",
+    "green-guests-kick",
     "heavy-guests-mix",
     "heavy-squids-build",
+    "hip-buckets-raise",
+    "late-paws-smell",
+    "lemon-sloths-approve",
     "quiet-bees-exist",
+    "rare-horses-cheer",
+    "red-lies-drive",
+    "serious-glasses-call",
+    "shaggy-ligers-obey",
+    "shiny-pillows-love",
+    "silly-tigers-scream",
     "six-cheetahs-repeat",
+    "spicy-shrimps-battle",
+    "strange-turkeys-sort",
     "tender-guests-refuse",
     "thick-parents-joke",
-    "wicked-planets-call"
+    "wicked-carpets-tie",
+    "wicked-planets-call",
+    "wicked-stingrays-buy"
   ]
 }

.changeset/rare-horses-cheer.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-cart': patch
+---
+
+Solve issue where the total of the cart was zero due to discount or store credit the user couldn't proceed to the checkout. We now check for items and errors instead of the total.

.changeset/red-lies-drive.md

@@ -0,0 +1,7 @@
+---
+'@graphcommerce/magento-graphcms': patch
+'@graphcommerce/magento-open-source': patch
+'@graphcommerce/misc': patch
+---
+
+Solve issue where the performanceLink was only activated during production while it should have been during development.

.changeset/serious-glasses-call.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/hygraph-cli': patch
+---
+
+Migrated `@graphcommerce/hygraph-cli` package to `"type": "module"`

.changeset/shaggy-ligers-obey.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/misc': patch
+---
+
+Added missing WebWorker tsconfig for magento-open-source example

.changeset/shiny-pillows-love.md

@@ -0,0 +1,6 @@
+---
+'@graphcommerce/googletagmanager': patch
+'@graphcommerce/googleanalytics': patch
+---
+
+Remove dependencies from `@graphcommerce/googletagmanager` and `@graphcommerce/googleanalytics` on Magento packages and make the datalayer optional

.changeset/silly-tigers-scream.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/magento-category': patch
+---
+
+Move the category fragment to the category prop

.changeset/spicy-shrimps-battle.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+Remove rewriteLegacyEnv as that hasn't been used for years

.changeset/strange-turkeys-sort.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/graphql-mesh': patch
+---
+
+GraphQL Mesh will now be in read-only mode by default, so only a single instance is created globally. This means it doesn't get recreated on each page compilation and fast refresh. Creating the instance is an expensive operation and can take multiple seconds and during development (and this can happen multiple times during a single change). Now only a single instance is created during development. To make sure changes are picked up during development set the config value `graphqlMeshEditMode: true` in your graphcommerce.config.js or set the env variable `GC_GRAPHQL_MESH_EDIT_MODE=1`. This is the same as the old behavior and this _will_ make the frontend considerably slower.

.changeset/wicked-carpets-tie.md

@@ -0,0 +1,6 @@
+---
+'@graphcommerce/magento-open-source': patch
+'@graphcommerce/misc': patch
+---
+
+Solve issue where plurals weren't properly defined

.changeset/wicked-stingrays-buy.md

@@ -0,0 +1,5 @@
+---
+'@graphcommerce/next-config': patch
+---
+
+Migrated `@graphcommerce/next-config` package to `"type": "module"`

docs/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 9.0.4-canary.10
+
+## 9.0.4-canary.9
+
+## 9.0.4-canary.8
+
+## 9.0.4-canary.7
+
+## 9.0.4-canary.6
+
+## 9.0.4-canary.5
+
 ## 9.0.4-canary.4
 
 ## 9.0.4-canary.3

docs/feature-list.md

@@ -203,7 +203,7 @@ Features taken from the Magento Commerce 2 Feature List
 - [x] Zoom-in on product images.
 - [ ] Display product videos from YouTube or Vimeo. — [Todo]
 - [x] Include swatches to show colors, fabrics, and more.
-- [ ] Show multiple products in a grouped view. — [Todo]
+- [x] Show multiple products in a grouped view. — [Todo]
 - [x] Indicate stock availability.
 - [x] Set related products, up-sell, and cross-sell recommendations to increase
       average order value.
@@ -276,7 +276,7 @@ Features taken from the Magento Commerce 2 Feature List
       emails.
 - [x] Build customer relationships by creating newsletters and managing their
       distribution.
-- [ ] Connect with customers with a Contact Us form. — [Todo]
+- [x] Connect with customers with a Contact Us form.
 
 ### Customer loyalty
 
@@ -305,10 +305,11 @@ Features taken from the Magento Commerce 2 Feature List
 - [x] Choose default billing and shipping addresses.
 - [x] Store unlimited addresses in the address book.
 - [x] See order status and history.
-- [ ] Re-order from the customer account. — [Todo]
+- [x] Re-order from the customer account.
 - [x] View recently ordered items.
-- [ ] Track available store credits, gift card totals, and reward points. —
-      [Commerce]
+- [x] Track available store credits — [Commerce]
+- [ ] Track gift card totals — [Commerce]
+- [ ] Track reward points — [Commerce]
 - [x] Manage newsletter subscriptions.
 - [x] View submitted product reviews.
 - [ ] Access downloadable/digital products. — [Todo]

docs/framework/config.md

@@ -251,6 +251,11 @@ The Google Tagmanager ID to be used on the site.
 
 This value is required even if you are configuring different values for each locale.
 
+#### graphqlMeshEditMode: boolean = `false`
+
+The GraphQL Mesh will be loaded once and any modifications to resolvers will be ignored. When developing
+new resolvers this should be set to true.
+
 #### hygraphManagementApi: string
 
 Hygraph Management API. **Only used for migrations.**

docs/framework/mesh.md

@@ -27,7 +27,8 @@ To make modifications to the Mesh configuration, you can:
 ### Modify the meshrc.yaml:
 
 You can always modify the base configuration of the Mesh by modifying the
-`meshrc.yaml` file.
+`meshrc.yaml` file. After making always run `yarn codegen` (this can be in a
+separate terminal and nextjs will reload it).
 
 ### Write a plugin:
 
@@ -61,6 +62,33 @@ export const meshConfig: FunctionPlugin<typeof meshConfigBase> = (
         },
       },
     ],
+    additionalResolvers: [
+      ...(baseConfig.additionalResolvers ?? []),
+      'lib/resolvers/my-feature.ts',
+    ],
   })
 }
 ```
+
+### Creating additional schema's
+
+During development it might come in handy to write schema extensions even before
+any backend work has been done. `AnyFile.graphqls` in the graphql directory will
+automatically be picked up and merged with the rest of the schema.
+
+### Creating additional resolvers
+
+In the plugin add additionalResolvers and point to your ts file where the
+resolver is.
+
+```tsx
+// This MUST be a type import, else there will be a circular dependency.
+import type { Resolvers } from '@graphcommerce/graphql-mesh'
+
+const resolvers: Resolvers = {}
+```
+
+To make sure changes are picked up during development set the config value
+`graphqlMeshEditMode: true` in your graphcommerce.config.js or set the env
+variable `GC_GRAPHQL_MESH_EDIT_MODE=1`. This _will_ make the frontend
+considerably slower.

docs/package.json

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

examples/magento-graphcms/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## 9.0.4-canary.10
+
+## 9.0.4-canary.9
+
+## 9.0.4-canary.8
+
+## 9.0.4-canary.7
+
+## 9.0.4-canary.6
+
+### Patch Changes
+
+- [#2478](https://github.com/graphcommerce-org/graphcommerce/pull/2478) [`16a3b73`](https://github.com/graphcommerce-org/graphcommerce/commit/16a3b73af173695605a0e8dfaa57777391e8b99d) - Solve issue where the performanceLink was only activated during production while it should have been during development. ([@paales](https://github.com/paales))
+
+## 9.0.4-canary.5
+
 ## 9.0.4-canary.4
 
 ## 9.0.4-canary.3

examples/magento-graphcms/components/ProductListLayout/ProductListLayoutClassic.tsx

@@ -47,7 +47,7 @@ export const ProductListLayoutClassic = memoDeep((props: ProductListLayoutProps)
           </LayoutTitle>
           <CategoryDescription
             sx={(theme) => ({ textAlign: 'center', mb: theme.spacings.sm })}
-            description={category?.description}
+            category={category}
           />
           <CategoryChildren
             params={params}

examples/magento-graphcms/components/ProductListLayout/ProductListLayoutDefault.tsx

@@ -71,7 +71,7 @@ export const ProductListLayoutDefault = memoDeep((props: ProductListLayoutProps)
               textAlignMd='center'
               textAlignSm='center'
               sx={(theme) => ({ px: theme.page.horizontal })}
-              description={category?.description}
+              category={category}
             />
             <CategoryChildren
               sx={(theme) => ({

examples/magento-graphcms/components/ProductListLayout/ProductListLayoutSidebar.tsx

@@ -95,11 +95,7 @@ export const ProductListLayoutSidebar = memoDeep((props: ProductListLayoutProps)
             <>
               <Typography variant='h1'>{title}</Typography>
 
-              <CategoryDescription
-                textAlignMd='start'
-                textAlignSm='start'
-                description={category?.description}
-              />
+              <CategoryDescription textAlignMd='start' textAlignSm='start' category={category} />
               <MediaQuery query={(theme) => theme.breakpoints.down('md')}>
                 <CategoryChildren params={params}>{category?.children}</CategoryChildren>
               </MediaQuery>

examples/magento-graphcms/lib/graphql/graphqlSsrClient.ts

@@ -25,7 +25,7 @@ function client(context: GetStaticPropsContext, fetchPolicy: FetchPolicy = 'no-c
 
   return new ApolloClient({
     link: ApolloLink.from([
-      ...(process.env.NODE_ENV === 'production' ? [measurePerformanceLink] : []),
+      ...(process.env.NODE_ENV !== 'production' ? [measurePerformanceLink] : []),
       errorLink,
       ...config.links,
       new MeshApolloLink(getBuiltMesh()),

examples/magento-graphcms/locales/nl.po

@@ -19,7 +19,7 @@ msgstr "Dit zal al uw gegevens verwijderen, inclusief bestelgeschiedenis en opge
 
 #. js-lingui-generated-id
 msgid "{0, plural, one {<0>{addedItems}</0> has been added to your shopping cart} two {<1>{addedItems}</1> have been added to your shopping cart!} other {# products have been added to your shopping cart!}}"
-msgstr "{0, plural, one {<0>{addedItems}</0> is toegevoegd aan uw winkelwagen} two {<1>{addedItems}</1> is toegevoegd aan uw winkelwagen!} other {# producten zijn toegevoegd aan uw winkelwagen!}}"
+msgstr "{0, plural, one {<0>{addedItems}</0> is toegevoegd aan je winkelwagen} two {<1>{addedItems}</1> zijn toegevoegd aan je winkelwagen!} other {# producten zijn toegevoegd aan je winkelwagen!}}"
 
 #. js-lingui-generated-id
 msgid "I understand that my account will be deleted and this can not be undone."