contentful 11.12.2 → 11.12.4

package/dist/contentful.browser.js

@@ -1447,10 +1447,10 @@ var contentful = (function (exports) {
    * @returns {Object} The JSON-compatible object.
    */
   var toJSONObject = function toJSONObject(obj) {
-    var stack = new Array(10);
-    var _visit = function visit(source, i) {
+    var visited = new WeakSet();
+    var _visit = function visit(source) {
       if (isObject(source)) {
-        if (stack.indexOf(source) >= 0) {
+        if (visited.has(source)) {
           return;
         }
 
@@ -1459,19 +1459,20 @@ var contentful = (function (exports) {
           return source;
         }
         if (!('toJSON' in source)) {
-          stack[i] = source;
+          // add-on descent / delete-on-ascent: preserves path semantics, so DAG nodes serialise at every occurrence (see #7230).
+          visited.add(source);
           var target = isArray$7(source) ? [] : {};
           forEach(source, function (value, key) {
-            var reducedValue = _visit(value, i + 1);
+            var reducedValue = _visit(value);
             !isUndefined(reducedValue) && (target[key] = reducedValue);
           });
-          stack[i] = undefined;
+          visited.delete(source);
           return target;
         }
       }
       return source;
     };
-    return _visit(obj, 0);
+    return _visit(obj);
   };
 
   /**
@@ -1642,8 +1643,6 @@ var contentful = (function (exports) {
     });
     return parsed;
   };
-  var $internals = Symbol('internals');
-  var INVALID_HEADER_VALUE_CHARS_RE = /[^\x09\x20-\x7E\x80-\xFF]/g;
   function trimSPorHTAB(str) {
     var start = 0;
     var end = str.length;
@@ -1663,12 +1662,37 @@ var contentful = (function (exports) {
     }
     return start === 0 && end === str.length ? str : str.slice(start, end);
   }
+
+  // The control-code ranges are intentional: header sanitization strips C0/DEL bytes.
+  // eslint-disable-next-line no-control-regex
+  var INVALID_UNICODE_HEADER_VALUE_CHARS = new RegExp("[\\u0000-\\u0008\\u000a-\\u001f\\u007f]+", 'g');
+  // eslint-disable-next-line no-control-regex
+  var INVALID_BYTE_STRING_HEADER_VALUE_CHARS = new RegExp("[^\\u0009\\u0020-\\u007e\\u0080-\\u00ff]+", 'g');
+  function sanitizeValue(value, invalidChars) {
+    if (utils$1$1.isArray(value)) {
+      return value.map(function (item) {
+        return sanitizeValue(item, invalidChars);
+      });
+    }
+    return trimSPorHTAB(String(value).replace(invalidChars, ''));
+  }
+  var sanitizeHeaderValue = function sanitizeHeaderValue(value) {
+    return sanitizeValue(value, INVALID_UNICODE_HEADER_VALUE_CHARS);
+  };
+  var sanitizeByteStringHeaderValue = function sanitizeByteStringHeaderValue(value) {
+    return sanitizeValue(value, INVALID_BYTE_STRING_HEADER_VALUE_CHARS);
+  };
+  function toByteStringHeaderObject(headers) {
+    var byteStringHeaders = Object.create(null);
+    utils$1$1.forEach(headers.toJSON(), function (value, header) {
+      byteStringHeaders[header] = sanitizeByteStringHeaderValue(value);
+    });
+    return byteStringHeaders;
+  }
+  var $internals = Symbol('internals');
   function normalizeHeader(header) {
     return header && String(header).trim().toLowerCase();
   }
-  function sanitizeHeaderValue(str) {
-    return trimSPorHTAB(str.replace(INVALID_HEADER_VALUE_CHARS_RE, ''));
-  }
   function normalizeValue(value) {
     if (value === false || value == null) {
       return value;
@@ -1949,8 +1973,8 @@ var contentful = (function (exports) {
   AxiosHeaders.accessor(['Content-Type', 'Content-Length', 'Accept', 'Accept-Encoding', 'User-Agent', 'Authorization']);
 
   // reserved names hotfix
-  utils$1$1.reduceDescriptors(AxiosHeaders.prototype, function (_ref10, key) {
-    var value = _ref10.value;
+  utils$1$1.reduceDescriptors(AxiosHeaders.prototype, function (_ref0, key) {
+    var value = _ref0.value;
     var mapped = key[0].toUpperCase() + key.slice(1); // map `set` => `Set`
     return {
       get: function get() {
@@ -2621,7 +2645,7 @@ var contentful = (function (exports) {
         }
         return !isNumericKey;
       }
-      if (!target[name] || !utils$1$1.isObject(target[name])) {
+      if (!utils$1$1.hasOwnProp(target, name) || !utils$1$1.isObject(target[name])) {
         target[name] = [];
       }
       var result = buildPath(path, value, target[name], index);
@@ -2915,6 +2939,9 @@ var contentful = (function (exports) {
     var bytesNotified = 0;
     var _speedometer = speedometer(50, 250);
     return throttle(function (e) {
+      if (!e || typeof e.loaded !== 'number') {
+        return;
+      }
       var rawLoaded = e.loaded;
       var total = e.lengthComputable ? e.total : undefined;
       var loaded = total != null ? Math.min(rawLoaded, total) : rawLoaded;
@@ -3186,10 +3213,10 @@ var contentful = (function (exports) {
       headers.set(formHeaders);
       return;
     }
-    Object.entries(formHeaders).forEach(function (_ref11) {
-      var _ref12 = _slicedToArray$1(_ref11, 2),
-        key = _ref12[0],
-        val = _ref12[1];
+    Object.entries(formHeaders).forEach(function (_ref1) {
+      var _ref10 = _slicedToArray$1(_ref1, 2),
+        key = _ref10[0],
+        val = _ref10[1];
       if (FORM_DATA_CONTENT_HEADERS.includes(key.toLowerCase())) {
         headers.set(key, val);
       }
@@ -3382,7 +3409,7 @@ var contentful = (function (exports) {
 
       // Add headers to the request
       if ('setRequestHeader' in request) {
-        utils$1$1.forEach(requestHeaders.toJSON(), function setRequestHeader(val, key) {
+        utils$1$1.forEach(toByteStringHeaderObject(requestHeaders), function setRequestHeader(val, key) {
           request.setRequestHeader(key, val);
         });
       }
@@ -3443,42 +3470,43 @@ var contentful = (function (exports) {
     });
   };
   var composeSignals = function composeSignals(signals, timeout) {
-    var _signals = signals = signals ? signals.filter(Boolean) : [],
-      length = _signals.length;
-    if (timeout || length) {
-      var controller = new AbortController();
-      var aborted;
-      var onabort = function onabort(reason) {
-        if (!aborted) {
-          aborted = true;
-          unsubscribe();
-          var err = reason instanceof Error ? reason : this.reason;
-          controller.abort(err instanceof AxiosError ? err : new CanceledError(err instanceof Error ? err.message : err));
-        }
-      };
-      var timer = timeout && setTimeout(function () {
-        timer = null;
-        onabort(new AxiosError("timeout of ".concat(timeout, "ms exceeded"), AxiosError.ETIMEDOUT));
-      }, timeout);
-      var unsubscribe = function unsubscribe() {
-        if (signals) {
-          timer && clearTimeout(timer);
-          timer = null;
-          signals.forEach(function (signal) {
-            signal.unsubscribe ? signal.unsubscribe(onabort) : signal.removeEventListener('abort', onabort);
-          });
-          signals = null;
-        }
-      };
+    signals = signals ? signals.filter(Boolean) : [];
+    if (!timeout && !signals.length) {
+      return;
+    }
+    var controller = new AbortController();
+    var aborted = false;
+    var onabort = function onabort(reason) {
+      if (!aborted) {
+        aborted = true;
+        unsubscribe();
+        var err = reason instanceof Error ? reason : this.reason;
+        controller.abort(err instanceof AxiosError ? err : new CanceledError(err instanceof Error ? err.message : err));
+      }
+    };
+    var timer = timeout && setTimeout(function () {
+      timer = null;
+      onabort(new AxiosError("timeout of ".concat(timeout, "ms exceeded"), AxiosError.ETIMEDOUT));
+    }, timeout);
+    var unsubscribe = function unsubscribe() {
+      if (!signals) {
+        return;
+      }
+      timer && clearTimeout(timer);
+      timer = null;
       signals.forEach(function (signal) {
-        return signal.addEventListener('abort', onabort);
+        signal.unsubscribe ? signal.unsubscribe(onabort) : signal.removeEventListener('abort', onabort);
       });
-      var signal = controller.signal;
-      signal.unsubscribe = function () {
-        return utils$1$1.asap(unsubscribe);
-      };
-      return signal;
-    }
+      signals = null;
+    };
+    signals.forEach(function (signal) {
+      return signal.addEventListener('abort', onabort);
+    });
+    var signal = controller.signal;
+    signal.unsubscribe = function () {
+      return utils$1$1.asap(unsubscribe);
+    };
+    return signal;
   };
   var streamChunk = /*#__PURE__*/_regeneratorRuntime.mark(function streamChunk(chunk, chunkSize) {
     var len, pos, end;
@@ -3778,7 +3806,7 @@ var contentful = (function (exports) {
     }
     return bytes;
   }
-  var VERSION = "1.16.0";
+  var VERSION = "1.16.1";
   var DEFAULT_CHUNK_SIZE = 64 * 1024;
   var isFunction = utils$1$1.isFunction;
   var test = function test(fn) {
@@ -3792,8 +3820,7 @@ var contentful = (function (exports) {
     }
   };
   var factory = function factory(env) {
-    var _utils$1$global;
-    var globalObject = (_utils$1$global = utils$1$1.global) !== null && _utils$1$global !== void 0 ? _utils$1$global : globalThis;
+    var globalObject = utils$1$1.global !== undefined && utils$1$1.global !== null ? utils$1$1.global : globalThis;
     var ReadableStream = globalObject.ReadableStream,
       TextEncoder = globalObject.TextEncoder;
     env = utils$1$1.merge.call({
@@ -3818,7 +3845,7 @@ var contentful = (function (exports) {
         return encoder.encode(str);
       };
     }(new TextEncoder()) : (/*#__PURE__*/function () {
-      var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(str) {
+      var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(str) {
         return _regeneratorRuntime.wrap(function _callee4$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -3835,7 +3862,7 @@ var contentful = (function (exports) {
         }, _callee4);
       }));
       return function (_x4) {
-        return _ref13.apply(this, arguments);
+        return _ref11.apply(this, arguments);
       };
     }()));
     var supportsRequestStream = isRequestSupported && isReadableStreamSupported && test(function () {
@@ -3874,7 +3901,7 @@ var contentful = (function (exports) {
       });
     }();
     var getBodyLength = /*#__PURE__*/function () {
-      var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(body) {
+      var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(body) {
         var _request;
         return _regeneratorRuntime.wrap(function _callee5$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -3928,11 +3955,11 @@ var contentful = (function (exports) {
         }, _callee5);
       }));
       return function getBodyLength(_x5) {
-        return _ref14.apply(this, arguments);
+        return _ref12.apply(this, arguments);
       };
     }();
     var resolveBodyLength = /*#__PURE__*/function () {
-      var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(headers, body) {
+      var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(headers, body) {
         var length;
         return _regeneratorRuntime.wrap(function _callee6$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -3946,12 +3973,12 @@ var contentful = (function (exports) {
         }, _callee6);
       }));
       return function resolveBodyLength(_x6, _x7) {
-        return _ref15.apply(this, arguments);
+        return _ref13.apply(this, arguments);
       };
     }();
     return /*#__PURE__*/function () {
-      var _ref16 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(config) {
-        var _resolveConfig, url, method, data, signal, cancelToken, timeout, onDownloadProgress, onUploadProgress, responseType, headers, _resolveConfig$withCr, withCredentials, fetchOptions, maxContentLength, maxBodyLength, hasMaxContentLength, hasMaxBodyLength, _fetch, composedSignal, request, unsubscribe, requestContentLength, estimated, outboundLength, _request, contentTypeHeader, _progressEventDecorat, _progressEventDecorat2, onProgress, flush, isCredentialsSupported, contentType, resolvedOptions, response, declaredLength, isStreamResponse, options, responseContentLength, _ref17, _ref18, _onProgress, _flush, bytesRead, onChunkProgress, responseData, materializedSize, canceledError;
+      var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(config) {
+        var _resolveConfig, url, method, data, signal, cancelToken, timeout, onDownloadProgress, onUploadProgress, responseType, headers, _resolveConfig$withCr, withCredentials, fetchOptions, maxContentLength, maxBodyLength, hasMaxContentLength, hasMaxBodyLength, _fetch, composedSignal, request, unsubscribe, requestContentLength, estimated, outboundLength, _request, contentTypeHeader, _progressEventDecorat, _progressEventDecorat2, onProgress, flush, isCredentialsSupported, contentType, resolvedOptions, response, declaredLength, isStreamResponse, options, responseContentLength, _ref15, _ref16, _onProgress, _flush, bytesRead, onChunkProgress, responseData, materializedSize, canceledError;
         return _regeneratorRuntime.wrap(function _callee7$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -4039,7 +4066,7 @@ var contentful = (function (exports) {
               resolvedOptions = _objectSpread$2(_objectSpread$2({}, fetchOptions), {}, {
                 signal: composedSignal,
                 method: method.toUpperCase(),
-                headers: headers.normalize().toJSON(),
+                headers: toByteStringHeaderObject(headers.normalize()),
                 body: data,
                 duplex: 'half',
                 credentials: isCredentialsSupported ? withCredentials : undefined
@@ -4067,7 +4094,7 @@ var contentful = (function (exports) {
                   options[prop] = response[prop];
                 });
                 responseContentLength = utils$1$1.toFiniteNumber(response.headers.get('content-length'));
-                _ref17 = onDownloadProgress && progressEventDecorator(responseContentLength, progressEventReducer(asyncDecorator(onDownloadProgress), true)) || [], _ref18 = _slicedToArray$1(_ref17, 2), _onProgress = _ref18[0], _flush = _ref18[1];
+                _ref15 = onDownloadProgress && progressEventDecorator(responseContentLength, progressEventReducer(asyncDecorator(onDownloadProgress), true)) || [], _ref16 = _slicedToArray$1(_ref15, 2), _onProgress = _ref16[0], _flush = _ref16[1];
                 bytesRead = 0;
                 onChunkProgress = function onChunkProgress(loadedBytes) {
                   if (hasMaxContentLength) {
@@ -4155,7 +4182,7 @@ var contentful = (function (exports) {
         }, _callee7, null, [[8, 58]]);
       }));
       return function (_x8) {
-        return _ref16.apply(this, arguments);
+        return _ref14.apply(this, arguments);
       };
     }();
   };
@@ -4271,10 +4298,10 @@ var contentful = (function (exports) {
       rejectedReasons[id || '#' + i] = adapter;
     }
     if (!adapter) {
-      var reasons = Object.entries(rejectedReasons).map(function (_ref19) {
-        var _ref20 = _slicedToArray$1(_ref19, 2),
-          id = _ref20[0],
-          state = _ref20[1];
+      var reasons = Object.entries(rejectedReasons).map(function (_ref17) {
+        var _ref18 = _slicedToArray$1(_ref17, 2),
+          id = _ref18[0],
+          state = _ref18[1];
         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';
@@ -4525,7 +4552,7 @@ var contentful = (function (exports) {
             }
           }, _callee8, this, [[0, 6]]);
         }));
-        function request(_x9, _x10) {
+        function request(_x9, _x0) {
           return _request2.apply(this, arguments);
         }
         return request;
@@ -4922,10 +4949,10 @@ var contentful = (function (exports) {
     SslHandshakeFailed: 525,
     InvalidSslCertificate: 526
   };
-  Object.entries(HttpStatusCode).forEach(function (_ref21) {
-    var _ref22 = _slicedToArray$1(_ref21, 2),
-      key = _ref22[0],
-      value = _ref22[1];
+  Object.entries(HttpStatusCode).forEach(function (_ref19) {
+    var _ref20 = _slicedToArray$1(_ref19, 2),
+      key = _ref20[0],
+      value = _ref20[1];
     HttpStatusCode[value] = key;
   });
 
@@ -8087,7 +8114,7 @@ var contentful = (function (exports) {
     }
     if (obj === null) {
       if (strictNullHandling) {
-        return encoder && !encodeValuesOnly ? encoder(prefix, defaults$1.encoder, charset, 'key', format) : prefix;
+        return formatter(encoder && !encodeValuesOnly ? encoder(prefix, defaults$1.encoder, charset, 'key', format) : prefix);
       }
       obj = '';
     }
@@ -8106,7 +8133,9 @@ var contentful = (function (exports) {
     if (generateArrayPrefix === 'comma' && isArray$1(obj)) {
       // we need to join elements in
       if (encodeValuesOnly && encoder) {
-        obj = utils$1.maybeMap(obj, encoder);
+        obj = utils$1.maybeMap(obj, function (v) {
+          return v == null ? v : encoder(v);
+        });
       }
       objKeys = [{
         value: obj.length > 0 ? obj.join(',') || null : void undefined
@@ -8227,6 +8256,9 @@ var contentful = (function (exports) {
     var sideChannel = getSideChannel();
     for (var i = 0; i < objKeys.length; ++i) {
       var key = objKeys[i];
+      if (typeof key === 'undefined' || key === null) {
+        continue;
+      }
       var value = obj[key];
       if (options.skipNulls && value === null) {
         continue;
@@ -8238,10 +8270,10 @@ var contentful = (function (exports) {
     if (options.charsetSentinel) {
       if (options.charset === 'iso-8859-1') {
         // encodeURIComponent('&#10003;'), the "numeric entity" representation of a checkmark
-        prefix += 'utf8=%26%2310003%3B&';
+        prefix += 'utf8=%26%2310003%3B' + options.delimiter;
       } else {
         // encodeURIComponent('✓')
-        prefix += 'utf8=%E2%9C%93&';
+        prefix += 'utf8=%E2%9C%93' + options.delimiter;
       }
     }
     return joined.length > 0 ? prefix + joined : '';
@@ -8306,8 +8338,8 @@ var contentful = (function (exports) {
     var cleanStr = options.ignoreQueryPrefix ? str.replace(/^\?/, '') : str;
     cleanStr = cleanStr.replace(/%5B/gi, '[').replace(/%5D/gi, ']');
     var limit = options.parameterLimit === Infinity ? void undefined : options.parameterLimit;
-    var parts = cleanStr.split(options.delimiter, options.throwOnLimitExceeded ? limit + 1 : limit);
-    if (options.throwOnLimitExceeded && parts.length > limit) {
+    var parts = cleanStr.split(options.delimiter, options.throwOnLimitExceeded && typeof limit !== 'undefined' ? limit + 1 : limit);
+    if (options.throwOnLimitExceeded && typeof limit !== 'undefined' && parts.length > limit) {
       throw new RangeError('Parameter limit exceeded. Only ' + limit + ' parameter' + (limit === 1 ? '' : 's') + ' allowed.');
     }
     var skipIndex = -1; // Keep track of where the utf8 sentinel was found
@@ -8414,8 +8446,13 @@ var contentful = (function (exports) {
     }
     return leaf;
   };
-  var splitKeyIntoSegments = function splitKeyIntoSegments(givenKey, options) {
-    var key = options.allowDots ? givenKey.replace(/\.([^.[]+)/g, '[$1]') : givenKey;
+
+  // Split a key like "a[b][c[]]" into ['a', '[b]', '[c[]]'] while preserving
+  // qs parse semantics for depth/prototype guards.
+  var splitKeyIntoSegments = function splitKeyIntoSegments(originalKey, options) {
+    var key = options.allowDots ? originalKey.replace(/\.([^.[]+)/g, '[$1]') : originalKey;
+
+    // depth <= 0 keeps the whole key as one segment
     if (options.depth <= 0) {
       if (!options.plainObjects && has.call(Object.prototype, key)) {
         if (!options.allowPrototypes) {
@@ -8424,37 +8461,67 @@ var contentful = (function (exports) {
       }
       return [key];
     }
-    var brackets = /(\[[^[\]]*])/;
-    var child = /(\[[^[\]]*])/g;
-    var segment = brackets.exec(key);
-    var parent = segment ? key.slice(0, segment.index) : key;
-    var keys = [];
+    var segments = [];
+
+    // parent before the first '[' (may be empty if key starts with '[')
+    var first = key.indexOf('[');
+    var parent = first >= 0 ? key.slice(0, first) : key;
     if (parent) {
       if (!options.plainObjects && has.call(Object.prototype, parent)) {
         if (!options.allowPrototypes) {
           return;
         }
       }
-      keys[keys.length] = parent;
-    }
-    var i = 0;
-    while ((segment = child.exec(key)) !== null && i < options.depth) {
-      i += 1;
-      var segmentContent = segment[1].slice(1, -1);
-      if (!options.plainObjects && has.call(Object.prototype, segmentContent)) {
-        if (!options.allowPrototypes) {
-          return;
+      segments[segments.length] = parent;
+    }
+    var n = key.length;
+    var open = first;
+    var collected = 0;
+    while (open >= 0 && collected < options.depth) {
+      var level = 1;
+      var i = open + 1;
+      var close = -1;
+
+      // balance nested '[' and ']' inside this bracket group using a nesting level counter
+      while (i < n && close < 0) {
+        var cu = key.charCodeAt(i);
+        if (cu === 0x5B) {
+          // '['
+          level += 1;
+        } else if (cu === 0x5D) {
+          // ']'
+          level -= 1;
+          if (level === 0) {
+            close = i; // found matching close; loop will exit by condition
+          }
         }
+        i += 1;
+      }
+      if (close < 0) {
+        // Unterminated group: wrap the raw remainder in one bracket pair so it stays
+        // a single literal segment (e.g. "[[]b" -> "[[]b]"); we do not infer missing ']'.
+        segments[segments.length] = '[' + key.slice(open) + ']';
+        return segments;
       }
-      keys[keys.length] = segment[1];
+      var seg = key.slice(open, close + 1);
+      // prototype guard for the content of this group
+      var content = seg.slice(1, -1);
+      if (!options.plainObjects && has.call(Object.prototype, content) && !options.allowPrototypes) {
+        return;
+      }
+      segments[segments.length] = seg;
+      collected += 1;
+
+      // find the next '[' after this balanced group
+      open = key.indexOf('[', close + 1);
     }
-    if (segment) {
+    if (open >= 0) {
       if (options.strictDepth === true) {
         throw new RangeError('Input depth exceeded depth option of ' + options.depth + ' and strictDepth is true');
       }
-      keys[keys.length] = '[' + key.slice(segment.index) + ']';
+      segments[segments.length] = '[' + key.slice(open) + ']';
     }
-    return keys;
+    return segments;
   };
   var parseKeys = function parseQueryStringKeys(givenKey, val, options, valuesParsed) {
     if (!givenKey) {
@@ -10046,7 +10113,14 @@ var contentful = (function (exports) {
       return false;
     }
     var isValidConfig = isValidTimelinePreviewConfig(timelinePreview);
-    var isValidHost = typeof host === 'string' && host.startsWith('preview');
+    // Show error if used outside of CPA.
+    // Opt-out of the error if a custom domain is used and CPA could not be identified.
+    // Use an exact domain match to avoid false-positives on proxy hostnames that contain
+    // "contentful" as a substring (e.g. api-contentful-proxy.example.com).
+    var PREVIEW_HOST_REGEX = /^preview(\.eu)?\.contentful\.com$/;
+    var isContentfulHost = typeof host === 'string' && PREVIEW_HOST_REGEX.test(host);
+    var isCustomHost = typeof host !== 'string' || !host.endsWith('.contentful.com');
+    var isValidHost = isContentfulHost || isCustomHost;
     if (isValidConfig && !isValidHost) {
       throw new ValidationError('timelinePreview', "The 'timelinePreview' parameter can only be used with the CPA. Please set host to 'preview.contentful.com' or 'preview.eu.contentful.com' to enable Timeline Preview.\n      ");
     }
@@ -10430,58 +10504,58 @@ var contentful = (function (exports) {
       return _internalGetEntry.apply(this, arguments);
     }
     function _internalGetEntry() {
-      _internalGetEntry = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee10(id, query, options) {
+      _internalGetEntry = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0(id, query, options) {
         var response;
-        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime.wrap(function _callee0$(_context0) {
+          while (1) switch (_context0.prev = _context0.next) {
             case 0:
               if (id) {
-                _context10.next = 2;
+                _context0.next = 2;
                 break;
               }
               throw notFoundError(id);
             case 2:
-              _context10.prev = 2;
-              _context10.next = 5;
+              _context0.prev = 2;
+              _context0.next = 5;
               return internalGetEntries(Object.assign({
                 'sys.id': id
               }, maybeEnableSourceMaps(query)), options);
             case 5:
-              response = _context10.sent;
+              response = _context0.sent;
               if (!(response.items.length > 0)) {
-                _context10.next = 10;
+                _context0.next = 10;
                 break;
               }
-              return _context10.abrupt("return", response.items[0]);
+              return _context0.abrupt("return", response.items[0]);
             case 10:
               throw notFoundError(id);
             case 11:
-              _context10.next = 16;
+              _context0.next = 16;
               break;
             case 13:
-              _context10.prev = 13;
-              _context10.t0 = _context10["catch"](2);
-              errorHandler(_context10.t0);
+              _context0.prev = 13;
+              _context0.t0 = _context0["catch"](2);
+              errorHandler(_context0.t0);
             case 16:
             case "end":
-              return _context10.stop();
+              return _context0.stop();
           }
-        }, _callee10, null, [[2, 13]]);
+        }, _callee0, null, [[2, 13]]);
       }));
       return _internalGetEntry.apply(this, arguments);
     }
-    function makeGetEntries(_x10) {
+    function makeGetEntries(_x0) {
       return _makeGetEntries.apply(this, arguments);
     }
     function _makeGetEntries() {
-      _makeGetEntries = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(query) {
+      _makeGetEntries = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee1(query) {
         var options,
           withAllLocales,
-          _args11 = arguments;
-        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+          _args1 = arguments;
+        return _regeneratorRuntime.wrap(function _callee1$(_context1) {
+          while (1) switch (_context1.prev = _context1.next) {
             case 0:
-              options = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : {
+              options = _args1.length > 1 && _args1[1] !== undefined ? _args1[1] : {
                 withAllLocales: false,
                 withoutLinkResolution: false,
                 withoutUnresolvableLinks: false,
@@ -10492,14 +10566,14 @@ var contentful = (function (exports) {
               validateResolveLinksParam(query);
               validateRemoveUnresolvedParam(query);
               validateSearchParameters(query);
-              return _context11.abrupt("return", internalGetEntries(withAllLocales ? Object.assign(Object.assign({}, query), {
+              return _context1.abrupt("return", internalGetEntries(withAllLocales ? Object.assign(Object.assign({}, query), {
                 locale: '*'
               }) : query, options));
             case 7:
             case "end":
-              return _context11.stop();
+              return _context1.stop();
           }
-        }, _callee11);
+        }, _callee1);
       }));
       return _makeGetEntries.apply(this, arguments);
     }
@@ -10509,17 +10583,17 @@ var contentful = (function (exports) {
       // Then, apply source maps and other normalizations
       return maybeEnableSourceMaps(normalizeSearchParameters(normalizeSelect(withTimelinePreview)));
     }
-    function internalGetEntries(_x11, _x12) {
+    function internalGetEntries(_x1, _x10) {
       return _internalGetEntries.apply(this, arguments);
     }
     function _internalGetEntries() {
-      _internalGetEntries = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12(query, options) {
+      _internalGetEntries = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee10(query, options) {
         var withoutLinkResolution, withoutUnresolvableLinks, withLocaleBasedPublishing, baseConfig, config, entries;
-        return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               withoutLinkResolution = options.withoutLinkResolution, withoutUnresolvableLinks = options.withoutUnresolvableLinks, withLocaleBasedPublishing = options.withLocaleBasedPublishing;
-              _context12.prev = 1;
+              _context10.prev = 1;
               baseConfig = createRequestConfig({
                 query: prepareQuery(query)
               });
@@ -10529,47 +10603,47 @@ var contentful = (function (exports) {
                   'X-Contentful-Locale-Based-Publishing': true
                 });
               }
-              _context12.next = 7;
+              _context10.next = 7;
               return get({
                 context: 'environment',
                 path: maybeEnableTimelinePreview('entries'),
                 config: config
               });
             case 7:
-              entries = _context12.sent;
-              return _context12.abrupt("return", resolveCircular(entries, {
+              entries = _context10.sent;
+              return _context10.abrupt("return", resolveCircular(entries, {
                 resolveLinks: !withoutLinkResolution,
                 removeUnresolved: withoutUnresolvableLinks !== null && withoutUnresolvableLinks !== void 0 ? withoutUnresolvableLinks : false
               }));
             case 11:
-              _context12.prev = 11;
-              _context12.t0 = _context12["catch"](1);
-              errorHandler(_context12.t0);
+              _context10.prev = 11;
+              _context10.t0 = _context10["catch"](1);
+              errorHandler(_context10.t0);
             case 14:
             case "end":
-              return _context12.stop();
+              return _context10.stop();
           }
-        }, _callee12, null, [[1, 11]]);
+        }, _callee10, null, [[1, 11]]);
       }));
       return _internalGetEntries.apply(this, arguments);
     }
-    function getAsset(_x13) {
+    function getAsset(_x11) {
       return _getAsset.apply(this, arguments);
     }
     function _getAsset() {
-      _getAsset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13(id) {
+      _getAsset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(id) {
         var query,
-          _args13 = arguments;
-        return _regeneratorRuntime.wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+          _args11 = arguments;
+        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              query = _args13.length > 1 && _args13[1] !== undefined ? _args13[1] : {};
-              return _context13.abrupt("return", makeGetAsset(id, query, options));
+              query = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : {};
+              return _context11.abrupt("return", makeGetAsset(id, query, options));
             case 2:
             case "end":
-              return _context13.stop();
+              return _context11.stop();
           }
-        }, _callee13);
+        }, _callee11);
       }));
       return _getAsset.apply(this, arguments);
     }
@@ -10577,19 +10651,19 @@ var contentful = (function (exports) {
       return _getAssets.apply(this, arguments);
     }
     function _getAssets() {
-      _getAssets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
+      _getAssets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
         var query,
-          _args14 = arguments;
-        return _regeneratorRuntime.wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              query = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
-              return _context14.abrupt("return", makeGetAssets(query, options));
+              query = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
+              return _context12.abrupt("return", makeGetAssets(query, options));
             case 2:
             case "end":
-              return _context14.stop();
+              return _context12.stop();
           }
-        }, _callee14);
+        }, _callee12);
       }));
       return _getAssets.apply(this, arguments);
     }
@@ -10597,40 +10671,40 @@ var contentful = (function (exports) {
       return _getAssetsWithCursor.apply(this, arguments);
     }
     function _getAssetsWithCursor() {
-      _getAssetsWithCursor = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
+      _getAssetsWithCursor = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
         var query,
           response,
-          _args15 = arguments;
-        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+          _args13 = arguments;
+        return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              query = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
-              _context15.next = 3;
+              query = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
+              _context13.next = 3;
               return makeGetAssets(normalizeCursorPaginationParameters(query), options);
             case 3:
-              response = _context15.sent;
-              return _context15.abrupt("return", normalizeCursorPaginationResponse(response));
+              response = _context13.sent;
+              return _context13.abrupt("return", normalizeCursorPaginationResponse(response));
             case 5:
             case "end":
-              return _context15.stop();
+              return _context13.stop();
           }
-        }, _callee15);
+        }, _callee13);
       }));
       return _getAssetsWithCursor.apply(this, arguments);
     }
-    function makeGetAssets(_x14) {
+    function makeGetAssets(_x12) {
       return _makeGetAssets.apply(this, arguments);
     }
     function _makeGetAssets() {
-      _makeGetAssets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee16(query) {
+      _makeGetAssets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14(query) {
         var options,
           withAllLocales,
           localeSpecificQuery,
-          _args16 = arguments;
-        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+          _args14 = arguments;
+        return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              options = _args16.length > 1 && _args16[1] !== undefined ? _args16[1] : {
+              options = _args14.length > 1 && _args14[1] !== undefined ? _args14[1] : {
                 withAllLocales: false,
                 withoutLinkResolution: false,
                 withoutUnresolvableLinks: false,
@@ -10642,26 +10716,26 @@ var contentful = (function (exports) {
               localeSpecificQuery = withAllLocales ? Object.assign(Object.assign({}, query), {
                 locale: '*'
               }) : query;
-              return _context16.abrupt("return", internalGetAssets(localeSpecificQuery, options));
+              return _context14.abrupt("return", internalGetAssets(localeSpecificQuery, options));
             case 6:
             case "end":
-              return _context16.stop();
+              return _context14.stop();
           }
-        }, _callee16);
+        }, _callee14);
       }));
       return _makeGetAssets.apply(this, arguments);
     }
-    function internalGetAsset(_x15, _x16, _x17) {
+    function internalGetAsset(_x13, _x14, _x15) {
       return _internalGetAsset.apply(this, arguments);
     }
     function _internalGetAsset() {
-      _internalGetAsset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee17(id, query, options) {
+      _internalGetAsset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(id, query, options) {
         var withLocaleBasedPublishing, baseConfig, config;
-        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               withLocaleBasedPublishing = options.withLocaleBasedPublishing;
-              _context17.prev = 1;
+              _context15.prev = 1;
               baseConfig = createRequestConfig({
                 query: prepareQuery(query)
               });
@@ -10671,36 +10745,36 @@ var contentful = (function (exports) {
                   'X-Contentful-Locale-Based-Publishing': true
                 });
               }
-              return _context17.abrupt("return", get({
+              return _context15.abrupt("return", get({
                 context: 'environment',
                 path: maybeEnableTimelinePreview("assets/".concat(id)),
                 config: config
               }));
             case 8:
-              _context17.prev = 8;
-              _context17.t0 = _context17["catch"](1);
-              errorHandler(_context17.t0);
+              _context15.prev = 8;
+              _context15.t0 = _context15["catch"](1);
+              errorHandler(_context15.t0);
             case 11:
             case "end":
-              return _context17.stop();
+              return _context15.stop();
           }
-        }, _callee17, null, [[1, 8]]);
+        }, _callee15, null, [[1, 8]]);
       }));
       return _internalGetAsset.apply(this, arguments);
     }
-    function makeGetAsset(_x18, _x19) {
+    function makeGetAsset(_x16, _x17) {
       return _makeGetAsset.apply(this, arguments);
     }
     function _makeGetAsset() {
-      _makeGetAsset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee18(id, query) {
+      _makeGetAsset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee16(id, query) {
         var options,
           withAllLocales,
           localeSpecificQuery,
-          _args18 = arguments;
-        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+          _args16 = arguments;
+        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              options = _args18.length > 2 && _args18[2] !== undefined ? _args18[2] : {
+              options = _args16.length > 2 && _args16[2] !== undefined ? _args16[2] : {
                 withAllLocales: false,
                 withoutLinkResolution: false,
                 withoutUnresolvableLinks: false,
@@ -10712,26 +10786,26 @@ var contentful = (function (exports) {
               localeSpecificQuery = withAllLocales ? Object.assign(Object.assign({}, query), {
                 locale: '*'
               }) : query;
-              return _context18.abrupt("return", internalGetAsset(id, localeSpecificQuery, options));
+              return _context16.abrupt("return", internalGetAsset(id, localeSpecificQuery, options));
             case 6:
             case "end":
-              return _context18.stop();
+              return _context16.stop();
           }
-        }, _callee18);
+        }, _callee16);
       }));
       return _makeGetAsset.apply(this, arguments);
     }
-    function internalGetAssets(_x20, _x21) {
+    function internalGetAssets(_x18, _x19) {
       return _internalGetAssets.apply(this, arguments);
     }
     function _internalGetAssets() {
-      _internalGetAssets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee19(query, options) {
+      _internalGetAssets = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee17(query, options) {
         var withLocaleBasedPublishing, baseConfig, config;
-        return _regeneratorRuntime.wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               withLocaleBasedPublishing = options.withLocaleBasedPublishing;
-              _context19.prev = 1;
+              _context17.prev = 1;
               baseConfig = createRequestConfig({
                 query: prepareQuery(query)
               });
@@ -10741,40 +10815,40 @@ var contentful = (function (exports) {
                   'X-Contentful-Locale-Based-Publishing': true
                 });
               }
-              return _context19.abrupt("return", get({
+              return _context17.abrupt("return", get({
                 context: 'environment',
                 path: maybeEnableTimelinePreview('assets'),
                 config: config
               }));
             case 8:
-              _context19.prev = 8;
-              _context19.t0 = _context19["catch"](1);
-              errorHandler(_context19.t0);
+              _context17.prev = 8;
+              _context17.t0 = _context17["catch"](1);
+              errorHandler(_context17.t0);
             case 11:
             case "end":
-              return _context19.stop();
+              return _context17.stop();
           }
-        }, _callee19, null, [[1, 8]]);
+        }, _callee17, null, [[1, 8]]);
       }));
       return _internalGetAssets.apply(this, arguments);
     }
-    function getTag(_x22) {
+    function getTag(_x20) {
       return _getTag.apply(this, arguments);
     }
     function _getTag() {
-      _getTag = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee20(id) {
-        return _regeneratorRuntime.wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      _getTag = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee18(id) {
+        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              return _context20.abrupt("return", get({
+              return _context18.abrupt("return", get({
                 context: 'environment',
                 path: "tags/".concat(id)
               }));
             case 1:
             case "end":
-              return _context20.stop();
+              return _context18.stop();
           }
-        }, _callee20);
+        }, _callee18);
       }));
       return _getTag.apply(this, arguments);
     }
@@ -10782,15 +10856,15 @@ var contentful = (function (exports) {
       return _getTags.apply(this, arguments);
     }
     function _getTags() {
-      _getTags = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee21() {
+      _getTags = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee19() {
         var query,
-          _args21 = arguments;
-        return _regeneratorRuntime.wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+          _args19 = arguments;
+        return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              query = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : {};
+              query = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : {};
               validateSearchParameters(query);
-              return _context21.abrupt("return", get({
+              return _context19.abrupt("return", get({
                 context: 'environment',
                 path: 'tags',
                 config: createRequestConfig({
@@ -10799,20 +10873,20 @@ var contentful = (function (exports) {
               }));
             case 3:
             case "end":
-              return _context21.stop();
+              return _context19.stop();
           }
-        }, _callee21);
+        }, _callee19);
       }));
       return _getTags.apply(this, arguments);
     }
-    function createAssetKey(_x23) {
+    function createAssetKey(_x21) {
       return _createAssetKey.apply(this, arguments);
     }
     function _createAssetKey() {
-      _createAssetKey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee22(expiresAt) {
+      _createAssetKey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee20(expiresAt) {
         var now, currentMaxLifetime;
-        return _regeneratorRuntime.wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime.wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               try {
                 now = Math.floor(Date.now() / 1000);
@@ -10824,7 +10898,7 @@ var contentful = (function (exports) {
               } catch (error) {
                 errorHandler(error);
               }
-              return _context22.abrupt("return", post({
+              return _context20.abrupt("return", post({
                 context: 'environment',
                 path: 'asset_keys',
                 data: {
@@ -10833,9 +10907,9 @@ var contentful = (function (exports) {
               }));
             case 2:
             case "end":
-              return _context22.stop();
+              return _context20.stop();
           }
-        }, _callee22);
+        }, _callee20);
       }));
       return _createAssetKey.apply(this, arguments);
     }
@@ -10843,15 +10917,15 @@ var contentful = (function (exports) {
       return _getLocales.apply(this, arguments);
     }
     function _getLocales() {
-      _getLocales = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee23() {
+      _getLocales = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee21() {
         var query,
-          _args23 = arguments;
-        return _regeneratorRuntime.wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+          _args21 = arguments;
+        return _regeneratorRuntime.wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              query = _args23.length > 0 && _args23[0] !== undefined ? _args23[0] : {};
+              query = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : {};
               validateSearchParameters(query);
-              return _context23.abrupt("return", get({
+              return _context21.abrupt("return", get({
                 context: 'environment',
                 path: 'locales',
                 config: createRequestConfig({
@@ -10860,46 +10934,46 @@ var contentful = (function (exports) {
               }));
             case 3:
             case "end":
-              return _context23.stop();
+              return _context21.stop();
           }
-        }, _callee23);
+        }, _callee21);
       }));
       return _getLocales.apply(this, arguments);
     }
-    function sync(_x24) {
+    function sync(_x22) {
       return _sync.apply(this, arguments);
     }
     function _sync() {
-      _sync = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee24(query) {
+      _sync = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee22(query) {
         var syncOptions,
-          _args24 = arguments;
-        return _regeneratorRuntime.wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+          _args22 = arguments;
+        return _regeneratorRuntime.wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              syncOptions = _args24.length > 1 && _args24[1] !== undefined ? _args24[1] : {
+              syncOptions = _args22.length > 1 && _args22[1] !== undefined ? _args22[1] : {
                 paginate: true
               };
-              return _context24.abrupt("return", makePagedSync(query, syncOptions, options));
+              return _context22.abrupt("return", makePagedSync(query, syncOptions, options));
             case 2:
             case "end":
-              return _context24.stop();
+              return _context22.stop();
           }
-        }, _callee24);
+        }, _callee22);
       }));
       return _sync.apply(this, arguments);
     }
-    function makePagedSync(_x25, _x26) {
+    function makePagedSync(_x23, _x24) {
       return _makePagedSync.apply(this, arguments);
     }
     function _makePagedSync() {
-      _makePagedSync = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee25(query, syncOptions) {
+      _makePagedSync = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee23(query, syncOptions) {
         var options,
           combinedOptions,
-          _args25 = arguments;
-        return _regeneratorRuntime.wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+          _args23 = arguments;
+        return _regeneratorRuntime.wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              options = _args25.length > 2 && _args25[2] !== undefined ? _args25[2] : {
+              options = _args23.length > 2 && _args23[2] !== undefined ? _args23[2] : {
                 withAllLocales: false,
                 withoutLinkResolution: false,
                 withoutUnresolvableLinks: false,
@@ -10909,12 +10983,12 @@ var contentful = (function (exports) {
               validateRemoveUnresolvedParam(query);
               combinedOptions = Object.assign(Object.assign({}, syncOptions), options);
               switchToEnvironment(http);
-              return _context25.abrupt("return", pagedSync(http, query, combinedOptions));
+              return _context23.abrupt("return", pagedSync(http, query, combinedOptions));
             case 6:
             case "end":
-              return _context25.stop();
+              return _context23.stop();
           }
-        }, _callee25);
+        }, _callee23);
       }));
       return _makePagedSync.apply(this, arguments);
     }
@@ -10939,19 +11013,19 @@ var contentful = (function (exports) {
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return internalGetConceptScheme(id, query);
     }
-    function internalGetConceptScheme(_x27) {
+    function internalGetConceptScheme(_x25) {
       return _internalGetConceptScheme.apply(this, arguments);
     }
     function _internalGetConceptScheme() {
-      _internalGetConceptScheme = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee26(id) {
+      _internalGetConceptScheme = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee24(id) {
         var query,
-          _args26 = arguments;
-        return _regeneratorRuntime.wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+          _args24 = arguments;
+        return _regeneratorRuntime.wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              query = _args26.length > 1 && _args26[1] !== undefined ? _args26[1] : {};
-              _context26.prev = 1;
-              return _context26.abrupt("return", get({
+              query = _args24.length > 1 && _args24[1] !== undefined ? _args24[1] : {};
+              _context24.prev = 1;
+              return _context24.abrupt("return", get({
                 context: 'environment',
                 path: "taxonomy/concept-schemes/".concat(id),
                 config: createRequestConfig({
@@ -10959,14 +11033,14 @@ var contentful = (function (exports) {
                 })
               }));
             case 5:
-              _context26.prev = 5;
-              _context26.t0 = _context26["catch"](1);
-              errorHandler(_context26.t0);
+              _context24.prev = 5;
+              _context24.t0 = _context24["catch"](1);
+              errorHandler(_context24.t0);
             case 8:
             case "end":
-              return _context26.stop();
+              return _context24.stop();
           }
-        }, _callee26, null, [[1, 5]]);
+        }, _callee24, null, [[1, 5]]);
       }));
       return _internalGetConceptScheme.apply(this, arguments);
     }
@@ -10978,15 +11052,15 @@ var contentful = (function (exports) {
       return _internalGetConceptSchemes.apply(this, arguments);
     }
     function _internalGetConceptSchemes() {
-      _internalGetConceptSchemes = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee27() {
+      _internalGetConceptSchemes = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee25() {
         var query,
-          _args27 = arguments;
-        return _regeneratorRuntime.wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+          _args25 = arguments;
+        return _regeneratorRuntime.wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              query = _args27.length > 0 && _args27[0] !== undefined ? _args27[0] : {};
-              _context27.prev = 1;
-              return _context27.abrupt("return", get({
+              query = _args25.length > 0 && _args25[0] !== undefined ? _args25[0] : {};
+              _context25.prev = 1;
+              return _context25.abrupt("return", get({
                 context: 'environment',
                 path: 'taxonomy/concept-schemes',
                 config: createRequestConfig({
@@ -10994,14 +11068,14 @@ var contentful = (function (exports) {
                 })
               }));
             case 5:
-              _context27.prev = 5;
-              _context27.t0 = _context27["catch"](1);
-              errorHandler(_context27.t0);
+              _context25.prev = 5;
+              _context25.t0 = _context25["catch"](1);
+              errorHandler(_context25.t0);
             case 8:
             case "end":
-              return _context27.stop();
+              return _context25.stop();
           }
-        }, _callee27, null, [[1, 5]]);
+        }, _callee25, null, [[1, 5]]);
       }));
       return _internalGetConceptSchemes.apply(this, arguments);
     }
@@ -11009,19 +11083,19 @@ var contentful = (function (exports) {
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return internalGetConcept(id, query);
     }
-    function internalGetConcept(_x28) {
+    function internalGetConcept(_x26) {
       return _internalGetConcept.apply(this, arguments);
     }
     function _internalGetConcept() {
-      _internalGetConcept = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee28(id) {
+      _internalGetConcept = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee26(id) {
         var query,
-          _args28 = arguments;
-        return _regeneratorRuntime.wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+          _args26 = arguments;
+        return _regeneratorRuntime.wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              query = _args28.length > 1 && _args28[1] !== undefined ? _args28[1] : {};
-              _context28.prev = 1;
-              return _context28.abrupt("return", get({
+              query = _args26.length > 1 && _args26[1] !== undefined ? _args26[1] : {};
+              _context26.prev = 1;
+              return _context26.abrupt("return", get({
                 context: 'environment',
                 path: "taxonomy/concepts/".concat(id),
                 config: createRequestConfig({
@@ -11029,14 +11103,14 @@ var contentful = (function (exports) {
                 })
               }));
             case 5:
-              _context28.prev = 5;
-              _context28.t0 = _context28["catch"](1);
-              errorHandler(_context28.t0);
+              _context26.prev = 5;
+              _context26.t0 = _context26["catch"](1);
+              errorHandler(_context26.t0);
             case 8:
             case "end":
-              return _context28.stop();
+              return _context26.stop();
           }
-        }, _callee28, null, [[1, 5]]);
+        }, _callee26, null, [[1, 5]]);
       }));
       return _internalGetConcept.apply(this, arguments);
     }
@@ -11048,15 +11122,15 @@ var contentful = (function (exports) {
       return _internalGetConcepts.apply(this, arguments);
     }
     function _internalGetConcepts() {
-      _internalGetConcepts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee29() {
+      _internalGetConcepts = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee27() {
         var query,
-          _args29 = arguments;
-        return _regeneratorRuntime.wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+          _args27 = arguments;
+        return _regeneratorRuntime.wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              query = _args29.length > 0 && _args29[0] !== undefined ? _args29[0] : {};
-              _context29.prev = 1;
-              return _context29.abrupt("return", get({
+              query = _args27.length > 0 && _args27[0] !== undefined ? _args27[0] : {};
+              _context27.prev = 1;
+              return _context27.abrupt("return", get({
                 context: 'environment',
                 path: 'taxonomy/concepts',
                 config: createRequestConfig({
@@ -11064,14 +11138,14 @@ var contentful = (function (exports) {
                 })
               }));
             case 5:
-              _context29.prev = 5;
-              _context29.t0 = _context29["catch"](1);
-              errorHandler(_context29.t0);
+              _context27.prev = 5;
+              _context27.t0 = _context27["catch"](1);
+              errorHandler(_context27.t0);
             case 8:
             case "end":
-              return _context29.stop();
+              return _context27.stop();
           }
-        }, _callee29, null, [[1, 5]]);
+        }, _callee27, null, [[1, 5]]);
       }));
       return _internalGetConcepts.apply(this, arguments);
     }
@@ -11079,19 +11153,19 @@ var contentful = (function (exports) {
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return internalGetConceptAncestors(id, query);
     }
-    function internalGetConceptAncestors(_x29) {
+    function internalGetConceptAncestors(_x27) {
       return _internalGetConceptAncestors.apply(this, arguments);
     }
     function _internalGetConceptAncestors() {
-      _internalGetConceptAncestors = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee30(id) {
+      _internalGetConceptAncestors = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee28(id) {
         var query,
-          _args30 = arguments;
-        return _regeneratorRuntime.wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+          _args28 = arguments;
+        return _regeneratorRuntime.wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              query = _args30.length > 1 && _args30[1] !== undefined ? _args30[1] : {};
-              _context30.prev = 1;
-              return _context30.abrupt("return", get({
+              query = _args28.length > 1 && _args28[1] !== undefined ? _args28[1] : {};
+              _context28.prev = 1;
+              return _context28.abrupt("return", get({
                 context: 'environment',
                 path: "taxonomy/concepts/".concat(id, "/ancestors"),
                 config: createRequestConfig({
@@ -11099,14 +11173,14 @@ var contentful = (function (exports) {
                 })
               }));
             case 5:
-              _context30.prev = 5;
-              _context30.t0 = _context30["catch"](1);
-              errorHandler(_context30.t0);
+              _context28.prev = 5;
+              _context28.t0 = _context28["catch"](1);
+              errorHandler(_context28.t0);
             case 8:
             case "end":
-              return _context30.stop();
+              return _context28.stop();
           }
-        }, _callee30, null, [[1, 5]]);
+        }, _callee28, null, [[1, 5]]);
       }));
       return _internalGetConceptAncestors.apply(this, arguments);
     }
@@ -11114,22 +11188,22 @@ var contentful = (function (exports) {
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return internalGetConceptDescendants(id, query);
     }
-    function internalGetConceptDescendants(_x30) {
+    function internalGetConceptDescendants(_x28) {
       return _internalGetConceptDescendants.apply(this, arguments);
     }
     /*
      * Switches BaseURL to use /environments path
      * */
     function _internalGetConceptDescendants() {
-      _internalGetConceptDescendants = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee31(id) {
+      _internalGetConceptDescendants = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee29(id) {
         var query,
-          _args31 = arguments;
-        return _regeneratorRuntime.wrap(function _callee31$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+          _args29 = arguments;
+        return _regeneratorRuntime.wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              query = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {};
-              _context31.prev = 1;
-              return _context31.abrupt("return", get({
+              query = _args29.length > 1 && _args29[1] !== undefined ? _args29[1] : {};
+              _context29.prev = 1;
+              return _context29.abrupt("return", get({
                 context: 'environment',
                 path: "taxonomy/concepts/".concat(id, "/descendants"),
                 config: createRequestConfig({
@@ -11137,14 +11211,14 @@ var contentful = (function (exports) {
                 })
               }));
             case 5:
-              _context31.prev = 5;
-              _context31.t0 = _context31["catch"](1);
-              errorHandler(_context31.t0);
+              _context29.prev = 5;
+              _context29.t0 = _context29["catch"](1);
+              errorHandler(_context29.t0);
             case 8:
             case "end":
-              return _context31.stop();
+              return _context29.stop();
           }
-        }, _callee31, null, [[1, 5]]);
+        }, _callee29, null, [[1, 5]]);
       }));
       return _internalGetConceptDescendants.apply(this, arguments);
     }