Merge branch 'develop' into PWA-3139-V2

CHANGELOG.md

@@ -1,32 +1,45 @@
-# PWA Studio Release 13.1.0
+# PWA Studio Release 13.2.0
 
-**NOTE:**  
-_This changelog only contains release notes for PWA Studio and Venia 13.1.0_  
+**NOTE:**
+_This changelog only contains release notes for PWA Studio and Venia 13.2.0_
 _For older release notes, see_ [PWA Studio releases][].
 
 ## Highlights
 
-- **PHP 8.2 support** — PWA Studio now supports PHP 8.2. GitHub PRs: [4][], [25][], [34][], [5][], [20][], [10][]
-- **Payment method persists** — The chosen payment method now persists throughout the user's session. GitHub PR: [3969][]
-- **Node 18 support** — PWA Studio now supports Node 18.0,0+. GitHub PR: [172][]
+The 13.2.0 release of PWA Studio provides customers with many accessibility improvements for keyboard and screen-reader access, as well as several bug fixes. Full details are described below.
 
-## Additional fixes
+## Accessibility Updates
 
-- Story: [36][] — Updated Zend libraries to respective laminas.
-- Bug: [4028][] — Fixed support for Page Builder column-line content type
-- Bug: [35][] — Fixed an issue that crashed the Categories page when applying a filter.
-- Bug: [4053][] — Fixed an issue that prevented a filter from being applied to the text label.
-- Bug: [4059][] — Fixed an issue where the URL was not updated properly in Page Builder.
-- Bug: [4061][] — Fixed null-network requests that occurred when refreshing the Venia home page.
-- Bug: [4066][] — Fixed fashion-size value to be read by screen readers.
-- Bug: [4049][] —Fixed keyboard access for the Cancel button adjacent to the Create Account button.
-- Bug: [4064][] — Fixed keyboard access to the Sign in button.
-- Bug: [26][] — Fixed Venia sample data cloud deployment with PHP 8.2.
-- Bug: [4052][] — Fixed an issue that caused the Additional Giftcard link to appear in the discounted section.
+-  Story: [4092][] — Sign in > Forget password is working with keyboard Enter key press.
+-  Story: [4100][] — Minicart > Buttons is working with keyboard Enter key press.
+-  Story: [4120][] — Apply Gift Card > Button is working with keyboard Enter key.
+-  Story: [4112][] — Enter Coupon Code > Button is working with keyboard Enter key press.
+-  Story: [4094][] — Apply Gift Card > Link Check Balance button is working now with Enter key press.
+-  Story: [4111][] — Estimate your Shipping > Button is working with keyboard Enter key press.
+-  bug: [4104][] — The screen reader now reads the appropriate message as expected when a shopper clicks Return to  apply a gift card on the cart page without entering a gift card number.
+-  bug: [4104][] — System was getting crashed with unexpected error when pressed Retrun button with invalid Gift card number but now fixed and working without any issue.
 
-## 13.1.0 Lighthouse scores
+## Additional fixes
 
-With each new release of PWA Studio, we perform Lighthouse audits of four Venia page types, each representing a different level of complexity. Shown below are the Lighthouse scores for the 13.1.0 release of these pages on desktop and mobile devices.
+-  Story: [4086][] — Updated to latest @adobe/magento-storefront-event-collector.
+-  Story: [4040][] — Added Dev Container config to improve developer experience.
+-  Story: [4103][] — Updated eventing system to stay compatible with latest AEP schema.
+-  Bug: [4123][] — Edited the Magento2 Backend URL to working url.
+-  Bug: [4121][] — The 'signout' event is now captured.
+-  Bug: [4118][] — PWA Scaffolding Tool uses old version.
+-  Bug: [4084][] — useLink operations empty object destructuring.
+-  Bug: [4115][] — Selecting payment method causing graphql error.
+-  Bug: [4083][] — No results when filtering a category with a composite attribute from layered navigation.
+-  Bug: [4075][] — Venia header/layout broken in offline mode.
+-  Bug: [4124][] — Region required validation is working in pwa according to option selected in Magento.
+-  Bug: [4109][] — Url Rewrite to external URL does not work on PWA.
+-  Bug: [4114][] — PWA shows 404 when having store code in URL.
+-  Bug: [4102][] — When you click on Thumbnail, Add to cart works.
+-  Bug: [4060][] — Search auto populate results not accessible with tab or up/down keys.
+
+## 13.2.0 Lighthouse scores
+
+With each new release of PWA Studio, we perform Lighthouse audits of four Venia page types, each representing a different level of complexity. Shown below are the Lighthouse scores for the 13.2.0 release of these pages on desktop and mobile devices.
 
 ### Desktop scores
 
@@ -50,15 +63,14 @@ With each new release of PWA Studio, we perform Lighthouse audits of four Venia
 |            SEO |     ![](images/score_100.svg)     |      ![](images/score_100.svg)      |     ![](images/score_100.svg)      |     ![](images/score_100.svg)     |
 |            PWA |    ![](images/pwa_perfect.svg)    |    ![](images/pwa_imperfect.svg)    |   ![](images/pwa_imperfect.svg)    |    ![](images/pwa_perfect.svg)    |
 
-## Known issues
 
-- Event data is currently not being stored properly in the database. Our initial investigation concluded that this would affect all PWA Studio customers using Beacon eventing.
+## Known issue
 
-- When a user logs out, that user's local storage session persists. As a result, the cart ID from the logged out user is retrieved and given to the _guest user_ on the computer. This causes the following error when the guest user tries to check out: `An error has occurred. Please check the input and try again.` To resolve this issue, try disabling graphql session sharing as described in the GraphQL documentation on session cookies here: https://devdocs.magento.com/guides/v2.4/graphql/authorization-tokens.html#session-cookies.
+When a user logs out, that user's local storage session persists. As a result, the cart ID from the logged out user is retrieved and given to the _guest user_ on the computer. This causes the following error when the guest user tries to check out: `An error has occurred. Please check the input and try again.` To resolve this issue, try disabling graphql session sharing as described in the GraphQL documentation on session cookies here: https://devdocs.magento.com/guides/v2.4/graphql/authorization-tokens.html#session-cookies.
 
 ## Upgrading from a previous version
 
-Use the steps outlined in this section to update your [scaffolded project][] from 13.0.0 to 13.1.0.
+Use the steps outlined in this section to update your [scaffolded project][] from 13.1.0 to 13.2.0.
 See [Upgrading versions][] for more information about upgrading between PWA Studio versions.
 
 [scaffolded project]: https://developer.adobe.com/commerce/pwa-studio/tutorials/
@@ -67,53 +79,60 @@ See [Upgrading versions][] for more information about upgrading between PWA Stud
 ### Updated package dependencies
 
 Open your `package.json` file and update the PWA Studio package dependencies to the versions associated with this release.
-The following table lists the latest versions of each package as of 13.1.0. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 13.0.0.
+The following table lists the latest versions of each package as of 13.2.0. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 13.1.0.
 
-**Note:**
+**NOTE:**
 Your project may not depend on some packages listed in this table.
 
+**[UPDATE THIS TABLE WITH THE LATEST VERSIONS OF EACH PACKAGE]**
+
 | Package                                | Latest version |
 |----------------------------------------|----------------|
 | `babel-preset-peregrine`               | 1.2.2          |
-| `create-pwa`                           | **2.3.5***     |
-| `experience-platform-connector`        | **1.0.4***     |
-| `upward-security-headers`              | **1.0.13***    |
-| `venia-sample-backends`                | 0.0.9          |
-| `venia-sample-eventing`                | **0.0.5***     |
-| `venia-sample-language-packs`          | **0.0.13***    |
-| `venia-sample-payments-checkmo`        | **0.0.11***    |
-| `pagebuilder`                          | **8.1.0***     |
-| `peregrine`                            | **13.0.1***    |
-| `pwa-buildpack`                        | 11.4.1         |
+| `create-pwa`                           | **2.4.5***     |
+| `experience-platform-connector`        | **1.0.5***     |
+| `upward-security-headers`              | **1.0.14***    |
+| `venia-sample-backends`                | 0.0.10          |
+| `venia-sample-eventing`                | **0.0.6***     |
+| `venia-sample-language-packs`          | **0.0.14***    |
+| `venia-sample-payments-checkmo`        | **0.0.12***    |
+| `pagebuilder`                          | **8.2.0***     |
+| `peregrine`                            | **13.1.1***    |
+| `pwa-buildpack`                        | 11.4.2        |
 | `pwa-theme-venia`                      | 1.4.0          |
 | `upward-js`                            | 5.3.2          |
 | `upward-spec`                          | 5.2.1          |
-| `venia-concept`                        | **13.1.0***    |
-| `venia-ui`                             | **10.1.0***    |
-| `magento2-pwa`                         | **0.5.0***          |
-| `magento2-pwa-commerce`                | **0.0.3***          |
-| `magento-venia-sample-data-modules`    | **0.0.4***          |
-| `magento-venia-sample-data-modules-ee` | **0.0.3***          |
-| `magento2-upward-connector`            | **2.0.2***          |
-| `upward-php`                           | **2.0.2***          |
-
-[4]: https://github.com/magento-commerce/venia-sample-data-modules-ee/pull/4
-[25]: https://github.com/magento-commerce/venia-sample-data-modules/pull/25
-[34]: https://github.com/magento-commerce/magento2-pwa/pull/34
-[5]: https://github.com/magento-commerce/magento2-pwa-commerce/pull/5
-[20]: https://github.com/magento-commerce/magento2-upward-connector/pull/20
-[10]: https://github.com/magento-commerce/upward-php/pull/10
-[3969]: https://github.com/magento/pwa-studio/pull/3969
-[4028]: https://github.com/magento/pwa-studio/pull/4028
-[35]: https://github.com/magento-commerce/magento2-pwa/pull/35
-[4053]: https://github.com/magento/pwa-studio/pull/4053
-[172]: https://github.com/AdobeDocs/commerce-pwa-studio/pull/172
-[4059]: https://github.com/magento/pwa-studio/pull/4059
-[4061]: https://github.com/magento/pwa-studio/pull/4061
-[4066]: https://github.com/magento/pwa-studio/pull/4066
-[4049]: https://github.com/magento/pwa-studio/pull/4049
-[4064]: https://github.com/magento/pwa-studio/pull/4064
-[26]: https://github.com/magento-commerce/venia-sample-data-modules/pull/26
-[4052]: https://github.com/magento/pwa-studio/pull/4052
-[36]: https://github.com/magento-commerce/magento2-pwa/pull/36
+| `venia-concept`                        | **13.2.0***    |
+| `venia-ui`                             | **10.2.0***    |
+| `magento2-pwa`                         | 0.5.1          |
+| `magento2-pwa-commerce`                | 0.0.3          |
+| `magento-venia-sample-data-modules`    | 0.0.4         |
+| `magento-venia-sample-data-modules-ee` | 0.0.3          |
+| `magento2-upward-connector`            | 2.0.2         |
+| `upward-php`                           | 2.0.2          |
+
+[4092]: https://github.com/magento/pwa-studio/pull/4092
+[4100]: https://github.com/magento/pwa-studio/pull/4100
+[4086]: https://github.com/magento/pwa-studio/pull/4086
+[4040]: https://github.com/magento/pwa-studio/pull/4040
+[4103]: https://github.com/magento/pwa-studio/pull/4103
+[4094]: https://github.com/magento/pwa-studio/pull/4094
+[4120]: https://github.com/magento/pwa-studio/pull/4120
+[4112]: https://github.com/magento/pwa-studio/pull/4112
+[4111]: https://github.com/magento/pwa-studio/pull/4111
+[4104]: https://github.com/magento/pwa-studio/pull/4104
+[4123]: https://github.com/magento/pwa-studio/pull/4123
+[134]: https://github.com/magento-commerce/pwa-studio-cicd/pull/134
+[4121]: https://github.com/magento/pwa-studio/pull/4121
+[4118]: https://github.com/magento/pwa-studio/pull/4118
+[4084]: https://github.com/magento/pwa-studio/pull/4084
+[4115]: https://github.com/magento/pwa-studio/pull/4115
+[4083]: https://github.com/magento/pwa-studio/pull/4083
+[4075]: https://github.com/magento/pwa-studio/pull/4075
+[4124]: https://github.com/magento/pwa-studio/pull/4124
+[4109]: https://github.com/magento/pwa-studio/pull/4109
+[4114]: https://github.com/magento/pwa-studio/pull/4114
+[4102]: https://github.com/magento/pwa-studio/pull/4102
+[4060]: https://github.com/magento/pwa-studio/pull/4060
+
 [PWA Studio releases]: https://github.com/magento/pwa-studio/releases

magento-compatibility.js

@@ -4,6 +4,7 @@
 
 // PWA Studio version -> Magento version.
 module.exports = {
+    '13.2.0': '2.4.7-beta1',
     '13.1.0': '2.4.6',
     '13.0.0': '2.4.5',
     '12.7.0': '2.4.5',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/pwa-studio",
-  "version": "13.1.0",
+  "version": "13.2.0",
   "private": true,
   "workspaces": [
     "packages/babel-preset-peregrine",

packages/create-pwa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/create-pwa",
-  "version": "2.3.5",
+  "version": "2.4.5",
   "publishConfig": {
     "access": "public"
   },
@@ -29,8 +29,8 @@
   },
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme",
   "dependencies": {
-    "@magento/pwa-buildpack": "~11.4.1",
-    "@magento/venia-concept": "~13.1.0",
+    "@magento/pwa-buildpack": "~11.4.2",
+    "@magento/venia-concept": "~13.2.0",
     "chalk": "^2.4.2",
     "change-case": "^3.1.0",
     "compression": "~1.7.4",

packages/extensions/experience-platform-connector/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/experience-platform-connector",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -18,8 +18,8 @@
   "devDependencies": {},
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
-    "@magento/peregrine": "~13.0.1",
-    "@magento/pwa-buildpack": "~11.4.1",
+    "@magento/peregrine": "~13.1.1",
+    "@magento/pwa-buildpack": "~11.4.2",
     "react": "~17.0.1"
   },
   "pwa-studio": {

packages/extensions/upward-security-headers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/upward-security-headers",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "publishConfig": {
     "access": "public"
   },
@@ -13,8 +13,8 @@
   "author": "Adobe Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~11.4.1",
-    "@magento/venia-ui": "~10.1.0",
+    "@magento/pwa-buildpack": "~11.4.2",
+    "@magento/venia-ui": "~10.2.0",
     "webpack": "~4.46.0"
   },
   "pwa-studio": {

packages/extensions/venia-sample-backends/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-backends",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "publishConfig": {
     "access": "public"
   },
@@ -13,7 +13,7 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~11.4.1",
+    "@magento/pwa-buildpack": "~11.4.2",
     "node-fetch": "~2.3.0"
   },
   "pwa-studio": {

packages/extensions/venia-sample-eventing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-eventing",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "publishConfig": {
     "access": "public"
   },
@@ -12,8 +12,8 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~13.0.1",
-    "@magento/pwa-buildpack": "~11.4.1",
+    "@magento/peregrine": "~13.1.1",
+    "@magento/pwa-buildpack": "~11.4.2",
     "react": "~17.0.1"
   },
   "pwa-studio": {

packages/extensions/venia-sample-language-packs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-language-packs",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "publishConfig": {
     "access": "public"
   },
@@ -12,8 +12,8 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~11.4.1",
-    "@magento/venia-ui": "~10.1.0"
+    "@magento/pwa-buildpack": "~11.4.2",
+    "@magento/venia-ui": "~10.2.0"
   },
   "pwa-studio": {
     "targets": {

packages/extensions/venia-sample-payments-checkmo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-payments-checkmo",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "publishConfig": {
     "access": "public"
   },
@@ -12,9 +12,9 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~13.0.1",
-    "@magento/pwa-buildpack": "~11.4.1",
-    "@magento/venia-ui": "~10.1.0",
+    "@magento/peregrine": "~13.1.1",
+    "@magento/pwa-buildpack": "~11.4.2",
+    "@magento/venia-ui": "~10.2.0",
     "react": "~17.0.1",
     "react-intl": "~5.20.0",
     "react-router-dom": "~5.2.0"

packages/pagebuilder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/pagebuilder",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "publishConfig": {
     "access": "public"
   },
@@ -34,9 +34,9 @@
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme",
   "dependencies": {},
   "devDependencies": {
-    "@magento/peregrine": "~13.0.1",
-    "@magento/pwa-buildpack": "~11.4.1",
-    "@magento/venia-ui": "~10.1.0",
+    "@magento/peregrine": "~13.1.1",
+    "@magento/pwa-buildpack": "~11.4.2",
+    "@magento/venia-ui": "~10.2.0",
     "@storybook/react": "~6.3.7",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
@@ -50,9 +50,9 @@
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
     "@magento/babel-preset-peregrine": "~1.2.2",
-    "@magento/peregrine": "~13.0.1",
-    "@magento/pwa-buildpack": "~11.4.1",
-    "@magento/venia-ui": "~10.1.0",
+    "@magento/peregrine": "~13.1.1",
+    "@magento/pwa-buildpack": "~11.4.2",
+    "@magento/venia-ui": "~10.2.0",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
     "lodash.escape": "~4.0.1",

packages/peregrine/lib/talons/Header/cartTriggerFragments.gql.js

@@ -4,5 +4,6 @@ export const CartTriggerFragment = gql`
     fragment CartTriggerFragment on Cart {
         id
         total_quantity
+        total_summary_quantity_including_config
     }
 `;

packages/peregrine/lib/talons/Header/useCartTrigger.js

@@ -52,7 +52,7 @@ export const useCartTrigger = props => {
         errorPolicy: 'all'
     });
 
-    const itemCount = data?.cart?.total_quantity || 0;
+    const itemCount = data?.cart?.total_summary_quantity_including_config || 0;
 
     const handleTriggerClick = useCallback(() => {
         // Open the mini cart.

packages/peregrine/lib/talons/ProductFullDetail/productFullDetail.gql.ce.js

@@ -11,6 +11,10 @@ export const ADD_PRODUCT_TO_CART = gql`
                 ...CartTriggerFragment
                 ...MiniCartFragment
             }
+            user_errors {
+                code
+                message
+            }
         }
     }
     ${CartTriggerFragment}