Main 142 (#4440)

* Fixing the searchPage Issue : setFilterOptions is not a function. (#4430)

* Release notes/14.2.0 (#4429)

* Removed npm yml

* added release notes

* added release notes

* PWA-14.2.0- Changed log

* v14.2.0-beta.6

* Merge conflict (#4433)

* adding release 14.1.0 change.log md

* adding compatibility.js

* Removed npm yml

* v14.2.0

* v14.2.0

---------

Co-authored-by: arpit.khare <[email protected]>
Co-authored-by: magento-github-admin-beta <[email protected]>
Co-authored-by: devops-pwa-codebuild <[email protected]>

* v14.2.0-beta.7

* Release 14.2.0 v2 (#4438)

* adding release 14.1.0 change.log md

* adding compatibility.js

* v14.2.0

* v14.2.0

* merge conflict resolve

---------

Co-authored-by: arpit.khare <[email protected]>
Co-authored-by: magento-github-admin-beta <[email protected]>
Co-authored-by: devops-pwa-codebuild <[email protected]>

* resolve merge conflicts

---------

Co-authored-by: Ilesh Tiwari <[email protected]>
Co-authored-by: devops-pwa-codebuild <[email protected]>
Co-authored-by: arpit.khare <[email protected]>
Co-authored-by: magento-github-admin-beta <[email protected]>

Author: 5 people

CHANGELOG.md

@@ -1,16 +1,52 @@
+<<<<<<< HEAD
+# PWA Studio Release 14.2.0
+
+**NOTE:**
+_This changelog only contains release notes for PWA Studio and Venia 14.2.0_
+=======
 # PWA Studio Release 14.1.0
 
 **NOTE:**
 _This changelog only contains release notes for PWA Studio and Venia 14.1.0_
+>>>>>>> 1c445d3e5 (adding release 14.1.0 change.log md)
 _For older release notes, see_ [PWA Studio releases][].
 
 ## Highlights
 
+<<<<<<< HEAD
+PHP 8.4 support — PWA Studio now supports PHP 8.4. GitHub PRs: [62], [7], [29], [6], [25], [12]
+
+The 14.2.0 release of PWA Studio provides compatibility with PREX extension and Upgradation from node 14 to 18.
+=======
 The 14.1.0 release of PWA Studio provides compatibility with PREX extension and Upgradation from node 14 to 18.
+>>>>>>> 1c445d3e5 (adding release 14.1.0 change.log md)
 
 
 ## Additional fixes
 
+<<<<<<< HEAD
+-  Story: [4385][] — Added payment method for "Cash on Delivery" compatibiility into pwa-studio
+-  Story: [4374][] — DOM Text Interpreted As HTML in PWA Code
+-  Story: [4340][] — Pwa-studio Dependency Updates
+-  Story: [4386][] — Implemented Price slider Filter with tailwind css 
+-  Bug: [4395][] — Fixed error while creating User from Sign-in page which appeares post logout
+-  Bug: [4346][] — Fixed account email confirmation flow and Added code to display error message from grapqhl response in form
+-  Bug: [4362][] — Rolled back necessary changes of Tailwind
+-  Bug: [4353][] — New theme creation - tailwind preset issues
+-  Bug: [4318][] — Fixed issue of system is getting crashed when login / create user on Home page or Order Success page in case of translated language other then English
+-  Bug: [4344][] — fixed issue of unable to see the Default Thumbnail for newly created product in PLP and PDP
+-  Bug: [4354][] — Fixed Shipping address error when login
+-  Bug: [4318][] — Fixed issue of system is getting crashed when selecting add to cart in case of translated language
+-  Bug: [4357][] — Upward pwa forwarding BOT request to backend
+-  Bug: [4403][] — Removing code since creating problem while yarn build in local when added this extension to package.json
+however packages is published on NPM so will resolve in next release
+-  Bug: [4342][] — Resolved error when getting thumbnails on order row for deleted products
+-  Bug: [4339][] — able to see appropriate css variable on front end
+-  Bug: [4363][] —  Fixed system is thorwing Error while signin from shipping address page
+-  Bug: [4341][] — Order confirmation page persists through page refreshes when authenticated also navigates to home page on refresh for guest users
+-  Bug: [4413][] — fixed unable to proceed checkout on iOS or Android Device post product added to cart
+-  Bug: [4424][] — Unable to place order in Mobile screen as well as not able to filter or sort in PLP
+=======
 -  Story: [4319][] — Get Minimum Password Length from configuration.
 -  Story: [4314][] — Header location should set to correct endpoint in case of 301|302.
 -  Bug: [4316][] — DevContainer > Node 14 to 18 LTS is updated in dev container
@@ -25,11 +61,17 @@ The 14.1.0 release of PWA Studio provides compatibility with PREX extension and
 -  Bug: [4305][] — PWA Studio URL redirect not working
 -  Bug: [4117][] — Update README.md with PWA Studio XD Kit
 -  Bug: [4301][] — Language translating giving errors
+>>>>>>> 1c445d3e5 (adding release 14.1.0 change.log md)
 
+## 14.2.0 Lighthouse scores
 
+<<<<<<< HEAD
+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.2.0 release of these pages on desktop and mobile devices.
+=======
 ## 14.1.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 14.1.0 release of these pages on desktop and mobile devices.
+>>>>>>> 1c445d3e5 (adding release 14.1.0 change.log md)
 
 ### Desktop scores
 
@@ -60,7 +102,11 @@ When a user logs out, that user's local storage session persists. As a result, t
 
 ## Upgrading from a previous version
 
+<<<<<<< HEAD
+Use the steps outlined in this section to update your [scaffolded project][] from 14.1.0 to 14.2.0
+=======
 Use the steps outlined in this section to update your [scaffolded project][] from 14.0.1 to 14.1.0
+>>>>>>> 1c445d3e5 (adding release 14.1.0 change.log md)
 See [Upgrading versions][] for more information about upgrading between PWA Studio versions.
 
 [scaffolded project]: https://developer.adobe.com/commerce/pwa-studio/tutorials/
@@ -69,7 +115,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 14.0.1. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 14.0.0.
+The following table lists the latest versions of each package as of 14.2.0. The **bolded** versions with an asterisk (*) are the packages that were updated from PWA Studio 14.1.0.
 
 **NOTE:**
 Your project may not depend on some packages listed in this table.
@@ -78,6 +124,58 @@ Your project may not depend on some packages listed in this table.
 
 | Package                                | Latest version |
 |----------------------------------------|----------------|
+<<<<<<< HEAD
+| `babel-preset-peregrine`               | 1.3.3          |
+| `create-pwa`                           | **2.5.6***     |
+| `experience-platform-connector`        | **1.0.9***     |
+| `upward-security-headers`              | 1.0.17         |
+| `venia-sample-backends`                | **0.0.12***    |
+| `venia-sample-eventing`                | **0.0.10***    |
+| `venia-sample-language-packs`          | **0.0.18***    |
+| `venia-sample-payments-checkmo`        | **0.0.16***    |
+| `venia-sample-payments-cashondelivery` | 0.0.1          |
+| `pagebuilder`                          | **9.3.3***     |
+| `peregrine`                            | **14.5.1***    |
+| `pwa-buildpack`                        | **11.5.4 ***   |
+| `pwa-theme-venia`                      | 2.4.0          |
+| `upward-js`                            | 5.4.2          |
+| `upward-spec`                          | 5.3.1          |
+| `venia-concept`                        | **14.2.0***    |
+| `venia-ui`                             | **11.6.0***    |
+| `magento2-pwa`                         | **0.9.2***     |
+| `magento2-pwa-commerce`                | **0.1.4***     |
+| `magento-venia-sample-data-modules`    | **0.0.6***     |
+| `magento-venia-sample-data-modules-ee` | **0.0.5***     |
+| `magento2-upward-connector`            | **2.0.5***     |
+| `upward-php`                           | **2.0.4***     |
+
+[4395]: https://github.com/magento/pwa-studio/pull/4395
+[4385]: https://github.com/magento/pwa-studio/pull/4385
+[62]:   https://github.com/magento-commerce/magento2-pwa/pull/62
+[7]:    https://github.com/magento-commerce/magento2-pwa-commerce/pull/7
+[29]:   https://github.com/magento-commerce/venia-sample-data-modules/pull/29
+[6]:    https://github.com/magento-commerce/venia-sample-data-modules-ee/pull/6
+[25]:   https://github.com/magento-commerce/magento2-upward-connector/pull/25
+[12]:   https://github.com/magento-commerce/upward-php/pull/12
+[4346]: https://github.com/magento/pwa-studio/pull/4346
+[4362]: https://github.com/magento/pwa-studio/pull/4362
+[4353]: https://github.com/magento/pwa-studio/pull/4353/
+[4374]: https://github.com/magento/pwa-studio/pull/4374
+[4318]: https://github.com/magento/pwa-studio/pull/4318
+[4340]: https://github.com/magento/pwa-studio/pull/4340
+[4344]: https://github.com/magento/pwa-studio/pull/4344
+[4354]: https://github.com/magento/pwa-studio/pull/4354
+[4357]: https://github.com/magento/pwa-studio/pull/4357
+[4386]: https://github.com/magento/pwa-studio/pull/4386
+[4403]: https://github.com/magento/pwa-studio/pull/4403
+[4342]: https://github.com/magento/pwa-studio/pull/4342
+[4339]: https://github.com/magento/pwa-studio/pull/4339
+[4363]: https://github.com/magento/pwa-studio/pull/4363
+[4341]: https://github.com/magento/pwa-studio/pull/4341
+[4413]: https://github.com/magento/pwa-studio/pull/4413
+[4424]: https://github.com/magento/pwa-studio/pull/4424
+
+=======
 | `babel-preset-peregrine`               | 1.3.3    |
 | `create-pwa`                           | 2.4.6          |
 | `experience-platform-connector`        | **1.0.8***     |
@@ -116,5 +214,6 @@ Your project may not depend on some packages listed in this table.
 [4305]: https://github.com/magento/pwa-studio/pull/4305
 [4117]: https://github.com/magento/pwa-studio/pull/4117
 [4301]: https://github.com/magento/pwa-studio/pull/4301
+>>>>>>> 1c445d3e5 (adding release 14.1.0 change.log md)
 
 [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.2.0': '2.4.7-p4',
     '14.1.0': '2.4.7-p2',
     '14.0.1': '2.4.7-beta3',
     '14.0.0': '2.4.7-beta3',

packages/venia-ui/lib/components/FilterSidebar/filterSidebar.js

@@ -78,7 +78,7 @@ const FilterSidebar = props => {
     );
 
     useEffect(() => {
-        if (filterState) {
+        if (filterState && setFilterOptions) {
             setFilterOptions(filterState);
         }
     }, [filterState, setFilterOptions]);