@salesforce/commerce-sdk-react 5.1.1-preview.0 → 5.1.1

package/CHANGELOG.md

@@ -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/components/StorefrontPreview/storefront-preview.d.ts

@@ -12,8 +12,8 @@ type OptionalWhenDisabled<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 declare const StorefrontPreview: {
     ({ children, enabled, getToken, onContextChange, getBasePath }: React.PropsWithChildren<OptionalWhenDisabled<{

package/components/StorefrontPreview/storefront-preview.js

@@ -30,6 +30,29 @@ function removeBasePathFromPath(path, basePath) {
   const matches = path.startsWith(basePath + '/') || path === basePath;
   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(pathOrLocation) {
+  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 _objectSpread(_objectSpread({}, pathOrLocation), {}, {
+      pathname: pathname.slice(idx)
+    });
+  }
+  return pathOrLocation;
+}
 
 /**
  * Strip the base path from a path
@@ -53,8 +76,8 @@ function removeBasePathFromLocation(pathOrLocation, basePath) {
  * @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).
  */
 const StorefrontPreview = ({
   children,
@@ -77,7 +100,8 @@ const StorefrontPreview = ({
         siteId,
         experimentalUnsafeNavigate: (path, action = 'push', ...args) => {
           const basePath = (getBasePath === null || getBasePath === void 0 ? void 0 : getBasePath()) ?? '';
-          const pathWithoutBase = removeBasePathFromLocation(path, basePath);
+          const normalizedPath = normalizePwaKitPath(path);
+          const pathWithoutBase = removeBasePathFromLocation(normalizedPath, basePath);
           history[action](pathWithoutBase, ...args);
         }
       });

package/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",
@@ -97,5 +97,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "beabe8a971b6170bddfe08ae3f5ca2f1bfe66aa7"
+  "gitHead": "d09ed57f84432913ab3e55e3073802d319c5dc3c"
 }