@W-21671037@ Release PWA Kit 3.17.1 (#3761)

* W-2129587: removed wrapperStyle, add position fixed for LoadingSpinner to have full screen overlay

* bump version to preview.1

* @W-21414441@ Bugfix - Fix adding to cart from a master product in the wishlist (#3732)

* Fix add to cart bug and add e2e test

* Update CHANGELOG.md

* W-21432256 fix redirect payment methods status value during preview t… (#3734)

* W-21432256 fix redirect payment methods status value during preview testing

* @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration (#3741)

* @W-21551291: [1CC][PWA Kit] Custom billing address lost after OTP registration

Signed-off-by: d.phan <d.phan@salesforce.com>

* add changelog

Signed-off-by: d.phan <d.phan@salesforce.com>

* lint fix

Signed-off-by: d.phan <d.phan@salesforce.com>

* lint fix

Signed-off-by: d.phan <d.phan@salesforce.com>

---------

Signed-off-by: d.phan <d.phan@salesforce.com>

* clean up changelog

* bump versions

* Add missing overrides to extensible app (#3745)

* Add missing overrides to extensible app

* Update CHANGELOG.md

* Bump versions

* @W-20784635@ Productize base paths (#3614)

* @W-20784722@ Move envBasePath into ssrParameters (#3590)

* Move envBasePath into ssrParameters

* Apply MRT restrictions on supported base paths

* Update changelogs

* one more changelog

* Update express.test.js

* Remove whitespace trimming

* Remove test base path

* Add comment

* @W-20784635@ Support adding base paths to shopper facing URLs (#3615)

* Add base path to react router routes

* Handle basename for urls that bypass react router

* Add a feature toggle for app base names

* Add tests

* Update config templates

* Rename getBasename to getRouterBasePath

* Update changelogs

* Test fixes

* Remove unused import and cleanup comments

* Apply suggestions

* Clean up redundant code

* Fix issues from merge conflict

* Update CHANGELOG.md

* [Storefront Preview] Address base path duplication for manually entered urls (#3666)

* Address base path duplication

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Apply suggestions

* Fix unwanted basePath removal if base path is a substring

* Lint

* Add console warn

* Update refresh component to avoid duplicate base paths

* Fix merge issue

* Add tests for coverage

* Squash changelogs

* Remove warning

---------

Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>

* Bump version to 3.17.1-preview.0

* Update CHANGELOG.md

* @W-21671037@ Remove base path from /__pwa-kit requests if showBasePath is false (#3758)

* Remove base path from /__pwa-kit requests if showBasePath is false

* Update CHANGELOG.md

* Use a redirect so client side is able hydrate.

* Apply storefront preview component changes to deal with client-side single page navigation

* Update CHANGELOG.md

* Bump version to 3.17.1

---------

Signed-off-by: nayanavishwa <nayana.vishwa@salesforce.com>
Signed-off-by: d.phan <d.phan@salesforce.com>
Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Co-authored-by: nayanavishwa <nayana.vishwa@salesforce.com>
Co-authored-by: amittapalli <amittapalli@yahoo.com>
Co-authored-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com>

Author: 4 people

e2e/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "e2e-scripts",
-  "version": "3.17.1-preview.0",
+  "version": "3.17.1",
   "description": "E2E test scripts for PWA Kit",
   "main": "index.js",
   "private": true,
@@ -15,7 +15,7 @@
     "@actions/core": "^1.11.1",
     "@aws-sdk/client-s3": "3.450.0",
     "@aws-sdk/client-sts": "3.450.0",
-    "@salesforce/pwa-kit-dev": "3.17.1-preview.0",
+    "@salesforce/pwa-kit-dev": "3.17.1",
     "jest": "^29.7.0"
   },
   "jest": {

e2e/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.17.1-preview.0",
+  "version": "3.17.1",
   "packages": [
     "packages/*",
     "e2e"

lerna.json

@@ -1,6 +1,6 @@
 {
     "name": "pwa-kit",
-    "version": "3.17.1-preview.0",
+    "version": "3.17.1",
     "scripts": {
         "bump-version": "node ./scripts/bump-version/index.js",
         "bump-version:retail-react-app": "node ./scripts/bump-version/index.js --package=@salesforce/retail-react-app",

package-lock.json

@@ -1,5 +1,6 @@
-## v5.1.1-preview.0 (Mar 13, 2026)
+## v5.1.1 (Mar 20, 2026)
 - Update storefront preview to support base paths [#3614](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3614)
+- Remove base path from /__pwa-kit route requests when showBasePath is false [#3758](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3758)
 
 ## v5.1.0 (Mar 12, 2026)
 - Add Page Designer Support [#3727](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3727)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/commerce-sdk-react",
-  "version": "5.1.1-preview.0",
+  "version": "5.1.1",
   "description": "A library that provides react hooks for fetching data from Commerce Cloud",
   "homepage": "https://github.com/SalesforceCommerceCloud/pwa-kit/tree/develop/packages/ecom-react-hooks#readme",
   "bugs": {
@@ -46,7 +46,7 @@
     "jwt-decode": "^4.0.0"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.17.1-preview.0",
+    "@salesforce/pwa-kit-dev": "3.17.1",
     "@tanstack/react-query": "^4.28.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
@@ -61,7 +61,7 @@
     "@types/react-helmet": "~6.1.6",
     "@types/react-router-dom": "~5.3.3",
     "cross-env": "^5.2.1",
-    "internal-lib-build": "3.17.1-preview.0",
+    "internal-lib-build": "3.17.1",
     "jsonwebtoken": "^9.0.0",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",

packages/commerce-sdk-react/CHANGELOG.md

@@ -213,6 +213,102 @@ describe('Storefront Preview Component', function () {
         expect(mockPush).toHaveBeenCalledWith({pathname: '/product/123', search: '?q=1'})
     })
 
+    test('experimentalUnsafeNavigate strips base path prefix from /__pwa-kit/ paths when getBasePath returns empty (showBasePath false)', () => {
+        ;(detectStorefrontPreview as jest.Mock).mockReturnValue(true)
+
+        render(
+            <StorefrontPreview
+                enabled={true}
+                getToken={() => 'my-token'}
+                getBasePath={() => ''}
+            />
+        )
+
+        // Runtime Admin sends /test/__pwa-kit/refresh but React Router has no basename
+        window.STOREFRONT_PREVIEW?.experimentalUnsafeNavigate?.(
+            '/test/__pwa-kit/refresh?referrer=/some-page',
+            'replace'
+        )
+        expect(mockReplace).toHaveBeenCalledWith('/__pwa-kit/refresh?referrer=/some-page')
+    })
+
+    test('experimentalUnsafeNavigate strips base path prefix from /__pwa-kit/ location objects when getBasePath returns empty', () => {
+        ;(detectStorefrontPreview as jest.Mock).mockReturnValue(true)
+
+        render(
+            <StorefrontPreview
+                enabled={true}
+                getToken={() => 'my-token'}
+                getBasePath={() => ''}
+            />
+        )
+
+        window.STOREFRONT_PREVIEW?.experimentalUnsafeNavigate?.(
+            {pathname: '/test/__pwa-kit/refresh', search: '?referrer=/some-page'},
+            'replace'
+        )
+        expect(mockReplace).toHaveBeenCalledWith({
+            pathname: '/__pwa-kit/refresh',
+            search: '?referrer=/some-page'
+        })
+    })
+
+    test('experimentalUnsafeNavigate normalizes /__pwa-kit/ paths and then strips router base path (showBasePath true)', () => {
+        ;(detectStorefrontPreview as jest.Mock).mockReturnValue(true)
+
+        render(
+            <StorefrontPreview
+                enabled={true}
+                getToken={() => 'my-token'}
+                getBasePath={() => '/test'}
+            />
+        )
+
+        // Runtime Admin sends /test/__pwa-kit/refresh, normalizePwaKitPath strips to
+        // /__pwa-kit/refresh, then removeBasePathFromLocation is a no-op (doesn't start with /test/)
+        // React Router re-adds the basename, so history receives /__pwa-kit/refresh
+        window.STOREFRONT_PREVIEW?.experimentalUnsafeNavigate?.(
+            '/test/__pwa-kit/refresh?referrer=/test/some-page',
+            'replace'
+        )
+        expect(mockReplace).toHaveBeenCalledWith('/__pwa-kit/refresh?referrer=/test/some-page')
+    })
+
+    test('experimentalUnsafeNavigate does not alter /__pwa-kit/ paths that have no prefix', () => {
+        ;(detectStorefrontPreview as jest.Mock).mockReturnValue(true)
+
+        render(
+            <StorefrontPreview
+                enabled={true}
+                getToken={() => 'my-token'}
+                getBasePath={() => ''}
+            />
+        )
+
+        // Path already starts with /__pwa-kit/ — no prefix to strip
+        window.STOREFRONT_PREVIEW?.experimentalUnsafeNavigate?.(
+            '/__pwa-kit/refresh?referrer=/some-page',
+            'push'
+        )
+        expect(mockPush).toHaveBeenCalledWith('/__pwa-kit/refresh?referrer=/some-page')
+    })
+
+    test('experimentalUnsafeNavigate does not affect non /__pwa-kit/ paths when showBasePath is false', () => {
+        ;(detectStorefrontPreview as jest.Mock).mockReturnValue(true)
+
+        render(
+            <StorefrontPreview
+                enabled={true}
+                getToken={() => 'my-token'}
+                getBasePath={() => ''}
+            />
+        )
+
+        // Regular navigation paths should pass through untouched
+        window.STOREFRONT_PREVIEW?.experimentalUnsafeNavigate?.('/products/123', 'push')
+        expect(mockPush).toHaveBeenCalledWith('/products/123')
+    })
+
     test('cache breaker is added to the parameters of SCAPI requests, only if in storefront preview', () => {
         ;(detectStorefrontPreview as jest.Mock).mockReturnValue(true)
         mockQueryEndpoint('baskets/123', {})

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

@@ -27,6 +27,28 @@ function removeBasePathFromPath(path: string, basePath: string): string {
     return matches ? path.slice(basePath.length) || '/' : path
 }
 
+const PWA_KIT_PATH_PREFIX = '/__pwa-kit/'
+
+/**
+ * Runtime Admin always prepends envBasePath to /__pwa-kit/ paths (e.g. /test/__pwa-kit/refresh),
+ * but when showBasePath is false, React Router has no basename and expects /__pwa-kit/refresh.
+ * 
+ * This ensures that regardless of the showBasePath setting, these paths are normalized to 
+ * remove the base path.
+ */
+function normalizePwaKitPath<T>(pathOrLocation: LocationDescriptor<T>): LocationDescriptor<T> {
+    if (typeof pathOrLocation === 'string') {
+        const idx = pathOrLocation.indexOf(PWA_KIT_PATH_PREFIX)
+        return idx > 0 ? pathOrLocation.slice(idx) : pathOrLocation
+    }
+    const pathname = pathOrLocation.pathname ?? '/'
+    const idx = pathname.indexOf(PWA_KIT_PATH_PREFIX)
+    if (idx > 0) {
+        return {...pathOrLocation, pathname: pathname.slice(idx)}
+    }
+    return pathOrLocation
+}
+
 /**
  * Strip the base path from a path
  *
@@ -53,8 +75,8 @@ function removeBasePathFromLocation<T>(
  * @param enabled - flag to turn on/off Storefront Preview feature. By default, it is set to true.
  * This flag only applies if storefront is running in a Runtime Admin iframe.
  * @param getToken - A method that returns the access token for the current user
- * @param getBasePath - A method that returns the router base path of the app. Requird if using
- * base path for router routes (showBasePath is true in url config).
+ * @param getBasePath - A method that returns the router base path of the app.
+ * Required if using a base path for router routes (showBasePath is true in url config).
  */
 export const StorefrontPreview = ({
     children,
@@ -88,7 +110,8 @@ export const StorefrontPreview = ({
                     ...args: unknown[]
                 ) => {
                     const basePath = getBasePath?.() ?? ''
-                    const pathWithoutBase = removeBasePathFromLocation(path, basePath)
+                    const normalizedPath = normalizePwaKitPath(path)
+                    const pathWithoutBase = removeBasePathFromLocation(normalizedPath, basePath)
                     history[action](pathWithoutBase, ...args)
                 }
             }