contentful 11.12.0 → 11.12.1

package/dist/contentful.browser.js

@@ -1668,7 +1668,6 @@ var contentful = (function (exports) {
   AxiosError.ERR_CANCELED = 'ERR_CANCELED';
   AxiosError.ERR_NOT_SUPPORT = 'ERR_NOT_SUPPORT';
   AxiosError.ERR_INVALID_URL = 'ERR_INVALID_URL';
-  var AxiosError$1 = AxiosError;
 
   // eslint-disable-next-line strict
   var httpAdapter = null;
@@ -1786,7 +1785,7 @@ var contentful = (function (exports) {
         return value.toString();
       }
       if (!useBlob && utils$1$1.isBlob(value)) {
-        throw new AxiosError$1('Blob is not supported. Use a Buffer instead.');
+        throw new AxiosError('Blob is not supported. Use a Buffer instead.');
       }
       if (utils$1$1.isArrayBuffer(value) || utils$1$1.isTypedArray(value)) {
         return useBlob && typeof Blob === 'function' ? new Blob([value]) : Buffer.from(value);
@@ -1909,8 +1908,8 @@ var contentful = (function (exports) {
   };
 
   /**
-   * It replaces all instances of the characters `:`, `$`, `,`, `+`, `[`, and `]` with their
-   * URI encoded counterparts
+   * It replaces URL-encoded forms of `:`, `$`, `,`, and spaces with
+   * their plain counterparts (`:`, `$`, `,`, `+`).
    *
    * @param {string} val The value to be encoded.
    *
@@ -2029,7 +2028,6 @@ var contentful = (function (exports) {
       }
     }]);
   }();
-  var InterceptorManager$1 = InterceptorManager;
   var transitionalDefaults = {
     silentJSONParsing: true,
     forcedJSONParsing: true,
@@ -2088,8 +2086,8 @@ var contentful = (function (exports) {
   var utils$3 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     hasBrowserEnv: hasBrowserEnv,
-    hasStandardBrowserWebWorkerEnv: hasStandardBrowserWebWorkerEnv,
     hasStandardBrowserEnv: hasStandardBrowserEnv,
+    hasStandardBrowserWebWorkerEnv: hasStandardBrowserWebWorkerEnv,
     navigator: _navigator,
     origin: origin
   });
@@ -2264,7 +2262,7 @@ var contentful = (function (exports) {
         } catch (e) {
           if (strictJSONParsing) {
             if (e.name === 'SyntaxError') {
-              throw AxiosError$1.from(e, AxiosError$1.ERR_BAD_RESPONSE, this, null, this.response);
+              throw AxiosError.from(e, AxiosError.ERR_BAD_RESPONSE, this, null, this.response);
             }
             throw e;
           }
@@ -2298,7 +2296,6 @@ var contentful = (function (exports) {
   utils$1$1.forEach(['delete', 'get', 'head', 'post', 'put', 'patch'], function (method) {
     defaults$2.headers[method] = {};
   });
-  var defaults$1$1 = defaults$2;
 
   // RawAxiosHeaders whose duplicates are ignored by node
   // c.f. https://nodejs.org/api/http.html#http_message_headers
@@ -2343,14 +2340,42 @@ var contentful = (function (exports) {
     return parsed;
   };
   var $internals = Symbol('internals');
+  var isValidHeaderValue = function isValidHeaderValue(value) {
+    return !/[\r\n]/.test(value);
+  };
+  function assertValidHeaderValue(value, header) {
+    if (value === false || value == null) {
+      return;
+    }
+    if (utils$1$1.isArray(value)) {
+      value.forEach(function (v) {
+        return assertValidHeaderValue(v, header);
+      });
+      return;
+    }
+    if (!isValidHeaderValue(String(value))) {
+      throw new Error("Invalid character in header content [\"".concat(header, "\"]"));
+    }
+  }
   function normalizeHeader(header) {
     return header && String(header).trim().toLowerCase();
   }
+  function stripTrailingCRLF(str) {
+    var end = str.length;
+    while (end > 0) {
+      var charCode = str.charCodeAt(end - 1);
+      if (charCode !== 10 && charCode !== 13) {
+        break;
+      }
+      end -= 1;
+    }
+    return end === str.length ? str : str.slice(0, end);
+  }
   function normalizeValue(value) {
     if (value === false || value == null) {
       return value;
     }
-    return utils$1$1.isArray(value) ? value.map(normalizeValue) : String(value);
+    return utils$1$1.isArray(value) ? value.map(normalizeValue) : stripTrailingCRLF(String(value));
   }
   function parseTokens(str) {
     var tokens = Object.create(null);
@@ -2411,6 +2436,7 @@ var contentful = (function (exports) {
           }
           var key = utils$1$1.findKey(self, lHeader);
           if (!key || self[key] === undefined || _rewrite === true || _rewrite === undefined && self[key] !== false) {
+            assertValidHeaderValue(_value, _header);
             self[key || _header] = normalizeValue(_value);
           }
         }
@@ -2636,7 +2662,6 @@ var contentful = (function (exports) {
     };
   });
   utils$1$1.freezeMethods(AxiosHeaders);
-  var AxiosHeaders$1 = AxiosHeaders;
 
   /**
    * Transform the data for a request or a response
@@ -2647,9 +2672,9 @@ var contentful = (function (exports) {
    * @returns {*} The resulting transformed data
    */
   function transformData(fns, response) {
-    var config = this || defaults$1$1;
+    var config = this || defaults$2;
     var context = response || config;
-    var headers = AxiosHeaders$1.from(context.headers);
+    var headers = AxiosHeaders.from(context.headers);
     var data = context.data;
     utils$1$1.forEach(fns, function transform(fn) {
       data = fn.call(config, data, headers.normalize(), response ? response.status : undefined);
@@ -2660,7 +2685,7 @@ var contentful = (function (exports) {
   function isCancel(value) {
     return !!(value && value.__CANCEL__);
   }
-  var CanceledError = /*#__PURE__*/function (_AxiosError$) {
+  var CanceledError = /*#__PURE__*/function (_AxiosError) {
     /**
      * A `CanceledError` is an object that is thrown when an operation is canceled.
      *
@@ -2673,16 +2698,14 @@ var contentful = (function (exports) {
     function CanceledError(message, config, request) {
       var _this2;
       _classCallCheck(this, CanceledError);
-      _this2 = _callSuper$3(this, CanceledError, [message == null ? 'canceled' : message, AxiosError$1.ERR_CANCELED, config, request]);
+      _this2 = _callSuper$3(this, CanceledError, [message == null ? 'canceled' : message, AxiosError.ERR_CANCELED, config, request]);
       _this2.name = 'CanceledError';
       _this2.__CANCEL__ = true;
       return _this2;
     }
-    _inherits(CanceledError, _AxiosError$);
+    _inherits(CanceledError, _AxiosError);
     return _createClass(CanceledError);
-  }(AxiosError$1);
-  var CanceledError$1 = CanceledError;
-
+  }(AxiosError);
   /**
    * Resolve or reject a Promise based on response status.
    *
@@ -2697,7 +2720,7 @@ var contentful = (function (exports) {
     if (!response.status || !validateStatus || validateStatus(response.status)) {
       resolve(response);
     } else {
-      reject(new AxiosError$1('Request failed with status code ' + response.status, [AxiosError$1.ERR_BAD_REQUEST, AxiosError$1.ERR_BAD_RESPONSE][Math.floor(response.status / 100) - 4], response.config, response.request, response));
+      reject(new AxiosError('Request failed with status code ' + response.status, [AxiosError.ERR_BAD_REQUEST, AxiosError.ERR_BAD_RESPONSE][Math.floor(response.status / 100) - 4], response.config, response.request, response));
     }
   }
   function parseProtocol(url) {
@@ -2929,7 +2952,7 @@ var contentful = (function (exports) {
     return requestedURL;
   }
   var headersToObject = function headersToObject(thing) {
-    return thing instanceof AxiosHeaders$1 ? _objectSpread$2({}, thing) : thing;
+    return thing instanceof AxiosHeaders ? _objectSpread$2({}, thing) : thing;
   };
 
   /**
@@ -3038,7 +3061,7 @@ var contentful = (function (exports) {
       xsrfCookieName = newConfig.xsrfCookieName,
       headers = newConfig.headers,
       auth = newConfig.auth;
-    newConfig.headers = headers = AxiosHeaders$1.from(headers);
+    newConfig.headers = headers = AxiosHeaders.from(headers);
     newConfig.url = buildURL(buildFullPath(newConfig.baseURL, newConfig.url, newConfig.allowAbsoluteUrls), config.params, config.paramsSerializer);
 
     // HTTP basic authentication
@@ -3085,7 +3108,7 @@ var contentful = (function (exports) {
     return new Promise(function dispatchXhrRequest(resolve, reject) {
       var _config = resolveConfig(config);
       var requestData = _config.data;
-      var requestHeaders = AxiosHeaders$1.from(_config.headers).normalize();
+      var requestHeaders = AxiosHeaders.from(_config.headers).normalize();
       var responseType = _config.responseType,
         onUploadProgress = _config.onUploadProgress,
         onDownloadProgress = _config.onDownloadProgress;
@@ -3109,7 +3132,7 @@ var contentful = (function (exports) {
           return;
         }
         // Prepare the response
-        var responseHeaders = AxiosHeaders$1.from('getAllResponseHeaders' in request && request.getAllResponseHeaders());
+        var responseHeaders = AxiosHeaders.from('getAllResponseHeaders' in request && request.getAllResponseHeaders());
         var responseData = !responseType || responseType === 'text' || responseType === 'json' ? request.responseText : request.response;
         var response = {
           data: responseData,
@@ -3158,7 +3181,7 @@ var contentful = (function (exports) {
         if (!request) {
           return;
         }
-        reject(new AxiosError$1('Request aborted', AxiosError$1.ECONNABORTED, config, request));
+        reject(new AxiosError('Request aborted', AxiosError.ECONNABORTED, config, request));
 
         // Clean up request
         request = null;
@@ -3170,7 +3193,7 @@ var contentful = (function (exports) {
         // (message may be empty; when present, surface it)
         // See https://developer.mozilla.org/docs/Web/API/XMLHttpRequest/error_event
         var msg = event && event.message ? event.message : 'Network Error';
-        var err = new AxiosError$1(msg, AxiosError$1.ERR_NETWORK, config, request);
+        var err = new AxiosError(msg, AxiosError.ERR_NETWORK, config, request);
         // attach the underlying event for consumers who want details
         err.event = event || null;
         reject(err);
@@ -3184,7 +3207,7 @@ var contentful = (function (exports) {
         if (_config.timeoutErrorMessage) {
           timeoutErrorMessage = _config.timeoutErrorMessage;
         }
-        reject(new AxiosError$1(timeoutErrorMessage, transitional.clarifyTimeoutError ? AxiosError$1.ETIMEDOUT : AxiosError$1.ECONNABORTED, config, request));
+        reject(new AxiosError(timeoutErrorMessage, transitional.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED, config, request));
 
         // Clean up request
         request = null;
@@ -3235,7 +3258,7 @@ var contentful = (function (exports) {
           if (!request) {
             return;
           }
-          reject(!cancel || cancel.type ? new CanceledError$1(null, config, request) : cancel);
+          reject(!cancel || cancel.type ? new CanceledError(null, config, request) : cancel);
           request.abort();
           request = null;
         };
@@ -3246,7 +3269,7 @@ var contentful = (function (exports) {
       }
       var protocol = parseProtocol(_config.url);
       if (protocol && platform.protocols.indexOf(protocol) === -1) {
-        reject(new AxiosError$1('Unsupported protocol ' + protocol + ':', AxiosError$1.ERR_BAD_REQUEST, config));
+        reject(new AxiosError('Unsupported protocol ' + protocol + ':', AxiosError.ERR_BAD_REQUEST, config));
         return;
       }
 
@@ -3265,12 +3288,12 @@ var contentful = (function (exports) {
           aborted = true;
           unsubscribe();
           var err = reason instanceof Error ? reason : this.reason;
-          controller.abort(err instanceof AxiosError$1 ? err : new CanceledError$1(err instanceof Error ? err.message : err));
+          controller.abort(err instanceof AxiosError ? err : new CanceledError(err instanceof Error ? err.message : err));
         }
       };
       var timer = timeout && setTimeout(function () {
         timer = null;
-        onabort(new AxiosError$1("timeout of ".concat(timeout, "ms exceeded"), AxiosError$1.ETIMEDOUT));
+        onabort(new AxiosError("timeout of ".concat(timeout, "ms exceeded"), AxiosError.ETIMEDOUT));
       }, timeout);
       var unsubscribe = function unsubscribe() {
         if (signals) {
@@ -3292,14 +3315,13 @@ var contentful = (function (exports) {
       return signal;
     }
   };
-  var composeSignals$1 = composeSignals;
   var streamChunk = /*#__PURE__*/_regeneratorRuntime.mark(function streamChunk(chunk, chunkSize) {
     var len, pos, end;
     return _regeneratorRuntime.wrap(function streamChunk$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           len = chunk.byteLength;
-          if (!(!chunkSize || len < chunkSize)) {
+          if (!(len < chunkSize)) {
             _context.next = 5;
             break;
           }
@@ -3564,14 +3586,16 @@ var contentful = (function (exports) {
     }()));
     var supportsRequestStream = isRequestSupported && isReadableStreamSupported && test(function () {
       var duplexAccessed = false;
+      var body = new ReadableStream$1();
       var hasContentType = new Request(platform.origin, {
-        body: new ReadableStream$1(),
+        body: body,
         method: 'POST',
         get duplex() {
           duplexAccessed = true;
           return 'half';
         }
       }).headers.has('Content-Type');
+      body.cancel();
       return duplexAccessed && !hasContentType;
     });
     var supportsResponseStream = isResponseSupported && isReadableStreamSupported && test(function () {
@@ -3589,7 +3613,7 @@ var contentful = (function (exports) {
           if (method) {
             return method.call(res);
           }
-          throw new AxiosError$1("Response type '".concat(type, "' is not supported"), AxiosError$1.ERR_NOT_SUPPORT, config);
+          throw new AxiosError("Response type '".concat(type, "' is not supported"), AxiosError.ERR_NOT_SUPPORT, config);
         });
       });
     }();
@@ -3678,7 +3702,7 @@ var contentful = (function (exports) {
               _resolveConfig = resolveConfig(config), url = _resolveConfig.url, method = _resolveConfig.method, data = _resolveConfig.data, signal = _resolveConfig.signal, cancelToken = _resolveConfig.cancelToken, timeout = _resolveConfig.timeout, onDownloadProgress = _resolveConfig.onDownloadProgress, onUploadProgress = _resolveConfig.onUploadProgress, responseType = _resolveConfig.responseType, headers = _resolveConfig.headers, _resolveConfig$withCr = _resolveConfig.withCredentials, withCredentials = _resolveConfig$withCr === void 0 ? 'same-origin' : _resolveConfig$withCr, fetchOptions = _resolveConfig.fetchOptions;
               _fetch = envFetch || fetch;
               responseType = responseType ? (responseType + '').toLowerCase() : 'text';
-              composedSignal = composeSignals$1([signal, cancelToken && cancelToken.toAbortSignal()], timeout);
+              composedSignal = composeSignals([signal, cancelToken && cancelToken.toAbortSignal()], timeout);
               request = null;
               unsubscribe = composedSignal && composedSignal.unsubscribe && function () {
                 composedSignal.unsubscribe();
@@ -3755,7 +3779,7 @@ var contentful = (function (exports) {
               return new Promise(function (resolve, reject) {
                 settle(resolve, reject, {
                   data: responseData,
-                  headers: AxiosHeaders$1.from(response.headers),
+                  headers: AxiosHeaders.from(response.headers),
                   status: response.status,
                   statusText: response.statusText,
                   config: config,
@@ -3772,11 +3796,11 @@ var contentful = (function (exports) {
                 _context8.next = 41;
                 break;
               }
-              throw Object.assign(new AxiosError$1('Network Error', AxiosError$1.ERR_NETWORK, config, request, _context8.t2 && _context8.t2.response), {
+              throw Object.assign(new AxiosError('Network Error', AxiosError.ERR_NETWORK, config, request, _context8.t2 && _context8.t2.response), {
                 cause: _context8.t2.cause || _context8.t2
               });
             case 41:
-              throw AxiosError$1.from(_context8.t2, _context8.t2 && _context8.t2.code, config, request, _context8.t2 && _context8.t2.response);
+              throw AxiosError.from(_context8.t2, _context8.t2 && _context8.t2.code, config, request, _context8.t2 && _context8.t2.response);
             case 42:
             case "end":
               return _context8.stop();
@@ -3887,7 +3911,7 @@ var contentful = (function (exports) {
       if (!isResolvedHandle(nameOrAdapter)) {
         adapter = knownAdapters[(id = String(nameOrAdapter)).toLowerCase()];
         if (adapter === undefined) {
-          throw new AxiosError$1("Unknown adapter '".concat(id, "'"));
+          throw new AxiosError("Unknown adapter '".concat(id, "'"));
         }
       }
       if (adapter && (utils$1$1.isFunction(adapter) || (adapter = adapter.get(config)))) {
@@ -3903,7 +3927,7 @@ var contentful = (function (exports) {
         return "adapter ".concat(id, " ") + (state === false ? 'is not supported by the environment' : 'is not available in the build');
       });
       var s = length ? reasons.length > 1 ? 'since :\n' + reasons.map(renderReason).join('\n') : ' ' + renderReason(reasons[0]) : 'as no adapter specified';
-      throw new AxiosError$1("There is no suitable adapter to dispatch the request " + s, 'ERR_NOT_SUPPORT');
+      throw new AxiosError("There is no suitable adapter to dispatch the request " + s, 'ERR_NOT_SUPPORT');
     }
     return adapter;
   }
@@ -3936,7 +3960,7 @@ var contentful = (function (exports) {
       config.cancelToken.throwIfRequested();
     }
     if (config.signal && config.signal.aborted) {
-      throw new CanceledError$1(null, config);
+      throw new CanceledError(null, config);
     }
   }
 
@@ -3949,20 +3973,20 @@ var contentful = (function (exports) {
    */
   function dispatchRequest(config) {
     throwIfCancellationRequested(config);
-    config.headers = AxiosHeaders$1.from(config.headers);
+    config.headers = AxiosHeaders.from(config.headers);
 
     // Transform request data
     config.data = transformData.call(config, config.transformRequest);
     if (['post', 'put', 'patch'].indexOf(config.method) !== -1) {
       config.headers.setContentType('application/x-www-form-urlencoded', false);
     }
-    var adapter = adapters.getAdapter(config.adapter || defaults$1$1.adapter, config);
+    var adapter = adapters.getAdapter(config.adapter || defaults$2.adapter, config);
     return adapter(config).then(function onAdapterResolution(response) {
       throwIfCancellationRequested(config);
 
       // Transform response data
       response.data = transformData.call(config, config.transformResponse, response);
-      response.headers = AxiosHeaders$1.from(response.headers);
+      response.headers = AxiosHeaders.from(response.headers);
       return response;
     }, function onAdapterRejection(reason) {
       if (!isCancel(reason)) {
@@ -3971,13 +3995,13 @@ var contentful = (function (exports) {
         // Transform response data
         if (reason && reason.response) {
           reason.response.data = transformData.call(config, config.transformResponse, reason.response);
-          reason.response.headers = AxiosHeaders$1.from(reason.response.headers);
+          reason.response.headers = AxiosHeaders.from(reason.response.headers);
         }
       }
       return Promise.reject(reason);
     });
   }
-  var VERSION = "1.13.6";
+  var VERSION = "1.15.0";
   var validators$1 = {};
 
   // eslint-disable-next-line func-names
@@ -4005,7 +4029,7 @@ var contentful = (function (exports) {
     // eslint-disable-next-line func-names
     return function (value, opt, opts) {
       if (validator === false) {
-        throw new AxiosError$1(formatMessage(opt, ' has been removed' + (version ? ' in ' + version : '')), AxiosError$1.ERR_DEPRECATED);
+        throw new AxiosError(formatMessage(opt, ' has been removed' + (version ? ' in ' + version : '')), AxiosError.ERR_DEPRECATED);
       }
       if (version && !deprecatedWarnings[opt]) {
         deprecatedWarnings[opt] = true;
@@ -4035,7 +4059,7 @@ var contentful = (function (exports) {
 
   function assertOptions(options, schema, allowUnknown) {
     if (_typeof$2(options) !== 'object') {
-      throw new AxiosError$1('options must be an object', AxiosError$1.ERR_BAD_OPTION_VALUE);
+      throw new AxiosError('options must be an object', AxiosError.ERR_BAD_OPTION_VALUE);
     }
     var keys = Object.keys(options);
     var i = keys.length;
@@ -4046,12 +4070,12 @@ var contentful = (function (exports) {
         var value = options[opt];
         var result = value === undefined || _validator(value, opt, options);
         if (result !== true) {
-          throw new AxiosError$1('option ' + opt + ' must be ' + result, AxiosError$1.ERR_BAD_OPTION_VALUE);
+          throw new AxiosError('option ' + opt + ' must be ' + result, AxiosError.ERR_BAD_OPTION_VALUE);
         }
         continue;
       }
       if (allowUnknown !== true) {
-        throw new AxiosError$1('Unknown option ' + opt, AxiosError$1.ERR_BAD_OPTION);
+        throw new AxiosError('Unknown option ' + opt, AxiosError.ERR_BAD_OPTION);
       }
     }
   }
@@ -4073,8 +4097,8 @@ var contentful = (function (exports) {
       _classCallCheck(this, Axios);
       this.defaults = instanceConfig || {};
       this.interceptors = {
-        request: new InterceptorManager$1(),
-        response: new InterceptorManager$1()
+        request: new InterceptorManager(),
+        response: new InterceptorManager()
       };
     }
 
@@ -4090,7 +4114,7 @@ var contentful = (function (exports) {
       key: "request",
       value: (function () {
         var _request2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(configOrUrl, config) {
-          var dummy, stack;
+          var dummy, stack, firstNewlineIndex, secondNewlineIndex, stackWithoutTwoTopLines;
           return _regeneratorRuntime.wrap(function _callee8$(_context9) {
             while (1) switch (_context9.prev = _context9.next) {
               case 0:
@@ -4107,13 +4131,24 @@ var contentful = (function (exports) {
                   Error.captureStackTrace ? Error.captureStackTrace(dummy) : dummy = new Error();
 
                   // slice off the Error: ... line
-                  stack = dummy.stack ? dummy.stack.replace(/^.+\n/, '') : '';
+                  stack = function () {
+                    if (!dummy.stack) {
+                      return '';
+                    }
+                    var firstNewlineIndex = dummy.stack.indexOf('\n');
+                    return firstNewlineIndex === -1 ? '' : dummy.stack.slice(firstNewlineIndex + 1);
+                  }();
                   try {
                     if (!_context9.t0.stack) {
                       _context9.t0.stack = stack;
                       // match without the 2 top stack lines
-                    } else if (stack && !String(_context9.t0.stack).endsWith(stack.replace(/^.+\n.+\n/, ''))) {
-                      _context9.t0.stack += '\n' + stack;
+                    } else if (stack) {
+                      firstNewlineIndex = stack.indexOf('\n');
+                      secondNewlineIndex = firstNewlineIndex === -1 ? -1 : stack.indexOf('\n', firstNewlineIndex + 1);
+                      stackWithoutTwoTopLines = secondNewlineIndex === -1 ? '' : stack.slice(secondNewlineIndex + 1);
+                      if (!String(_context9.t0.stack).endsWith(stackWithoutTwoTopLines)) {
+                        _context9.t0.stack += '\n' + stack;
+                      }
                     }
                   } catch (e) {
                     // ignore the case where "stack" is an un-writable property
@@ -4187,7 +4222,7 @@ var contentful = (function (exports) {
         headers && utils$1$1.forEach(['delete', 'get', 'head', 'post', 'put', 'patch', 'common'], function (method) {
           delete headers[method];
         });
-        config.headers = AxiosHeaders$1.concat(contextHeaders, headers);
+        config.headers = AxiosHeaders.concat(contextHeaders, headers);
 
         // filter out skipped interceptors
         var requestInterceptorChain = [];
@@ -4267,8 +4302,6 @@ var contentful = (function (exports) {
     };
   });
   utils$1$1.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
-    /*eslint func-names:0*/
-
     function generateHTTPMethod(isForm) {
       return function httpMethod(url, data, config) {
         return this.request(mergeConfig(config || {}, {
@@ -4284,7 +4317,6 @@ var contentful = (function (exports) {
     Axios.prototype[method] = generateHTTPMethod();
     Axios.prototype[method + 'Form'] = generateHTTPMethod(true);
   });
-  var Axios$1 = Axios;
 
   /**
    * A `CancelToken` is an object that can be used to request cancellation of an operation.
@@ -4333,7 +4365,7 @@ var contentful = (function (exports) {
           // Cancellation has already been requested
           return;
         }
-        token.reason = new CanceledError$1(message, config, request);
+        token.reason = new CanceledError(message, config, request);
         resolvePromise(token.reason);
       });
     }
@@ -4413,8 +4445,6 @@ var contentful = (function (exports) {
       }
     }]);
   }();
-  var CancelToken$1 = CancelToken;
-
   /**
    * Syntactic sugar for invoking a function and expanding an array for arguments.
    *
@@ -4529,7 +4559,6 @@ var contentful = (function (exports) {
       value = _ref23[1];
     HttpStatusCode[value] = key;
   });
-  var HttpStatusCode$1 = HttpStatusCode;
 
   /**
    * Create an instance of Axios
@@ -4539,11 +4568,11 @@ var contentful = (function (exports) {
    * @returns {Axios} A new instance of Axios
    */
   function createInstance(defaultConfig) {
-    var context = new Axios$1(defaultConfig);
-    var instance = bind$3(Axios$1.prototype.request, context);
+    var context = new Axios(defaultConfig);
+    var instance = bind$3(Axios.prototype.request, context);
 
     // Copy axios.prototype to instance
-    utils$1$1.extend(instance, Axios$1.prototype, context, {
+    utils$1$1.extend(instance, Axios.prototype, context, {
       allOwnKeys: true
     });
 
@@ -4560,20 +4589,20 @@ var contentful = (function (exports) {
   }
 
   // Create the default instance to be exported
-  var axios = createInstance(defaults$1$1);
+  var axios = createInstance(defaults$2);
 
   // Expose Axios class to allow class inheritance
-  axios.Axios = Axios$1;
+  axios.Axios = Axios;
 
   // Expose Cancel & CancelToken
-  axios.CanceledError = CanceledError$1;
-  axios.CancelToken = CancelToken$1;
+  axios.CanceledError = CanceledError;
+  axios.CancelToken = CancelToken;
   axios.isCancel = isCancel;
   axios.VERSION = VERSION;
   axios.toFormData = toFormData;
 
   // Expose AxiosError class
-  axios.AxiosError = AxiosError$1;
+  axios.AxiosError = AxiosError;
 
   // alias for CanceledError for backward compatibility
   axios.Cancel = axios.CanceledError;
@@ -4589,12 +4618,12 @@ var contentful = (function (exports) {
 
   // Expose mergeConfig
   axios.mergeConfig = mergeConfig;
-  axios.AxiosHeaders = AxiosHeaders$1;
+  axios.AxiosHeaders = AxiosHeaders;
   axios.formToJSON = function (thing) {
     return formDataToJSON(utils$1$1.isHTMLForm(thing) ? new FormData(thing) : thing);
   };
   axios.getAdapter = adapters.getAdapter;
-  axios.HttpStatusCode = HttpStatusCode$1;
+  axios.HttpStatusCode = HttpStatusCode;
   axios.default = axios;
   var axios_1 = axios;
   var axios$1 = /*@__PURE__*/getDefaultExportFromCjs(axios_1);
@@ -9222,7 +9251,7 @@ var contentful = (function (exports) {
     }
     var responseClone = index(response);
     var allIncludes = Object.keys(responseClone.includes || {}).reduce(function (all, type) {
-      return [].concat(_toConsumableArray(all), _toConsumableArray(response.includes[type]));
+      return [].concat(_toConsumableArray(all), _toConsumableArray(responseClone.includes[type]));
     }, []);
     var allEntries = [].concat(_toConsumableArray(responseClone.items), _toConsumableArray(allIncludes)).filter(function (entity) {
       return Boolean(entity.sys);