Main 142 v1 (#4441)

* Removed npm yml * 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 <glo42707@adobe.com> Co-authored-by: magento-github-admin-beta <119524626+magento-github-admin-beta@users.noreply.github.com> Co-authored-by: devops-pwa-codebuild <magento-devops-github-pwa-int@adobe.com> * 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 <glo42707@adobe.com> Co-authored-by: magento-github-admin-beta <119524626+magento-github-admin-beta@users.noreply.github.com> Co-authored-by: devops-pwa-codebuild <magento-devops-github-pwa-int@adobe.com> --------- Co-authored-by: Ilesh Tiwari <del15881@adobe.com> Co-authored-by: devops-pwa-codebuild <magento-devops-github-pwa-int@adobe.com> Co-authored-by: arpit.khare <glo42707@adobe.com> Co-authored-by: magento-github-admin-beta <119524626+magento-github-admin-beta@users.noreply.github.com>
magento · Mar 4, 2025 · 0769f95 · 0769f95
1 parent 33b3e2a
commit 0769f95
Showing 1 changed file with 0 additions and 79 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,30 +1,18 @@
-<<<<<<< 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
@@ -46,32 +34,10 @@ however packages is published on NPM so will resolve in next release
 -  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
--  Bug: [4303][] — Props error on Checkout page
--  Bug: [4260][] — Change user time to logout
--  Bug: [4277][] — PDP breadcrumbs only show one level of product category
--  Bug: [4280][] — Login issue with PWA 14.0
--  Bug: [4273][] — PWA Store View Not Functioning for Taiwan Store View with Language Locale 'zh_Hant_TW'
--  Bug: [59][] — GraphQL with PWA Non-default Sortable attribute fails
--  Bug: [4300][] — Update magento-compatibility.js to indicate all dependencies and just not magento
--  Bug: [4309][] —  Extending Peregrine Talons for Custom Applications
--  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
 
@@ -102,11 +68,7 @@ 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/
@@ -124,7 +86,6 @@ 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***     |
@@ -175,45 +136,5 @@ Your project may not depend on some packages listed in this table.
 [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***     |
-| `upward-security-headers`              | **1.0.17***    |
-| `venia-sample-backends`                | 0.0.11   |
-| `venia-sample-eventing`                | **0.0.9***     |
-| `venia-sample-language-packs`          | **0.0.17***    |
-| `venia-sample-payments-checkmo`        | **0.0.15***    |
-| `pagebuilder`                          | **9.3.2***     |
-| `peregrine`                            | **14.4.1***    |
-| `pwa-buildpack`                        | 11.5.3         |
-| `pwa-theme-venia`                      | 2.4.0          |
-| `upward-js`                            | 5.4.2          |
-| `upward-spec`                          | 5.3.1          |
-| `venia-concept`                        | **14.1.0***    |
-| `venia-ui`                             | **11.5.0***    |
-| `magento2-pwa`                         | **0.8.2***         |
-| `magento2-pwa-commerce`                | 0.0.4          |
-| `magento-venia-sample-data-modules`    | 0.0.5          |
-| `magento-venia-sample-data-modules-ee` | 0.0.4          |
-| `magento2-upward-connector`            | 2.0.4          |
-| `upward-php`                           | 2.0.3          |
-
-[4319]: https://github.com/magento/pwa-studio/pull/4319
-[4314]: https://github.com/magento/pwa-studio/pull/4314
-[4316]: https://github.com/magento/pwa-studio/pull/4316
-[4303]: https://github.com/magento/pwa-studio/pull/4303
-[4260]: https://github.com/magento/pwa-studio/pull/4260
-[57]: https://github.com/magento-commerce/magento2-pwa/pull/57
-[4277]: https://github.com/magento/pwa-studio/pull/4277
-[4280]: https://github.com/magento/pwa-studio/pull/4280
-[4273]: https://github.com/magento/pwa-studio/pull/4273
-[59]: https://github.com/magento-commerce/magento2-pwa/pull/59
-[4300]: https://github.com/magento/pwa-studio/pull/4300
-[4309]: https://github.com/magento/pwa-studio/pull/4309
-[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