Skip to content

update feature branch with develop#3161

Draft
sf-shikhar-prasoon wants to merge 1630 commits into
feature/bonus-productsfrom
develop
Draft

update feature branch with develop#3161
sf-shikhar-prasoon wants to merge 1630 commits into
feature/bonus-productsfrom
develop

Conversation

@sf-shikhar-prasoon
Copy link
Copy Markdown
Contributor

@sf-shikhar-prasoon sf-shikhar-prasoon commented Aug 22, 2025

Description

Types of Changes

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Documentation update
  • Breaking change (could cause existing functionality to not work as expected)
  • Other changes (non-breaking changes that does not fit any of the above)

Breaking changes include:

  • Removing a public function or component or prop
  • Adding a required argument to a function
  • Changing the data type of a function parameter or return value
  • Adding a new peer dependency to package.json

Changes

  • (change1)

How to Test-Drive This PR

  • (step1)

Checklists

General

  • Changes are covered by test cases
  • CHANGELOG.md updated with a short description of changes (not required for documentation updates)

Accessibility Compliance

You must check off all items in one of the follow two lists:

  • There are no changes to UI

or...

Localization

  • Changes include a UI text update in the Retail React App (which requires translation)

@cc-prodsec
Copy link
Copy Markdown
Collaborator

cc-prodsec commented Aug 22, 2025 •
edited
Loading

⛔ Snyk checks have failed. 25 issues have been found so far.

Status Scan Engine Critical High Medium Low Total (25)
⛔ Open Source Security 0 15 10 0 25 issues
✅ Licenses 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

@vcua-mobify vcua-mobify temporarily deployed to extra-features-e2e August 22, 2025 20:15 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 23, 2025 07:01 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 24, 2025 07:01 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 25, 2025 07:01 — with GitHub Actions Inactive
@vcua-mobify vcua-mobify temporarily deployed to extra-features-e2e August 25, 2025 23:02 — with GitHub Actions Inactive
@adamraya adamraya temporarily deployed to extra-features-e2e August 25, 2025 23:33 — with GitHub Actions Inactive
@shethj shethj temporarily deployed to extra-features-e2e August 26, 2025 15:38 — with GitHub Actions Inactive
@shethj shethj temporarily deployed to extra-features-e2e August 26, 2025 21:06 — with GitHub Actions Inactive
@vmarta vmarta temporarily deployed to extra-features-e2e August 26, 2025 21:26 — with GitHub Actions Inactive
@adamraya adamraya temporarily deployed to extra-features-e2e August 26, 2025 23:38 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 27, 2025 07:01 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 28, 2025 07:01 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 28, 2025 19:09 — with GitHub Actions Inactive
@vmarta vmarta temporarily deployed to extra-features-e2e August 28, 2025 22:07 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 29, 2025 07:02 — with GitHub Actions Inactive
@shethj shethj temporarily deployed to extra-features-e2e August 29, 2025 18:45 — with GitHub Actions Inactive
@vcua-mobify vcua-mobify temporarily deployed to extra-features-e2e August 29, 2025 22:30 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 30, 2025 07:01 — with GitHub Actions Inactive
@jeremy-jung1 jeremy-jung1 temporarily deployed to extra-features-e2e August 31, 2025 07:01 — with GitHub Actions Inactive
vcua-mobify and others added 30 commits May 21, 2026 22:37
@vcua-mobify
@W-22602804@ Remove idp_access_token from request sent to SLAS (#3843)
71b50a3 
* Remove idp_access_token from request sent to SLAS

* Unrelated - fix flaky CI by waiting for animations to finish before checking color contrast

* Revert "Unrelated - fix flaky CI by waiting for animations to finish before checking color contrast"

This reverts commit 3d96bd7.
@kevinxh
Merge pull request #3839 from SalesforceCommerceCloud/fix/page-design…
d45f6b1 
…er-integration-patch

feat: use contentLinkUuid for Page Designer integration @W-22348894
@kevinxh
chore: bump versions for v3.18.1 patch release
093af0b 
SDK packages: 3.18.0 → 3.18.1
commerce-sdk-react: 5.2.0 → 5.2.1
retail-react-app: 10.0.0 → 10.0.1
@kevinxh
docs: add dates to changelog entries for v3.18.1
a86310a
@kevinxh
Merge pull request #3845 from SalesforceCommerceCloud/bump/v3.18.1
7ca6c8b 
chore: bump versions for v3.18.1 patch release
@kevinxh
chore: restore develop -dev versions after release-3.18.x merge
f990e09 
Bump versions back to develop values:
- SDK packages: 3.19.0-dev
- commerce-sdk-react: 5.3.0-dev
- retail-react-app: 10.1.0-dev
- pwa-kit-mcp: 0.4.0 (unchanged)
@kevinxh
chore: revert retail-react-app version bump to unblock SDK release
9b5b6eb 
retail-react-app depends on the SDK packages (commerce-sdk-react,
pwa-kit-dev, pwa-kit-react-sdk, pwa-kit-runtime) which haven't been
published yet. Reverting its version bump so the CI can release the
SDKs first without hitting npm 404 errors.
@kevinxh
fix: keep SDK dep versions at 3.18.1 to pass syncpack check
6e4627b
@kevinxh
chore: re-run CI
89806b4
@kevinxh
Merge pull request #3847 from SalesforceCommerceCloud/kevinxh/revert-…
c9397dd 
…retail-app-version-bump

chore: revert retail-react-app version bump to unblock SDK release
@kevinxh
Revert "chore: revert retail-react-app version bump to unblock SDK re…
46ad06b 
…lease"
@kevinxh
Merge pull request #3849 from SalesforceCommerceCloud/revert-3847-kev…
e73955a 
…inxh/revert-retail-app-version-bump

Revert "chore: revert retail-react-app version bump to unblock SDK release"
@kevinxh
Merge remote-tracking branch 'origin/release-3.18.x' into merge/relea…
21a7503 
…se-3.18.x-to-develop
@kevinxh
Merge remote-tracking branch 'origin/develop' into merge/release-3.18…
879fdf4 
….x-to-develop

# Conflicts:
#	packages/commerce-sdk-react/CHANGELOG.md
#	packages/commerce-sdk-react/package-lock.json
#	packages/commerce-sdk-react/package.json
#	packages/pwa-kit-create-app/CHANGELOG.md
#	packages/pwa-kit-dev/CHANGELOG.md
#	packages/pwa-kit-react-sdk/CHANGELOG.md
#	packages/pwa-kit-react-sdk/package-lock.json
#	packages/pwa-kit-runtime/CHANGELOG.md
#	packages/template-express-minimal/package-lock.json
#	packages/template-mrt-reference-app/package-lock.json
#	packages/template-retail-react-app/CHANGELOG.md
#	packages/template-retail-react-app/package-lock.json
#	packages/template-retail-react-app/package.json
#	packages/template-typescript-minimal/package-lock.json
#	packages/test-commerce-sdk-react/package-lock.json
@kevinxh
Merge pull request #3846 from SalesforceCommerceCloud/merge/release-3…
5de8772 
….18.x-to-develop

Merge release-3.18.x back to develop (v3.18.1 patch)
@adamraya
Merge remote-tracking branch 'origin/develop' into bendvc/W-22385616_…
50c2a60 
…dal-hooks

# Conflicts:
#	packages/pwa-kit-runtime/CHANGELOG.md
@adamraya
Bump retail-react-app vendor.js bundle budget to 397 kB
2299ae5 
PR's vendor.js is 395.33 KB gzip (was 394.78 KB on develop) — the new
MrtDataStoreProvider context, useCustomSitePreferences /
useCustomGlobalPreferences hooks, and the bootstrap-key wiring add ~0.55 KB
to the shipped client bundle. Raise the budget by 2 kB so compile variance
doesn't flake CI without giving up the guardrail.
@adamraya
Add CHANGELOG entry for vendor.js bundle-size budget bump
3b92a04
@adamraya
Merge pull request #3834 from SalesforceCommerceCloud/bendvc/W-223856…
2bb709f 
…16_dal-hooks

[DAL] Add MRT Data Store Context and Hooks for Template Usage
@kevinxh
Merge origin/develop into kevinxh/verify-pwa-kit-issue-3789
9f3efc7
@kevinxh
Address review: extract buildBabelExcludeRegex into testable module
cb6a34e 
- Extract regex builder into babel-exclude.js so it can be tested
  without importing the full webpack config (which has heavy deps)
- Update config.js to import from the new module
- Fix copyright year to 2026 in config.test.js
- Test now exercises the real production function

Re: EXT_EXTENDS_WIN — it IS used at config.js:337 for webpack chunk
splitting on Windows, so it's not dead code.
@kevinxh
Add JSDoc comment for buildBabelExcludeRegex
a3fefca
@kevinxh
Address review: remove dead constants, drop redundant test block
407f049 
- Remove ESCAPED_SEP and EXT_EXTENDS_REGEX (unused after extracting
  buildBabelExcludeRegex)
- Remove "on current platform" describe block that duplicated the
  explicit Windows/Unix test blocks
@kevinxh
Rename config.test.js to babel-exclude.test.js to match its module
8082cfd
@kevinxh
Trigger CI
b5bdd6e
@kevinxh
Add clarifying comment for EXT_EXTENDS_WIN usage (not a regex)
83a1976
@kevinxh
Merge pull request #3840 from SalesforceCommerceCloud/kevinxh/verify-…
d88a7c2 
…pwa-kit-issue-3789

Fix Windows babel-loader exclude regex bug (#3789)
@vcua-mobify
@W-22419797@ @W-22457820@ Docs for http-only (#3841)
ace0af9 
* Apply configurable domain to cookies created by slas proxy

* Lint

* Add initial docs for http-only

* Apply suggestions

* Apply suggestions
@vcua-mobify
@W-22476773@ Storefront Preview / HttpOnly - foundations for dynamic …
0cdb15b 
…SameSite (#3850)

* Apply configurable domain to cookies created by slas proxy

* Lint

* Add plumbing for supporting Storefront Preview with HttpOnly cookies

* Apply review adjustments

* Address comments and apply suggestions

* Update CSP to allow non-prod preview

* Add soak and dev MRT to preview trusted list

* Update CHANGELOG.md

---------

Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
@vcua-mobify
@W-22476773@ Storefront Preview / HttpOnly - dynamic SameSite for Htt…
5086c43 
…pOnly session cookies (#3851)

* Apply configurable domain to cookies created by slas proxy

* Lint

* Add plumbing for supporting Storefront Preview with HttpOnly cookies

* Apply review adjustments

* Add dynamic SameSite for Storefront Preview

* Update CHANGELOG.md

* Cleanup host scoped marker cookie if cookieDomain is set

* Address comments and apply suggestions

* Apply suggestions from PR 1

* Update CSP to allow non-prod preview

* Add soak and dev MRT to preview trusted list

* Update CHANGELOG.md

---------

Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.