@commercetools/ts-client 2.1.7 → 3.0.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @commercetools/ts-client
 
+## 3.0.1
+
+### Patch Changes
+
+- [#902](https://github.com/commercetools/commercetools-sdk-typescript/pull/902) [`a08c782`](https://github.com/commercetools/commercetools-sdk-typescript/commit/a08c78267518c5010940a1f0887319225c8beb6d) Thanks [@ajimae](https://github.com/ajimae)! - remove buffer module and replace with js native String.normalize function
+
+- [#841](https://github.com/commercetools/commercetools-sdk-typescript/pull/841) [`626c403`](https://github.com/commercetools/commercetools-sdk-typescript/commit/626c4035544c804db96a6e5f1c63f6ea9073c649) Thanks [@ajimae](https://github.com/ajimae)! - Improve README.md file
+
+## 3.0.0
+
+### Major Changes
+
+- [#896](https://github.com/commercetools/commercetools-sdk-typescript/pull/896) [`f9b8cb6`](https://github.com/commercetools/commercetools-sdk-typescript/commit/f9b8cb605d99fe5ece13bdc3c152eb4818e19b3b) Thanks [@lojzatran](https://github.com/lojzatran)! - Remove support of nodejs 16
+
 ## 2.1.7
 
 ### Patch Changes

package/README.md

@@ -23,10 +23,12 @@ import {
   type MiddlewareRequest,
   type MiddlewareResponse,
   type Client,
+  createHttpMiddleware,
+  createConcurrentModificationMiddleware,
+  createAuthMiddlewareForClientCredentialsFlow,
   ClientBuilder,
 } from '@commercetools/ts-client'
 import { createApiBuilderFromCtpClient } from '@commercetools/platform-sdk'
-import fetch from 'node-fetch'
 
 const projectKey = 'mc-project-key'
 const authMiddlewareOptions = {
@@ -50,7 +52,12 @@ const retryOptions = {
   maxRetries: 3,
   retryDelay: 200,
   backoff: true,
-  retryCodes: [200],
+  retryCodes: [503],
+}
+
+const loggerFn = (response) => {
+  // log response object
+  console.log(response)
 }
 
 // custom middleware
@@ -68,15 +75,11 @@ function middleware(options) {
 
 const client: Client = new ClientBuilder()
   .withPasswordFlow(authMiddlewareOptions)
-  .withLoggerMiddleware({
-    includeOriginalRequest: false,
-    includeResponseHeaders: false,
-  })
+  .withLoggerMiddleware({ loggerFn })
   .withCorrelationIdMiddleware({
     generate: () => 'fake-correlation-id' + Math.floor(Math.random() + 2),
   })
   .withHttpMiddleware(httpMiddlewareOptions)
-  .withRetryMiddleware(retryOptions)
   .withMiddleware(middleware({})) // <<<------------------- add the custom middleware here
   .build()
 
@@ -150,11 +153,13 @@ const client = new ClientBuilder()
   .build()
 ```
 
-> [!WARNING]
-> Do not add the built-in middlewares using `withMiddleware` method. Adding by this method does not respect the ordering of the middlewares and could lead to unexpected behavior.
+<!-- > [!WARNING]
+> Do not add the built-in middlewares using `withMiddleware` method. Adding by this method does not respect the ordering of the middlewares and could lead to unexpected behavior. -->
+
+The `withMiddleware` method can be used to add middleware functions (both built-in and custom middleware) in an ordered fashion.
 
 ```ts
-// WRONG CODE!!!!!
+// Example
 const authMiddlewareOptions = {
   credentials: {
     clientId: 'xxx',
@@ -169,12 +174,76 @@ const httpMiddlewareOptions = {
   httpClient: fetch,
 }
 
+const logger = () => {
+  return (next) => async (request) => {
+    // log request object
+    console.log('Request:', request)
+    const response = await next(request)
+
+    // log response object
+    console.log('Response', response)
+    return response
+  }
+}
+
 const client = new ClientBuilder()
   .withMiddleware(
     createAuthMiddlewareForClientCredentialsFlow(authMiddlewareOptions)
   )
   .withMiddleware(createHttpMiddleware(httpMiddlewareOptions))
   .withMiddleware(createConcurrentModificationMiddleware())
+  .withMiddleware(logger())
   .build()
-// WRONG CODE!!!!!
 ```
+
+This will add the middleware in an ordered fashion starting with the:
+
+1. createAuthMiddlewareForClientCredentialsFlow
+2. createHttpMiddleware
+3. createConcurrentModificationMiddleware
+4. logger
+
+Note that when using the `withMiddleware` function to add a custom middleware along side other in built middleware functions, it will add the custom middleware to the start of the execution chain.
+
+```ts
+// Example
+const authMiddlewareOptions = {
+  credentials: {
+    clientId: 'xxx',
+    clientSecret: 'xxx',
+  },
+  host: 'https://auth.europe-west1.gcp.commercetools.com',
+  projectKey: 'xxx',
+}
+
+const httpMiddlewareOptions = {
+  host: 'https://api.europe-west1.gcp.commercetools.com',
+  httpClient: fetch,
+}
+
+const logger = () => {
+  return (next) => async (request) => {
+    // log request object
+    console.log('Request:', request)
+    const response = await next(request)
+
+    // log response object
+    console.log('Response', response)
+    return response
+  }
+}
+
+const client = new ClientBuilder()
+  .withClientCredentialsFlow(authMiddlewareOptions)
+  .withHttpMiddleware(httpMiddlewareOptions)
+  .withConcurrentModificationMiddleware()
+  .withMiddleware(logger())
+  .build()
+```
+
+The order of execution is as follows:
+
+1. withMiddleware <------ the custom middleware
+2. withClientCredentialsFlow
+3. withHttpMiddleware
+4. withConcurrentModificationMiddleware

package/dist/commercetools-ts-client.browser.cjs.js

@@ -2,14 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var fetch$1 = require('node-fetch');
-var AbortController = require('abort-controller');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
-
-var fetch__default = /*#__PURE__*/_interopDefault(fetch$1);
-var AbortController__default = /*#__PURE__*/_interopDefault(AbortController);
-
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -35,10 +27,12 @@ function _defineProperty(e, r, t) {
   }) : e[r] = t, e;
 }
 
-var Buffer = require('buffer/').Buffer;
 function byteLength(body) {
-  if (body && (typeof body === 'string' || body instanceof Uint8Array)) {
-    return Buffer.byteLength(body).toString();
+  if (body && typeof body === 'string') {
+    return body.normalize('NFD').length.toString();
+  }
+  if (body && body instanceof Uint8Array) {
+    return new TextDecoder().decode(body).length.toString();
   }
   if (body && typeof body === 'object') {
     return new TextEncoder().encode(JSON.stringify(body)).length.toString();
@@ -192,7 +186,7 @@ async function executor(request) {
       });
     }
     function initializeAbortController() {
-      const abortController = (getAbortController ? getAbortController() : null) || new AbortController__default["default"]();
+      const abortController = (getAbortController ? getAbortController() : null) || new AbortController();
       rest.abortController = abortController;
       rest.signal = abortController.signal;
       return abortController;
@@ -216,7 +210,9 @@ async function executor(request) {
             };
           }
         } catch (e) {
-          if (e.name.includes('AbortError') && retryWhenAborted) {
+          //  in nodejs v18, the error is AbortError, in nodejs v20, the error is TimeoutError
+          //  https://github.com/nodejs/undici/issues/2590
+          if ((e.name.includes('AbortError') || e.name.includes('TimeoutError')) && retryWhenAborted) {
             return {
               _response: e,
               shouldRetry: true
@@ -313,7 +309,13 @@ function getHeaders(headers) {
 
   // Tmp fix for Firefox until it supports iterables
   if (!headers.forEach) return parse(headers);
-  return headers.forEach((value, name) => value);
+
+  // whatwg-fetch
+  const map = {};
+  headers.forEach((value, name) => {
+    return map[name] = value;
+  });
+  return map;
 }
 
 function isBuffer(obj) {
@@ -760,7 +762,7 @@ function createAuthMiddlewareForAnonymousSessionFlow$1(options) {
         request,
         tokenCache,
         tokenCacheKey,
-        httpClient: options.httpClient || fetch__default["default"],
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForAnonymousSessionFlow(options),
         userOption: options,
@@ -815,7 +817,7 @@ function createAuthMiddlewareForClientCredentialsFlow$1(options) {
         tokenCache,
         tokenCacheKey,
         tokenCacheObject,
-        httpClient: options.httpClient || fetch__default["default"],
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForClientCredentialsFlow(options),
         next
@@ -891,7 +893,7 @@ function createAuthMiddlewareForPasswordFlow$1(options) {
         request,
         tokenCache,
         tokenCacheKey,
-        httpClient: options.httpClient || fetch__default["default"],
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForPasswordFlow(options),
         userOption: options,
@@ -1271,9 +1273,9 @@ function createQueueMiddleware$1({
 
 var packageJson = {
 	name: "@commercetools/ts-client",
-	version: "2.1.7",
+	version: "3.0.1",
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	description: "commercetools Composable Commerce TypeScript SDK client.",
 	keywords: [
@@ -1304,9 +1306,7 @@ var packageJson = {
 		url: "https://github.com/commercetools/commercetools-sdk-typescript/issues"
 	},
 	dependencies: {
-		"abort-controller": "3.0.0",
-		buffer: "^6.0.3",
-		"node-fetch": "^2.6.1"
+		buffer: "^6.0.3"
 	},
 	files: [
 		"dist",
@@ -1321,9 +1321,9 @@ var packageJson = {
 	},
 	devDependencies: {
 		"common-tags": "1.8.2",
-		dotenv: "16.4.5",
+		dotenv: "16.4.7",
 		jest: "29.7.0",
-		nock: "12.0.3",
+		nock: "^14.0.0-beta.19",
 		"organize-imports-cli": "0.10.0"
 	},
 	scripts: {
@@ -1558,11 +1558,11 @@ class ClientBuilder {
       host: oauthUri,
       projectKey: projectKey || this.projectKey,
       credentials,
-      httpClient: httpClient || fetch__default["default"],
+      httpClient: httpClient || fetch,
       scopes
     }).withHttpMiddleware({
       host: baseUri,
-      httpClient: httpClient || fetch__default["default"]
+      httpClient: httpClient || fetch
     });
   }
   withAuthMiddleware(authMiddleware) {
@@ -1583,7 +1583,7 @@ class ClientBuilder {
       },
       oauthUri: options.oauthUri || null,
       scopes: options.scopes,
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1599,7 +1599,7 @@ class ClientBuilder {
           password: options.credentials.user.password || null
         }
       },
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1612,7 +1612,7 @@ class ClientBuilder {
         clientSecret: options.credentials.clientSecret || null,
         anonymousId: options.credentials.anonymousId || null
       },
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1624,7 +1624,7 @@ class ClientBuilder {
         clientId: options.credentials.clientId || null,
         clientSecret: options.credentials.clientSecret || null
       },
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       refreshToken: options.refreshToken || null,
       ...options
     }));
@@ -1638,7 +1638,7 @@ class ClientBuilder {
   withHttpMiddleware(options) {
     this.httpMiddleware = createHttpMiddleware({
       host: options.host || CTP_API_URL,
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       ...options
     });
     return this;

package/dist/commercetools-ts-client.browser.esm.js

@@ -1,6 +1,3 @@
-import fetch$1 from 'node-fetch';
-import AbortController from 'abort-controller';
-
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -26,10 +23,12 @@ function _defineProperty(e, r, t) {
   }) : e[r] = t, e;
 }
 
-var Buffer = require('buffer/').Buffer;
 function byteLength(body) {
-  if (body && (typeof body === 'string' || body instanceof Uint8Array)) {
-    return Buffer.byteLength(body).toString();
+  if (body && typeof body === 'string') {
+    return body.normalize('NFD').length.toString();
+  }
+  if (body && body instanceof Uint8Array) {
+    return new TextDecoder().decode(body).length.toString();
   }
   if (body && typeof body === 'object') {
     return new TextEncoder().encode(JSON.stringify(body)).length.toString();
@@ -207,7 +206,9 @@ async function executor(request) {
             };
           }
         } catch (e) {
-          if (e.name.includes('AbortError') && retryWhenAborted) {
+          //  in nodejs v18, the error is AbortError, in nodejs v20, the error is TimeoutError
+          //  https://github.com/nodejs/undici/issues/2590
+          if ((e.name.includes('AbortError') || e.name.includes('TimeoutError')) && retryWhenAborted) {
             return {
               _response: e,
               shouldRetry: true
@@ -304,7 +305,13 @@ function getHeaders(headers) {
 
   // Tmp fix for Firefox until it supports iterables
   if (!headers.forEach) return parse(headers);
-  return headers.forEach((value, name) => value);
+
+  // whatwg-fetch
+  const map = {};
+  headers.forEach((value, name) => {
+    return map[name] = value;
+  });
+  return map;
 }
 
 function isBuffer(obj) {
@@ -751,7 +758,7 @@ function createAuthMiddlewareForAnonymousSessionFlow$1(options) {
         request,
         tokenCache,
         tokenCacheKey,
-        httpClient: options.httpClient || fetch$1,
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForAnonymousSessionFlow(options),
         userOption: options,
@@ -806,7 +813,7 @@ function createAuthMiddlewareForClientCredentialsFlow$1(options) {
         tokenCache,
         tokenCacheKey,
         tokenCacheObject,
-        httpClient: options.httpClient || fetch$1,
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForClientCredentialsFlow(options),
         next
@@ -882,7 +889,7 @@ function createAuthMiddlewareForPasswordFlow$1(options) {
         request,
         tokenCache,
         tokenCacheKey,
-        httpClient: options.httpClient || fetch$1,
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForPasswordFlow(options),
         userOption: options,
@@ -1262,9 +1269,9 @@ function createQueueMiddleware$1({
 
 var packageJson = {
 	name: "@commercetools/ts-client",
-	version: "2.1.7",
+	version: "3.0.1",
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	description: "commercetools Composable Commerce TypeScript SDK client.",
 	keywords: [
@@ -1295,9 +1302,7 @@ var packageJson = {
 		url: "https://github.com/commercetools/commercetools-sdk-typescript/issues"
 	},
 	dependencies: {
-		"abort-controller": "3.0.0",
-		buffer: "^6.0.3",
-		"node-fetch": "^2.6.1"
+		buffer: "^6.0.3"
 	},
 	files: [
 		"dist",
@@ -1312,9 +1317,9 @@ var packageJson = {
 	},
 	devDependencies: {
 		"common-tags": "1.8.2",
-		dotenv: "16.4.5",
+		dotenv: "16.4.7",
 		jest: "29.7.0",
-		nock: "12.0.3",
+		nock: "^14.0.0-beta.19",
 		"organize-imports-cli": "0.10.0"
 	},
 	scripts: {
@@ -1549,11 +1554,11 @@ class ClientBuilder {
       host: oauthUri,
       projectKey: projectKey || this.projectKey,
       credentials,
-      httpClient: httpClient || fetch$1,
+      httpClient: httpClient || fetch,
       scopes
     }).withHttpMiddleware({
       host: baseUri,
-      httpClient: httpClient || fetch$1
+      httpClient: httpClient || fetch
     });
   }
   withAuthMiddleware(authMiddleware) {
@@ -1574,7 +1579,7 @@ class ClientBuilder {
       },
       oauthUri: options.oauthUri || null,
       scopes: options.scopes,
-      httpClient: options.httpClient || fetch$1,
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1590,7 +1595,7 @@ class ClientBuilder {
           password: options.credentials.user.password || null
         }
       },
-      httpClient: options.httpClient || fetch$1,
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1603,7 +1608,7 @@ class ClientBuilder {
         clientSecret: options.credentials.clientSecret || null,
         anonymousId: options.credentials.anonymousId || null
       },
-      httpClient: options.httpClient || fetch$1,
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1615,7 +1620,7 @@ class ClientBuilder {
         clientId: options.credentials.clientId || null,
         clientSecret: options.credentials.clientSecret || null
       },
-      httpClient: options.httpClient || fetch$1,
+      httpClient: options.httpClient || fetch,
       refreshToken: options.refreshToken || null,
       ...options
     }));
@@ -1629,7 +1634,7 @@ class ClientBuilder {
   withHttpMiddleware(options) {
     this.httpMiddleware = createHttpMiddleware({
       host: options.host || CTP_API_URL,
-      httpClient: options.httpClient || fetch$1,
+      httpClient: options.httpClient || fetch,
       ...options
     });
     return this;

package/dist/commercetools-ts-client.cjs.dev.js

@@ -2,14 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var fetch$1 = require('node-fetch');
-var AbortController = require('abort-controller');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
-
-var fetch__default = /*#__PURE__*/_interopDefault(fetch$1);
-var AbortController__default = /*#__PURE__*/_interopDefault(AbortController);
-
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -35,10 +27,12 @@ function _defineProperty(e, r, t) {
   }) : e[r] = t, e;
 }
 
-var Buffer = require('buffer/').Buffer;
 function byteLength(body) {
-  if (body && (typeof body === 'string' || body instanceof Uint8Array)) {
-    return Buffer.byteLength(body).toString();
+  if (body && typeof body === 'string') {
+    return body.normalize('NFD').length.toString();
+  }
+  if (body && body instanceof Uint8Array) {
+    return new TextDecoder().decode(body).length.toString();
   }
   if (body && typeof body === 'object') {
     return new TextEncoder().encode(JSON.stringify(body)).length.toString();
@@ -192,7 +186,7 @@ async function executor(request) {
       });
     }
     function initializeAbortController() {
-      const abortController = (getAbortController ? getAbortController() : null) || new AbortController__default["default"]();
+      const abortController = (getAbortController ? getAbortController() : null) || new AbortController();
       rest.abortController = abortController;
       rest.signal = abortController.signal;
       return abortController;
@@ -216,7 +210,9 @@ async function executor(request) {
             };
           }
         } catch (e) {
-          if (e.name.includes('AbortError') && retryWhenAborted) {
+          //  in nodejs v18, the error is AbortError, in nodejs v20, the error is TimeoutError
+          //  https://github.com/nodejs/undici/issues/2590
+          if ((e.name.includes('AbortError') || e.name.includes('TimeoutError')) && retryWhenAborted) {
             return {
               _response: e,
               shouldRetry: true
@@ -313,7 +309,13 @@ function getHeaders(headers) {
 
   // Tmp fix for Firefox until it supports iterables
   if (!headers.forEach) return parse(headers);
-  return headers.forEach((value, name) => value);
+
+  // whatwg-fetch
+  const map = {};
+  headers.forEach((value, name) => {
+    return map[name] = value;
+  });
+  return map;
 }
 
 function isBuffer(obj) {
@@ -760,7 +762,7 @@ function createAuthMiddlewareForAnonymousSessionFlow$1(options) {
         request,
         tokenCache,
         tokenCacheKey,
-        httpClient: options.httpClient || fetch__default["default"],
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForAnonymousSessionFlow(options),
         userOption: options,
@@ -815,7 +817,7 @@ function createAuthMiddlewareForClientCredentialsFlow$1(options) {
         tokenCache,
         tokenCacheKey,
         tokenCacheObject,
-        httpClient: options.httpClient || fetch__default["default"],
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForClientCredentialsFlow(options),
         next
@@ -891,7 +893,7 @@ function createAuthMiddlewareForPasswordFlow$1(options) {
         request,
         tokenCache,
         tokenCacheKey,
-        httpClient: options.httpClient || fetch__default["default"],
+        httpClient: options.httpClient || fetch,
         httpClientOptions: options.httpClientOptions,
         ...buildRequestForPasswordFlow(options),
         userOption: options,
@@ -1271,9 +1273,9 @@ function createQueueMiddleware$1({
 
 var packageJson = {
 	name: "@commercetools/ts-client",
-	version: "2.1.7",
+	version: "3.0.1",
 	engines: {
-		node: ">=14"
+		node: ">=18"
 	},
 	description: "commercetools Composable Commerce TypeScript SDK client.",
 	keywords: [
@@ -1304,9 +1306,7 @@ var packageJson = {
 		url: "https://github.com/commercetools/commercetools-sdk-typescript/issues"
 	},
 	dependencies: {
-		"abort-controller": "3.0.0",
-		buffer: "^6.0.3",
-		"node-fetch": "^2.6.1"
+		buffer: "^6.0.3"
 	},
 	files: [
 		"dist",
@@ -1321,9 +1321,9 @@ var packageJson = {
 	},
 	devDependencies: {
 		"common-tags": "1.8.2",
-		dotenv: "16.4.5",
+		dotenv: "16.4.7",
 		jest: "29.7.0",
-		nock: "12.0.3",
+		nock: "^14.0.0-beta.19",
 		"organize-imports-cli": "0.10.0"
 	},
 	scripts: {
@@ -1558,11 +1558,11 @@ class ClientBuilder {
       host: oauthUri,
       projectKey: projectKey || this.projectKey,
       credentials,
-      httpClient: httpClient || fetch__default["default"],
+      httpClient: httpClient || fetch,
       scopes
     }).withHttpMiddleware({
       host: baseUri,
-      httpClient: httpClient || fetch__default["default"]
+      httpClient: httpClient || fetch
     });
   }
   withAuthMiddleware(authMiddleware) {
@@ -1583,7 +1583,7 @@ class ClientBuilder {
       },
       oauthUri: options.oauthUri || null,
       scopes: options.scopes,
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1599,7 +1599,7 @@ class ClientBuilder {
           password: options.credentials.user.password || null
         }
       },
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1612,7 +1612,7 @@ class ClientBuilder {
         clientSecret: options.credentials.clientSecret || null,
         anonymousId: options.credentials.anonymousId || null
       },
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       ...options
     }));
   }
@@ -1624,7 +1624,7 @@ class ClientBuilder {
         clientId: options.credentials.clientId || null,
         clientSecret: options.credentials.clientSecret || null
       },
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       refreshToken: options.refreshToken || null,
       ...options
     }));
@@ -1638,7 +1638,7 @@ class ClientBuilder {
   withHttpMiddleware(options) {
     this.httpMiddleware = createHttpMiddleware({
       host: options.host || CTP_API_URL,
-      httpClient: options.httpClient || fetch__default["default"],
+      httpClient: options.httpClient || fetch,
       ...options
     });
     return this;