@sanity/client 6.28.3 → 6.28.4-beta.0

package/dist/index.browser.js

@@ -180,6 +180,9 @@ const createWarningPrinter = (message) => (
   `See ${generateHelpUrl(
     "js-client-browser-token"
   )} for more information and how to hide this warning.`
+]), printCredentialedTokenWarning = createWarningPrinter([
+  "You have configured Sanity client to use a token, but also provided `withCredentials: true`.",
+  "This is no longer supported - only token will be used - remove `withCredentials: true`."
 ]), printNoApiVersionSpecifiedWarning = createWarningPrinter([
   "Using the Sanity client without specifying an API version is deprecated.",
   `See ${generateHelpUrl("js-client-api-version")}`
@@ -250,8 +253,9 @@ const initConfig = (config, prevConfig) => {
     throw new Error(
       `stega.studioUrl must be a string or a function, received ${newConfig.stega.studioUrl}`
     );
-  const isBrowser = typeof window < "u" && window.location && window.location.hostname, isLocalhost = isBrowser && isLocal(window.location.hostname);
-  isBrowser && isLocalhost && newConfig.token && newConfig.ignoreBrowserTokenWarning !== !0 ? printBrowserTokenWarning() : typeof newConfig.useCdn > "u" && printCdnWarning(), projectBased && projectId(newConfig.projectId), newConfig.dataset && dataset(newConfig.dataset), "requestTagPrefix" in newConfig && (newConfig.requestTagPrefix = newConfig.requestTagPrefix ? requestTag(newConfig.requestTagPrefix).replace(/\.+$/, "") : void 0), newConfig.apiVersion = `${newConfig.apiVersion}`.replace(/^v/, ""), newConfig.isDefaultApi = newConfig.apiHost === defaultConfig.apiHost, newConfig.useCdn === !0 && newConfig.withCredentials && printCdnAndWithCredentialsWarning(), newConfig.useCdn = newConfig.useCdn !== !1 && !newConfig.withCredentials, validateApiVersion(newConfig.apiVersion);
+  const isBrowser = typeof window < "u" && window.location && window.location.hostname, isLocalhost = isBrowser && isLocal(window.location.hostname), hasToken = !!newConfig.token;
+  let withCredentials = !!newConfig.withCredentials;
+  withCredentials && hasToken && (printCredentialedTokenWarning(), withCredentials = !1), isBrowser && isLocalhost && hasToken && newConfig.ignoreBrowserTokenWarning !== !0 ? printBrowserTokenWarning() : typeof newConfig.useCdn > "u" && printCdnWarning(), projectBased && projectId(newConfig.projectId), newConfig.dataset && dataset(newConfig.dataset), "requestTagPrefix" in newConfig && (newConfig.requestTagPrefix = newConfig.requestTagPrefix ? requestTag(newConfig.requestTagPrefix).replace(/\.+$/, "") : void 0), newConfig.apiVersion = `${newConfig.apiVersion}`.replace(/^v/, ""), newConfig.isDefaultApi = newConfig.apiHost === defaultConfig.apiHost, newConfig.useCdn === !0 && withCredentials && printCdnAndWithCredentialsWarning(), newConfig.useCdn = newConfig.useCdn !== !1 && !withCredentials, validateApiVersion(newConfig.apiVersion);
   const hostParts = newConfig.apiHost.split("://", 2), protocol = hostParts[0], host = hostParts[1], cdnHost = newConfig.isDefaultApi ? defaultCdnHost : host;
   return newConfig.useProjectHostname ? (newConfig.url = `${protocol}://${newConfig.projectId}.${host}/v${newConfig.apiVersion}`, newConfig.cdnUrl = `${protocol}://${newConfig.projectId}.${cdnHost}/v${newConfig.apiVersion}`) : (newConfig.url = `${newConfig.apiHost}/v${newConfig.apiVersion}`, newConfig.cdnUrl = newConfig.url), newConfig;
 };
@@ -699,7 +703,7 @@ const projectHeader = "X-Sanity-Project-ID";
 function requestOptions(config, overrides = {}) {
   const headers = {}, token = overrides.token || config.token;
   token && (headers.Authorization = `Bearer ${token}`), !overrides.useGlobalApi && !config.useProjectHostname && config.projectId && (headers[projectHeader] = config.projectId);
-  const withCredentials = !!(typeof overrides.withCredentials > "u" ? config.token || config.withCredentials : overrides.withCredentials), timeout = typeof overrides.timeout > "u" ? config.timeout : overrides.timeout;
+  const withCredentials = !!(typeof overrides.withCredentials > "u" ? config.withCredentials : overrides.withCredentials), timeout = typeof overrides.timeout > "u" ? config.timeout : overrides.timeout;
   return Object.assign({}, overrides, {
     headers: Object.assign({}, headers, overrides.headers || {}),
     timeout: typeof timeout > "u" ? 5 * 60 * 1e3 : timeout,
@@ -1009,7 +1013,7 @@ function _listen(query, params, opts = {}) {
   if (uri.length > MAX_URL_LENGTH)
     return throwError(() => new Error("Query too large for listener"));
   const listenFor = options.events ? options.events : ["mutation"], esOptions = {};
-  return (token || withCredentials) && (esOptions.withCredentials = !0), token && (esOptions.headers = {
+  return withCredentials && (esOptions.withCredentials = !0), token && (esOptions.headers = {
     Authorization: `Bearer ${token}`
   }), connectEventSource(() => (
     // use polyfill if there is no global EventSource or if we need to set headers
@@ -1042,7 +1046,10 @@ function _shareReplayLatest(config) {
       }),
       share(shareConfig)
     ), emitLatest = new Observable((subscriber) => {
-      emitted && subscriber.next(latest), subscriber.complete();
+      emitted && subscriber.next(
+        // this cast is safe because of the emitted check which asserts that we got T from the source
+        latest
+      ), subscriber.complete();
     });
     return merge(wrapped, emitLatest);
   };