@sanity/cli 3.92.1-next.40.1f1bdfec39 → 3.92.1-next.42.40eccef023

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.92.1-next.40.1f1bdfec39",
+  "version": "3.92.1-next.42.40eccef023",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -50,7 +50,7 @@
     "build": "pkg-utils build --strict --check --clean",
     "check:types": "tsc --project tsconfig.lib.json",
     "clean": "rimraf lib",
-    "lint": "eslint --cache .",
+    "lint": "eslint .",
     "prepublishOnly": "turbo run build",
     "test": "vitest",
     "ts": "node -r esbuild-register",
@@ -59,31 +59,32 @@
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/client": "^7.6.0",
-    "@sanity/codegen": "3.92.1-next.40.1f1bdfec39",
+    "@sanity/codegen": "3.92.1-next.42.40eccef023",
     "@sanity/runtime-cli": "^8.1.0",
     "@sanity/telemetry": "^0.8.0",
     "@sanity/template-validator": "^2.4.3",
-    "@sanity/util": "3.92.1-next.40.1f1bdfec39",
+    "@sanity/util": "3.92.1-next.42.40eccef023",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
     "esbuild": "0.25.5",
-    "esbuild-register": "^3.5.0",
+    "esbuild-register": "^3.6.0",
     "get-it": "^8.6.9",
     "groq-js": "^1.17.0",
     "pkg-dir": "^5.0.0",
-    "prettier": "^3.3.0",
+    "prettier": "^3.5.3",
     "semver": "^7.3.5",
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
+    "@repo/eslint-config": "0.0.0",
     "@repo/package.config": "3.92.0",
     "@repo/test-config": "3.92.0",
     "@rexxars/gitconfiglocal": "^3.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@sanity/eslint-config-studio": "^4.0.0",
+    "@sanity/eslint-config-studio": "^5.0.2",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.92.1-next.40.1f1bdfec39",
+    "@sanity/types": "3.92.1-next.42.40eccef023",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -110,6 +111,7 @@
     "execa": "^2.0.0",
     "get-latest-version": "^5.0.0",
     "git-user-info": "^2.0.3",
+    "globals": "^16.2.0",
     "inquirer": "^6.0.0",
     "is-installed-globally": "^0.4.0",
     "leven": "^3.1.0",
@@ -135,5 +137,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "1f1bdfec39b18178f3fbb08586a63826845a7684"
+  "gitHead": "40eccef02385fc6963c544a7bf7247df049624b7"
 }

package/src/actions/codemod/codemodAction.ts

@@ -101,7 +101,7 @@ function ensureNpx() {
     if (!npxHelp.includes('npm')) {
       throw new Error('Not the npx we expected')
     }
-  } catch (err) {
+  } catch {
     throw new Error(
       `Failed to run "npx" - required to run codemods. Do you have a recent version of npm installed?`,
     )

package/src/actions/codemod/mods/reactIconsV3.ts

@@ -48,7 +48,7 @@ export const reactIconsV3: CodeMod = {
 async function maybeReadJson(jsonPath: string): Promise<PackageJson | null> {
   try {
     return await readJson(jsonPath)
-  } catch (err) {
+  } catch {
     return null
   }
 }

package/src/actions/init-plugin/bootstrapFromTemplate.ts

@@ -4,7 +4,6 @@ import path from 'node:path'
 import {absolutify, pathIsEmpty} from '@sanity/util/fs'
 import decompress from 'decompress'
 import {getIt} from 'get-it'
-// eslint-disable-next-line import/extensions
 import {promise} from 'get-it/middleware'
 import resolveFrom from 'resolve-from'
 import semver from 'semver'
@@ -44,7 +43,7 @@ export async function bootstrapFromTemplate(
   try {
     const projectManifest = await readJson<SanityJson>(path.join(workDir, 'sanity.json'))
     inProjectContext = Boolean(projectManifest.root)
-  } catch (err) {
+  } catch {
     // Intentional noop
   }
 
@@ -185,7 +184,7 @@ function getZip(url: string): Promise<decompress.File[]> {
 function parseJson<T = any>(json: string): T | undefined {
   try {
     return JSON.parse(json)
-  } catch (err) {
+  } catch {
     return undefined
   }
 }

package/src/actions/init-project/bootstrapLocalTemplate.ts

@@ -86,8 +86,8 @@ export async function bootstrapLocalTemplate(
   const dependencyVersions = await resolveLatestVersions({
     ...(isAppTemplate ? {} : studioDependencies.dependencies),
     ...(isAppTemplate ? {} : studioDependencies.devDependencies),
-    ...(template.dependencies || {}),
-    ...(template.devDependencies || {}),
+    ...template.dependencies,
+    ...template.devDependencies,
   })
   spinner.succeed()
 

package/src/actions/init-project/git.ts

@@ -26,11 +26,11 @@ export function tryGitInit(rootDir: string, commitMessage?: string): boolean {
       cwd: rootDir,
     })
     return true
-  } catch (e) {
+  } catch {
     if (didInit) {
       try {
         rimrafSync(path.join(rootDir, '.git'))
-      } catch (_) {
+      } catch {
         // intentional noop
       }
     }
@@ -42,7 +42,7 @@ function isInGitRepository(rootDir: string): boolean {
   try {
     execSync('git rev-parse --is-inside-work-tree', {stdio: 'ignore', cwd: rootDir})
     return true
-  } catch (_) {
+  } catch {
     // intentional noop
   }
   return false
@@ -52,7 +52,7 @@ function isInMercurialRepository(rootDir: string): boolean {
   try {
     execSync('hg --cwd . root', {stdio: 'ignore', cwd: rootDir})
     return true
-  } catch (_) {
+  } catch {
     // intentional noop
   }
   return false

package/src/actions/init-project/initProject.ts

@@ -725,7 +725,7 @@ export default async function initSanity(
     print('')
 
     // Provide login options (`sanity login`)
-    const {extOptions, ...otherArgs} = args
+    const {extOptions: _extOptions, ...otherArgs} = args
     const loginArgs: CliCommandArguments<LoginFlags> = {...otherArgs, extOptions: {}}
     await login(loginArgs, {...context, telemetry: trace.newContext('login')})
     return getUserData(apiClient)
@@ -1129,7 +1129,7 @@ export default async function initSanity(
           body: {metadata: {cliInitializedAt: new Date().toISOString()}},
         })
       }
-    } catch (err) {
+    } catch {
       // Non-critical update
       debug('Failed to update cliInitializedAt metadata')
     }

package/src/actions/init-project/readPackageJson.ts

@@ -10,9 +10,8 @@ import {type PackageJson} from '../../types'
  */
 export function readPackageJson(filePath: string): PackageJson | undefined {
   try {
-    // eslint-disable-next-line no-sync
     return JSON.parse(fs.readFileSync(filePath, 'utf8'))
-  } catch (err) {
+  } catch {
     return undefined
   }
 }

package/src/actions/versions/findSanityModuleVersions.ts

@@ -93,7 +93,7 @@ function getLocalManifest(workDir: string): Partial<PackageJson> {
   try {
     const fileContent = readFileSync(joinPath(workDir, 'package.json'), 'utf8')
     return JSON.parse(fileContent)
-  } catch (err) {
+  } catch {
     return {}
   }
 }

package/src/commands/init/initCommand.ts

@@ -95,7 +95,7 @@ export interface InitFlags {
   'package-manager'?: PackageManager
 }
 
-export const initCommand: CliCommandDefinition<InitFlags> = {
+const initCommand: CliCommandDefinition<InitFlags> = {
   name: 'init',
   signature: '',
   description: 'Initializes a new Sanity Studio and/or project',

package/src/util/cliWorker.ts

@@ -28,7 +28,7 @@ export async function getCliWorkerPath(workerPath: string): Promise<string> {
   const resolvedPath = path.resolve(cliDir, 'lib', 'workers', workerPath)
   try {
     return require.resolve(resolvedPath)
-  } catch (err) {
+  } catch {
     throw new Error(`Unable to resolve path for worker: ${workerPath}`)
   }
 }

package/src/util/clientWrapper.ts

@@ -86,8 +86,8 @@ export function getClientWrapper(
     const token = getCliToken()
     const apiHost = apiHosts[sanityEnv]
     const apiConfig = {
-      ...(cliApiConfig || {}),
-      ...(api || {}),
+      ...cliApiConfig,
+      ...api,
     }
 
     if (apiHost) {

package/src/util/getCliConfig.ts

@@ -35,14 +35,15 @@ export async function getCliConfig(
   if (forked) {
     try {
       return await getCliConfigForked(cwd)
-    } catch (err) {
+    } catch {
       // Intentional noop - try unforked variant
     }
   }
 
   const {unregister} = __DEV__
     ? {unregister: () => undefined}
-    : require('esbuild-register/dist/node').register({supported: {'dynamic-import': true}})
+    : // eslint-disable-next-line @typescript-eslint/no-require-imports
+      require('esbuild-register/dist/node').register({supported: {'dynamic-import': true}})
 
   try {
     const v3Config = getSanityCliConfig(cwd)
@@ -68,7 +69,6 @@ async function getCliConfigForked(cwd: string): Promise<CliConfigResult | null>
   return new Promise((resolve, reject) => {
     const worker = new Worker(workerPath, {
       workerData: cwd,
-      // eslint-disable-next-line no-process-env
       env: process.env,
     })
     worker.on('message', (message) => {

package/src/util/getLocalVersion.ts

@@ -29,7 +29,7 @@ function tryGetVersion(modulePath: string): string | undefined {
     const fileContent = readFileSync(modulePath, 'utf8')
     const manifest = JSON.parse(fileContent)
     return manifest.version
-  } catch (err) {
+  } catch {
     return undefined
   }
 }

package/src/util/journeyConfig.ts

@@ -154,7 +154,7 @@ export async function fetchJourneyConfig(
       schemaUrl: response.schemaUrl,
       isFirstProject: true,
     }
-  } catch (err) {
+  } catch {
     throw new Error(`Failed to fetch remote schema config: ${projectId}`)
   }
 }
@@ -169,7 +169,7 @@ async function fetchJourneySchema(schemaUrl: string): Promise<DocumentOrObject[]
   try {
     const response = await import(schemaUrl)
     return response.default
-  } catch (err) {
+  } catch {
     throw new Error(`Failed to fetch remote schema: ${schemaUrl}`)
   }
 }

package/src/util/remoteTemplate.ts

@@ -264,7 +264,7 @@ export async function applyEnvVariables(
     }
 
     await writeFile(join(root, targetName), envContent)
-  } catch (err) {
+  } catch {
     throw new Error(
       'Failed to set environment variables. This could be due to file permissions or the .env file format. See https://www.sanity.io/docs/environment-variables for details on environment variable setup.',
     )
@@ -278,7 +278,7 @@ export async function tryApplyPackageName(root: string, name: string): Promise<v
     pkg.name = name
 
     await writeFile(join(root, 'package.json'), JSON.stringify(pkg, null, 2))
-  } catch (err) {
+  } catch {
     // noop
   }
 }

package/src/workers/typegenGenerate.ts

@@ -12,7 +12,6 @@ import createDebug from 'debug'
 import {typeEvaluate, type TypeNode} from 'groq-js'
 
 const $info = createDebug('sanity:codegen:generate:info')
-const $warn = createDebug('sanity:codegen:generate:warn')
 
 export interface TypegenGenerateTypesWorkerData {
   workDir: string

package/templates/.eslintrc

@@ -1,8 +0,0 @@
-{
-  "root": true,
-  "extends": "@sanity/eslint-config-studio",
-  "rules": {
-    "import/no-unresolved": "off",
-    "no-restricted-imports": "off"
-  }
-}