Merge branch 'develop' into PWA-3162-V3

CHANGELOG.md

@@ -1,45 +1,41 @@
-# PWA Studio Release 13.2.0
+# PWA Studio Release 13.3.0
 
 **NOTE:**
-_This changelog only contains release notes for PWA Studio and Venia 13.2.0_
+_This changelog only contains release notes for PWA Studio and Venia 13.3.0_
 _For older release notes, see_ [PWA Studio releases][].
 
 ## Highlights
 
-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.
+The 13.3.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.
 
 ## Accessibility Updates
 
--  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.
+-  Bug: [4172][] — Reading wrong quantity into sub-folder of My account even when havnig atleast 1 item or more or zero has been fixed.
+-  Bug: [4131][] — Once the account is created and the logged in users are announced as "Hi <username>" and the moment you press tab it highlight the area and announces as "Toggle my account menu button expanded"
 
 ## Additional fixes
 
--  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.
+-  Story: [4173][] — Price filter is now showing currency symbol
+-  Story: [4090][] — Added additional user_errors parameter for cart addition and show error message if reported by Adobe Commerce.
+-  Bug: [43][] — EAV attribute option loading Performance Issue resolved
+-  Bug: [4124][] — Region is required in PWA even if this option is disabled in Magento has been fixed
+-  Bug: [41][] - System is able to navigate to layered URL based on search term
+-  Bug: [4168][] — System is able to navigate to layered URL based on search term
+-  Bug: [4133][] — User is able to access category/subcategory pages even while active search
+-  Bug: [4174][] — Error has been fixed on shipping address page to complete checkout for guest and registered user
+-  Bug: [4143][] — Duplicate Queries were fired multiple times at time of load of page but after fix applied it is resolved
+-  Bug: [40][] — User is able see checkmo option when checkmo checkout configuration is done for selceted country
+-  Bug: [32][] - The system was thowing error with prex extension while adding the product to cart but after user can add product without any error with or without prex extension.
+-  Bug: [113][] — The system was thowing error with prex extension while adding the product to cart but after user can add product without any error with or without prex extension.
+-  Bug: [4135][] — Error message has been updated acording to action on Edit Item popup while updating unavailable quantity.
+-  Bug: [38][] - Total number of iteam quantity is displayed as per configuration selected in backend
+-  Bug: [4149][] — Total number of iteam quantity is displayed as per configuration selected in backend
+-  Bug: [21][] — Error occurs when Runtime exception is thrown in vendor/magento/module-upward-connector/Model/PageType.php is resolved
+-  Bug: [4129][] — Image is rendered on wrong pages when parallax is used on page builder.
+
+## 13.3.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.3.0 release of these pages on desktop and mobile devices.
 
 ### Desktop scores
 
@@ -50,7 +46,7 @@ With each new release of PWA Studio, we perform Lighthouse audits of four Venia
 |  Accessibility |    ![](images/score_100.svg)    |      ![](images/score_100.svg)      |     ![](images/score_100.svg)      |     ![](images/score_100.svg)     |
 | Best Practices |    ![](images/score_100.svg)    |      ![](images/score_100.svg)      |     ![](images/score_100.svg)      |     ![](images/score_100.svg)     |
 |            SEO |    ![](images/score_100.svg)    |      ![](images/score_100.svg)      |     ![](images/score_100.svg)      |     ![](images/score_100.svg)     |
-|            PWA |   ![](images/pwa_perfect.svg)   |     ![](images/pwa_perfect.svg)     |    ![](images/pwa_perfect.svg)     |    ![](images/pwa_perfect.svg)    |
+|            PWA |   ![](images/pwa_perfect.svg)   |     ![](images/pwa_perfect.svg)     |    ![](images/pwa_perfect.svg)     |    ![](images/pwa_perfect.svg)     |
 
 ### Mobile scores
 
@@ -70,7 +66,7 @@ When a user logs out, that user's local storage session persists. As a result, t
 
 ## Upgrading from a previous version
 
-Use the steps outlined in this section to update your [scaffolded project][] from 13.1.0 to 13.2.0.
+Use the steps outlined in this section to update your [scaffolded project][] from 13.2.0 to 13.3.0.
 See [Upgrading versions][] for more information about upgrading between PWA Studio versions.
 
 [scaffolded project]: https://developer.adobe.com/commerce/pwa-studio/tutorials/
@@ -79,7 +75,7 @@ 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.2.0. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 13.1.0.
+The following table lists the latest versions of each package as of 13.3.0. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 13.2.0.
 
 **NOTE:**
 Your project may not depend on some packages listed in this table.
@@ -88,51 +84,47 @@ Your project may not depend on some packages listed in this table.
 
 | Package                                | Latest version |
 |----------------------------------------|----------------|
-| `babel-preset-peregrine`               | 1.2.2          |
-| `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        |
+| `babel-preset-peregrine`               | **1.2.3***     |
+| `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.1***     |
+| `peregrine`                            | **13.2.1***    |
+| `pwa-buildpack`                        | **11.4.3***    |
 | `pwa-theme-venia`                      | 1.4.0          |
 | `upward-js`                            | 5.3.2          |
 | `upward-spec`                          | 5.2.1          |
-| `venia-concept`                        | **13.2.0***    |
-| `venia-ui`                             | **10.2.0***    |
-| `magento2-pwa`                         | 0.5.1          |
+| `venia-concept`                        | **13.3.0***    |
+| `venia-ui`                             | **10.3.0***    |
+| `magento2-pwa`                         | **0.6.1***     |
 | `magento2-pwa-commerce`                | 0.0.3          |
-| `magento-venia-sample-data-modules`    | 0.0.4         |
+| `magento-venia-sample-data-modules`    | 0.0.4          |
 | `magento-venia-sample-data-modules-ee` | 0.0.3          |
-| `magento2-upward-connector`            | 2.0.2         |
+| `magento2-upward-connector`            | **2.0.3***     |
 | `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
+[4172]: https://github.com/magento/pwa-studio/pull/4172
+[4131]: https://github.com/magento/pwa-studio/pull/4131
+[4173]: https://github.com/magento/pwa-studio/pull/4173
+[4090]: https://github.com/magento/pwa-studio/pull/4090
+[43]: https://github.com/magento-commerce/magento2-pwa/pull/43
 [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
+[41]: https://github.com/magento-commerce/magento2-pwa/pull/41
+[4168]: https://github.com/magento/pwa-studio/pull/4168
+[4133]: https://github.com/magento/pwa-studio/pull/4133
+[4174]: https://github.com/magento/pwa-studio/pull/4174
+[4143]: https://github.com/magento/pwa-studio/pull/4143
+[40]: https://github.com/magento-commerce/magento2-pwa/pull/40
+[21]: https://github.com/magento-commerce/magento2-upward-connector/pull/21
+[4129]: https://github.com/magento/pwa-studio/pull/4129
+[38]: https://github.com/magento-commerce/magento2-pwa/pull/38
+[4149]: https://github.com/magento/pwa-studio/pull/4149
+[4135]: https://github.com/magento/pwa-studio/pull/4135
+[32]: https://github.com/magento-commerce/venia-data-collector/pull/32
+[113]: https://github.com/magento-commerce/venia-product-recommendations/pull/113
 
 [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.3.0': '2.4.7-beta2',
     '13.2.0': '2.4.7-beta1',
     '13.1.0': '2.4.6',
     '13.0.0': '2.4.5',

package.json

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

packages/babel-preset-peregrine/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/babel-preset-peregrine",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "publishConfig": {
     "access": "public"
   },

packages/create-pwa/package.json

@@ -29,8 +29,8 @@
   },
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme",
   "dependencies": {
-    "@magento/pwa-buildpack": "~11.4.2",
-    "@magento/venia-concept": "~13.2.0",
+    "@magento/pwa-buildpack": "~11.4.3",
+    "@magento/venia-concept": "~13.3.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.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
@@ -18,8 +18,8 @@
   "devDependencies": {},
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
-    "@magento/peregrine": "~13.1.1",
-    "@magento/pwa-buildpack": "~11.4.2",
+    "@magento/peregrine": "~13.2.1",
+    "@magento/pwa-buildpack": "~11.4.3",
     "react": "~17.0.1"
   },
   "pwa-studio": {

packages/extensions/experience-platform-connector/src/__tests__/__snapshots__/utils.spec.js.snap

@@ -47,6 +47,7 @@ Array [
       },
       "productType": "ConfigurableProduct",
       "sku": "VSK02",
+      "topLevelSku": "VSK02",
     },
     "quantity": 1,
   },
@@ -82,6 +83,7 @@ Array [
       },
       "productType": "SimpleProduct",
       "sku": "VA17-SI-NA",
+      "topLevelSku": "VA17-SI-NA",
     },
     "quantity": 2,
   },
@@ -130,6 +132,7 @@ Array [
       },
       "productType": "ConfigurableProduct",
       "sku": "VA04",
+      "topLevelSku": "VA04",
     },
     "quantity": 3,
   },

packages/extensions/experience-platform-connector/src/handlers/__tests__/__snapshots__/shoppingMiniCartView.spec.js.snap

@@ -47,6 +47,7 @@ Object {
         },
         "productType": "ConfigurableProduct",
         "sku": "VSK02",
+        "topLevelSku": "VSK02",
       },
       "quantity": 1,
     },
@@ -78,6 +79,7 @@ Object {
         },
         "productType": "SimpleProduct",
         "sku": "VA17-SI-NA",
+        "topLevelSku": "VA17-SI-NA",
       },
       "quantity": 2,
     },
@@ -122,6 +124,7 @@ Object {
         },
         "productType": "ConfigurableProduct",
         "sku": "VA04",
+        "topLevelSku": "VA04",
       },
       "quantity": 3,
     },

packages/extensions/experience-platform-connector/src/handlers/__tests__/shoppingCartPageView.spec.js

@@ -81,6 +81,7 @@ describe('handle()', () => {
                     },
                     "productType": "ConfigurableProduct",
                     "sku": "VSK02",
+                    "topLevelSku": "VSK02",
                   },
                   "quantity": 1,
                 },
@@ -116,6 +117,7 @@ describe('handle()', () => {
                     },
                     "productType": "SimpleProduct",
                     "sku": "VA17-SI-NA",
+                    "topLevelSku": "VA17-SI-NA",
                   },
                   "quantity": 2,
                 },
@@ -164,6 +166,7 @@ describe('handle()', () => {
                     },
                     "productType": "ConfigurableProduct",
                     "sku": "VA04",
+                    "topLevelSku": "VA04",
                   },
                   "quantity": 3,
                 },

packages/extensions/experience-platform-connector/src/handlers/__tests__/startCheckout.spec.js

@@ -96,6 +96,7 @@ describe('handle()', () => {
                     },
                     "productType": "ConfigurableProduct",
                     "sku": "VP08",
+                    "topLevelSku": "VP08",
                   },
                   "quantity": 3,
                 },
@@ -138,6 +139,7 @@ describe('handle()', () => {
                     },
                     "productType": "ConfigurableProduct",
                     "sku": "VA09",
+                    "topLevelSku": "VA09",
                   },
                   "quantity": 1,
                 },
@@ -173,6 +175,7 @@ describe('handle()', () => {
                     },
                     "productType": "SimpleProduct",
                     "sku": "VA22-SI-NA",
+                    "topLevelSku": "VA22-SI-NA",
                   },
                   "quantity": 1,
                 },

packages/extensions/experience-platform-connector/src/utils.js

@@ -82,6 +82,7 @@ export const getFormattedProducts = products => {
                   product: {
                       name: name,
                       sku: sku,
+                      topLevelSku: product.sku,
                       productType: type,
                       pricing: {
                           regularPrice: prices.price.value,

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

@@ -1,6 +1,6 @@
 {
   "name": "@magento/upward-security-headers",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "publishConfig": {
     "access": "public"
   },
@@ -13,8 +13,8 @@
   "author": "Adobe Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/pwa-buildpack": "~11.4.2",
-    "@magento/venia-ui": "~10.2.0",
+    "@magento/pwa-buildpack": "~11.4.3",
+    "@magento/venia-ui": "~10.3.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.10",
+  "version": "0.0.11",
   "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.2",
+    "@magento/pwa-buildpack": "~11.4.3",
     "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.6",
+  "version": "0.0.7",
   "publishConfig": {
     "access": "public"
   },
@@ -12,8 +12,8 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~13.1.1",
-    "@magento/pwa-buildpack": "~11.4.2",
+    "@magento/peregrine": "~13.2.1",
+    "@magento/pwa-buildpack": "~11.4.3",
     "react": "~17.0.1"
   },
   "pwa-studio": {