@sanity/client 6.22.3-canary.0 → 6.22.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/client",
-  "version": "6.22.3-canary.0",
+  "version": "6.22.3",
   "description": "Client for retrieving, creating and patching data from Sanity.io",
   "keywords": [
     "sanity",
@@ -104,7 +104,7 @@
     "test:deno:update_import_map": "deno run --allow-read --allow-write runtimes/deno/update_import_map.ts",
     "test:edge-runtime": "npm test -- --config vitest.edge.config.ts",
     "test:next": "npm test -- --config ./vitest.next.config.ts",
-    "test:node-runtimes": "node --test runtimes/node | npx faucet"
+    "test:node-runtimes": "(cd runtimes/node && node --test | npx faucet)"
   },
   "browserslist": "extends @sanity/browserslist-config",
   "prettier": {
@@ -124,13 +124,13 @@
   "devDependencies": {
     "@edge-runtime/types": "^3.0.2",
     "@edge-runtime/vm": "^4.0.3",
-    "@rollup/plugin-commonjs": "^26.0.3",
+    "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@sanity/pkg-utils": "^6.11.8",
     "@types/json-diff": "^1.0.3",
     "@types/node": "^22.9.0",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.13.0",
+    "@typescript-eslint/parser": "^8.13.0",
     "@vercel/stega": "0.1.2",
     "@vitest/coverage-v8": "2.1.4",
     "eslint": "^8.57.1",
@@ -141,7 +141,8 @@
     "happy-dom": "^12.10.3",
     "json-diff": "^1.0.6",
     "ls-engines": "^0.9.3",
-    "next": "^14.2.16",
+    "msw": "^2.6.0",
+    "next": "^15.0.2",
     "nock": "^13.5.5",
     "prettier": "^3.3.3",
     "prettier-plugin-packagejson": "^2.5.3",
@@ -153,6 +154,7 @@
     "vitest": "2.1.4",
     "vitest-github-actions-reporter": "0.11.1"
   },
+  "packageManager": "npm@10.5.2",
   "engines": {
     "node": ">=14.18"
   }

package/src/data/live.ts

@@ -1,5 +1,6 @@
 import {Observable} from 'rxjs'
 
+import {CorsOriginError} from '../http/errors'
 import type {ObservableSanityClient, SanityClient} from '../SanityClient'
 import type {
   Any,
@@ -38,6 +39,7 @@ export class LiveClient {
     tag?: string
   } = {}): Observable<LiveEventMessage | LiveEventRestart | LiveEventReconnect | LiveEventWelcome> {
     const {
+      projectId,
       apiVersion: _apiVersion,
       token,
       withCredentials,
@@ -143,6 +145,22 @@ export class LiveClient {
           return
         }
 
+        // Detect if CORS is allowed, the way the CORS is checked supports preflight caching, so when the EventSource boots up it knows it sees the preflight was already made and we're good to go
+        try {
+          await fetch(url, {
+            method: 'OPTIONS',
+            mode: 'cors',
+            credentials: esOptions.withCredentials ? 'include' : 'omit',
+            headers: esOptions.headers,
+          })
+          if (unsubscribed) {
+            return
+          }
+        } catch {
+          // If the request fails, then we assume it was due to CORS, and we rethrow a special error that allows special handling in userland
+          throw new CorsOriginError({projectId: projectId!})
+        }
+
         const evs = new EventSourceImplementation(url.toString(), esOptions)
         evs.addEventListener('error', onError)
         for (const type of listenFor) {

package/src/defineCreateClient.ts

@@ -5,7 +5,7 @@ import type {Any, ClientConfig, HttpRequest} from './types'
 
 export * from './data/patch'
 export * from './data/transaction'
-export {ClientError, ServerError} from './http/errors'
+export {ClientError, CorsOriginError, ServerError} from './http/errors'
 export * from './SanityClient'
 export * from './types'
 

package/src/http/errors.ts

@@ -106,3 +106,26 @@ function stringifyBody(body: Any, res: Any) {
   const isJson = contentType.indexOf('application/json') !== -1
   return isJson ? JSON.stringify(body, null, 2) : body
 }
+
+/** @public */
+export class CorsOriginError extends Error {
+  projectId: string
+  addOriginUrl?: URL
+
+  constructor({projectId}: {projectId: string}) {
+    super('CorsOriginError')
+    this.name = 'CorsOriginError'
+    this.projectId = projectId
+
+    const url = new URL(`https://sanity.io/manage/project/${projectId}/api`)
+    if (typeof location !== 'undefined') {
+      const {origin} = location
+      url.searchParams.set('cors', 'add')
+      url.searchParams.set('origin', origin)
+      this.addOriginUrl = url
+      this.message = `The current origin is not allowed to connect to the Live Content API. Add it here: ${url}`
+    } else {
+      this.message = `The current origin is not allowed to connect to the Live Content API. Change your configuration here: ${url}`
+    }
+  }
+}

package/src/stega/types.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-empty-object-type */
 import type {ClientConfig, InitializedClientConfig, RawQueryResponse} from '@sanity/client'
 import type {
   ContentSourceMap,

package/src/types.ts

@@ -1,4 +1,5 @@
 // deno-lint-ignore-file no-empty-interface
+/* eslint-disable @typescript-eslint/no-empty-object-type */
 
 import type {Requester} from 'get-it'