Merge branch 'next' into corel

* next:
  chore(deps): dedupe pnpm-lock.yaml (#7752)
  chore(deps): update react monorepo (#7753)
  fix(deps): update dependency react-rx to ^4.1.3 (#7744)
  fix(deps): update dependency @sanity/ui to ^2.8.19 (#7742)
  fix(deps): update dependency @portabletext/editor to ^1.5.4 (#7737)
  fix(deps): update dependency @sanity/presentation to v1.17.8 (#7743)
  test(codegen): migrate codegen tests to vitest (#7741)
  fix: invalid locale namespace specified for create (#7732)
  chore(deps): update dependency @sanity/prettier-config to ^1.0.3 (#7733)
  fix(deps): update dependency react-rx to ^4.1.1 (#7739)
  fix(deps): update dependency groq-js to ^1.14.0 (#7738)
  test(cli): migrate cli tests to vitest (#7731)
  fix(core): export BetaFeatures and ScheduledPublishing types (#7659)
  chore(test-studio): update dependency @portabletext/editor to ^1.4.1 (#7734)
  fix(deps): update dependency @portabletext/editor to ^1.4.1 (#7735)
  fix(deps): update dependency @portabletext/editor to ^1.4.0 (#7729)
  fix(deps): update dependency @sanity/ui to ^2.8.18 (#7730)
  fix(deps): Update dev-non-major (#7724)
  fix(deps): update dependency @sanity/ui to ^2.8.17 (#7725)
  fix(deps): update dependency @portabletext/editor to ^1.3.0 (#7727)

Author: bjoerge

.github/workflows/cli-test.yml

@@ -70,10 +70,7 @@ jobs:
 
       - name: Test
         id: test
-        run: |
-          node -v
-          npm -v
-          pnpm test:jest --silent --selectProjects=@sanity/cli
+        run: pnpm test:vitest --silent --project=@sanity/cli
         env:
           # Update token in github and change below to ${{ secrets.SANITY_CI_CLI_AUTH_TOKEN }} after merge to next
           SANITY_CI_CLI_AUTH_TOKEN_STAGING: ${{ secrets.SANITY_CI_CLI_AUTH_TOKEN_STAGING }}

dev/design-studio/package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@sanity/icons": "^3.4.0",
-    "@sanity/ui": "^2.8.16",
+    "@sanity/ui": "^2.8.18",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "sanity": "workspace:*",

dev/embedded-studio/package.json

@@ -8,7 +8,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@sanity/ui": "^2.8.16",
+    "@sanity/ui": "^2.8.18",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "sanity": "workspace:*",

dev/studio-e2e-testing/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@sanity/google-maps-input": "^4.0.0",
     "@sanity/icons": "^3.4.0",
-    "@sanity/ui": "^2.8.16",
+    "@sanity/ui": "^2.8.18",
     "@sanity/vision": "3.62.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

dev/test-studio/package.json

@@ -16,7 +16,7 @@
     "workshop:dev": "node -r esbuild-register scripts/workshop/dev.ts"
   },
   "dependencies": {
-    "@portabletext/editor": "^1.2.0",
+    "@portabletext/editor": "^1.4.1",
     "@portabletext/react": "^3.0.0",
     "@sanity/assist": "^3.0.2",
     "@sanity/block-tools": "3.62.3",
@@ -36,7 +36,7 @@
     "@sanity/react-loader": "^1.10.15-release.4",
     "@sanity/tsdoc": "1.0.122",
     "@sanity/types": "workspace:*",
-    "@sanity/ui": "^2.8.16",
+    "@sanity/ui": "^2.8.18",
     "@sanity/ui-workshop": "^1.0.0",
     "@sanity/util": "workspace:*",
     "@sanity/uuid": "^3.0.1",

examples/ecommerce-studio/package.json

@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@sanity/cli": "3.62.2",
-    "@sanity/ui": "^2.8.16",
+    "@sanity/ui": "^2.8.19",
     "react": "^18.3.1",
     "react-barcode": "^1.4.1",
     "react-dom": "^18.3.1",

package.json

@@ -113,15 +113,15 @@
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/mutate": "^0.10.1",
     "@sanity/pkg-utils": "6.11.8",
-    "@sanity/prettier-config": "^1.0.2",
+    "@sanity/prettier-config": "^1.0.3",
     "@sanity/test": "0.0.1-alpha.1",
     "@sanity/tsdoc": "1.0.122",
     "@sanity/ui": "2.10.0-corel.0",
     "@sanity/uuid": "^3.0.2",
     "@types/glob": "^7.2.0",
     "@types/lodash": "^4.17.7",
     "@types/node": "^18.19.8",
-    "@types/react": "^18.3.5",
+    "@types/react": "^18.3.12",
     "@types/semver": "^7.5.6",
     "@types/yargs": "^17.0.7",
     "@typescript-eslint/eslint-plugin": "^7.18.0",

packages/@sanity/cli/jest.config.mjs

@@ -51,7 +51,7 @@
     "clean": "rimraf lib",
     "lint": "eslint .",
     "prepublishOnly": "turbo run build",
-    "test": "jest",
+    "test": "vitest",
     "ts": "node -r esbuild-register",
     "watch": "pkg-utils watch"
   },
@@ -67,15 +67,14 @@
     "esbuild": "0.21.5",
     "esbuild-register": "^3.5.0",
     "get-it": "^8.6.5",
-    "groq-js": "^1.13.0",
+    "groq-js": "^1.14.0",
     "pkg-dir": "^5.0.0",
     "prettier": "^3.3.0",
     "semver": "^7.3.5",
     "silver-fleece": "1.1.0",
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
     "@repo/package.config": "workspace:*",
     "@repo/test-config": "workspace:*",
     "@rexxars/gitconfiglocal": "^3.0.1",
@@ -129,6 +128,7 @@
     "semver-compare": "^1.0.0",
     "tar": "^6.1.11",
     "vite": "^4.5.3",
+    "vitest": "^2.1.1",
     "which": "^2.0.2",
     "xdg-basedir": "^4.0.0"
   },

packages/@sanity/cli/package.json

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`CLI: \`sanity typegen\` sanity typegen generate: formats code 1`] = `
+exports[`CLI: \`sanity typegen\` > sanity typegen generate: formats code 1`] = `
 "/**
  * ---------------------------------------------------------------------------------
  * This file has been generated by Sanity TypeGen.
@@ -36,20 +36,20 @@ export type AllSanitySchemaTypes = Person | Slug;
 export declare const internalGroqTypeReferenceTo: unique symbol;
 // Source: ./src/queries.ts
 // Variable: PAGE_QUERY
-// Query: *[_type == \\"page\\" && slug.current == $slug][0]
+// Query: *[_type == "page" && slug.current == $slug][0]
 export type PAGE_QUERYResult = null;
 
 // Query TypeMap
 import '@sanity/client';
 declare module '@sanity/client' {
   interface SanityQueries {
-    '*[_type == \\"page\\" && slug.current == $slug][0]': PAGE_QUERYResult;
+    '*[_type == "page" && slug.current == $slug][0]': PAGE_QUERYResult;
   }
 }
 "
 `;
 
-exports[`CLI: \`sanity typegen\` sanity typegen generate: with overloadClientMethods false 1`] = `
+exports[`CLI: \`sanity typegen\` > sanity typegen generate: with overloadClientMethods false 1`] = `
 "/**
  * ---------------------------------------------------------------------------------
  * This file has been generated by Sanity TypeGen.
@@ -85,7 +85,7 @@ export type AllSanitySchemaTypes = Person | Slug;
 export declare const internalGroqTypeReferenceTo: unique symbol;
 // Source: ./src/queries.ts
 // Variable: PAGE_QUERY
-// Query: *[_type == \\"page\\" && slug.current == $slug][0]
+// Query: *[_type == "page" && slug.current == $slug][0]
 export type PAGE_QUERYResult = null;
 "
 `;

packages/@sanity/cli/test/__snapshots__/typegen.test.ts.snap

@@ -1,11 +1,11 @@
-import {describe, expect, jest} from '@jest/globals'
+import {describe, expect, vi} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {getTestRunArgs, runSanityCmdCommand, studioVersions} from './shared/environment'
 
 describeCliTest('CLI: `sanity dataset alias`', () => {
   describe.each(studioVersions)('%s', (version) => {
-    jest.setTimeout(30 * 1000)
+    vi.setConfig({testTimeout: 30 * 1000})
 
     const testRunArgs = getTestRunArgs(version)
 

packages/@sanity/cli/test/alias.test.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
 
-import {describe, expect} from '@jest/globals'
+import {describe, expect} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {getCliUserEmail, runSanityCmdCommand, studioVersions} from './shared/environment'

packages/@sanity/cli/test/basics.test.ts

@@ -1,7 +1,7 @@
 import {readdir, readFile, stat} from 'node:fs/promises'
 import path from 'node:path'
 
-import {describe, expect, jest, test} from '@jest/globals'
+import {describe, expect, test, vi} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {runSanityCmdCommand, studiosPath, studioVersions} from './shared/environment'
@@ -11,7 +11,7 @@ describeCliTest('CLI: `sanity build` / `sanity deploy`', () => {
     const testConcurrentV3 = version === 'v3' ? testConcurrent : test.skip
 
     // Builds can take a bit of time with lots of concurrent tasks and slow CIs
-    jest.setTimeout(240 * 1000)
+    vi.setConfig({testTimeout: 240 * 1000})
 
     const studioPath = path.join(studiosPath, version)
 

packages/@sanity/cli/test/build.test.ts

@@ -1,4 +1,4 @@
-import {describe, expect} from '@jest/globals'
+import {describe, expect} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {getTestRunArgs, runSanityCmdCommand, studioVersions, testClient} from './shared/environment'

packages/@sanity/cli/test/cors.test.ts

@@ -1,4 +1,4 @@
-import {describe, expect} from '@jest/globals'
+import {describe, expect} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {getTestRunArgs, runSanityCmdCommand, studioVersions, testClient} from './shared/environment'

packages/@sanity/cli/test/dataset.test.ts

@@ -1,12 +1,12 @@
-import {describe, expect, jest, test} from '@jest/globals'
+import {describe, expect, test, vi} from 'vitest'
 
 import {describeCliTest} from './shared/describe'
 import {getTestRunArgs, runSanityCmdCommand, studioVersions} from './shared/environment'
 
 describeCliTest('CLI: `sanity dataset copy`', () => {
   describe.each(studioVersions)('%s', (version) => {
     // Copy tests can be fairly slow even on small datasets
-    jest.setTimeout(120 * 1000)
+    vi.setConfig({testTimeout: 120 * 1000})
 
     const testRunArgs = getTestRunArgs(version)
 

packages/@sanity/cli/test/datasetCopy.test.ts

@@ -2,7 +2,7 @@ import {createHash} from 'node:crypto'
 import {readFile} from 'node:fs/promises'
 import path from 'node:path'
 
-import {describe, expect, test} from '@jest/globals'
+import {describe, expect, test} from 'vitest'
 
 import {describeCliTest} from './shared/describe'
 import {testServerCommand} from './shared/devServer'

packages/@sanity/cli/test/dev.test.ts

@@ -1,4 +1,4 @@
-import {describe, expect} from '@jest/globals'
+import {describe, expect} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {getTestRunArgs, runSanityCmdCommand, studioVersions, testClient} from './shared/environment'

packages/@sanity/cli/test/documents.test.ts

@@ -1,4 +1,4 @@
-import {describe, expect} from '@jest/globals'
+import {describe, expect} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {getCliUserEmail, runSanityCmdCommand, studioVersions} from './shared/environment'

packages/@sanity/cli/test/exec.test.ts

@@ -1,8 +1,8 @@
 import {stat} from 'node:fs/promises'
 import path from 'node:path'
 
-import {describe, expect} from '@jest/globals'
 import tar from 'tar'
+import {describe, expect} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {

packages/@sanity/cli/test/exportImport.test.ts

@@ -1,4 +1,4 @@
-import {expect} from '@jest/globals'
+import {expect} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {getTestRunArgs, runSanityCmdCommand, studioVersions, testClient} from './shared/environment'

packages/@sanity/cli/test/graphql.test.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
 
-import {describe, expect} from '@jest/globals'
+import {describe, expect} from 'vitest'
 
 import templates from '../src/actions/init-project/templates'
 import {describeCliTest, testConcurrent} from './shared/describe'

packages/@sanity/cli/test/init.test.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
 
-import {describe, expect} from '@jest/globals'
+import {describe, expect} from 'vitest'
 
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {testServerCommand} from './shared/devServer'

packages/@sanity/cli/test/preview.test.ts

@@ -1,4 +1,4 @@
-import {describe, test} from '@jest/globals'
+import {describe, test} from 'vitest'
 
 import {cliUserToken, hasBuiltCli} from './environment'