Commit 8d52bd5
committed
Merge feature/1cc_merge into avinash.W-21086834
- Resolved conflicts keeping Einstein checkoutType (one-click) in one-click checkout context
- Kept oneClickCheckout enabled: true in config
- Took feature/1cc_merge for: package-lock files, one-click partials, translations, commerce-sdk-react auth/ShopperConfigurations, pwa-kit-runtime build-remote-server, account payments/profile tests, header/icons/multiship, hooks index
- Merged: checkout-context (checkoutType + their goToNextStep), config default, bundlesize, auth passwordless paramsFile tree
333 files changed
+44078
-17116
lines changed- .github
- actions
- bundle_size_test
- check_clean
- check_if_latest_release
- count_deps
- create_mrt
- datadog
- e2e_generate_app
- e2e_validate_generated_app
- lighthouse_ci
- linting
- publish_to_npm
- push_to_mrt
- smoke_tests
- snyk
- workflows
- e2e
- tests
- a11y
- desktop
- __snapshots__
- guest
- registered
- slas-private-client/__snapshots__
- guest
- registered
- slas-public-client/__snapshots__
- guest
- registered
- mobile
- __snapshots__
- guest
- registered
- slas-public-client/__snapshots__
- guest
- registered
- desktop
- mobile
- packages
- commerce-sdk-react
- src
- auth
- hooks
- ShopperConfigurations
- ShopperCustomers
- ShopperExperience
- ShopperLogin
- ShopperOrders
- internal-lib-build
- pwa-kit-create-app
- assets
- bootstrap/js
- config
- overrides/app
- components/_app-config
- static/img
- templates/@salesforce/retail-react-app
- app
- components/_app-config
- static/img
- config
- pwa-kit-dev
- pwa-kit-mcp
- src
- data
- ai-instructions
- cursor
- generic
- server
- tools
- utils
- pwa-kit-react-sdk
- pwa-kit-runtime
- src
- ssr/server
- utils
- ssr-server
- template-express-minimal
- template-mrt-reference-app
- app
- static
- config
- template-retail-react-app
- app
- assets/svg
- components
- _app-config
- _app
- address-suggestion-dropdown
- bonus-product-view-modal
- email-confirmation
- forms
- header
- icons
- login
- multiship
- order-summary
- passwordless-login
- product-item-list
- product-item
- product-view-modal
- product-view
- search
- partials
- store-display
- hooks
- use-bonus-product-selection-modal
- components
- mocks
- pages
- account
- cart
- partials
- checkout-one-click
- partials
- util
- checkout
- partials
- util
- confirmation
- home
- login
- page-not-found
- product-detail
- product-list/partials
- registration
- reset-password
- static
- img
- translations/compiled
- theme/components/project
- utils
- bonus-product
- config
- mocks
- translations
- template-typescript-minimal
- test-commerce-sdk-react
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
333 files changed
+44078
-17116
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
0 commit comments