Skip to content

Merge develop into oms feature branch#3009

Merged
sf-emmyzhang merged 189 commits intofeature/order-management-pluginfrom
merge-develop-into-oms
Aug 6, 2025
Merged

Merge develop into oms feature branch#3009
sf-emmyzhang merged 189 commits intofeature/order-management-pluginfrom
merge-develop-into-oms

Conversation

@sf-emmyzhang
Copy link
Contributor

@sf-emmyzhang sf-emmyzhang commented Aug 6, 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)

snilakandan13 and others added 30 commits July 1, 2025 14:46
@snilakandan13
Added cursor rules
7ae5702
@snilakandan13
Rules updated
c774939
@snilakandan13
Rules updated
ebdd8a9
@snilakandan13
Updated Readme document
702811b
@snilakandan13
Updated rules
b299d4e
@snilakandan13
updated rules
a2bff8b
@snilakandan13
Merge branch 'feature/pwa-developer-agent-only' of https://github.com…
0f52866 
…/SalesforceCommerceCloud/pwa-kit into t/commerce/W-18909894/addCursorRules
@snilakandan13
Cursor Rules for generating components
370178a
@snilakandan13
Added MCP rules for Component creation
b683539
@snilakandan13
Merge branch 'develop' of https://github.com/SalesforceCommerceCloud/…
a14dcef 
…pwa-kit into t/commerce/W-18909894/addCursorRules
@yhsieh1
@W-18737391 Add developemnt guidelines and page creation rules
2124053
@yhsieh1
remove from .cursor/rules folder
9b336fb
@yhsieh1
update rule
2ab0829
@yhsieh1
condense guideliens
3fd3078
@yhsieh1
Merge branch 'develop' of https://github.com/SalesforceCommerceCloud/…
6e6f9b1 
…pwa-kit into feature/W-18737391/updateCursorRules
@yhsieh1
update changelog
086381f
@yhsieh1
update rule to help pattern match
3bf0c83
@snilakandan13
Cursor rules and cleanup of tool
c1a87dd
@snilakandan13
Deleting from the monorepo
3668dc9
@snilakandan13
skip changelog
647fcab
@vcua-mobify
Update CHANGELOG.md
0b45818
@vcua-mobify
bump versions
8d44cf6
@vcua-mobify
Bump versions in mcp server
cad3f3a
@yhsieh1
added cursor rules
cce224d
@snilakandan13
Added options for other
b31f4d3
@yhsieh1
move cursor rules to root
57c29ec
@yhsieh1
move cursor rules to root
90faabc
@yhsieh1
revert change log
3e0d98a
@snilakandan13
Cursor rules for creating new component
310e504
@snilakandan13
Merge pull request #2702 from SalesforceCommerceCloud/t/commerce/W-18…
ff0cc39 
…909894/addCursorRules

@W-18909894 - add cursor rules for creating components
bendvc and others added 25 commits July 31, 2025 15:56
@bendvc @knhage
Update packages/pwa-kit-mcp/README.md
f5c3499 
Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>
@bendvc @knhage
Update packages/pwa-kit-mcp/README.md
bb401b9 
Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>
@bendvc @knhage
Update packages/pwa-kit-mcp/README.md
f3c2645 
Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>
@bendvc @knhage
Update packages/pwa-kit-mcp/README.md
7a99a42 
Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>
@bendvc @knhage
Update packages/pwa-kit-mcp/README.md
bce93ad 
Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>
@bendvc
Fix link
1668af6
@bendvc
Merge branch 'bendvc/remove-claude-references' of https://github.com/…
d7f8405 
…SalesforceCommerceCloud/pwa-kit into bendvc/remove-claude-references
@snilakandan13
Reverting the test change
bdcca80
@snilakandan13
Merge branch 'develop' into t/commerce/W-19013916/updatingPageCreatio…
48e4e38 
…nCursorRules
@bendvc
Update package description
1e67830
@bendvc
Remove folder structure section
ea5f1ca
@snilakandan13
Merge pull request #2946 from SalesforceCommerceCloud/t/commerce/W-19…
39b5732 
…013916/updatingPageCreationCursorRules

@W-19013916 - Committing for Rules and cleanup
@sf-avinash-kasipathy
@W-19179026: disable streaming responses (#2964)
311c5da
@bendvc
Merge branch 'develop' into bendvc/remove-claude-references
1a403c7
@bendvc
Explicitly added example of what the path to your project might look …
350378c 
…like.
@bendvc @knhage
Update packages/pwa-kit-mcp/README.md
faa48f2 
Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>
@bendvc
Merge pull request #2954 from SalesforceCommerceCloud/bendvc/remove-c…
3632d67 
…laude-references

[🧱 MCP Server Tool] Clean up readme file
@wei-liu-sf
@W-19248293: logMCPMessage is broken
7eb99e8
@wei-liu-sf
@W-19248293: logMCPMessage is broken
0694935
@wei-liu-sf
fix lint errors
c7884c7
@wei-liu-sf
Merge branch 'develop' into wliu-W-19248293-logMCPMessage
5f025ec
@wei-liu-sf
Merge pull request #2989 from SalesforceCommerceCloud/wliu-W-19248293…
a473997 
…-logMCPMessage

@W-19248293: logMCPMessage is broken
@patricksullivansf
@W-19251796 MCP a11y performance tool format fix (#3003)
0b671bc
@unandyala @bfeister
@W-19183433: Add code owners validation to the CI pipeline (#2939)
f99bc2a 
* Update codeowners

* Update codeowners

* Update codeowners

* Add codeowners validator to the pipeline

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

---------

Co-authored-by: Brian Feister <47546998+bfeister@users.noreply.github.com>
@sf-emmyzhang
Merge branch 'develop' into merge-develop-into-oms
d21cca0
@sf-emmyzhang sf-emmyzhang requested a review from a team as a code owner August 6, 2025 18:25
@cc-prodsec
Copy link
Collaborator

cc-prodsec commented Aug 6, 2025 •
edited
Loading

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

✅ security/snyk check is complete. No issues have been found. (View Details)

✅ license/snyk check is complete. No issues have been found. (View Details)

@sf-emmyzhang sf-emmyzhang merged commit 61ee444 into feature/order-management-plugin Aug 6, 2025
26 of 37 checks passed
@sf-emmyzhang sf-emmyzhang deleted the merge-develop-into-oms branch August 6, 2025 20:45
sf-deepali-bharmal pushed a commit that referenced this pull request Aug 19, 2025
@sf-emmyzhang @snilakandan13
@yhsieh1 @vcua-mobify @bendvc @patricksullivansf @ddiazccrz @carson-campbell @vmarta @szirpesf @seckardt @shethj @joeluong-sfcc @sf-henry-semaganda @alexvuong @wei-liu-sf @aditek-sf @unandyala @sf-avinash-kasipathy @knhage @bfeister @sf-deepali-bharmal
Merge develop into oms feature branch (#3009)
bd5b889 
* Added cursor rules

* Rules updated

* Rules updated

* Updated Readme document

* Updated rules

* updated rules

* Cursor Rules for generating components

* Added MCP rules for Component creation

* @W-18737391 Add developemnt guidelines and page creation rules

* remove from .cursor/rules folder

* update rule

* condense guideliens

* update changelog

* update rule to help pattern match

* Cursor rules and cleanup of tool

* Deleting from the monorepo

* skip changelog

* Update CHANGELOG.md

* bump versions

* Bump versions in mcp server

* added cursor rules

* Added options for other

* move cursor rules to root

* move cursor rules to root

* revert change log

* Cursor rules for creating new component

* nested cursor rules

* move to nested rules location

* revert create mobify app js

* Initial Commit

Add initGit option
Update readme for create app tool
Always use latest for create app npx package version.

* Change when git init is run

also added basic gitignore for non-extension projects

* Update CHANGELOG.md

* Fix tests

* Rename pwa-kit-mcp project

* Update server.js

* Include bin entry in package.json

* update changelog.md

* update changelog.md

* Fix dependencies etc

* Add example with output dir

* remove duplicated rules under assets

* @W-19065116 fix formating issue

* Punctuation fix in readme

* @W-19054407 BOPIS fix bundle inventory and child pickup selection (#2823)

* @W-19054407 BOPIS fix bundle inventory and child pickup selection

* @W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog

* Revert "@W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog"

This reverts commit f5be70b.

* @W-19054407 BOPIS changelog update

---------

Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>

* Update program.json

PR feedback on description.

Signed-off-by: Ben Chypak <bchypak@mobify.com>

* @W-19053749: Updated changelog to match new accepted style (#2837)

* Updated changelog

* update changelog

* revert development guidelines changes

* revert development guidelines changes

* Rename package to pwa-kit-mcp

* Update server json in readme

* Update readme and bump version

* Ensure the latest version is used in readme example

* Version align the mcp server with the platform version

* Use --initGit flag and test for .git/ creation

* Add flag both commands for template and presets

* Ensure gitignore is created

* Ensure default command includes --initGit

* Update base command

* @W-19045349 Add better error handling for Datacloud (#2811)

* Add better error handling for Datacloud

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Add new dataCloudAPI config

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Refactored to decrease duplicate code

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Fix prettier issues

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Remove comments

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Sync datacloud api values (#2843)

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>

---------

Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>

* qa prompt

* update

* encapulate rule copy logic

* update e2e test to verify .cursor folder is generated

* feat: add feature flag to enable/disable partial hydration @W-19082948 (#2846)

* update changelog

* Bump versions

* Clean up changelogs

* Update usid expiry to match refresh_token expiry

* Linting fix

* Update changelog

* Better prompting for cursor and create app program

* Update packages/commerce-sdk-react/src/auth/index.ts

Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com>

* Add unit tests for usid expiry

* Remove overlapping test cases

* update commerce-sdk-react

* update changelog

* bump version

* bump develop to next dev version

* Update changelogs

* Change version number

* Update readme

* Move tools to tools folder

* Clean up files/folders, create new tool folder.

* Lint

* A11y tests - Handle dynamic aria labels generated by chakra UI (#2864)

* Handle dynamic aria labels generated by chakra UI

* improve sanitization

---------

Co-authored-by: Alex Vuong <alex.vuong@salesforce.com>

* initial implementation of create page mcp tool

* fix

* support open url

* fix the import

* update README and changelog

* Modified create page mcp tool

* Added Image Componentsupport to Create page MCP tool

* Fixed failing tests

* Added new and fixed failing tests and corrected linting issues

* Added new test and minor update to system prompt

* Updated image component functionality

* Updated system prompt

* Fixed routes issue

* Added tests and comments

* Fixed merge conflicts and moved cursor to retail-react-app

* skip changelog

* Removed unused const

* Addressed comments

* Update reading expiry time for usid

* Removed the cursor rule

* Update codeowners file to include ownership for specific features (#2921)

* Update codeowners

* @W-18895609: 🚀 Shopper Agent Experience v3.0 (#2658)

* feat: shopper agent experience v3.0

* fix: enabling streaming (#2911)

* Committing for Rules and cleanup

* skip changelog

* Fixed tests

* Remove reference to claude and clean up readme

* Update CHANGELOG.md

* Lint fix

* Addressed comments

* Make development section more robust.

* Removed the flex hardcode in log message

* Fixing Page Tool

* Fixing Linter

* Updating the Page tool

* Fix eslint discoverability in the monorepo (@W-19068681@) (#2927)

* Attempt at fixing eslint discoverability in the monorepo

* Support other packages

* Another approach: centralize the eslint dependencies

* Add a script to sync eslint stuffs to the root

* Update package lock files

* Move timing of script to preinstall

* Update package lock files

* No need for this documentation

* Empty commit

* Simplify the script's logic

* Reverting changes for Page tool

* Added comment back

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* Fix link

* Reverting the test change

* Update package description

* Remove folder structure section

* @W-19179026: disable streaming responses (#2964)

* Explicitly added example of what the path to your project might look like.

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>

* @W-19248293: logMCPMessage is broken

* @W-19248293: logMCPMessage is broken

* fix lint errors

* @W-19251796 MCP a11y performance tool format fix (#3003)

* @W-19183433: Add code owners validation to the CI pipeline (#2939)

* Update codeowners

* Update codeowners

* Update codeowners

* Add codeowners validator to the pipeline

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

---------

Co-authored-by: Brian Feister <47546998+bfeister@users.noreply.github.com>

---------

Signed-off-by: yhsieh1 <yhsieh@salesforce.com>
Signed-off-by: Ben Chypak <bchypak@mobify.com>
Signed-off-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>
Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com>
Co-authored-by: snilakandan <snilakandan@salesforce.com>
Co-authored-by: Yuming Hsieh <yhsieh@salesforce.com>
Co-authored-by: vcua-mobify <vcua@salesforce.com>
Co-authored-by: snilakandan13 <119348013+snilakandan13@users.noreply.github.com>
Co-authored-by: Ben Chypak <bchypak@salesforce.com>
Co-authored-by: patricksullivansf <100441292+patricksullivansf@users.noreply.github.com>
Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Co-authored-by: Ben Chypak <bchypak@mobify.com>
Co-authored-by: Daniel Diaz <38542490+ddiazccrz@users.noreply.github.com>
Co-authored-by: Carson Campbell <170666418+carson-campbell@users.noreply.github.com>
Co-authored-by: Vincent Marta <vmarta@salesforce.com>
Co-authored-by: Shailesh Zirpe <szirpe+sf@salesforce.com>
Co-authored-by: Steffen Eckardt <3235219+seckardt@users.noreply.github.com>
Co-authored-by: Jainam Sheth <j.sheth@salesforce.com>
Co-authored-by: Jainam Sheth <99490559+shethj@users.noreply.github.com>
Co-authored-by: Joel Uong <joel.uong@salesforce.com>
Co-authored-by: sf-henry-semaganda <henry.semaganda@salesforce.com>
Co-authored-by: Alex Vuong <alex.vuong@salesforce.com>
Co-authored-by: Shailesh Zirpe <42553862+szirpesf@users.noreply.github.com>
Co-authored-by: wei-liu <wei.liu@salesforce.com>
Co-authored-by: atekur <atekur@salesforce.com>
Co-authored-by: Aditya Tekur <126732792+aditek-sf@users.noreply.github.com>
Co-authored-by: Ujwala <59447810+unandyala@users.noreply.github.com>
Co-authored-by: Avinash Kasipathy <akasipathy@salesforce.com>
Co-authored-by: Katia Hage <k.n.hage@salesforce.com>
Co-authored-by: Brian Feister <47546998+bfeister@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.