Merge branch 'standard-product-support' into t/cc-shark/W-18767088/refactor-add-to-cart

Signed-off-by: Kyle Wright <30636085+sf-kyle-wright@users.noreply.github.com>

Author: sf-kyle-wright

packages/commerce-sdk-react/CHANGELOG.md

@@ -1,4 +1,6 @@
 ## v3.4.0-dev.0 (May 23, 2025)
+
+- Optionally disable auth init in CommerceApiProvider [#2629](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2629)
 - Now compatible with either React 17 and 18 [#2506](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2506)
 - Gracefully handle missing SDK Clients in CommerceApiProvider [#2539](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2539)
 - Refactor commerce-sdk-react to allow injecting ApiClients [#2519](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2519)

packages/commerce-sdk-react/src/provider.test.tsx

@@ -72,4 +72,20 @@ describe('provider', () => {
         expect(element).toBeInTheDocument()
         expect(element.textContent?.includes('/mobify/slas/private')).toBeTruthy()
     })
+
+    test('does not call Auth.ready() when disableAuthInit is true', () => {
+        renderWithProviders(<h1>Auth not initialized!</h1>, {disableAuthInit: true})
+        expect(screen.getByText('Auth not initialized!')).toBeInTheDocument()
+        expect(Auth).toHaveBeenCalledTimes(1)
+        const authInstance = (Auth as jest.Mock).mock.instances[0]
+        expect(authInstance.ready).toHaveBeenCalledTimes(0)
+    })
+
+    test('calls Auth.ready() when disableAuthInit is false', () => {
+        renderWithProviders(<h1>Auth initialized!</h1>, {disableAuthInit: false})
+        expect(screen.getByText('Auth initialized!')).toBeInTheDocument()
+        expect(Auth).toHaveBeenCalledTimes(1)
+        const authInstance = (Auth as jest.Mock).mock.instances[0]
+        expect(authInstance.ready).toHaveBeenCalledTimes(1)
+    })
 })

packages/commerce-sdk-react/src/provider.tsx

@@ -49,6 +49,7 @@ export interface CommerceApiProviderProps extends ApiClientConfigParams {
     refreshTokenRegisteredCookieTTL?: number
     refreshTokenGuestCookieTTL?: number
     apiClients?: ApiClients
+    disableAuthInit?: boolean
 }
 
 /**
@@ -132,7 +133,8 @@ const CommerceApiProvider = (props: CommerceApiProviderProps): ReactElement => {
         passwordlessLoginCallbackURI,
         refreshTokenRegisteredCookieTTL,
         refreshTokenGuestCookieTTL,
-        apiClients
+        apiClients,
+        disableAuthInit = false
     } = props
 
     // Set the logger based on provided configuration, or default to the console object if no logger is provided
@@ -270,7 +272,11 @@ const CommerceApiProvider = (props: CommerceApiProviderProps): ReactElement => {
     ])
 
     // Initialize the session
-    useEffect(() => void auth.ready(), [auth])
+    useEffect(() => {
+        if (!disableAuthInit) {
+            void auth.ready()
+        }
+    }, [auth, disableAuthInit])
 
     return (
         <ConfigContext.Provider

packages/pwa-kit-create-app/CHANGELOG.md

@@ -1,17 +1,19 @@
 ## v3.11.0-dev.0 (May 23, 2025)
+- Change the default ECOM instance in the generated application [#2610](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2610)
+- Load active data scripts on demand only [#2623](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2623)
 
 ## v3.10.0 (May 22, 2025)
-- Add Data Cloud API configuration to `default.js`. [#2318] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2229)
+- Add Data Cloud API configuration to `default.js`. [#2318](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2318)
 - Fix dependencies vulnerabilities [#2338](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2338)
 
 ## v3.9.1 (Mar 05, 2025)
 - Update PWA-Kit SDKs to v3.9.1 [#2301](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2301)
 
 ## v3.9.0 (Feb 18, 2025)
 
-- Update `default.js` and `ssr.js` template to support new passwordless, social, and reset password flows. [#2263] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2263)
+- Update `default.js` and `ssr.js` template to support new passwordless, social, and reset password flows. [#2263](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2263)
 - Support Node 22 [#2218](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2218)
-- Update `default.js` template to include new login configurations [#2079] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2079)
+- Update `default.js` template to include new login configurations [#2079](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2079)
 - Handle import error when ssr.js imports from template retail react app [#2270](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2270)
 
 ## v3.8.0 (Oct 28, 2024)

packages/pwa-kit-create-app/assets/bootstrap/js/overrides/app/ssr.js.hbs

@@ -289,7 +289,8 @@ const {handler} = runtime.createHandler(options, (app) => {
                 directives: {
                     'img-src': [
                         // Default source for product images - replace with your CDN
-                        '*.commercecloud.salesforce.com'
+                        '*.commercecloud.salesforce.com',
+                        '*.demandware.net'
                     ],
                     'script-src': [
                         // Used by the service worker in /worker/main.js