Main resolve conflict v2 #4570

glo82145 · 2025-10-15T15:21:15Z

Description

TODO: Describe your changes in detail here.

Related Issue

Closes #ISSUE_NUMBER.

Acceptance

Verification Stakeholders

Specification

Verification Steps

Test scenario(s) for direct fix/feature

Test scenario(s) for any existing impacted features/areas

Test scenario(s) for any Magento Backend Supported Configurations

Is Browser/Device testing needed?

Any ad-hoc/edge case scenarios that need to be considered?

Screenshots / Screen Captures (if appropriate)

Breaking Changes (if any)

Checklist

I have added tests to cover my changes, if necessary.
I have added translations for new strings, if necessary.
I have updated the documentation accordingly, if necessary.

* v14.3.1-alpha1 * Merge pull request #4525 from magento/patch/npm-access-update-live-search Adding Public Access to publish to NPM * v14.3.1-alpha12 * v14.3.1-beta1 * PWA-14.3.1 release notes (#4530) * PWA-14.3.1 release notes (#4531) * Update magento-compatibility.js (#4532) * v14.3.1 --------- Co-authored-by: devops-pwa-codebuild <magento-devops-github-pwa-int@adobe.com> Co-authored-by: Ilesh Tiwari <del15881@adobe.com>

#4537) * Prevent Cart Creation for Guest User and Add Functionality To Create Cart only when Guest User Adds Product to Cart * Fixing Prettier and Snapshot test cases * Removing unwanted and commented out code

* PWA-3576::Video component issue in dynamic CMS block * PWA-3576::Video component issue in dynamic CMS block

…up (#4540)

…nts and add in useApp talon to avoid infinite loop (#4543) Co-authored-by: Jose Amietta <joseamietta@gmail.com>

* Prevent Cart Creation for Guest User and Add Functionality To Create Cart only when Guest User Adds Product to Cart * Fixing Prettier and Snapshot test cases * Removing unwanted and commented out code * Handle Cart Creation and Merging for the Logged In users * Adding Logic To create a Cart when Products added to cart from wishlist Page * Fixing all the Failing Test cases related to Wishlist * Fixing Failing Test Cases for ADD TO CART Dialog box * Fixing Cart related test cases

Co-authored-by: glo82145 <glo82145@adobe.com>

Co-authored-by: Bharathidasan Elangovan <del22123@adobe.com>

* PWA-3610: Fixed targetables call * PWA-3610: Fixed targetables call

* Fixing the Issues with Targetables on Release blocker * Fixing Prettier Issues

* PWA-3613: RI-Wishlist pagination fix * PWA-3613:Fixed lint and prettier issues --------- Co-authored-by: Bharathidasan Elangovan <del22123@adobe.com>

* PWA-3610: Fixed targetables call * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log

* PWA-3610: Fixed targetables call * PWA-14.4.0 - Change log

* PWA-3610: Fixed targetables call * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log

pwa-studio-bot · 2025-10-15T15:23:38Z

	Fails
🚫	`node` failed.
🚫	Cypress tests in the following files did not pass 😔. All tests must pass before this PR can be merged displays assigned products: AssertionError: Timed out retrying after 30000ms: Expected to find element: `[data-cy="CategoryContent-root"] [data-cy="GalleryItem-name"], [data-cy="SearchPage-root"] [data-cy="GalleryItem-name"]`, but never found it. ,shows products specific to the categories in the different store: AssertionError: Timed out retrying after 30000ms: Expected to find element: `[data-cy="CategoryContent-root"] [data-cy="GalleryItem-name"], [data-cy="SearchPage-root"] [data-cy="GalleryItem-name"]`, but never found it. ,lets users add products to cart regardless of store view: AssertionError: Timed out retrying after 30000ms: Expected to find element: `[data-cy="CategoryContent-root"] [data-cy="GalleryItem-root"]`, but never found it.

Log

ERROR ON TASK: cypressTests


Error:  Danger had errors running. See message(s) above for more details.
danger-results://tmp/danger-results.json

Generated by 🚫 dangerJS against 4a284df

pwa-studio-bot · 2025-10-15T15:23:49Z

	Fails
🚫	Lighthouse assertions failed 😔. All assertions must pass before this PR can be merged https://pr-4570.pwa-venia.com/ categories.pwa (auditRan) Expected: 1 Actual: 0 Result: Failed Max Potential First Input Delay (maxNumericValue) Expected: 520 Actual: 660 Result: Failed Docs link: https://developer.chrome.com/docs/lighthouse/performance/lighthouse-max-potential-fid/ First Contentful Paint (maxNumericValue) Expected: 2900 Actual: 2921.3525 Result: Failed Docs link: https://developer.chrome.com/docs/lighthouse/performance/first-contentful-paint/ Total Blocking Time (minScore) Expected: 0.35 Actual: 0.22 Result: Failed Docs link: https://developer.chrome.com/docs/lighthouse/performance/lighthouse-total-blocking-time/ https://pr-4570.pwa-venia.com/venia-tops.html?page=1 categories.pwa (auditRan) Expected: 1 Actual: 0 Result: Failed Max Potential First Input Delay (maxNumericValue) Expected: 520 Actual: 656 Result: Failed Docs link: https://developer.chrome.com/docs/lighthouse/performance/lighthouse-max-potential-fid/ https://pr-4570.pwa-venia.com/valeria-two-layer-tank.html categories.pwa (auditRan) Expected: 1 Actual: 0 Result: Failed Max Potential First Input Delay (maxNumericValue) Expected: 520 Actual: 631 Result: Failed Docs link: https://developer.chrome.com/docs/lighthouse/performance/lighthouse-max-potential-fid/ Total Blocking Time (minScore) Expected: 0.2 Actual: 0.19 Result: Failed Docs link: https://developer.chrome.com/docs/lighthouse/performance/lighthouse-total-blocking-time/ https://pr-4570.pwa-venia.com/search.html?query=tops&page=1 categories.pwa (auditRan) Expected: 1 Actual: 0 Result: Failed Max Potential First Input Delay (maxNumericValue) Expected: 520 Actual: 647 Result: Failed Docs link: https://developer.chrome.com/docs/lighthouse/performance/lighthouse-max-potential-fid/
🚫	`node` failed.

Log

ERROR ON TASK: lighthouseTests


Error:  Danger had errors running. See message(s) above for more details.
danger-results://tmp/danger-results-69bf0a1a.json

Generated by 🚫 dangerJS against 4a284df

pwa-studio-bot · 2025-10-15T15:24:32Z

	Fails
🚫	`node` failed.

Log

ERROR ON TASK: cypressTests


Error:  Danger had errors running. See message(s) above for more details.
danger-results://tmp/danger-results.json

Generated by 🚫 dangerJS against 4a284df

pwa-studio-bot · 2025-10-15T15:27:16Z

	Fails
🚫	Whoops! Pull requests should be opened against `develop`, not `main`. Please reopen this PR against the correct branch.
🚫	A version label is required. A maintainer must add one.
🚫	No linked issue found. Please link a relevant open issue by adding the text "closes #<issue_number>" or "closes JIRA-<issue_number>" in your PR.
🚫	Missing information in PR. Please fill out the "Description" section.

	Warnings
⚠️	Found the word "TODO" in the PR description. Just letting you know incase you forgot :)

	Messages
📖	DangerCI Failures related to missing labels/description/linked issues/etc will persist until the next push or next pr-test build run (assuming they are fixed).
📖	Access a deployed version of this PR here. Make sure to wait for the "pwa-pull-request-deploy" job to complete.

If your PR is missing information, check against the original template here. At a minimum you must have the section headers from the template and provide some information in each section.

Generated by 🚫 dangerJS against 4a284df

glo82145 and others added 30 commits August 8, 2025 23:20

PWA-3536: Removed package-lock.json (#4535)

83727ee

PWA-3463: Supressing noisy warnings on Select (#4505)

2b1d48d

PWA-4468: use the same version of react-tabs everywhere (#4469)

1afe1ff

Prevent Cart Creation for Guest User and Add Functionality To Create … (

c12e79f

#4537) * Prevent Cart Creation for Guest User and Add Functionality To Create Cart only when Guest User Adds Product to Cart * Fixing Prettier and Snapshot test cases * Removing unwanted and commented out code

PWA-3576::Video component issue in dynamic CMS block (#4541)

72e78b0

* PWA-3576::Video component issue in dynamic CMS block * PWA-3576::Video component issue in dynamic CMS block

PWA-3537: Fixed out of saleable stock issue in PDP and cart edit pop …

17d0d12

…up (#4540)

PWA-3534:Fixed wishlist pagination issue (#4542)

c0261de

Remove useCustomerWishlistSkus hook from Carousel and Gallery compone…

f36cd14

…nts and add in useApp talon to avoid infinite loop (#4543) Co-authored-by: Jose Amietta <joseamietta@gmail.com>

PWA-3583: Fixed search page-clear filter customer issue (#4544)

acf9d19

Fixing Wishlist Failing Test Cases originating from PR ID : 4543 (#4547)

5b96526

PWA-3538::nvalid auth middleware clearTimeout implementation (#4550)

8013a18

PWA-3542:Fixed upward path issue (#4549)

b2df0a3

Co-authored-by: glo82145 <glo82145@adobe.com>

PWA-3361:Multi store CSP fix (#4548)

913d116

Co-authored-by: glo82145 <glo82145@adobe.com>

PWA-3610: Fixed targetables call (#4558)

2691b28

Fixing 404 Rendering Issue (#4556)

af3ce24

Co-authored-by: Bharathidasan Elangovan <del22123@adobe.com>

v14.4.0-alpha2

f16666c

v14.4.0-alpha3

48c9771

Pwa 3610 v2 (#4559)

1fc70cb

* PWA-3610: Fixed targetables call * PWA-3610: Fixed targetables call

v14.4.0-alpha5

594e6c9

v14.4.0-alpha6

a5aa7ec

Fixing the Issues with Targetables on Release blocker (#4561)

f1abf99

* Fixing the Issues with Targetables on Release blocker * Fixing Prettier Issues

v14.4.0-alpha10

b30cd15

v14.4.0-alpha11

9c1da8d

PWA-3613: RI-Wishlist pagination fix (#4562)

77c4c18

* PWA-3613: RI-Wishlist pagination fix * PWA-3613:Fixed lint and prettier issues --------- Co-authored-by: Bharathidasan Elangovan <del22123@adobe.com>

v14.4.0-alpha12

bc74169

v14.4.0-beta1

3040895

Pwa 14.4.0 changelog (#4564)

57e0141

* PWA-3610: Fixed targetables call * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log

Pwa 14.4.0 resolve conflicts (#4565)

745a970

* PWA-3610: Fixed targetables call * PWA-14.4.0 - Change log

glo82145 and others added 4 commits October 15, 2025 16:32

Pwa 14.4.0 releaseconflicts v1 (#4566)

9f4415f

* PWA-3610: Fixed targetables call * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log * PWA-14.4.0 - Change log

v14.4.0-beta2

91cdcba

v14.4.0-beta3

8bdab87

PWA-14.4.0-resolve-conflist

4a284df

pwa-studio-bot added pkg:pwa-buildpack pkg:peregrine pkg:venia-concept pkg:upward-js Pertains to upward-js reference implementation of UPWARD. pkg:venia-ui pkg:create-pwa labels Oct 15, 2025

pwa-studio-bot closed this Oct 15, 2025

pwa-studio-bot added pkg:pagebuilder pkg:extensions labels Oct 15, 2025

glo82145 reopened this Oct 15, 2025

del22123 approved these changes Oct 15, 2025

View reviewed changes

pwa-studio-bot closed this Oct 15, 2025

glo82145 reopened this Oct 15, 2025

glo82145 merged commit ba5e707 into main Oct 15, 2025
6 of 15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Main resolve conflict v2 #4570

Main resolve conflict v2 #4570

Uh oh!

glo82145 commented Oct 15, 2025

Uh oh!

pwa-studio-bot commented Oct 15, 2025 •

edited

Loading

Uh oh!

pwa-studio-bot commented Oct 15, 2025 •

edited

Loading

categories.pwa (auditRan)

Max Potential First Input Delay (maxNumericValue)

First Contentful Paint (maxNumericValue)

Total Blocking Time (minScore)

categories.pwa (auditRan)

Max Potential First Input Delay (maxNumericValue)

categories.pwa (auditRan)

Max Potential First Input Delay (maxNumericValue)

Total Blocking Time (minScore)

categories.pwa (auditRan)

Max Potential First Input Delay (maxNumericValue)

Uh oh!

pwa-studio-bot commented Oct 15, 2025

Uh oh!

pwa-studio-bot commented Oct 15, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Main resolve conflict v2 #4570

Main resolve conflict v2 #4570

Uh oh!

Conversation

glo82145 commented Oct 15, 2025

Description

Related Issue

Acceptance

Verification Stakeholders

Specification

Verification Steps

Test scenario(s) for direct fix/feature

Test scenario(s) for any existing impacted features/areas

Test scenario(s) for any Magento Backend Supported Configurations

Is Browser/Device testing needed?

Any ad-hoc/edge case scenarios that need to be considered?

Screenshots / Screen Captures (if appropriate)

Breaking Changes (if any)

Checklist

Uh oh!

pwa-studio-bot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Log

Uh oh!

pwa-studio-bot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

categories.pwa (auditRan)

Max Potential First Input Delay (maxNumericValue)

First Contentful Paint (maxNumericValue)

Total Blocking Time (minScore)

categories.pwa (auditRan)

Max Potential First Input Delay (maxNumericValue)

categories.pwa (auditRan)

Max Potential First Input Delay (maxNumericValue)

Total Blocking Time (minScore)

categories.pwa (auditRan)

Max Potential First Input Delay (maxNumericValue)

Log

Uh oh!

pwa-studio-bot commented Oct 15, 2025

Log

Uh oh!

pwa-studio-bot commented Oct 15, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

pwa-studio-bot commented Oct 15, 2025 •

edited

Loading

pwa-studio-bot commented Oct 15, 2025 •

edited

Loading