Merge release-3.16.x back to develop, bump to 3.17.0-dev by kevinxh · Pull Request #3665 · SalesforceCommerceCloud/pwa-kit

kevinxh · 2026-02-13T00:14:57Z

Summary

Merge release-3.16.x back to develop after 3.16.0 stable release
Bump all SDK packages to 3.17.0-dev
Bump commerce-sdk-react to 5.1.0-dev
Bump retail-react-app to 9.1.0-dev
Bump pwa-kit-mcp to 0.5.0-dev (same minor since it was not released this cycle)

Test plan

Verify all package versions are correct via lerna list --all --long
Verify cross-dependencies are correct
CI passes

CRITICAL: Use "Create a merge commit" when merging — NEVER squash merge.

- Consolidate commerce-sdk-react v5.0.0-dev and v4.4.0-dev changelog entries into single section - Add AWS SDK v2 to v3 migration entry to pwa-kit-runtime changelog Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

SDK packages: 3.16.0-preview.0 commerce-sdk-react: 5.0.0-preview.0 retail-react-app: 9.0.0-preview.0 pwa-kit-mcp: 0.5.0-preview.0 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

…view.1 Bump versions for 3.16.0-preview.1

- Update "Edit" labels to "Change" on contact info, payment, and shipping options toggle cards - Fix billing address display logic in payment summary - Update translations (en-US, en-GB, en-XA)

1CC UX fixes (W-21240479)

* alpha tag for one click checkout * alpha tag for one click checkout * error handling * error handling * error handling * responsebuffer * responsebuffer * responsebuffer

…view.2 Bump versions for 3.16.0-preview.2

Bump versions for 3.16.0 stable release

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

cc-prodsec · 2026-02-13T00:15:13Z

✅ Snyk checks have passed. No issues have been found so far.

Status	Scanner	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues
✅	Licenses	0	0	0	0	0 issues

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

alexvuong · 2026-02-13T00:18:01Z

packages/commerce-sdk-react/package-lock.json

      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || ^22.0.0 || ^24.0.0",
-        "npm": "^9.0.0 || ^10.0.0 || ^11.0.0"
+        "node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",


this look wrong

alexvuong · 2026-02-13T00:18:20Z

packages/internal-lib-build/package-lock.json

      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || ^22.0.0 || ^24.0.0",
-        "npm": "^9.0.0 || ^10.0.0 || ^11.0.0"
+        "node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",


this look wrong

alexvuong · 2026-02-13T00:19:11Z

packages/pwa-kit-create-app/package-lock.json

      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || ^22.0.0 || ^24.0.0",
-        "npm": "^9.0.0 || ^10.0.0 || ^11.0.0"
+        "node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",


same as above

alexvuong · 2026-02-13T00:19:52Z

packages/pwa-kit-dev/package-lock.json

      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || ^22.0.0 || ^24.0.0",
-        "npm": "^9.0.0 || ^10.0.0 || ^11.0.0"
+        "node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",


alexvuong · 2026-02-13T00:20:15Z

packages/pwa-kit-mcp/package-lock.json

      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || ^22.0.0 || ^24.0.0",
-        "npm": "^9.0.0 || ^10.0.0 || ^11.0.0"
+        "node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",


alexvuong · 2026-02-13T00:20:47Z

packages/pwa-kit-runtime/src/ssr/server/build-remote-server.js

                            try {
                                const customBuffer = options.onSLASPrivateProxyRes(
-                                    workingBuffer,
+                                    responseBuffer,


is this expected?

yes, this is a bug fix we merged to the release branch. this is expected

alexvuong · 2026-02-13T00:21:01Z

packages/pwa-kit-runtime/package-lock.json

      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || ^22.0.0 || ^24.0.0",
-        "npm": "^9.0.0 || ^10.0.0 || ^11.0.0"
+        "node": "^16.11.0 || ^18.0.0 || ^20.0.0 || ^22.0.0",


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>

kevinxh and others added 18 commits February 6, 2026 15:24

Update changelogs for 3.16.0 release preparation

5d47b78

- Consolidate commerce-sdk-react v5.0.0-dev and v4.4.0-dev changelog entries into single section - Add AWS SDK v2 to v3 migration entry to pwa-kit-runtime changelog Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Bump versions for 3.16.0-preview.0

f14c1e9

SDK packages: 3.16.0-preview.0 commerce-sdk-react: 5.0.0-preview.0 retail-react-app: 9.0.0-preview.0 pwa-kit-mcp: 0.5.0-preview.0 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Merge develop for preview.1

1582aaa

Bump versions for 3.16.0-preview.1

5a3d81e

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Merge pull request #3649 from SalesforceCommerceCloud/prep-3.16.0-pre…

4401444

…view.1 Bump versions for 3.16.0-preview.1

1CC UX fixes (W-21240479)

fb333b9

- Update "Edit" labels to "Change" on contact info, payment, and shipping options toggle cards - Fix billing address display logic in payment summary - Update translations (en-US, en-GB, en-XA)

Trigger CI

61b3f28

Merge pull request #3660 from SalesforceCommerceCloud/prep-3.16.0-bugfix

85a9dfc

1CC UX fixes (W-21240479)

Bump versions for 3.16.0-preview.2

82fcae0

Trigger CI

37cee6d

@W-21252790: 1cc in Developer Preview mode (#3662)

f86c2c1

* alpha tag for one click checkout * alpha tag for one click checkout * error handling * error handling * error handling * responsebuffer * responsebuffer * responsebuffer

Merge pull request #3661 from SalesforceCommerceCloud/prep-3.16.0-pre…

70ef0ff

…view.2 Bump versions for 3.16.0-preview.2

Bump versions for 3.16.0 stable release

167ede5

Clean up changelogs for stable release

9667b10

Update 1CC config comment with Developer Preview note and release link

c6730fc

Merge pull request #3664 from SalesforceCommerceCloud/prep-3.16.0-stable

6c5fadd

Bump versions for 3.16.0 stable release

Merge release-3.16.x back to develop

a0b508b

Bump dev versions to 3.17.0-dev for next release cycle

bffe5c9

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

kevinxh requested review from a team as code owners February 13, 2026 00:14

alexvuong reviewed Feb 13, 2026

View reviewed changes

kevinxh and others added 2 commits February 12, 2026 16:26

Fix package versions and changelog headers after failed bump

004ba7f

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>

adamraya approved these changes Feb 13, 2026

View reviewed changes

vmarta approved these changes Feb 13, 2026

View reviewed changes

alexvuong approved these changes Feb 13, 2026

View reviewed changes

kevinxh enabled auto-merge February 13, 2026 01:21

kumaravinashcommercecloud approved these changes Feb 13, 2026

View reviewed changes

kevinxh merged commit 6e2b841 into develop Feb 13, 2026
42 checks passed

kevinxh deleted the merge-release-3.16.x-to-develop branch February 13, 2026 12:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge release-3.16.x back to develop, bump to 3.17.0-dev#3665

Merge release-3.16.x back to develop, bump to 3.17.0-dev#3665
kevinxh merged 20 commits intodevelopfrom
merge-release-3.16.x-to-develop

kevinxh commented Feb 13, 2026

Uh oh!

cc-prodsec commented Feb 13, 2026 •

edited

Loading

Uh oh!

alexvuong Feb 13, 2026

Uh oh!

alexvuong Feb 13, 2026

Uh oh!

alexvuong Feb 13, 2026

Uh oh!

alexvuong Feb 13, 2026

Uh oh!

alexvuong Feb 13, 2026

Uh oh!

alexvuong Feb 13, 2026

Uh oh!

kevinxh Feb 13, 2026

Uh oh!

alexvuong Feb 13, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

kevinxh commented Feb 13, 2026

Summary

Test plan

Uh oh!

cc-prodsec commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Snyk checks have passed. No issues have been found so far.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

cc-prodsec commented Feb 13, 2026 •

edited

Loading