contentful 11.7.17 → 11.7.19

package/dist/contentful.browser.js

@@ -979,10 +979,8 @@ var contentful = (function (exports) {
         result[targetKey] = merge$1({}, val);
       } else if (isArray$7(val)) {
         result[targetKey] = val.slice();
-      } else {
-        if (!skipUndefined || !isUndefined(val)) {
-          result[targetKey] = val;
-        }
+      } else if (!skipUndefined || !isUndefined(val)) {
+        result[targetKey] = val;
       }
     };
     for (var i = 0, l = arguments.length; i < l; i++) {
@@ -3277,11 +3275,9 @@ var contentful = (function (exports) {
   var DEFAULT_CHUNK_SIZE = 64 * 1024;
   var isFunction = utils$1$1.isFunction;
   var globalFetchAPI = function (_ref13) {
-    var fetch = _ref13.fetch,
-      Request = _ref13.Request,
+    var Request = _ref13.Request,
       Response = _ref13.Response;
     return {
-      fetch: fetch,
       Request: Request,
       Response: Response
     };
@@ -3300,11 +3296,14 @@ var contentful = (function (exports) {
     }
   };
   var factory = function factory(env) {
-    var _Object$assign = Object.assign({}, globalFetchAPI, env),
-      fetch = _Object$assign.fetch,
-      Request = _Object$assign.Request,
-      Response = _Object$assign.Response;
-    var isFetchSupported = isFunction(fetch);
+    env = utils$1$1.merge.call({
+      skipUndefined: true
+    }, globalFetchAPI, env);
+    var _env = env,
+      envFetch = _env.fetch,
+      Request = _env.Request,
+      Response = _env.Response;
+    var isFetchSupported = envFetch ? isFunction(envFetch) : typeof fetch === 'function';
     var isRequestSupported = isFunction(Request);
     var isResponseSupported = isFunction(Response);
     if (!isFetchSupported) {
@@ -3445,31 +3444,32 @@ var contentful = (function (exports) {
     }();
     return /*#__PURE__*/function () {
       var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(config) {
-        var _resolveConfig, url, method, data, signal, cancelToken, timeout, onDownloadProgress, onUploadProgress, responseType, headers, _resolveConfig$withCr, withCredentials, fetchOptions, composedSignal, request, unsubscribe, requestContentLength, _request, contentTypeHeader, _progressEventDecorat, _progressEventDecorat2, onProgress, flush, isCredentialsSupported, resolvedOptions, response, isStreamResponse, options, responseContentLength, _ref18, _ref19, _onProgress, _flush, responseData;
+        var _resolveConfig, url, method, data, signal, cancelToken, timeout, onDownloadProgress, onUploadProgress, responseType, headers, _resolveConfig$withCr, withCredentials, fetchOptions, _fetch, composedSignal, request, unsubscribe, requestContentLength, _request, contentTypeHeader, _progressEventDecorat, _progressEventDecorat2, onProgress, flush, isCredentialsSupported, resolvedOptions, response, isStreamResponse, options, responseContentLength, _ref18, _ref19, _onProgress, _flush, responseData;
         return _regeneratorRuntime.wrap(function _callee7$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _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);
               request = null;
               unsubscribe = composedSignal && composedSignal.unsubscribe && function () {
                 composedSignal.unsubscribe();
               };
-              _context8.prev = 5;
+              _context8.prev = 6;
               _context8.t0 = onUploadProgress && supportsRequestStream && method !== 'get' && method !== 'head';
               if (!_context8.t0) {
-                _context8.next = 12;
+                _context8.next = 13;
                 break;
               }
-              _context8.next = 10;
+              _context8.next = 11;
               return resolveBodyLength(headers, data);
-            case 10:
+            case 11:
               _context8.t1 = requestContentLength = _context8.sent;
               _context8.t0 = _context8.t1 !== 0;
-            case 12:
+            case 13:
               if (!_context8.t0) {
-                _context8.next = 16;
+                _context8.next = 17;
                 break;
               }
               _request = new Request(url, {
@@ -3484,7 +3484,7 @@ var contentful = (function (exports) {
                 _progressEventDecorat = progressEventDecorator(requestContentLength, progressEventReducer(asyncDecorator(onUploadProgress))), _progressEventDecorat2 = _slicedToArray$1(_progressEventDecorat, 2), onProgress = _progressEventDecorat2[0], flush = _progressEventDecorat2[1];
                 data = trackStream(_request.body, DEFAULT_CHUNK_SIZE, onProgress, flush);
               }
-            case 16:
+            case 17:
               if (!utils$1$1.isString(withCredentials)) {
                 withCredentials = withCredentials ? 'include' : 'omit';
               }
@@ -3501,9 +3501,9 @@ var contentful = (function (exports) {
                 credentials: isCredentialsSupported ? withCredentials : undefined
               });
               request = isRequestSupported && new Request(url, resolvedOptions);
-              _context8.next = 22;
-              return isRequestSupported ? fetch(request, fetchOptions) : fetch(url, resolvedOptions);
-            case 22:
+              _context8.next = 23;
+              return isRequestSupported ? _fetch(request, fetchOptions) : _fetch(url, resolvedOptions);
+            case 23:
               response = _context8.sent;
               isStreamResponse = supportsResponseStream && (responseType === 'stream' || responseType === 'response');
               if (supportsResponseStream && (onDownloadProgress || isStreamResponse && unsubscribe)) {
@@ -3519,12 +3519,12 @@ var contentful = (function (exports) {
                 }), options);
               }
               responseType = responseType || 'text';
-              _context8.next = 28;
+              _context8.next = 29;
               return resolvers[utils$1$1.findKey(resolvers, responseType) || 'text'](response, config);
-            case 28:
+            case 29:
               responseData = _context8.sent;
               !isStreamResponse && unsubscribe && unsubscribe();
-              _context8.next = 32;
+              _context8.next = 33;
               return new Promise(function (resolve, reject) {
                 settle(resolve, reject, {
                   data: responseData,
@@ -3535,26 +3535,26 @@ var contentful = (function (exports) {
                   request: request
                 });
               });
-            case 32:
+            case 33:
               return _context8.abrupt("return", _context8.sent);
-            case 35:
-              _context8.prev = 35;
-              _context8.t2 = _context8["catch"](5);
+            case 36:
+              _context8.prev = 36;
+              _context8.t2 = _context8["catch"](6);
               unsubscribe && unsubscribe();
               if (!(_context8.t2 && _context8.t2.name === 'TypeError' && /Load failed|fetch/i.test(_context8.t2.message))) {
-                _context8.next = 40;
+                _context8.next = 41;
                 break;
               }
               throw Object.assign(new AxiosError('Network Error', AxiosError.ERR_NETWORK, config, request), {
                 cause: _context8.t2.cause || _context8.t2
               });
-            case 40:
-              throw AxiosError.from(_context8.t2, _context8.t2 && _context8.t2.code, config, request);
             case 41:
+              throw AxiosError.from(_context8.t2, _context8.t2 && _context8.t2.code, config, request);
+            case 42:
             case "end":
               return _context8.stop();
           }
-        }, _callee7, null, [[5, 35]]);
+        }, _callee7, null, [[6, 36]]);
       }));
       return function (_x8) {
         return _ref17.apply(this, arguments);
@@ -3563,9 +3563,7 @@ var contentful = (function (exports) {
   };
   var seedCache = new Map();
   var getFetch = function getFetch(config) {
-    var env = utils$1$1.merge.call({
-      skipUndefined: true
-    }, globalFetchAPI, config ? config.env : null);
+    var env = config ? config.env : {};
     var fetch = env.fetch,
       Request = env.Request,
       Response = env.Response;
@@ -3702,7 +3700,7 @@ var contentful = (function (exports) {
       return Promise.reject(reason);
     });
   }
-  var VERSION = "1.12.0";
+  var VERSION = "1.12.2";
   var validators$1 = {};
 
   // eslint-disable-next-line func-names
@@ -3943,7 +3941,6 @@ var contentful = (function (exports) {
         }
         len = requestInterceptorChain.length;
         var newConfig = config;
-        i = 0;
         while (i < len) {
           var onFulfilled = requestInterceptorChain[i++];
           var onRejected = requestInterceptorChain[i++];
@@ -10518,7 +10515,7 @@ var contentful = (function (exports) {
       http.defaults.baseURL = getGlobalOptions().environmentBaseUrl;
     }
     return {
-      version: "11.7.17",
+      version: "11.7.19",
       getSpace: getSpace,
       getContentType: getContentType,
       getContentTypes: getContentTypes,
@@ -10645,7 +10642,7 @@ var contentful = (function (exports) {
       environment: 'master'
     };
     var config = Object.assign(Object.assign({}, defaultConfig), params);
-    var userAgentHeader = getUserAgentHeader("contentful.js/".concat("11.7.17"), config.application, config.integration);
+    var userAgentHeader = getUserAgentHeader("contentful.js/".concat("11.7.19"), config.application, config.integration);
     config.headers = Object.assign(Object.assign({}, config.headers), {
       'Content-Type': 'application/vnd.contentful.delivery.v1+json',
       'X-Contentful-User-Agent': userAgentHeader