@sanity/client 6.20.0 → 6.20.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/client",
-  "version": "6.20.0",
+  "version": "6.20.1",
   "description": "Client for retrieving, creating and patching data from Sanity.io",
   "keywords": [
     "sanity",
@@ -118,7 +118,7 @@
   },
   "dependencies": {
     "@sanity/eventsource": "^5.0.2",
-    "get-it": "^8.6.0",
+    "get-it": "^8.6.1",
     "rxjs": "^7.0.0"
   },
   "devDependencies": {
@@ -129,8 +129,8 @@
     "@sanity/pkg-utils": "^6.9.3",
     "@types/json-diff": "^1.0.3",
     "@types/node": "^20.8.8",
-    "@typescript-eslint/eslint-plugin": "^7.12.0",
-    "@typescript-eslint/parser": "^7.12.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
     "@vercel/stega": "0.1.2",
     "@vitest/coverage-v8": "1.6.0",
     "eslint": "^8.57.0",
@@ -140,10 +140,10 @@
     "faucet": "^0.0.4",
     "happy-dom": "^12.10.3",
     "json-diff": "^1.0.6",
-    "ls-engines": "^0.9.1",
-    "next": "^14.2.3",
+    "ls-engines": "^0.9.2",
+    "next": "^14.2.4",
     "nock": "^13.5.4",
-    "prettier": "^3.3.1",
+    "prettier": "^3.3.2",
     "prettier-plugin-packagejson": "^2.5.0",
     "rimraf": "^5.0.7",
     "rollup": "^4.18.0",

package/src/config.ts

@@ -130,6 +130,11 @@ export const initConfig = (
 
   newConfig.apiVersion = `${newConfig.apiVersion}`.replace(/^v/, '')
   newConfig.isDefaultApi = newConfig.apiHost === defaultConfig.apiHost
+
+  if (newConfig.useCdn === true && newConfig.withCredentials) {
+    warnings.printCdnAndWithCredentialsWarning()
+  }
+
   // If `useCdn` is undefined, we treat it as `true`
   newConfig.useCdn = newConfig.useCdn !== false && !newConfig.withCredentials
 

package/src/warnings.ts

@@ -6,6 +6,11 @@ const createWarningPrinter = (message: string[]) =>
   // eslint-disable-next-line no-console
   once((...args: Any[]) => console.warn(message.join(' '), ...args))
 
+export const printCdnAndWithCredentialsWarning = createWarningPrinter([
+  `Because you set \`withCredentials\` to true, we will override your \`useCdn\``,
+  `setting to be false since (cookie-based) credentials are never set on the CDN`,
+])
+
 export const printCdnWarning = createWarningPrinter([
   `Since you haven't set a value for \`useCdn\`, we will deliver content using our`,
   `global, edge-cached API-CDN. If you wish to have content delivered faster, set`,

package/umd/sanityClient.js

@@ -166,17 +166,12 @@
       typeof result[key] > "u" ? result[key] = value : isArray$3(result[key]) ? result[key].push(value) : result[key] = [result[key], value];
     }
     return result;
-  }, parseHeaders$1 = /* @__PURE__ */ getDefaultExportFromCjs$1(parseHeaders), __defProp$4 = Object.defineProperty, __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, __publicField$4 = (obj, key, value) => (__defNormalProp$4(obj, typeof key != "symbol" ? key + "" : key, value), value), __accessCheck$8 = (obj, member, msg) => {
-    if (!member.has(obj))
-      throw TypeError("Cannot " + msg);
-  }, __privateGet$8 = (obj, member, getter) => (__accessCheck$8(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj)), __privateAdd$8 = (obj, member, value) => {
-    if (member.has(obj))
-      throw TypeError("Cannot add the same private member more than once");
-    member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-  }, __privateSet$8 = (obj, member, value, setter) => (__accessCheck$8(obj, member, "write to private field"), member.set(obj, value), value), _method, _url, _resHeaders, _headers, _controller, _init, _useAbortSignal;
+  }, parseHeaders$1 = /* @__PURE__ */ getDefaultExportFromCjs$1(parseHeaders), __defProp$4 = Object.defineProperty, __typeError = (msg) => {
+    throw TypeError(msg);
+  }, __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key != "symbol" ? key + "" : key, value), __accessCheck$8 = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg), __privateGet$8 = (obj, member, getter) => (__accessCheck$8(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj)), __privateAdd$8 = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value), __privateSet$8 = (obj, member, value, setter) => (__accessCheck$8(obj, member, "write to private field"), member.set(obj, value), value), _method, _url, _resHeaders, _headers, _controller, _init, _useAbortSignal;
   class FetchXhr {
     constructor() {
-      __publicField$4(this, "onabort"), __publicField$4(this, "onerror"), __publicField$4(this, "onreadystatechange"), __publicField$4(this, "ontimeout"), __publicField$4(this, "readyState", 0), __publicField$4(this, "response"), __publicField$4(this, "responseText", ""), __publicField$4(this, "responseType", ""), __publicField$4(this, "status"), __publicField$4(this, "statusText"), __publicField$4(this, "withCredentials"), __privateAdd$8(this, _method, void 0), __privateAdd$8(this, _url, void 0), __privateAdd$8(this, _resHeaders, void 0), __privateAdd$8(this, _headers, {}), __privateAdd$8(this, _controller, void 0), __privateAdd$8(this, _init, {}), __privateAdd$8(this, _useAbortSignal, void 0);
+      __publicField$4(this, "onabort"), __publicField$4(this, "onerror"), __publicField$4(this, "onreadystatechange"), __publicField$4(this, "ontimeout"), __publicField$4(this, "readyState", 0), __publicField$4(this, "response"), __publicField$4(this, "responseText", ""), __publicField$4(this, "responseType", ""), __publicField$4(this, "status"), __publicField$4(this, "statusText"), __publicField$4(this, "withCredentials"), __privateAdd$8(this, _method), __privateAdd$8(this, _url), __privateAdd$8(this, _resHeaders), __privateAdd$8(this, _headers, {}), __privateAdd$8(this, _controller), __privateAdd$8(this, _init, {}), __privateAdd$8(this, _useAbortSignal);
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars -- _async is only declared for typings compatibility
     open(method, url, _async) {
@@ -203,10 +198,13 @@
         headers: __privateGet$8(this, _headers),
         body
       };
-      typeof AbortController == "function" && __privateGet$8(this, _useAbortSignal) && (__privateSet$8(this, _controller, new AbortController()), typeof EventTarget < "u" && __privateGet$8(this, _controller).signal instanceof EventTarget && (options.signal = __privateGet$8(this, _controller).signal)), typeof document < "u" && (options.credentials = this.withCredentials ? "include" : "omit"), fetch(__privateGet$8(this, _url), options).then((res) => (res.headers.forEach((value, key) => {
-        __privateSet$8(this, _resHeaders, __privateGet$8(this, _resHeaders) + `${key}: ${value}\r
+      typeof AbortController == "function" && __privateGet$8(this, _useAbortSignal) && (__privateSet$8(this, _controller, new AbortController()), typeof EventTarget < "u" && __privateGet$8(this, _controller).signal instanceof EventTarget && (options.signal = __privateGet$8(this, _controller).signal)), typeof document < "u" && (options.credentials = this.withCredentials ? "include" : "omit"), fetch(__privateGet$8(this, _url), options).then((res) => {
+        var _a;
+        return res.headers.forEach((value, key) => {
+          __privateSet$8(this, _resHeaders, __privateGet$8(this, _resHeaders) + `${key}: ${value}\r
 `);
-      }), this.status = res.status, this.statusText = res.statusText, this.readyState = 3, textBody ? res.text() : res.arrayBuffer())).then((resBody) => {
+        }), this.status = res.status, this.statusText = res.statusText, this.readyState = 3, (_a = this.onreadystatechange) == null || _a.call(this), textBody ? res.text() : res.arrayBuffer();
+      }).then((resBody) => {
         var _a;
         typeof resBody == "string" ? this.responseText = resBody : this.response = resBody, this.readyState = 4, (_a = this.onreadystatechange) == null || _a.call(this);
       }).catch((err) => {
@@ -307,8 +305,7 @@
 
   var browser$3 = { exports: {} }, ms, hasRequiredMs;
   function requireMs() {
-    if (hasRequiredMs)
-      return ms;
+    if (hasRequiredMs) return ms;
     hasRequiredMs = 1;
     var s = 1e3, m = s * 60, h = m * 60, d = h * 24, w = d * 7, y = d * 365.25;
     ms = function(val, options) {
@@ -614,11 +611,9 @@
     return Object.prototype.toString.call(o) === "[object Object]";
   }
   function isPlainObject$1(o) {
-    if (isObject(o) === !1)
-      return !1;
+    if (isObject(o) === !1) return !1;
     const ctor = o.constructor;
-    if (ctor === void 0)
-      return !0;
+    if (ctor === void 0) return !0;
     const prot = ctor.prototype;
     return !(isObject(prot) === !1 || // eslint-disable-next-line no-prototype-builtins
     prot.hasOwnProperty("isPrototypeOf") === !1);
@@ -697,7 +692,7 @@
       }
     };
   }
-  var __defProp$1$1 = Object.defineProperty, __defNormalProp$1$1 = (obj, key, value) => key in obj ? __defProp$1$1(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, __publicField$1$1 = (obj, key, value) => (__defNormalProp$1$1(obj, typeof key != "symbol" ? key + "" : key, value), value);
+  var __defProp$1$1 = Object.defineProperty, __defNormalProp$1$1 = (obj, key, value) => key in obj ? __defProp$1$1(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, __publicField$1$1 = (obj, key, value) => __defNormalProp$1$1(obj, typeof key != "symbol" ? key + "" : key, value);
   class Cancel {
     constructor(message) {
       __publicField$1$1(this, "__CANCEL__", !0), __publicField$1$1(this, "message"), this.message = message;
@@ -2303,7 +2298,10 @@ ${selectionOpts}`);
   const createWarningPrinter = (message) => (
     // eslint-disable-next-line no-console
     once((...args) => console.warn(message.join(" "), ...args))
-  ), printCdnWarning = createWarningPrinter([
+  ), printCdnAndWithCredentialsWarning = createWarningPrinter([
+    "Because you set `withCredentials` to true, we will override your `useCdn`",
+    "setting to be false since (cookie-based) credentials are never set on the CDN"
+  ]), printCdnWarning = createWarningPrinter([
     "Since you haven't set a value for `useCdn`, we will deliver content using our",
     "global, edge-cached API-CDN. If you wish to have content delivered faster, set",
     "`useCdn: false` to use the Live API. Note: You may incur higher costs using the live API."
@@ -2381,7 +2379,7 @@ ${selectionOpts}`);
         `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 = newConfig.useCdn !== !1 && !newConfig.withCredentials, validateApiVersion(newConfig.apiVersion);
+    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 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;
   }, projectHeader = "X-Sanity-Project-ID";