Skip to content

Commit ba5e707

Browse files
glo82145devops-pwa-codebuilddel15881del22123brendanfalkowski
authored
Main resolve conflict v2 (#4570)
* Sync main 14.3.1 (#4533) * 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> * PWA-3536: Removed package-lock.json (#4535) * PWA-3463: Supressing noisy warnings on Select (#4505) * PWA-4468: use the same version of `react-tabs` everywhere (#4469) * Prevent Cart Creation for Guest User and Add Functionality To Create … (#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) * 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 up (#4540) * PWA-3534:Fixed wishlist pagination issue (#4542) * Remove useCustomerWishlistSkus hook from Carousel and Gallery components 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) * Fixing Wishlist Failing Test Cases originating from PR ID : 4543 (#4547) * Enhancement/pwa 3550 (#4545) * 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 * PWA-3538::nvalid auth middleware clearTimeout implementation (#4550) * PWA-3542:Fixed upward path issue (#4549) Co-authored-by: glo82145 <glo82145@adobe.com> * PWA-3361:Multi store CSP fix (#4548) Co-authored-by: glo82145 <glo82145@adobe.com> * PWA-3610: Fixed targetables call (#4558) * Fixing 404 Rendering Issue (#4556) Co-authored-by: Bharathidasan Elangovan <del22123@adobe.com> * v14.4.0-alpha2 * v14.4.0-alpha3 * Pwa 3610 v2 (#4559) * PWA-3610: Fixed targetables call * PWA-3610: Fixed targetables call * v14.4.0-alpha5 * v14.4.0-alpha6 * Fixing the Issues with Targetables on Release blocker (#4561) * Fixing the Issues with Targetables on Release blocker * Fixing Prettier Issues * v14.4.0-alpha10 * v14.4.0-alpha11 * PWA-3613: RI-Wishlist pagination fix (#4562) * 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 * v14.4.0-beta1 * Pwa 14.4.0 changelog (#4564) * 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) * PWA-3610: Fixed targetables call * PWA-14.4.0 - Change log * Pwa 14.4.0 releaseconflicts v1 (#4566) * 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 * v14.4.0-beta3 --------- Co-authored-by: devops-pwa-codebuild <magento-devops-github-pwa-int@adobe.com> Co-authored-by: Ilesh Tiwari <del15881@adobe.com> Co-authored-by: Bharathidasan Elangovan <del22123@adobe.com> Co-authored-by: Brendan Falkowski <brendan@gravitydept.com> Co-authored-by: Jose Amietta <joseamietta@gmail.com>
1 parent 5abef40 commit ba5e707

File tree

60 files changed

+916
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+916
-445
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ docker/certs
2121

2222
## May temporarily create tarballs during scaffolding debug
2323
packages/**/*.tgz
24+
25+
package-lock.json

‎CHANGELOG.md‎

Lines changed: 59 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
1-
# PWA Studio Release 14.3.1
1+
# PWA Studio Release 14.4.0
22

33
**NOTE:**
4-
_This changelog only contains release notes for PWA Studio and Venia 14.3.1_
4+
_This changelog only contains release notes for PWA Studio and Venia 14.4.0_
55
_For older release notes, see_ [PWA Studio releases][].
66

77
## Highlights
88

9-
The 14.3.1 release of PWA Studio provides newly built package PWA Live Search
10-
9+
The 14.4.0 release of PWA Studio provides multiple bug fixes and improvements to the cart functionality.
1110

1211
## Additional fixes
1312

14-
- Story: [4524][] — Live search is built
15-
16-
17-
18-
## 14.3.1 Lighthouse scores
19-
20-
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.
21-
13+
- Story:[4545][] — The Add to Cart button has been enhanced
14+
- Bug:[4562][] — The wishlist pagination issue preventing more than 2 pages from displaying has been resolved
15+
- Bug:[4548][] — The CSP nonce error for inline scripts has been resolved
16+
- Bug:[4541][] — Videos now render properly on the frontend.
17+
- Bug:[310][] — Corrected typos and grammatical errors in all PWA developer documentation.
18+
- Bug:[4505][] — Fixed the Select component to use Peregrine's useInformedFieldStateWrapper.
19+
- Bug:[4469][] — Fixed a Yarn invariant violation caused by packages/pagebuilder requesting a different version of react-tabs.
20+
- Bug:[4540][] — Fixed an issue where the cart became empty when updating configurable products.
21+
- Bug:[4542][] — Fixed wishlist pagination issue.
22+
- Bug:[4535][] — Removed package-lock.json.
23+
- Bug:[4549][] — Resolved the upwardPath not found error.
24+
- Bug:[4543][] — Resolved an infinite loop query in GetWishlistItemsForLocalField.
25+
- Bug:[4550][] — Fixed invalid auth middleware clearTimeout implementation.
26+
- Bug:[4544][] — Fixed an issue where resetting search filters caused unfiltered search results.
27+
28+
## 14.4.0 Lighthouse scores
29+
30+
With each new release of PWA Studio, we perform Lighthouse audits on four Venia page types, each representing a different level of complexity.
31+
Shown below are the Lighthouse scores for the 14.4.0 release of these pages on desktop and mobile devices.
2232
### Desktop scores
2333

2434
| | 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
4555

4656
## Known issue
4757

48-
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.
58+
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.
59+
This causes the following error when the guest user tries to check out:
60+
An error has occurred. Please check the input and try again.
61+
62+
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.
4963

5064
## Upgrading from a previous version
5165

52-
Use the steps outlined in this section to update your [scaffolded project][] from 14.3.0 to 14.3.1
66+
Use the steps outlined in this section to update your [scaffolded project][] from 14.3.1 to 14.4.0
5367
See [Upgrading versions][] for more information about upgrading between PWA Studio versions.
5468

5569
[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
5872
### Updated package dependencies
5973

6074
Open your `package.json` file and update the PWA Studio package dependencies to the versions associated with this release.
61-
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.
75+
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.
6276

6377
**NOTE:**
6478
Your project may not depend on some packages listed in this table.
6579

6680
| Package | Latest version |
6781
|----------------------------------------|----------------|
6882
| `babel-preset-peregrine` | 1.3.3 |
69-
| `create-pwa` | 2.5.7 |
70-
| `experience-platform-connector` | 1.0.10 |
71-
| `upward-security-headers` | 1.0.18 |
72-
| `venia-sample-backends` | 0.0.12 |
73-
| `venia-sample-eventing` | 0.0.11 |
74-
| `venia-sample-language-packs` | 0.0.19 |
75-
| `venia-sample-payments-checkmo` | 0.0.17 |
76-
| `venia-sample-payments-cashondelivery` | 0.0.2 |
83+
| `create-pwa` | **2.5.8*** |
84+
| `experience-platform-connector` | **1.0.11*** |
85+
| `upward-security-headers` | **1.0.19*** |
86+
| `venia-sample-backends` | **0.0.13*** |
87+
| `venia-sample-eventing` | **0.0.12*** |
88+
| `venia-sample-language-packs` | **0.0.20*** |
89+
| `venia-sample-payments-checkmo` | **0.0.18*** |
90+
| `venia-sample-payments-cashondelivery` | **0.0.3*** |
91+
| `venia-pwa-live-search` | **1.0.1*** |
7792
| `venia-product-recommendations` | 1.0.2 |
78-
| `plugin-braintree-three-d-secure` | 1.0.0 |
79-
| `venia_pwa_live_search:` | 1.0.0 |
80-
| `pagebuilder` | **9.3.5*** |
81-
| `peregrine` | **15.5.2*** |
82-
| `pwa-buildpack` | 11.5.4 |
93+
| `plugin-braintree-three-d-secure` | 1.0.1 |
94+
| `pagebuilder` | **9.3.6*** |
95+
| `peregrine` | **15.6.2*** |
96+
| `pwa-buildpack` | **11.5.5*** |
8397
| `pwa-theme-venia` | 2.4.0 |
84-
| `upward-js` | 5.4.2 |
98+
| `upward-js` | **5.4.3*** |
8599
| `upward-spec` | 5.3.1 |
86-
| `venia-concept` | **14.3.1*** |
87-
| `venia-ui` | 11.7.0 |
100+
| `venia-concept` | **14.4.0*** |
101+
| `venia-ui` | **11.7.1*** |
88102
| `magento2-pwa` | 0.10.2 |
89103
| `magento2-pwa-commerce` | 0.1.5 |
90104
| `magento-venia-sample-data-modules` | 0.0.6 |
@@ -93,6 +107,19 @@ Your project may not depend on some packages listed in this table.
93107
| `upward-php` | 2.1.4 |
94108
| `pwa-live-search` | 1.0.0 |
95109

96-
[4524]: https://github.com/magento/pwa-studio/pull/4524
110+
[4562]: https://github.com/magento/pwa-studio/pull/4562
111+
[4548]: https://github.com/magento/pwa-studio/pull/4548
112+
[4545]: https://github.com/magento/pwa-studio/pull/4545
113+
[4541]: https://github.com/magento/pwa-studio/pull/4541
114+
[310]: https://github.com/AdobeDocs/commerce-pwa-studio/pull/310/
115+
[4505]: https://github.com/magento/pwa-studio/pull/4505
116+
[4469]: https://github.com/magento/pwa-studio/pull/4469
117+
[4540]: https://github.com/magento/pwa-studio/pull/4540
118+
[4542]: https://github.com/magento/pwa-studio/pull/4542
119+
[4535]: https://github.com/magento/pwa-studio/pull/4535
120+
[4549]: https://github.com/magento/pwa-studio/pull/4549
121+
[4543]: https://github.com/magento/pwa-studio/pull/4543
122+
[4550]: https://github.com/magento/pwa-studio/pull/4550
123+
[4544]: https://github.com/magento/pwa-studio/pull/4544
97124

98125
[PWA Studio releases]: https://github.com/magento/pwa-studio/releases

‎magento-compatibility.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// PWA Studio version -> Magento version.
66
module.exports = {
7+
'14.4.0': '2.4.9',
78
'14.3.1': '2.4.8',
89
'14.3.0': '2.4.8',
910
'14.2.0': '2.4.7-p4',

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@magento/pwa-studio",
3-
"version": "14.3.1",
3+
"version": "14.4.0-beta3",
44
"private": true,
55
"workspaces": [
66
"packages/babel-preset-peregrine",

‎packages/create-pwa/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@magento/create-pwa",
3-
"version": "2.5.7",
3+
"version": "2.5.8-beta3",
44
"publishConfig": {
55
"access": "public"
66
},
@@ -29,8 +29,8 @@
2929
},
3030
"homepage": "https://github.com/magento/pwa-studio/tree/main/packages/create-pwa#readme",
3131
"dependencies": {
32-
"@magento/pwa-buildpack": "~11.5.4",
33-
"@magento/venia-concept": "~14.3.1",
32+
"@magento/pwa-buildpack": "11.5.5-beta3",
33+
"@magento/venia-concept": "14.4.0-beta3",
3434
"chalk": "^2.4.2",
3535
"change-case": "^3.1.0",
3636
"compression": "~1.7.4",
@@ -43,4 +43,4 @@
4343
"node-fetch": "~2.6.1",
4444
"webpack": "~4.46.0"
4545
}
46-
}
46+
}

‎packages/extensions/experience-platform-connector/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@magento/experience-platform-connector",
3-
"version": "1.0.10",
3+
"version": "1.0.11-beta3",
44
"publishConfig": {
55
"access": "public"
66
},
@@ -18,8 +18,8 @@
1818
"devDependencies": {},
1919
"peerDependencies": {
2020
"@apollo/client": "~3.5.0",
21-
"@magento/peregrine": "~15.5.2",
22-
"@magento/pwa-buildpack": "~11.5.4",
21+
"@magento/peregrine": "15.6.2-beta3",
22+
"@magento/pwa-buildpack": "11.5.5-beta3",
2323
"react": "~17.0.1"
2424
},
2525
"pwa-studio": {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@magento/upward-security-headers",
3-
"version": "1.1.18",
3+
"version": "1.1.19-beta3",
44
"publishConfig": {
55
"access": "public"
66
},
@@ -13,8 +13,8 @@
1313
"author": "Adobe Commerce",
1414
"license": "(OSL-3.0 OR AFL-3.0)",
1515
"peerDependencies": {
16-
"@magento/pwa-buildpack": "~11.5.4",
17-
"@magento/venia-ui": "~11.7.0",
16+
"@magento/pwa-buildpack": "11.5.5-beta3",
17+
"@magento/venia-ui": "11.7.1-beta3",
1818
"webpack": "~4.46.0"
1919
},
2020
"pwa-studio": {

‎packages/extensions/upward-security-headers/upward.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ veniaSecurityHeaders:
2929
"
3030
default:
3131
inline: "
32-
script-src http: https: {{ backend }};
32+
script-src http: https: {{ backend }}{{#pageTypeNonce}} 'nonce-{{ pageTypeNonce }}'{{/pageTypeNonce}};
3333
style-src 'self' blob: https: 'unsafe-inline' {{ backend }};
3434
img-src data: http: https:;
3535
object-src 'none';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@magento/venia-pwa-live-search",
3-
"version": "1.0.0",
3+
"version": "1.0.1-beta3",
44
"publishConfig": {
55
"access": "public"
66
},

‎packages/extensions/venia-sample-backends/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@magento/venia-sample-backends",
3-
"version": "0.0.12",
3+
"version": "0.0.13-beta3",
44
"publishConfig": {
55
"access": "public"
66
},
@@ -13,7 +13,7 @@
1313
"repository": "github:magento/pwa-studio",
1414
"license": "(OSL-3.0 OR AFL-3.0)",
1515
"peerDependencies": {
16-
"@magento/pwa-buildpack": "~11.5.4",
16+
"@magento/pwa-buildpack": "11.5.5-beta3",
1717
"node-fetch": "~2.3.0"
1818
},
1919
"pwa-studio": {

0 commit comments

Comments
 (0)