@sanity/cli 3.68.2 → 3.68.4-corel.526

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.68.2",
+  "version": "3.68.4-corel.526+b512378d01",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -49,7 +49,7 @@
     "build": "pkg-utils build --strict --check --clean",
     "check:types": "tsc --project tsconfig.lib.json",
     "clean": "rimraf lib",
-    "lint": "eslint .",
+    "lint": "eslint --cache .",
     "prepublishOnly": "turbo run build",
     "test": "vitest",
     "ts": "node -r esbuild-register",
@@ -58,10 +58,10 @@
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/client": "^6.24.1",
-    "@sanity/codegen": "3.68.2",
+    "@sanity/codegen": "3.68.4-corel.526+b512378d01",
     "@sanity/telemetry": "^0.7.7",
-    "@sanity/template-validator": "^1.0.2",
-    "@sanity/util": "3.68.2",
+    "@sanity/template-validator": "^2.0.0",
+    "@sanity/util": "3.68.4-corel.526+b512378d01",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -75,13 +75,13 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@repo/package.config": "3.68.2",
-    "@repo/test-config": "3.68.2",
+    "@repo/package.config": "3.68.3",
+    "@repo/test-config": "3.68.3",
     "@rexxars/gitconfiglocal": "^3.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.68.2",
+    "@sanity/types": "3.68.4-corel.526+b512378d01",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -133,5 +133,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "a28a9cf41a5d393d90f750471225fcfe36301f28"
+  "gitHead": "b512378d011a6cfcc4b6a66acc6e40f66467b397"
 }

package/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})

package/src/util/remoteTemplate.ts

@@ -4,12 +4,7 @@ import {Readable} from 'node:stream'
 import {pipeline} from 'node:stream/promises'
 import {type ReadableStream} from 'node:stream/web'
 
-import {
-  ENV_TEMPLATE_FILES,
-  getMonoRepo,
-  REQUIRED_ENV_VAR,
-  validateSanityTemplate,
-} from '@sanity/template-validator'
+import {ENV_TEMPLATE_FILES, REQUIRED_ENV_VAR} from '@sanity/template-validator'
 import {x} from 'tar'
 
 import {debug} from '../debug'
@@ -42,7 +37,7 @@ export type RepoInfo = {
   filePath: string
 }
 
-function getGitHubRawContentUrl(repoInfo: RepoInfo): string {
+export function getGitHubRawContentUrl(repoInfo: RepoInfo): string {
   const {username, name, branch, filePath} = repoInfo
   return `https://raw.githubusercontent.com/${username}/${name}/${branch}/${filePath}`
 }
@@ -196,37 +191,6 @@ export async function downloadAndExtractRepo(
   )
 }
 
-/**
- * Checks if a GitHub repository is a monorepo by examining common monorepo configuration files.
- * Supports pnpm workspaces, Lerna, Rush, and npm workspaces (package.json).
- * @returns Promise that resolves to an array of package paths/names if monorepo is detected, undefined otherwise
- */
-export async function getPackages(
-  repoInfo: RepoInfo,
-  bearerToken?: string,
-): Promise<string[] | undefined> {
-  const headers: Record<string, string> = {}
-  if (bearerToken) {
-    headers.Authorization = `Bearer ${bearerToken}`
-  }
-  return getMonoRepo(getGitHubRawContentUrl(repoInfo), headers)
-}
-
-export async function validateRemoteTemplate(
-  repoInfo: RepoInfo,
-  packages: string[] = [''],
-  bearerToken?: string,
-): Promise<void> {
-  const headers: Record<string, string> = {}
-  if (bearerToken) {
-    headers.Authorization = `Bearer ${bearerToken}`
-  }
-  const result = await validateSanityTemplate(getGitHubRawContentUrl(repoInfo), packages, headers)
-  if (!result.isValid) {
-    throw new Error(result.errors.join('\n'))
-  }
-}
-
 export async function checkNeedsReadToken(root: string): Promise<boolean> {
   try {
     const templatePath = await Promise.any(