update feature branch with develop#3161
Draft
sf-shikhar-prasoon wants to merge 1485 commits intofeature/bonus-productsfrom
Draft
update feature branch with develop#3161sf-shikhar-prasoon wants to merge 1485 commits intofeature/bonus-productsfrom
develop#3161sf-shikhar-prasoon wants to merge 1485 commits intofeature/bonus-productsfrom
Conversation
Collaborator
⛔ Snyk checks have failed. 13 issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
The merge conflict resolution used --theirs (release branch) for package-lock files, which lost develop-only changes like Node 24 engine support from #3652. Restore lock files from develop and re-run npm install to pick up version bumps. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The previous bump-version re-run corrupted independent package versions. Re-run independent bumps and clean up duplicate changelog headers. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
….16.x-to-develop Merge release-3.16.x back to develop, bump to 3.17.0-dev
…saging (#3658) * feat: control floating button visibility and fix launch when hidden
…pper Consents hooks (#3674) - Updated Email Subscription component (in the footer section) with Shopper Consents hooks, also with updated styling and labels. - Updated commerce-sdk-react to use Shopper Consents hooks. - Fix for email validation on marketing consent capture: TLD must be more than 1 character. - Increase package max size from 90KB to 95KB, accounting for footer component size. - Check for feature enablement via Shopper Configurations API (feature=>`EnableConsentWithMarketingCloud`)
…3693) * @W-21362507: Fix for custom billing address as registered shoppers Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com>
* Bump dependencies versions * Update lock files * Fix npm registry * Update jest breaking changes * One click checkout tests with configurable mocks * Solve merge conflicts * Update package-lock.json
…ayout (#3682) * feat: update the banner with click events
* @W-21294742: No error toast for non-applicable shipping method Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * fix for multi-shipment Signed-off-by: d.phan <d.phan@salesforce.com> * fix edge cases Signed-off-by: d.phan <d.phan@salesforce.com> * minor comment remove Signed-off-by: d.phan <d.phan@salesforce.com> * fixes Signed-off-by: d.phan <d.phan@salesforce.com> * fix duplicate error toast Signed-off-by: d.phan <d.phan@salesforce.com> * fix for false positives error toast Signed-off-by: d.phan <d.phan@salesforce.com> * reuse util func Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix test Signed-off-by: d.phan <d.phan@salesforce.com> * fix a11y cart issue Signed-off-by: d.phan <d.phan@salesforce.com> * skip test temporarily Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> Signed-off-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com>
* W-21416242 translations * Add changelog * Remove translations - round 1 * removing translations round 2 * remove translations 3 * remove translations round 5 * revert translations
The changes enable Stripe, Adyen, and PayPal payment processing in PWA V3 via the SF Payments SDK and SCAPI APIs, with both standard checkout and express payment flows (Apple Pay, Google Pay, PayPal, Venmo).
* feat: add support for mobile and fix the header icons
feat: pd-support @W-21227485
…ent security policy headers
@W-21430145: remove 1cc from dev preview
* Restore MCP package to latest published npm version during SDK release During `--package sdk` bumps, lerna version bumps all packages including `@salesforce/pwa-kit-mcp`. The independent packages are then restored to their pre-bump versions, but MCP carries a dev version in the repo that should never appear in a released SDK. This change restores MCP to its latest published npm version (via `npm info @latest`) instead of the repo dev version, and moves `getLatestVersion` to shared utils so it can be reused. * Fix linting
* @W-20784722@ Move envBasePath into ssrParameters (#3590) * Move envBasePath into ssrParameters * Apply MRT restrictions on supported base paths * Update changelogs * one more changelog * Update express.test.js * Remove whitespace trimming * Remove test base path * Add comment * @W-20784635@ Support adding base paths to shopper facing URLs (#3615) * Add base path to react router routes * Handle basename for urls that bypass react router * Add a feature toggle for app base names * Add tests * Update config templates * Rename getBasename to getRouterBasePath * Update changelogs * Test fixes * Remove unused import and cleanup comments * Apply suggestions * Clean up redundant code * Fix issues from merge conflict * Update CHANGELOG.md * [Storefront Preview] Address base path duplication for manually entered urls (#3666) * Address base path duplication * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Apply suggestions * Fix unwanted basePath removal if base path is a substring * Lint * Add console warn * Update refresh component to avoid duplicate base paths * Fix merge issue * Add tests for coverage * Squash changelogs * Remove warning --------- Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
* Bump versions * @W-21414441@ Bump versions for 3.17.0-preview.1 (#3733) * W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay * bump version to preview.1 * @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732) * Fix add to cart bug and add e2e test * Update CHANGELOG.md * W-21432256 fix redirect payment methods status value during preview t… (#3734) * W-21432256 fix redirect payment methods status value during preview testing * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741) * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> * clean up changelog --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com> * @W-21414441@ Bump versions for 3.17.0-preview.12 (#3744) * W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay * bump version to preview.1 * @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732) * Fix add to cart bug and add e2e test * Update CHANGELOG.md * W-21432256 fix redirect payment methods status value during preview t… (#3734) * W-21432256 fix redirect payment methods status value during preview testing * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741) * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> * clean up changelog * bump versions * Add missing overrides to extensible app (#3745) * Add missing overrides to extensible app * Update CHANGELOG.md --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com> * @W-21414441@ PWA Kit Release 3.17.0 (#3746) * W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay * bump version to preview.1 * @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732) * Fix add to cart bug and add e2e test * Update CHANGELOG.md * W-21432256 fix redirect payment methods status value during preview t… (#3734) * W-21432256 fix redirect payment methods status value during preview testing * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741) * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> * clean up changelog * bump versions * Add missing overrides to extensible app (#3745) * Add missing overrides to extensible app * Update CHANGELOG.md * Bump versions --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com> * Bump to next dev version * Remove -dev in commerce sdk react 5.1.0 changelog --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com>
@W-21581300@ Harden SLAS private proxy error handling
* Bump versions * @W-21414441@ Bump versions for 3.17.0-preview.1 (#3733) * W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay * bump version to preview.1 * @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732) * Fix add to cart bug and add e2e test * Update CHANGELOG.md * W-21432256 fix redirect payment methods status value during preview t… (#3734) * W-21432256 fix redirect payment methods status value during preview testing * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741) * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> * clean up changelog --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com> * @W-21414441@ Bump versions for 3.17.0-preview.12 (#3744) * W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay * bump version to preview.1 * @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732) * Fix add to cart bug and add e2e test * Update CHANGELOG.md * W-21432256 fix redirect payment methods status value during preview t… (#3734) * W-21432256 fix redirect payment methods status value during preview testing * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741) * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> * clean up changelog * bump versions * Add missing overrides to extensible app (#3745) * Add missing overrides to extensible app * Update CHANGELOG.md --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com> * @W-21414441@ PWA Kit Release 3.17.0 (#3746) * W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay * bump version to preview.1 * @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732) * Fix add to cart bug and add e2e test * Update CHANGELOG.md * W-21432256 fix redirect payment methods status value during preview t… (#3734) * W-21432256 fix redirect payment methods status value during preview testing * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741) * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> * clean up changelog * bump versions * Add missing overrides to extensible app (#3745) * Add missing overrides to extensible app * Update CHANGELOG.md * Bump versions --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com> * @W-21566314@ - Bump version for 3.17.1-preview.0 (#3749) * W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay * bump version to preview.1 * @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732) * Fix add to cart bug and add e2e test * Update CHANGELOG.md * W-21432256 fix redirect payment methods status value during preview t… (#3734) * W-21432256 fix redirect payment methods status value during preview testing * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741) * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> * clean up changelog * bump versions * Add missing overrides to extensible app (#3745) * Add missing overrides to extensible app * Update CHANGELOG.md * Bump versions * @W-20784635@ Productize base paths (#3614) * @W-20784722@ Move envBasePath into ssrParameters (#3590) * Move envBasePath into ssrParameters * Apply MRT restrictions on supported base paths * Update changelogs * one more changelog * Update express.test.js * Remove whitespace trimming * Remove test base path * Add comment * @W-20784635@ Support adding base paths to shopper facing URLs (#3615) * Add base path to react router routes * Handle basename for urls that bypass react router * Add a feature toggle for app base names * Add tests * Update config templates * Rename getBasename to getRouterBasePath * Update changelogs * Test fixes * Remove unused import and cleanup comments * Apply suggestions * Clean up redundant code * Fix issues from merge conflict * Update CHANGELOG.md * [Storefront Preview] Address base path duplication for manually entered urls (#3666) * Address base path duplication * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Apply suggestions * Fix unwanted basePath removal if base path is a substring * Lint * Add console warn * Update refresh component to avoid duplicate base paths * Fix merge issue * Add tests for coverage * Squash changelogs * Remove warning --------- Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Bump version to 3.17.1-preview.0 * Update CHANGELOG.md --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com> * @W-21671037@ Release PWA Kit 3.17.1 (#3761) * W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay * bump version to preview.1 * @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732) * Fix add to cart bug and add e2e test * Update CHANGELOG.md * W-21432256 fix redirect payment methods status value during preview t… (#3734) * W-21432256 fix redirect payment methods status value during preview testing * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741) * @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> * clean up changelog * bump versions * Add missing overrides to extensible app (#3745) * Add missing overrides to extensible app * Update CHANGELOG.md * Bump versions * @W-20784635@ Productize base paths (#3614) * @W-20784722@ Move envBasePath into ssrParameters (#3590) * Move envBasePath into ssrParameters * Apply MRT restrictions on supported base paths * Update changelogs * one more changelog * Update express.test.js * Remove whitespace trimming * Remove test base path * Add comment * @W-20784635@ Support adding base paths to shopper facing URLs (#3615) * Add base path to react router routes * Handle basename for urls that bypass react router * Add a feature toggle for app base names * Add tests * Update config templates * Rename getBasename to getRouterBasePath * Update changelogs * Test fixes * Remove unused import and cleanup comments * Apply suggestions * Clean up redundant code * Fix issues from merge conflict * Update CHANGELOG.md * [Storefront Preview] Address base path duplication for manually entered urls (#3666) * Address base path duplication * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Apply suggestions * Fix unwanted basePath removal if base path is a substring * Lint * Add console warn * Update refresh component to avoid duplicate base paths * Fix merge issue * Add tests for coverage * Squash changelogs * Remove warning --------- Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Bump version to 3.17.1-preview.0 * Update CHANGELOG.md * @W-21671037@ Remove base path from /__pwa-kit requests if showBasePath is false (#3758) * Remove base path from /__pwa-kit requests if showBasePath is false * Update CHANGELOG.md * Use a redirect so client side is able hydrate. * Apply storefront preview component changes to deal with client-side single page navigation * Update CHANGELOG.md * Bump version to 3.17.1 --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com> * Update CHANGELOG.md --------- Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com> Signed-off-by: d.phan <d.phan@salesforce.com> Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com> Co-authored-by: amittapalli <amittapalli@yahoo.com> Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Types of Changes
Changes
How to Test-Drive This PR
Checklists
General
Accessibility Compliance
You must check off all items in one of the follow two lists:
or...
Localization