Main resolve conflict

CHANGELOG.md

@@ -1,24 +1,34 @@
-# PWA Studio Release 14.3.1
+# PWA Studio Release 14.4.0
 
 **NOTE:**
-_This changelog only contains release notes for PWA Studio and Venia 14.3.1_
+_This changelog only contains release notes for PWA Studio and Venia 14.4.0_
 _For older release notes, see_ [PWA Studio releases][].
 
 ## Highlights
 
-The 14.3.1 release of PWA Studio provides newly built package PWA Live Search
-
+The 14.4.0 release of PWA Studio provides multiple bug fixes and improvements to the cart functionality.
 
 ## Additional fixes
 
--  Story: [4524][] — Live search is built
-
-
-
-## 14.3.1 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 14.3.1 release of these pages on desktop and mobile devices.
-
+-  Story:[4545][] — The Add to Cart button has been enhanced
+-  Bug:[4562][] — The wishlist pagination issue preventing more than 2 pages from displaying has been resolved
+-  Bug:[4548][] — The CSP nonce error for inline scripts has been resolved
+-  Bug:[4541][] — Videos now render properly on the frontend.
+-  Bug:[310][] — Corrected typos and grammatical errors in all PWA developer documentation.
+-  Bug:[4505][] — Fixed the Select component to use Peregrine's useInformedFieldStateWrapper.
+-  Bug:[4469][] — Fixed a Yarn invariant violation caused by packages/pagebuilder requesting a different version of react-tabs.
+-  Bug:[4540][] — Fixed an issue where the cart became empty when updating configurable products.
+-  Bug:[4542][] — Fixed wishlist pagination issue.
+-  Bug:[4535][] — Removed package-lock.json.
+-  Bug:[4549][] — Resolved the upwardPath not found error.
+-  Bug:[4543][] — Resolved an infinite loop query in GetWishlistItemsForLocalField.
+-  Bug:[4550][] — Fixed invalid auth middleware clearTimeout implementation.
+-  Bug:[4544][] — Fixed an issue where resetting search filters caused unfiltered search results.
+
+## 14.4.0 Lighthouse scores
+
+With each new release of PWA Studio, we perform Lighthouse audits on four Venia page types, each representing a different level of complexity.
+Shown below are the Lighthouse scores for the 14.4.0 release of these pages on desktop and mobile devices.
 ### Desktop scores
 
 |                |            Home Page            |          Product Category           |          Product Details           |          Search Results           |
@@ -45,11 +55,15 @@ With each new release of PWA Studio, we perform Lighthouse audits of four Venia
 
 ## 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 assigned to the guest user on the same 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 14.3.0 to 14.3.1
+Use the steps outlined in this section to update your [scaffolded project][] from 14.3.1 to 14.4.0
 See [Upgrading versions][] for more information about upgrading between PWA Studio versions.
 
 [scaffolded project]: https://developer.adobe.com/commerce/pwa-studio/tutorials/
@@ -58,33 +72,33 @@ 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 14.3.1. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 14.3.0.
+The following table lists the latest versions of each package as of 14.4.0. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 14.3.1.
 
 **NOTE:**
 Your project may not depend on some packages listed in this table.
 
 | Package                                | Latest version |
 |----------------------------------------|----------------|
 | `babel-preset-peregrine`               | 1.3.3          |
-| `create-pwa`                           | 2.5.7          |
-| `experience-platform-connector`        | 1.0.10         |
-| `upward-security-headers`              | 1.0.18         |
-| `venia-sample-backends`                | 0.0.12         |
-| `venia-sample-eventing`                | 0.0.11         |
-| `venia-sample-language-packs`          | 0.0.19         |
-| `venia-sample-payments-checkmo`        | 0.0.17         |
-| `venia-sample-payments-cashondelivery` | 0.0.2          |
+| `create-pwa`                           | **2.5.8***     |
+| `experience-platform-connector`        | **1.0.11***    |
+| `upward-security-headers`              | **1.0.19***    |
+| `venia-sample-backends`                | **0.0.13***    |
+| `venia-sample-eventing`                | **0.0.12***    |
+| `venia-sample-language-packs`          | **0.0.20***    |
+| `venia-sample-payments-checkmo`        | **0.0.18***    |
+| `venia-sample-payments-cashondelivery` | **0.0.3***     |
+| `venia-pwa-live-search`                | **1.0.1***     |
 | `venia-product-recommendations`        | 1.0.2          |
-| `plugin-braintree-three-d-secure`      | 1.0.0          |
-| `venia_pwa_live_search:`               | 1.0.0          |
-| `pagebuilder`                          | **9.3.5***     |
-| `peregrine`                            | **15.5.2***    |
-| `pwa-buildpack`                        | 11.5.4         |
+| `plugin-braintree-three-d-secure`      | 1.0.1          |
+| `pagebuilder`                          | **9.3.6***     |
+| `peregrine`                            | **15.6.2***    |
+| `pwa-buildpack`                        | **11.5.5***    |
 | `pwa-theme-venia`                      | 2.4.0          |
-| `upward-js`                            | 5.4.2          |
+| `upward-js`                            | **5.4.3***     |
 | `upward-spec`                          | 5.3.1          |
-| `venia-concept`                        | **14.3.1***    |
-| `venia-ui`                             | 11.7.0         |
+| `venia-concept`                        | **14.4.0***    |
+| `venia-ui`                             | **11.7.1***    |
 | `magento2-pwa`                         | 0.10.2         |
 | `magento2-pwa-commerce`                | 0.1.5          |
 | `magento-venia-sample-data-modules`    | 0.0.6          |
@@ -93,6 +107,19 @@ Your project may not depend on some packages listed in this table.
 | `upward-php`                           | 2.1.4          |
 | `pwa-live-search`                      | 1.0.0          |
 
-[4524]: https://github.com/magento/pwa-studio/pull/4524
+[4562]: https://github.com/magento/pwa-studio/pull/4562
+[4548]: https://github.com/magento/pwa-studio/pull/4548
+[4545]: https://github.com/magento/pwa-studio/pull/4545
+[4541]: https://github.com/magento/pwa-studio/pull/4541
+[310]: https://github.com/AdobeDocs/commerce-pwa-studio/pull/310/
+[4505]: https://github.com/magento/pwa-studio/pull/4505
+[4469]: https://github.com/magento/pwa-studio/pull/4469
+[4540]: https://github.com/magento/pwa-studio/pull/4540
+[4542]: https://github.com/magento/pwa-studio/pull/4542
+[4535]: https://github.com/magento/pwa-studio/pull/4535
+[4549]: https://github.com/magento/pwa-studio/pull/4549
+[4543]: https://github.com/magento/pwa-studio/pull/4543
+[4550]: https://github.com/magento/pwa-studio/pull/4550
+[4544]: https://github.com/magento/pwa-studio/pull/4544
 
 [PWA Studio releases]: https://github.com/magento/pwa-studio/releases

magento-compatibility.js

@@ -4,6 +4,7 @@
 
 // PWA Studio version -> Magento version.
 module.exports = {
+    '14.4.0': '2.4.9',
     '14.3.1': '2.4.8',
     '14.3.0': '2.4.8',
     '14.2.0': '2.4.7-p4',

package.json

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

packages/create-pwa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/create-pwa",
-  "version": "2.5.7",
+  "version": "2.5.8",
   "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.5.4",
-    "@magento/venia-concept": "~14.3.1",
+    "@magento/pwa-buildpack": "~11.5.5",
+    "@magento/venia-concept": "~14.4.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.10",
+  "version": "1.0.11",
   "publishConfig": {
     "access": "public"
   },
@@ -18,8 +18,8 @@
   "devDependencies": {},
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
-    "@magento/peregrine": "~15.5.2",
-    "@magento/pwa-buildpack": "~11.5.4",
+    "@magento/peregrine": "~15.6.2",
+    "@magento/pwa-buildpack": "~11.5.5",
     "react": "~17.0.1"
   },
   "pwa-studio": {

packages/extensions/venia-pwa-live-search/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-pwa-live-search",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "publishConfig": {
     "access": "public"
   },

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

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-eventing",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "publishConfig": {
     "access": "public"
   },
@@ -12,8 +12,8 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~15.5.2",
-    "@magento/pwa-buildpack": "~11.5.4",
+    "@magento/peregrine": "~15.6.2",
+    "@magento/pwa-buildpack": "~11.5.5",
     "react": "~17.0.1"
   },
   "pwa-studio": {

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

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-payments-cashondelivery",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "publishConfig": {
     "access": "public"
   },
@@ -12,9 +12,9 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~15.5.2",
-    "@magento/pwa-buildpack": "~11.5.4",
-    "@magento/venia-ui": "~11.7.0",
+    "@magento/peregrine": "~15.6.2",
+    "@magento/pwa-buildpack": "~11.5.5",
+    "@magento/venia-ui": "~11.7.1",
     "react": "~17.0.1",
     "react-intl": "~5.20.0",
     "react-router-dom": "~5.2.0"

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

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-sample-payments-checkmo",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "publishConfig": {
     "access": "public"
   },
@@ -12,9 +12,9 @@
   "repository": "github:magento/pwa-studio",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "peerDependencies": {
-    "@magento/peregrine": "~15.5.2",
-    "@magento/pwa-buildpack": "~11.5.4",
-    "@magento/venia-ui": "~11.7.0",
+    "@magento/peregrine": "~15.6.2",
+    "@magento/pwa-buildpack": "~11.5.5",
+    "@magento/venia-ui": "~11.7.1",
     "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": "9.3.5",
+  "version": "9.3.6",
   "publishConfig": {
     "access": "public"
   },
@@ -34,25 +34,25 @@
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme",
   "dependencies": {},
   "devDependencies": {
-    "@magento/peregrine": "~15.5.2",
-    "@magento/pwa-buildpack": "~11.5.4",
-    "@magento/venia-ui": "~11.7.0",
+    "@magento/peregrine": "~15.6.2",
+    "@magento/pwa-buildpack": "~11.5.5",
+    "@magento/venia-ui": "~11.7.1",
     "@storybook/react": "~6.3.7",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
     "lodash.escape": "~4.0.1",
     "react": "~17.0.1",
     "react-dom": "~17.0.1",
     "react-slick": "~0.28.0",
-    "react-tabs": "~3.0.0",
+    "react-tabs": "~3.1.0",
     "react-test-renderer": "~17.0.1"
   },
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
     "@magento/babel-preset-peregrine": "~1.3.3",
-    "@magento/peregrine": "~15.5.2",
-    "@magento/pwa-buildpack": "~11.5.4",
-    "@magento/venia-ui": "~11.7.0",
+    "@magento/peregrine": "~15.6.2",
+    "@magento/pwa-buildpack": "~11.5.5",
+    "@magento/venia-ui": "~11.7.1",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
     "lodash.escape": "~4.0.1",

packages/peregrine/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/peregrine",
-  "version": "15.5.2",
+  "version": "15.6.2",
   "publishConfig": {
     "access": "public"
   },

packages/venia-concept/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-concept",
-  "version": "14.3.1",
+  "version": "14.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/venia-concept#readme",
   "dependencies": {
-    "@magento/experience-platform-connector": "~1.0.10",
+    "@magento/experience-platform-connector": "~1.0.11",
     "@magento/pwa-buildpack": "~11.5.3",
     "dompurify": "~3.2.4"
   },
@@ -55,11 +55,11 @@
     "@babel/runtime": "~7.15.3",
     "@magento/babel-preset-peregrine": "~1.3.3",
     "@magento/eslint-config": "~1.5.0",
-    "@magento/pagebuilder": "~9.3.5",
-    "@magento/peregrine": "~15.5.2",
+    "@magento/pagebuilder": "~9.3.6",
+    "@magento/peregrine": "~15.6.2",
     "@magento/pwa-theme-venia": "~2.4.0",
-    "@magento/upward-security-headers": "~1.1.18",
-    "@magento/venia-ui": "~11.7.0",
+    "@magento/upward-security-headers": "~1.1.19",
+    "@magento/venia-ui": "~11.7.1",
     "@pmmmwh/react-refresh-webpack-plugin": "0.4.1",
     "@storybook/react": "~6.3.7",
     "@types/node": "16",

packages/venia-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/venia-ui",
-  "version": "11.7.0",
+  "version": "11.7.1",
   "publishConfig": {
     "access": "public"
   },
@@ -80,8 +80,8 @@
   "peerDependencies": {
     "@apollo/client": "~3.5.0",
     "@magento/babel-preset-peregrine": "~1.3.3",
-    "@magento/peregrine": "~15.5.2",
-    "@magento/pwa-buildpack": "~11.5.4",
+    "@magento/peregrine": "~15.6.2",
+    "@magento/pwa-buildpack": "~11.5.5",
     "apollo-cache-persist": "~0.1.1",
     "braintree-web-drop-in": "~1.43.0",
     "graphql": "~15.5.0",

pwa-devdocs/package.json

@@ -1,7 +1,7 @@
 {
     "name": "pwa-devdocs",
     "private": true,
-    "version": "14.3.1",
+    "version": "14.4.0-beta2",
     "description": "A documentation site for Magento PWA",
     "main": "gulpfile.js",
     "dependencies": {