@commercetools-frontend/application-shell-connectors 22.30.3 → 22.31.0

package/dist/commercetools-frontend-application-shell-connectors.cjs.dev.js

@@ -16,7 +16,6 @@ var react = require('react');
 var moment = require('moment-timezone');
 var sentry = require('@commercetools-frontend/sentry');
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
-var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _reduceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/reduce');
 var _Object$entries = require('@babel/runtime-corejs3/core-js-stable/object/entries');
@@ -62,7 +61,6 @@ var _Object$defineProperty__default = /*#__PURE__*/_interopDefault(_Object$defin
 var _pt__default = /*#__PURE__*/_interopDefault(_pt);
 var moment__default = /*#__PURE__*/_interopDefault(moment);
 var _URL__default = /*#__PURE__*/_interopDefault(_URL);
-var _concatInstanceProperty__default = /*#__PURE__*/_interopDefault(_concatInstanceProperty);
 var _reduceInstanceProperty__default = /*#__PURE__*/_interopDefault(_reduceInstanceProperty);
 var _Object$entries__default = /*#__PURE__*/_interopDefault(_Object$entries);
 var _valuesInstanceProperty__default = /*#__PURE__*/_interopDefault(_valuesInstanceProperty);
@@ -81,7 +79,7 @@ var _Reflect$construct__default = /*#__PURE__*/_interopDefault(_Reflect$construc
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "22.30.3";
+var version = "22.31.0";
 
 // From https://github.com/acdlite/recompose/blob/master/src/packages/recompose/getDisplayName.js
 const getDisplayName = Component => {
@@ -103,10 +101,9 @@ const getMcOriginTld = host => {
   return host.replace(mcHostnameRegex, '$3');
 };
 const getMcApiUrlFromOrigin = origin => {
-  var _context;
   const url = new _URL__default["default"](origin);
   const originTld = getMcOriginTld(url.host);
-  return _concatInstanceProperty__default["default"](_context = "".concat(url.protocol, "//mc-api.")).call(_context, originTld);
+  return `${url.protocol}//mc-api.${originTld}`;
 };
 const parseAsBoolean = value => value === true || value === 'true';
 function getMcApiUrl() {
@@ -338,9 +335,9 @@ const createApplicationContext = (environment, user, project, projectDataLocale)
   environment: mapEnvironmentToApplicationContextEnvironment(environment),
   user: mapUserToApplicationContextUser(user),
   project: mapProjectToApplicationContextProject(project),
-  permissions: normalizeAllAppliedPermissions(project === null || project === void 0 ? void 0 : project.allAppliedPermissions),
-  actionRights: normalizeAllAppliedActionRights(project === null || project === void 0 ? void 0 : project.allAppliedActionRights),
-  dataFences: normalizeAllAppliedDataFences(project === null || project === void 0 ? void 0 : project.allAppliedDataFences),
+  permissions: normalizeAllAppliedPermissions(project?.allAppliedPermissions),
+  actionRights: normalizeAllAppliedActionRights(project?.allAppliedActionRights),
+  dataFences: normalizeAllAppliedDataFences(project?.allAppliedDataFences),
   dataLocale: projectDataLocale || null
 });
 const ApplicationContextProvider = props => jsxRuntime.jsx(Context$2.Provider, {
@@ -376,7 +373,7 @@ function withApplicationContext(mapApplicationContextToProps) {
         return jsxRuntime.jsx(Component, _objectSpread$6(_objectSpread$6({}, props), mappedProps));
       }
     });
-    WrappedComponent.displayName = "withApplicationContext(".concat(getDisplayName(Component), ")");
+    WrappedComponent.displayName = `withApplicationContext(${getDisplayName(Component)})`;
     return WrappedComponent;
   };
 }
@@ -485,7 +482,7 @@ ProjectExtensionProviderForImageRegex.propTypes = process.env.NODE_ENV !== "prod
 } : {};
 ProjectExtensionProviderForImageRegex.displayName = 'ProjectExtensionProviderForImageRegex';
 const GetProjectExtensionImageRegex = props => {
-  useWarning(false, "@commercetools-frontend/application-shell-connectors: It is not recommended to use the 'GetProjectExtensionImageRegex' anymore. Please use the 'useProjectExtensionImageRegex' hook instead.");
+  useWarning(false, `@commercetools-frontend/application-shell-connectors: It is not recommended to use the 'GetProjectExtensionImageRegex' anymore. Please use the 'useProjectExtensionImageRegex' hook instead.`);
   return jsxRuntime.jsx(Context.Consumer, {
     children: imageRegexContext => props.render(imageRegexContext)
   });
@@ -498,7 +495,7 @@ function withProjectExtensionImageRegex() {
   let propKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'imageRegexData';
   return Component => {
     const WrappedComponent = props => {
-      useWarning(false, "@commercetools-frontend/application-shell-connectors: It is not recommended to use the 'withProjectExtensionImageRegex' high order component anymore. Please use the 'useProjectExtensionImageRegex' hook instead.");
+      useWarning(false, `@commercetools-frontend/application-shell-connectors: It is not recommended to use the 'withProjectExtensionImageRegex' high order component anymore. Please use the 'useProjectExtensionImageRegex' hook instead.`);
       const imageregexContext = useProjectExtensionImageRegex();
       return jsxRuntime.jsx(GetProjectExtensionImageRegex, {
         render: () => jsxRuntime.jsx(Component, _objectSpread$4(_objectSpread$4({}, props), {}, {
@@ -506,7 +503,7 @@ function withProjectExtensionImageRegex() {
         }))
       });
     };
-    WrappedComponent.displayName = "withProjectExtensionImageRegex(".concat(getDisplayName(Component), ")");
+    WrappedComponent.displayName = `withProjectExtensionImageRegex(${getDisplayName(Component)})`;
     return WrappedComponent;
   };
 }
@@ -527,8 +524,8 @@ const forwardTokenRetryHeader = headers => _objectSpread$3(_objectSpread$3({}, h
 // so that the MC BE can issue a new token.
 // NOTE: the retry is not meant to work for the MC access token.
 const getDoesGraphQLTargetSupportTokenRetry = context => {
-  var _context$headers, _context$headers2, _context;
-  const graphQLTarget = ((_context$headers = context.headers) === null || _context$headers === void 0 ? void 0 : _context$headers[constants.SUPPORTED_HEADERS.X_GRAPHQL_TARGET]) || ((_context$headers2 = context.headers) === null || _context$headers2 === void 0 ? void 0 : _context$headers2[constants.SUPPORTED_HEADERS.X_GRAPHQL_TARGET.toLowerCase()]);
+  var _context;
+  const graphQLTarget = context.headers?.[constants.SUPPORTED_HEADERS.X_GRAPHQL_TARGET] || context.headers?.[constants.SUPPORTED_HEADERS.X_GRAPHQL_TARGET.toLowerCase()];
   return Boolean(graphQLTarget && _includesInstanceProperty__default["default"](_context = [constants.GRAPHQL_TARGETS.COMMERCETOOLS_PLATFORM, constants.GRAPHQL_TARGETS.ADMINISTRATION_SERVICE, constants.GRAPHQL_TARGETS.SETTINGS_SERVICE, constants.GRAPHQL_TARGETS.MERCHANT_CENTER_BACKEND]).call(_context, graphQLTarget));
 };
 const isHttpError = error => error.statusCode !== undefined || error.statusCode !== undefined;
@@ -542,7 +539,7 @@ const errorLink = error.onError(_ref => {
     operation = _ref.operation,
     forward = _ref.forward;
   if (networkError && isHttpError(networkError) && networkError.statusCode === constants.STATUS_CODES.UNAUTHORIZED) {
-    history__default["default"].push("/logout?reason=".concat(constants.LOGOUT_REASONS.UNAUTHORIZED));
+    history__default["default"].push(`/logout?reason=${constants.LOGOUT_REASONS.UNAUTHORIZED}`);
     return;
   }
 
@@ -554,8 +551,7 @@ const errorLink = error.onError(_ref => {
   if (graphQLErrors && isGraphQLError(graphQLErrors)) {
     const context = operation.getContext();
     for (const err of graphQLErrors) {
-      var _err$extensions;
-      const isNonAuthenticatedViaExtensionCode = (err === null || err === void 0 || (_err$extensions = err.extensions) === null || _err$extensions === void 0 ? void 0 : _err$extensions.code) === 'UNAUTHENTICATED';
+      const isNonAuthenticatedViaExtensionCode = err?.extensions?.code === 'UNAUTHENTICATED';
       /**
        * NOTE:
        *   Not not all GraphQL APIs expose an `extensions` field in
@@ -563,7 +559,7 @@ const errorLink = error.onError(_ref => {
        *   property until they introduced support for the `extensions`
        *   field.
        */
-      const isNonAuthenticatedViaCode = (err === null || err === void 0 ? void 0 : err.message) === 'invalid_token';
+      const isNonAuthenticatedViaCode = err?.message === 'invalid_token';
       if ((isNonAuthenticatedViaExtensionCode || isNonAuthenticatedViaCode) && getDoesGraphQLTargetSupportTokenRetry(context) && !getSkipTokenRetry(context)) {
         operation.setContext(_ref2 => {
           let headers = _ref2.headers;
@@ -581,8 +577,7 @@ const errorLink = error.onError(_ref => {
 
 // Attempt to load the `teamId` from sessionStorage
 function selectTeamIdFromStorage() {
-  var _window$app$__DEVELOP;
-  return window.sessionStorage.getItem(constants.STORAGE_KEYS.ACTIVE_TEAM_ID) || ((_window$app$__DEVELOP = window.app.__DEVELOPMENT__) === null || _window$app$__DEVELOP === void 0 || (_window$app$__DEVELOP = _window$app$__DEVELOP.oidc) === null || _window$app$__DEVELOP === void 0 ? void 0 : _window$app$__DEVELOP.teamId);
+  return window.sessionStorage.getItem(constants.STORAGE_KEYS.ACTIVE_TEAM_ID) || window.app.__DEVELOPMENT__?.oidc?.teamId;
 }
 
 const staticUrlPathsInPositionOfProjectKey = ['login', 'logout', 'account'];
@@ -643,7 +638,7 @@ function getCorrelationId() {
 
 const createApolloContextForProxyForwardTo = proxyForwardTocontext => ({
   // Send the request to the forward-to endpoint.
-  uri: "".concat(getMcApiUrl(), "/proxy/forward-to"),
+  uri: `${getMcApiUrl()}/proxy/forward-to`,
   // Custom properties to be used by the "header-link".
   forwardToConfig: proxyForwardTocontext,
   skipGraphQlTargetCheck: true
@@ -680,7 +675,7 @@ const logger = {
 const getSessionToken = () => window.sessionStorage.getItem(constants.STORAGE_KEYS.SESSION_TOKEN);
 const setActiveSession = sessionToken => {
   if (!sessionToken) return;
-  window.sessionStorage.setItem(constants.STORAGE_KEYS.SESSION_TOKEN, sessionToken !== null && sessionToken !== void 0 ? sessionToken : '');
+  window.sessionStorage.setItem(constants.STORAGE_KEYS.SESSION_TOKEN, sessionToken ?? '');
   window.localStorage.setItem(constants.STORAGE_KEYS.LOGIN_STRATEGY, constants.LOGIN_STRATEGY_OIDC);
   // Remove flag for original workflow
   window.localStorage.removeItem(constants.STORAGE_KEYS.IS_AUTHENTICATED);
@@ -702,8 +697,7 @@ const setSessionScope = scope => {
   window.sessionStorage.setItem(constants.STORAGE_KEYS.SESSION_SCOPE, scope);
 };
 const getSessionState = stateId => {
-  var _context;
-  const sessionStateKey = _concatInstanceProperty__default["default"](_context = "".concat(constants.STORAGE_KEYS.NONCE, "_")).call(_context, stateId);
+  const sessionStateKey = `${constants.STORAGE_KEYS.NONCE}_${stateId}`;
   const unparsedSessionState = window.sessionStorage.getItem(sessionStateKey);
   if (unparsedSessionState) {
     try {
@@ -711,22 +705,19 @@ const getSessionState = stateId => {
       return parsedSessionState;
     } catch (error) {
       if (process.env.NODE_ENV !== 'production') {
-        var _context2;
         // eslint-disable-next-line no-console
-        console.warn(_concatInstanceProperty__default["default"](_context2 = "Cannot parse session state for \"".concat(sessionStateKey, "\".\n")).call(_context2, unparsedSessionState));
+        console.warn(`Cannot parse session state for "${sessionStateKey}".\n${unparsedSessionState}`);
       }
     }
   }
   return null;
 };
 const setSessionState = (stateId, state) => {
-  var _context3;
-  const sessionStateKey = _concatInstanceProperty__default["default"](_context3 = "".concat(constants.STORAGE_KEYS.NONCE, "_")).call(_context3, stateId);
+  const sessionStateKey = `${constants.STORAGE_KEYS.NONCE}_${stateId}`;
   window.sessionStorage.setItem(sessionStateKey, _JSON$stringify__default["default"](state));
 };
 const removeSessionState = stateId => {
-  var _context4;
-  const sessionStateKey = _concatInstanceProperty__default["default"](_context4 = "".concat(constants.STORAGE_KEYS.NONCE, "_")).call(_context4, stateId);
+  const sessionStateKey = `${constants.STORAGE_KEYS.NONCE}_${stateId}`;
   window.sessionStorage.removeItem(sessionStateKey);
 };
 
@@ -748,7 +739,7 @@ var oidcStorage = /*#__PURE__*/Object.freeze({
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct__default["default"](Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct__default["default"](Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function () { return !!t; })(); }
 function ownKeys$2(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context3 = ownKeys$2(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context4 = ownKeys$2(Object(t))).call(_context4, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context2 = ownKeys$2(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context3 = ownKeys$2(Object(t))).call(_context3, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const defaultUserAgent = createHttpUserAgent__default["default"]({
   name: 'unknown-http-client',
   libraryName: typeof window !== 'undefined' ? window.app.applicationName : 'unknown-application-name'
@@ -756,50 +747,48 @@ const defaultUserAgent = createHttpUserAgent__default["default"]({
 const defaultForwardToVersion = 'v2';
 const defaultForwardToAudiencePolicy = 'forward-url-full-path';
 function buildApiUrl(endpoint) {
-  var _context;
   const apiUrl = getMcApiUrl().replace(/\/$/, '');
-  return _concatInstanceProperty__default["default"](_context = "".concat(apiUrl)).call(_context, endpoint);
+  return `${apiUrl}${endpoint}`;
 }
 const getAppliedForwardToHeaders = forwardToConfig => {
-  var _context2, _forwardToConfig$head, _forwardToConfig$vers, _forwardToConfig$audi;
+  var _context;
   if (!forwardToConfig) {
     return {};
   }
   if (!forwardToConfig.uri) {
-    throw new Error("Missing required \"uri\" option.");
+    throw new Error(`Missing required "uri" option.`);
   }
   const exchangeTokenClaims = [];
   if (forwardToConfig.includeUserPermissions) {
     exchangeTokenClaims.push('permissions');
   }
-  return _objectSpread$2(_objectSpread$2({}, _reduceInstanceProperty__default["default"](_context2 = _Object$entries__default["default"]((_forwardToConfig$head = forwardToConfig.headers) !== null && _forwardToConfig$head !== void 0 ? _forwardToConfig$head : {})).call(_context2, (customForwardHeaders, _ref) => {
+  return _objectSpread$2(_objectSpread$2({}, _reduceInstanceProperty__default["default"](_context = _Object$entries__default["default"](forwardToConfig.headers ?? {})).call(_context, (customForwardHeaders, _ref) => {
     let _ref2 = _slicedToArray(_ref, 2),
       headerName = _ref2[0],
       headerValue = _ref2[1];
     return _objectSpread$2(_objectSpread$2({}, customForwardHeaders), {}, {
       // Prefix headers so that the MC API can allow and forward them.
-      ["x-forward-header-".concat(headerName)]: headerValue
+      [`x-forward-header-${headerName}`]: headerValue
     });
   }, {})), {}, {
-    [constants.SUPPORTED_HEADERS.ACCEPT_VERSION]: (_forwardToConfig$vers = forwardToConfig.version) !== null && _forwardToConfig$vers !== void 0 ? _forwardToConfig$vers : defaultForwardToVersion,
+    [constants.SUPPORTED_HEADERS.ACCEPT_VERSION]: forwardToConfig.version ?? defaultForwardToVersion,
     [constants.SUPPORTED_HEADERS.X_FORWARD_TO]: forwardToConfig.uri,
-    [constants.SUPPORTED_HEADERS.X_FORWARD_TO_AUDIENCE_POLICY]: (_forwardToConfig$audi = forwardToConfig.audiencePolicy) !== null && _forwardToConfig$audi !== void 0 ? _forwardToConfig$audi : defaultForwardToAudiencePolicy,
+    [constants.SUPPORTED_HEADERS.X_FORWARD_TO_AUDIENCE_POLICY]: forwardToConfig.audiencePolicy ?? defaultForwardToAudiencePolicy,
     [constants.SUPPORTED_HEADERS.X_FORWARD_TO_CLAIMS]: exchangeTokenClaims.join(' ')
   });
 };
 function createHttpClientOptions() {
-  var _config$projectKey;
   let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const sessionToken = getSessionToken();
-  const projectKey = (_config$projectKey = config.projectKey) !== null && _config$projectKey !== void 0 ? _config$projectKey : selectProjectKeyFromUrl();
+  const projectKey = config.projectKey ?? selectProjectKeyFromUrl();
   const userId = selectUserId();
-  const userAgent = (config === null || config === void 0 ? void 0 : config.userAgent) || defaultUserAgent;
+  const userAgent = config?.userAgent || defaultUserAgent;
   return {
     credentials: 'include',
     headers: omitEmpty__default["default"](_objectSpread$2(_objectSpread$2({}, config.headers), {}, {
       // Required headers
       [constants.SUPPORTED_HEADERS.ACCEPT]: 'application/json',
-      [constants.SUPPORTED_HEADERS.AUTHORIZATION]: sessionToken ? "Bearer ".concat(sessionToken) : undefined,
+      [constants.SUPPORTED_HEADERS.AUTHORIZATION]: sessionToken ? `Bearer ${sessionToken}` : undefined,
       [constants.SUPPORTED_HEADERS.X_APPLICATION_ID]: window.app.applicationIdentifier,
       [constants.SUPPORTED_HEADERS.X_CUSTOM_VIEW_ID]: window.app.customViewId,
       [constants.SUPPORTED_HEADERS.X_CORRELATION_ID]: getCorrelationId({
@@ -838,7 +827,7 @@ async function executeHttpClientRequest(fetcher) {
       }))
     }));
     if (response.statusCode === constants.STATUS_CODES.UNAUTHORIZED) {
-      throw new RenewTokenError("Unauthorized response, attempting retry.");
+      throw new RenewTokenError(`Unauthorized response, attempting retry.`);
     }
 
     // In case a new session token is returned from the server, save it.
@@ -862,7 +851,7 @@ async function executeHttpClientRequest(fetcher) {
 }
 
 function ownKeys$1(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context4 = ownKeys$1(Object(t), !0)).call(_context4, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context5 = ownKeys$1(Object(t))).call(_context5, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context3 = ownKeys$1(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context4 = ownKeys$1(Object(t))).call(_context4, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const userAgent = createHttpUserAgent__default["default"]({
   name: 'apollo-client',
   // version: apolloVersion,
@@ -877,18 +866,13 @@ const isKnownGraphQlTarget = target => {
   return target ? _includesInstanceProperty__default["default"](_context = _Object$values__default["default"](constants.GRAPHQL_TARGETS)).call(_context, target) : false;
 };
 const extractSessionTokenFromResponse = context => {
-  var _context$response, _context$restResponse;
-  const refreshedSessionToken = (_context$response = context.response) === null || _context$response === void 0 || (_context$response = _context$response.headers) === null || _context$response === void 0 ? void 0 : _context$response.get('x-refreshed-session-token');
+  const refreshedSessionToken = context.response?.headers?.get('x-refreshed-session-token');
   if (refreshedSessionToken) {
-    return refreshedSessionToken !== null && refreshedSessionToken !== void 0 ? refreshedSessionToken : null;
+    return refreshedSessionToken ?? null;
   }
-  const restResponseWithRefreshTokenHeader = (_context$restResponse = context.restResponses) === null || _context$restResponse === void 0 ? void 0 : _findInstanceProperty__default["default"](_context$restResponse).call(_context$restResponse, response => {
-    var _response$headers;
-    return (_response$headers = response.headers) === null || _response$headers === void 0 ? void 0 : _response$headers.has('x-refreshed-session-token');
-  });
+  const restResponseWithRefreshTokenHeader = context.restResponses?.find(response => response.headers?.has('x-refreshed-session-token'));
   if (restResponseWithRefreshTokenHeader) {
-    var _restResponseWithRefr;
-    return (_restResponseWithRefr = restResponseWithRefreshTokenHeader.headers.get('x-refreshed-session-token')) !== null && _restResponseWithRefr !== void 0 ? _restResponseWithRefr : null;
+    return restResponseWithRefreshTokenHeader.headers.get('x-refreshed-session-token') ?? null;
   }
   return null;
 };
@@ -896,11 +880,11 @@ const extractSessionTokenFromResponse = context => {
 /* eslint-disable import/prefer-default-export */
 // Use a middleware to update the request headers with the correct params.
 const headerLink = new client.ApolloLink((operation, forward) => {
-  var _context2, _context3;
+  var _context2;
   const apolloContext = operation.getContext();
   const variables = operation.variables;
   const graphQlTarget = apolloContext.target || variables.target;
-  if (!apolloContext.skipGraphQlTargetCheck && !isKnownGraphQlTarget(graphQlTarget)) throw new Error(_concatInstanceProperty__default["default"](_context2 = "GraphQL target \"".concat(graphQlTarget, "\" is missing (or is not supported) in operation \"")).call(_context2, operation.operationName, "\""));
+  if (!apolloContext.skipGraphQlTargetCheck && !isKnownGraphQlTarget(graphQlTarget)) throw new Error(`GraphQL target "${graphQlTarget}" is missing (or is not supported) in operation "${operation.operationName}"`);
 
   /**
    * NOTE:
@@ -927,7 +911,7 @@ const headerLink = new client.ApolloLink((operation, forward) => {
     forwardToConfig: apolloContext.forwardToConfig,
     projectKey
   }));
-  return _mapInstanceProperty__default["default"](_context3 = forward(operation)).call(_context3, response => {
+  return _mapInstanceProperty__default["default"](_context2 = forward(operation)).call(_context2, response => {
     const context = operation.getContext();
     const refreshedSessionToken = extractSessionTokenFromResponse(context);
     if (refreshedSessionToken) {
@@ -940,7 +924,7 @@ const headerLink = new client.ApolloLink((operation, forward) => {
 const tokenRetryLink = new retry.RetryLink({
   attempts: (count, operation, error) => {
     const context = operation.getContext();
-    if ((error === null || error === void 0 ? void 0 : error.statusCode) === constants.STATUS_CODES.UNAUTHORIZED && count === 1 && getDoesGraphQLTargetSupportTokenRetry(context) && !getSkipTokenRetry(context)) {
+    if (error?.statusCode === constants.STATUS_CODES.UNAUTHORIZED && count === 1 && getDoesGraphQLTargetSupportTokenRetry(context) && !getSkipTokenRetry(context)) {
       operation.setContext(_ref => {
         let headers = _ref.headers;
         return {
@@ -958,7 +942,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _co
 const createApolloLink = function () {
   let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const httpLink = client.createHttpLink({
-    uri: "".concat(getMcApiUrl(), "/graphql"),
+    uri: `${getMcApiUrl()}/graphql`,
     fetch
   });
 
@@ -1002,9 +986,8 @@ const mergeArraysObjects = function () {
   }, []);
 };
 const createApolloClient = function () {
-  var _options$cache, _customCacheConfig$ty;
   let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  const customCacheConfig = (_options$cache = options === null || options === void 0 ? void 0 : options.cache) !== null && _options$cache !== void 0 ? _options$cache : {};
+  const customCacheConfig = options?.cache ?? {};
   return new client.ApolloClient({
     link: createApolloLink(options),
     // https://www.apollographql.com/docs/react/caching/cache-configuration/
@@ -1043,7 +1026,7 @@ const createApolloClient = function () {
             }
           }
         }
-      }, (_customCacheConfig$ty = customCacheConfig.typePolicies) !== null && _customCacheConfig$ty !== void 0 ? _customCacheConfig$ty : {})
+      }, customCacheConfig.typePolicies ?? {})
     }))
   });
 };