@salesforce/commerce-sdk-react 2.0.0-preview.1 → 2.0.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.0.1 (Jul 08, 2024)
+- Fix private slas proxy config for commerce api in provider [#1883](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1883)
+- Fix `useCustomQuery` error handling [#1883](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1883)
+- Fix `updateCustomer` squashing existing data [#1883](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1883)
+- Fix `transferBasket` updating the wrong customer basket [#1887](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1887)
+
 ## v2.0.0 (Jun 25, 2024)
 - Add `useCustomQuery` and `useCustomMutation` for SCAPI custom endpoint support [#1793](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1793)
 - Add Shopper Stores hooks [#1788](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/1788)

package/hooks/ShopperBaskets/cache.js

@@ -240,9 +240,11 @@ const cacheUpdateMatrix = exports.cacheUpdateMatrix = {
   transferBasket(customerId, {
     parameters
   }, response) {
+    var _response$customerInf;
     const {
       basketId
     } = response;
+    const transferedTo = response === null || response === void 0 ? void 0 : (_response$customerInf = response.customerInfo) === null || _response$customerInf === void 0 ? void 0 : _response$customerInf.customerId;
     return {
       // TODO: Convert invalidate to an update that removes the matching basket
       invalidate: [...(customerId && !basketId ? [invalidateCustomerBasketsQuery(customerId, parameters)] : [])],
@@ -250,7 +252,7 @@ const cacheUpdateMatrix = exports.cacheUpdateMatrix = {
         queryKey: _queryKeyHelpers.getBasket.queryKey(_objectSpread(_objectSpread({}, parameters), {}, {
           basketId
         }))
-      }, ...(customerId && basketId ? [updateCustomerBasketsQuery(customerId, _objectSpread(_objectSpread({}, parameters), {}, {
+      }, ...(transferedTo && basketId ? [updateCustomerBasketsQuery(transferedTo, _objectSpread(_objectSpread({}, parameters), {}, {
         basketId
       }), response)] : [])]
     };

package/hooks/ShopperCustomers/cache.js

@@ -268,7 +268,7 @@ const cacheUpdateMatrix = exports.cacheUpdateMatrix = {
   resetPassword: noop,
   updateCustomer(customerId, {
     parameters
-  }) {
+  }, response) {
     // When we update a customer, we don't know what data has changed, so we must invalidate all
     // derivative endpoints. They conveniently all start with the same path as `getCustomer`,
     // but we do NOT want to invalidate `getCustomer` itself, we want to _update_ it. (Ideally,
@@ -283,7 +283,13 @@ const cacheUpdateMatrix = exports.cacheUpdateMatrix = {
     const predicate = (0, _utils.and)((0, _utils.pathStartsWith)(path), isNotGetCustomer);
     return {
       update: [{
-        queryKey: _queryKeyHelpers.getCustomer.queryKey(parameters)
+        queryKey: _queryKeyHelpers.getCustomer.queryKey(parameters),
+        updater: createUpdateFunction(customer => {
+          // The `updateCustomer` endpoint does not return exhaustive customer data. It
+          // is missing data for `addresses` and `paymentInstruments`, to name a few. Here
+          // we ensure that any customer data we have is preserved.
+          return _objectSpread(_objectSpread({}, customer), response);
+        })
       }],
       invalidate: [{
         predicate

package/hooks/useQuery.js

@@ -93,7 +93,7 @@ const useCustomQuery = (apiOptions, queryOptions) => {
             Authorization: `Bearer ${access_token}`
           }, clientHeaders), (_options$options2 = options.options) === null || _options$options2 === void 0 ? void 0 : _options$options2.headers)
         }, options.options),
-        clientConfig: _objectSpread({
+        clientConfig: _objectSpread(_objectSpread({
           parameters: {
             clientId: config.clientId,
             siteId: config.siteId,
@@ -101,7 +101,9 @@ const useCustomQuery = (apiOptions, queryOptions) => {
             shortCode: config.organizationId
           },
           proxy: config.proxy
-        }, clientConfig)
+        }, clientConfig), {}, {
+          throwOnBadResponse: true
+        })
       }));
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/commerce-sdk-react",
-  "version": "2.0.0-preview.1",
+  "version": "2.0.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": {
@@ -45,7 +45,7 @@
     "jwt-decode": "^4.0.0"
   },
   "devDependencies": {
-    "@salesforce/pwa-kit-dev": "3.6.0-preview.1",
+    "@salesforce/pwa-kit-dev": "3.6.0",
     "@tanstack/react-query": "^4.28.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
@@ -60,7 +60,7 @@
     "@types/react-helmet": "~6.1.6",
     "@types/react-router-dom": "~5.3.3",
     "cross-env": "^5.2.1",
-    "internal-lib-build": "3.6.0-preview.1",
+    "internal-lib-build": "3.6.0",
     "jsonwebtoken": "^9.0.0",
     "nock": "^13.3.0",
     "nodemon": "^2.0.22",
@@ -90,5 +90,5 @@
   "publishConfig": {
     "directory": "dist"
   },
-  "gitHead": "9c4f0ecc797e8e62c3b5a52a1586d3f80bc7e060"
+  "gitHead": "eb6bc596bbce102309014335bb9072f305c425f2"
 }

package/provider.js

@@ -7,16 +7,20 @@ exports.default = exports.ConfigContext = exports.CommerceApiContext = exports.A
 var _react = _interopRequireWildcard(require("react"));
 var _commerceSdkIsomorphic = require("commerce-sdk-isomorphic");
 var _auth = _interopRequireDefault(require("./auth"));
+var _constant = require("./constant");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-/*
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-
 /**
  * @internal
  */
@@ -111,6 +115,8 @@ const CommerceApiProvider = props => {
     throwOnBadResponse: true,
     fetchOptions
   };
+  const baseUrl = config.proxy.split(_constant.MOBIFY_PATH)[0];
+  const privateClientEndpoint = `${baseUrl}${_constant.SLAS_PRIVATE_PROXY_PATH}`;
   const apiClients = (0, _react.useMemo)(() => {
     return {
       shopperBaskets: new _commerceSdkIsomorphic.ShopperBaskets(config),
@@ -118,7 +124,9 @@ const CommerceApiProvider = props => {
       shopperCustomers: new _commerceSdkIsomorphic.ShopperCustomers(config),
       shopperExperience: new _commerceSdkIsomorphic.ShopperExperience(config),
       shopperGiftCertificates: new _commerceSdkIsomorphic.ShopperGiftCertificates(config),
-      shopperLogin: new _commerceSdkIsomorphic.ShopperLogin(config),
+      shopperLogin: new _commerceSdkIsomorphic.ShopperLogin(_objectSpread(_objectSpread({}, config), {}, {
+        proxy: enablePWAKitPrivateClient ? privateClientEndpoint : config.proxy
+      })),
       shopperOrders: new _commerceSdkIsomorphic.ShopperOrders(config),
       shopperProducts: new _commerceSdkIsomorphic.ShopperProducts(config),
       shopperPromotions: new _commerceSdkIsomorphic.ShopperPromotions(config),