chore: merge next into corel

dev/depcheck-test/package.json

@@ -1,6 +1,6 @@
 {
   "name": "depcheck-test",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "license": "MIT",
   "author": "Sanity.io <[email protected]>"

dev/design-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "design-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Sanity Design Studio",
   "keywords": [
@@ -31,7 +31,7 @@
     "start": "../.bin/sanity start --port 4000"
   },
   "dependencies": {
-    "@sanity/icons": "^3.5.5",
+    "@sanity/icons": "^3.5.6",
     "@sanity/ui": "^2.10.12",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

dev/embedded-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "embedded-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "scripts": {
     "build": "tsc && vite build && sanity manifest extract",
@@ -15,7 +15,7 @@
     "styled-components": "^6.1.0"
   },
   "devDependencies": {
-    "@types/react": "^18.3.17",
+    "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.5",
     "@vitejs/plugin-react": "^4.3.4",
     "typescript": "5.7.2",

dev/page-building-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sanity-page-building-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "license": "MIT",
   "author": "Sanity.io <[email protected]>",

dev/starter-next-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sanity-starter-next-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "license": "MIT",
   "author": "Sanity.io <[email protected]>",

dev/starter-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sanity-starter-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "license": "MIT",
   "author": "Sanity.io <[email protected]>",

dev/strict-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sanity-strict-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "license": "MIT",
   "author": "Sanity.io <[email protected]>",

dev/studio-e2e-testing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "studio-e2e-testing",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "keywords": [
     "sanity"
@@ -17,9 +17,9 @@
   "dependencies": {
     "@sanity/color-input": "^4.0.1",
     "@sanity/google-maps-input": "^4.0.0",
-    "@sanity/icons": "^3.5.5",
+    "@sanity/icons": "^3.5.6",
     "@sanity/ui": "^2.10.12",
-    "@sanity/vision": "3.68.1",
+    "@sanity/vision": "3.68.3",
     "babel-plugin-react-compiler": "19.0.0-beta-201e55d-20241215",
     "react": "^18.3.1",
     "react-compiler-runtime": "19.0.0-beta-201e55d-20241215",

dev/test-create-integration-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "test-create-integration-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "license": "MIT",
   "author": "Sanity.io <[email protected]>",

dev/test-next-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sanity-test-next-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "license": "MIT",
   "author": "Sanity.io <[email protected]>",
@@ -13,7 +13,7 @@
   "dependencies": {
     "@sanity/vision": "workspace:*",
     "babel-plugin-react-compiler": "19.0.0-beta-201e55d-20241215",
-    "next": "15.1.1",
+    "next": "15.1.2",
     "react": "rc",
     "react-dom": "rc",
     "react-is": "rc",

dev/test-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sanity-test-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "license": "MIT",
   "author": "Sanity.io <[email protected]>",
@@ -16,15 +16,15 @@
     "workshop:dev": "node -r esbuild-register scripts/workshop/dev.ts"
   },
   "dependencies": {
-    "@portabletext/editor": "^1.16.3",
+    "@portabletext/editor": "^1.18.5",
     "@portabletext/react": "^3.0.0",
     "@sanity/assist": "^3.0.2",
-    "@sanity/block-tools": "3.68.1",
+    "@sanity/block-tools": "3.68.3",
     "@sanity/client": "^6.24.1",
     "@sanity/color": "^3.0.0",
     "@sanity/color-input": "^4.0.1",
     "@sanity/google-maps-input": "^4.0.0",
-    "@sanity/icons": "^3.5.5",
+    "@sanity/icons": "^3.5.6",
     "@sanity/image-url": "^1.0.2",
     "@sanity/locale-ko-kr": "^1.0.1",
     "@sanity/locale-nb-no": "^1.0.1",
@@ -42,7 +42,7 @@
     "@sanity/util": "workspace:*",
     "@sanity/uuid": "^3.0.1",
     "@sanity/vision": "workspace:*",
-    "@sanity/visual-editing": "2.10.10",
+    "@sanity/visual-editing": "2.11.3",
     "@turf/helpers": "^6.0.1",
     "@turf/points-within-polygon": "^5.1.5",
     "@vercel/stega": "0.1.2",

examples/blog-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blog-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Content studio running with schema from the blog init template",
   "keywords": [

examples/clean-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clean-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Content studio running with schema from the clean template",
   "keywords": [

examples/ecommerce-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecommerce-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "",
   "keywords": [
@@ -29,7 +29,7 @@
     "start": "sanity dev --port 3337"
   },
   "dependencies": {
-    "@sanity/cli": "3.68.1",
+    "@sanity/cli": "3.68.3",
     "@sanity/ui": "^2.10.12",
     "react": "^18.3.1",
     "react-barcode": "^1.4.1",

examples/movies-studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "movies-studio",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Content studio running with schema from the moviedb init template",
   "keywords": [

lerna.json

@@ -12,5 +12,5 @@
     "packages/groq",
     "packages/sanity"
   ],
-  "version": "3.68.1"
+  "version": "3.68.3"
 }

package.json

@@ -17,7 +17,7 @@
     "check:deps": "pnpm --recursive --parallel exec depcheck",
     "check:format": "prettier . --check",
     "check:lint": "turbo run lint --continue -- --quiet",
-    "check:react-compiler": "eslint --cache --no-inline-config --no-eslintrc --ext .cjs,.mjs,.js,.jsx,.ts,.tsx --parser @typescript-eslint/parser --plugin react-compiler --rule 'react-compiler/react-compiler: [warn]' --ignore-path .eslintignore.react-compiler --max-warnings 27 .",
+    "check:react-compiler": "eslint --cache --no-inline-config --no-eslintrc --ext .cjs,.mjs,.js,.jsx,.ts,.tsx --parser @typescript-eslint/parser --plugin react-compiler --rule 'react-compiler/react-compiler: [warn]' --ignore-path .eslintignore.react-compiler --max-warnings 26 .",
     "report:react-compiler-bailout": "eslint --cache --no-inline-config --no-eslintrc --ext .cjs,.mjs,.js,.jsx,.ts,.tsx --parser @typescript-eslint/parser --plugin react-compiler --rule 'react-compiler/react-compiler: [error,{__unstable_donotuse_reportAllBailouts:true}]' --ignore-path .eslintignore.react-compiler -f ./scripts/reactCompilerBailouts.cjs . || true",
     "check:test": "run-s test -- --silent",
     "check:types": "tsc && turbo run check:types --filter='./packages/*' --filter='./packages/@sanity/*'",

packages/@repo/dev-aliases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repo/dev-aliases",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Dev aliases for the sanity monorepo",
   "type": "module",

packages/@repo/package.bundle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repo/package.bundle",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Shared package bundle configuration",
   "main": "./src/package.bundle.ts",

packages/@repo/package.config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repo/package.config",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Shared @sanity/pkg-utils configuration",
   "main": "./src/package.config.ts",

packages/@repo/test-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repo/test-config",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Test (as in unit test) config shared across packages in the sanity monorepo",
   "type": "module",

packages/@repo/test-exports/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repo/test-exports",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true,
   "description": "Ensures that all the monorepo packages that are published works in native node ESM and CJS runtimes",
   "exports": {

packages/@repo/tsconfig/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@repo/tsconfig",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "private": true
 }

packages/@sanity/block-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/block-tools",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "description": "Can format HTML, Slate JSON or Sanity block array into any other format.",
   "keywords": [
     "sanity",
@@ -49,15 +49,15 @@
     "watch": "pkg-utils watch"
   },
   "dependencies": {
-    "@sanity/types": "3.68.1",
+    "@sanity/types": "3.68.3",
     "@types/react": "^18.3.5",
     "get-random-values-esm": "1.0.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@repo/package.config": "workspace:*",
     "@repo/test-config": "workspace:*",
-    "@sanity/schema": "3.68.1",
+    "@sanity/schema": "3.68.3",
     "@types/jsdom": "^20.0.0",
     "@types/lodash": "^4.17.7",
     "@vercel/stega": "0.1.2",

packages/@sanity/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.68.1",
+  "version": "3.68.3",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -58,10 +58,10 @@
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/client": "^6.24.1",
-    "@sanity/codegen": "3.68.1",
+    "@sanity/codegen": "3.68.3",
     "@sanity/telemetry": "^0.7.7",
-    "@sanity/template-validator": "^1.0.2",
-    "@sanity/util": "3.68.1",
+    "@sanity/template-validator": "^1.2.1",
+    "@sanity/util": "3.68.3",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -72,7 +72,6 @@
     "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": {

packages/@sanity/cli/src/actions/init-project/bootstrapRemoteTemplate.ts

@@ -1,6 +1,7 @@
 import {mkdir} from 'node:fs/promises'
 import {join} from 'node:path'
 
+import {getMonoRepo, GitHubFileReader, validateTemplate} from '@sanity/template-validator'
 import {type Framework, frameworks} from '@vercel/frameworks'
 import {detectFrameworkRecord, LocalFileSystemDetector} from '@vercel/fs-detectors'
 
@@ -12,11 +13,10 @@ import {
   checkNeedsReadToken,
   downloadAndExtractRepo,
   generateSanityApiReadToken,
-  getPackages,
+  getGitHubRawContentUrl,
   type RepoInfo,
   setCorsOrigin,
   tryApplyPackageName,
-  validateRemoteTemplate,
 } from '../../util/remoteTemplate'
 import {type GenerateConfigOptions} from './createStudioConfig'
 import {tryGitInit} from './git'
@@ -39,11 +39,20 @@ export async function bootstrapRemoteTemplate(
   const {outputPath, repoInfo, bearerToken, variables, packageName} = opts
   const {output, apiClient} = context
   const name = [repoInfo.username, repoInfo.name, repoInfo.filePath].filter(Boolean).join('/')
+  const contentsUrl = getGitHubRawContentUrl(repoInfo)
+  const headers: Record<string, string> = {}
+  if (bearerToken) {
+    headers.Authorization = `Bearer ${bearerToken}`
+  }
   const spinner = output.spinner(`Bootstrapping files from template "${name}"`).start()
 
   debug('Validating remote template')
-  const packages = await getPackages(repoInfo, bearerToken)
-  await validateRemoteTemplate(repoInfo, packages, bearerToken)
+  const fileReader = new GitHubFileReader(contentsUrl, headers)
+  const packages = await getMonoRepo(fileReader)
+  const validation = await validateTemplate(fileReader, packages)
+  if (!validation.isValid) {
+    throw new Error(validation.errors.join('\n'))
+  }
 
   debug('Create new directory "%s"', outputPath)
   await mkdir(outputPath, {recursive: true})

packages/@sanity/cli/src/actions/init-project/initProject.ts

@@ -1,4 +1,4 @@
-import {existsSync, readFileSync} from 'node:fs'
+import {existsSync} from 'node:fs'
 import fs from 'node:fs/promises'
 import path from 'node:path'
 
@@ -11,7 +11,6 @@ import {deburr, noop} from 'lodash'
 import pFilter from 'p-filter'
 import resolveFrom from 'resolve-from'
 import semver from 'semver'
-import {evaluate, patch} from 'silver-fleece'
 
 import {CLIInitStepCompleted} from '../../__telemetry__/init.telemetry'
 import {type InitFlags} from '../../commands/init/initCommand'
@@ -434,21 +433,6 @@ export default async function initSanity(
 
     await writeSourceFiles(sanityFolder(useTypeScript, templateToUse), undefined, hasSrcFolder)
 
-    // set tsconfig.json target to ES2017
-    const tsConfigPath = path.join(workDir, 'tsconfig.json')
-
-    if (useTypeScript && existsSync(tsConfigPath)) {
-      const tsConfigFile = readFileSync(tsConfigPath, 'utf8')
-      const config = evaluate(tsConfigFile)
-
-      if (config.compilerOptions.target?.toLowerCase() !== 'es2017') {
-        config.compilerOptions.target = 'ES2017'
-
-        const newConfig = patch(tsConfigFile, config)
-        await fs.writeFile(tsConfigPath, Buffer.from(newConfig))
-      }
-    }
-
     const appendEnv = unattended ? true : await promptForAppendEnv(prompt, envFilename)
 
     if (appendEnv) {