@sanity/cli 3.72.2-canary.32 → 3.72.2-corel.24

package/lib/index.d.mts

@@ -114,14 +114,6 @@ export declare interface CliConfig {
   vite?: UserViteConfig
   autoUpdates?: boolean
   studioHost?: string
-  /**
-   * Parameter used to configure other kinds of applications.
-   * Signals to `sanity` commands that this is not a studio.
-   * @internal
-   */
-  __experimental_coreAppConfiguration?: {
-    appLocation?: string
-  }
 }
 
 declare type CliConfigResult =
@@ -365,7 +357,6 @@ export declare function loadEnv(
 export declare interface PackageJson {
   name: string
   version: string
-  scripts?: Record<string, string>
   description?: string
   author?: string
   license?: string

package/lib/index.d.ts

@@ -114,14 +114,6 @@ export declare interface CliConfig {
   vite?: UserViteConfig
   autoUpdates?: boolean
   studioHost?: string
-  /**
-   * Parameter used to configure other kinds of applications.
-   * Signals to `sanity` commands that this is not a studio.
-   * @internal
-   */
-  __experimental_coreAppConfiguration?: {
-    appLocation?: string
-  }
 }
 
 declare type CliConfigResult =
@@ -365,7 +357,6 @@ export declare function loadEnv(
 export declare interface PackageJson {
   name: string
   version: string
-  scripts?: Record<string, string>
   description?: string
   author?: string
   license?: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.72.2-canary.32+df28986158",
+  "version": "3.72.2-corel.24+9afe9690e4",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -58,30 +58,30 @@
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/client": "^6.27.2",
-    "@sanity/codegen": "3.72.2-canary.32+df28986158",
+    "@sanity/codegen": "3.72.2-corel.24+9afe9690e4",
     "@sanity/telemetry": "^0.7.7",
     "@sanity/template-validator": "^2.4.0",
-    "@sanity/util": "3.72.2-canary.32+df28986158",
+    "@sanity/util": "3.72.2-corel.24+9afe9690e4",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
     "esbuild": "0.21.5",
     "esbuild-register": "^3.5.0",
     "get-it": "^8.6.7",
-    "groq-js": "^1.15.0",
+    "groq-js": "^1.14.2",
     "pkg-dir": "^5.0.0",
     "prettier": "^3.3.0",
     "semver": "^7.3.5",
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@repo/package.config": "3.74.0",
-    "@repo/test-config": "3.74.0",
+    "@repo/package.config": "3.72.1",
+    "@repo/test-config": "3.72.1",
     "@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.72.2-canary.32+df28986158",
+    "@sanity/types": "3.72.2-corel.24+9afe9690e4",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -126,12 +126,12 @@
     "semver-compare": "^1.0.0",
     "tar": "^6.1.11",
     "vite": "^6.0.11",
-    "vitest": "^2.1.9",
+    "vitest": "^2.1.8",
     "which": "^2.0.2",
     "xdg-basedir": "^4.0.0"
   },
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "df289861580b94a40cad224898d315f37d5cddec"
+  "gitHead": "9afe9690e4bd322059a6953a37c7ad6f9fe23f7e"
 }

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

@@ -10,10 +10,8 @@ import {copy} from '../../util/copy'
 import {getAndWriteJourneySchemaWorker} from '../../util/journeyConfig'
 import {resolveLatestVersions} from '../../util/resolveLatestVersions'
 import {createCliConfig} from './createCliConfig'
-import {createCoreAppCliConfig} from './createCoreAppCliConfig'
 import {createPackageManifest} from './createPackageManifest'
 import {createStudioConfig, type GenerateConfigOptions} from './createStudioConfig'
-import {determineCoreAppTemplate} from './determineCoreAppTemplate'
 import {type ProjectTemplate} from './initProject'
 import templates from './templates'
 import {updateInitialTemplateMetadata} from './updateInitialTemplateMetadata'
@@ -38,9 +36,9 @@ export async function bootstrapLocalTemplate(
   const {apiClient, cliRoot, output} = context
   const templatesDir = path.join(cliRoot, 'templates')
   const {outputPath, templateName, useTypeScript, packageName, variables} = opts
+  const {projectId} = variables
   const sourceDir = path.join(templatesDir, templateName)
   const sharedDir = path.join(templatesDir, 'shared')
-  const isCoreAppTemplate = determineCoreAppTemplate(templateName)
 
   // Check that we have a template info file (dependencies, plugins etc)
   const template = templates[templateName]
@@ -83,16 +81,15 @@ export async function bootstrapLocalTemplate(
   // Resolve latest versions of Sanity-dependencies
   spinner = output.spinner('Resolving latest module versions').start()
   const dependencyVersions = await resolveLatestVersions({
-    ...(isCoreAppTemplate ? {} : studioDependencies.dependencies),
-    ...(isCoreAppTemplate ? {} : studioDependencies.devDependencies),
+    ...studioDependencies.dependencies,
+    ...studioDependencies.devDependencies,
     ...(template.dependencies || {}),
-    ...(template.devDependencies || {}),
   })
   spinner.succeed()
 
   // Use the resolved version for the given dependency
   const dependencies = Object.keys({
-    ...(isCoreAppTemplate ? {} : studioDependencies.dependencies),
+    ...studioDependencies.dependencies,
     ...template.dependencies,
   }).reduce(
     (deps, dependency) => {
@@ -103,7 +100,7 @@ export async function bootstrapLocalTemplate(
   )
 
   const devDependencies = Object.keys({
-    ...(isCoreAppTemplate ? {} : studioDependencies.devDependencies),
+    ...studioDependencies.devDependencies,
     ...template.devDependencies,
   }).reduce(
     (deps, dependency) => {
@@ -119,41 +116,32 @@ export async function bootstrapLocalTemplate(
     name: packageName,
     dependencies,
     devDependencies,
-    scripts: template.scripts,
   })
 
   // ...and a studio config (`sanity.config.[ts|js]`)
-  const studioConfig = createStudioConfig({
+  const studioConfig = await createStudioConfig({
     template: template.configTemplate,
     variables,
   })
 
   // ...and a CLI config (`sanity.cli.[ts|js]`)
-  const cliConfig = isCoreAppTemplate
-    ? createCoreAppCliConfig({appLocation: template.appLocation!})
-    : createCliConfig({
-        projectId: variables.projectId,
-        dataset: variables.dataset,
-        autoUpdates: variables.autoUpdates,
-      })
+  const cliConfig = await createCliConfig({
+    projectId: variables.projectId,
+    dataset: variables.dataset,
+    autoUpdates: variables.autoUpdates,
+  })
 
   // Write non-template files to disc
   const codeExt = useTypeScript ? 'ts' : 'js'
-  await Promise.all(
-    [
-      ...[
-        isCoreAppTemplate
-          ? Promise.resolve(null)
-          : writeFileIfNotExists(`sanity.config.${codeExt}`, studioConfig),
-      ],
-      writeFileIfNotExists(`sanity.cli.${codeExt}`, cliConfig),
-      writeFileIfNotExists('package.json', packageManifest),
-      writeFileIfNotExists(
-        'eslint.config.mjs',
-        `import studio from '@sanity/eslint-config-studio'\n\nexport default [...studio]\n`,
-      ),
-    ].filter(Boolean),
-  )
+  await Promise.all([
+    writeFileIfNotExists(`sanity.config.${codeExt}`, studioConfig),
+    writeFileIfNotExists(`sanity.cli.${codeExt}`, cliConfig),
+    writeFileIfNotExists('package.json', packageManifest),
+    writeFileIfNotExists(
+      'eslint.config.mjs',
+      `import studio from '@sanity/eslint-config-studio'\n\nexport default [...studio]\n`,
+    ),
+  ])
 
   debug('Updating initial template metadata')
   await updateInitialTemplateMetadata(apiClient, variables.projectId, `cli-${templateName}`)

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

@@ -1,4 +1,6 @@
-import {processTemplate} from './processTemplate'
+import traverse from '@babel/traverse'
+import {parse, print} from 'recast'
+import * as parser from 'recast/parsers/typescript'
 
 const defaultTemplate = `
 import {defineCliConfig} from 'sanity/cli'
@@ -23,9 +25,49 @@ export interface GenerateCliConfigOptions {
 }
 
 export function createCliConfig(options: GenerateCliConfigOptions): string {
-  return processTemplate({
-    template: defaultTemplate,
-    variables: options,
-    includeBooleanTransform: true,
+  const variables = options
+  const template = defaultTemplate.trimStart()
+  const ast = parse(template, {parser})
+
+  traverse(ast, {
+    StringLiteral: {
+      enter({node}) {
+        const value = node.value
+        if (!value.startsWith('%') || !value.endsWith('%')) {
+          return
+        }
+        const variableName = value.slice(1, -1) as keyof GenerateCliConfigOptions
+        if (!(variableName in variables)) {
+          throw new Error(`Template variable '${value}' not defined`)
+        }
+        const newValue = variables[variableName]
+        /*
+         * although there are valid non-strings in our config,
+         * they're not in StringLiteral nodes, so assume undefined
+         */
+        node.value = typeof newValue === 'string' ? newValue : ''
+      },
+    },
+    Identifier: {
+      enter(path) {
+        if (!path.node.name.startsWith('__BOOL__')) {
+          return
+        }
+        const variableName = path.node.name.replace(
+          /^__BOOL__(.+?)__$/,
+          '$1',
+        ) as keyof GenerateCliConfigOptions
+        if (!(variableName in variables)) {
+          throw new Error(`Template variable '${variableName}' not defined`)
+        }
+        const value = variables[variableName]
+        if (typeof value !== 'boolean') {
+          throw new Error(`Expected boolean value for '${variableName}'`)
+        }
+        path.replaceWith({type: 'BooleanLiteral', value})
+      },
+    },
   })
+
+  return print(ast, {quote: 'single'}).code
 }

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

@@ -29,7 +29,7 @@ export function createPackageManifest(
 
     main: 'package.json',
     keywords: ['sanity'],
-    scripts: data.scripts || {
+    scripts: {
       'dev': 'sanity dev',
       'start': 'sanity start',
       'build': 'sanity build',

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

@@ -1,4 +1,6 @@
-import {processTemplate} from './processTemplate'
+import traverse from '@babel/traverse'
+import {parse, print} from 'recast'
+import * as parser from 'recast/parsers/typescript'
 
 const defaultTemplate = `
 import {defineConfig} from 'sanity'
@@ -45,8 +47,29 @@ export function createStudioConfig(options: GenerateConfigOptions): string {
     return options.template(variables).trimStart()
   }
 
-  return processTemplate({
-    template: options.template || defaultTemplate,
-    variables,
+  const template = (options.template || defaultTemplate).trimStart()
+  const ast = parse(template, {parser})
+  traverse(ast, {
+    StringLiteral: {
+      enter({node}) {
+        const value = node.value
+        if (!value.startsWith('%') || !value.endsWith('%')) {
+          return
+        }
+
+        const variableName = value.slice(1, -1) as keyof GenerateConfigOptions['variables']
+        if (!(variableName in variables)) {
+          throw new Error(`Template variable '${value}' not defined`)
+        }
+        const newValue = variables[variableName]
+        /*
+         * although there are valid non-strings in our config,
+         * they're not in this template, so assume undefined
+         */
+        node.value = typeof newValue === 'string' ? newValue : ''
+      },
+    },
   })
+
+  return print(ast, {quote: 'single'}).code
 }

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

@@ -49,7 +49,6 @@ import {createProject} from '../project/createProject'
 import {bootstrapLocalTemplate} from './bootstrapLocalTemplate'
 import {bootstrapRemoteTemplate} from './bootstrapRemoteTemplate'
 import {type GenerateConfigOptions} from './createStudioConfig'
-import {determineCoreAppTemplate} from './determineCoreAppTemplate'
 import {absolutify, validateEmptyPath} from './fsUtils'
 import {tryGitInit} from './git'
 import {promptForDatasetName} from './promptForDatasetName'
@@ -98,8 +97,6 @@ export interface ProjectTemplate {
   importPrompt?: string
   configTemplate?: string | ((variables: GenerateConfigOptions['variables']) => string)
   typescriptOnly?: boolean
-  appLocation?: string
-  scripts?: Record<string, string>
 }
 
 export interface ProjectOrganization {
@@ -274,9 +271,6 @@ export default async function initSanity(
   print('')
 
   const flags = await prepareFlags()
-  // skip project / dataset prompting
-  const isCoreAppTemplate = cliFlags.template ? determineCoreAppTemplate(cliFlags.template) : false // Default to false
-
   // We're authenticated, now lets select or create a project
   const {projectId, displayName, isFirstProject, datasetName, schemaUrl} = await getProjectDetails()
 
@@ -661,15 +655,11 @@ export default async function initSanity(
   const isCurrentDir = outputPath === process.cwd()
   if (isCurrentDir) {
     print(`\n${chalk.green('Success!')} Now, use this command to continue:\n`)
-    print(
-      `${chalk.cyan(devCommand)} - to run ${isCoreAppTemplate ? 'your Sanity application' : 'Sanity Studio'}\n`,
-    )
+    print(`${chalk.cyan(devCommand)} - to run Sanity Studio\n`)
   } else {
     print(`\n${chalk.green('Success!')} Now, use these commands to continue:\n`)
     print(`First: ${chalk.cyan(`cd ${outputPath}`)} - to enter project’s directory`)
-    print(
-      `Then: ${chalk.cyan(devCommand)} -to run ${isCoreAppTemplate ? 'your Sanity application' : 'Sanity Studio'}\n`,
-    )
+    print(`Then: ${chalk.cyan(devCommand)} - to run Sanity Studio\n`)
   }
 
   print(`Other helpful commands`)
@@ -730,15 +720,6 @@ export default async function initSanity(
       return data
     }
 
-    if (isCoreAppTemplate) {
-      return {
-        projectId: '',
-        displayName: '',
-        isFirstProject: false,
-        datasetName: '',
-      }
-    }
-
     debug('Prompting user to select or create a project')
     const project = await getOrCreateProject()
     debug(`Project with name ${project.displayName} selected`)

package/src/actions/init-project/templates/index.ts

@@ -1,7 +1,6 @@
 import {type ProjectTemplate} from '../initProject'
 import blog from './blog'
 import clean from './clean'
-import coreAppTemplate from './coreApp'
 import getStartedTemplate from './getStarted'
 import moviedb from './moviedb'
 import quickstart from './quickstart'
@@ -11,7 +10,6 @@ import shopifyOnline from './shopifyOnline'
 const templates: Record<string, ProjectTemplate | undefined> = {
   blog,
   clean,
-  'core-app': coreAppTemplate,
   'get-started': getStartedTemplate,
   moviedb,
   shopify,

package/src/types.ts

@@ -24,7 +24,6 @@ export interface SanityModuleInternal {
 export interface PackageJson {
   name: string
   version: string
-  scripts?: Record<string, string>
 
   description?: string
   author?: string
@@ -345,15 +344,6 @@ export interface CliConfig {
   autoUpdates?: boolean
 
   studioHost?: string
-
-  /**
-   * Parameter used to configure other kinds of applications.
-   * Signals to `sanity` commands that this is not a studio.
-   * @internal
-   */
-  __experimental_coreAppConfiguration?: {
-    appLocation?: string
-  }
 }
 
 export type UserViteConfig =

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

@@ -1,23 +0,0 @@
-import {processTemplate} from './processTemplate'
-
-const defaultCoreAppTemplate = `
-import {defineCliConfig} from 'sanity/cli'
-
-export default defineCliConfig({
-  __experimental_coreAppConfiguration: {
-    appLocation: '%appLocation%'
-  },
-})
-`
-
-export interface GenerateCliConfigOptions {
-  organizationId?: string
-  appLocation: string
-}
-
-export function createCoreAppCliConfig(options: GenerateCliConfigOptions): string {
-  return processTemplate({
-    template: defaultCoreAppTemplate,
-    variables: options,
-  })
-}

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

@@ -1,13 +0,0 @@
-const coreAppTemplates = ['core-app']
-
-/**
- * Determine if a given template is a studio template.
- * This function may need to be more robust once we
- * introduce remote templates, for example.
- *
- * @param templateName - Name of the template
- * @returns boolean indicating if the template is a studio template
- */
-export function determineCoreAppTemplate(templateName: string): boolean {
-  return coreAppTemplates.includes(templateName)
-}

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

@@ -1,55 +0,0 @@
-import traverse from '@babel/traverse'
-import {parse, print} from 'recast'
-import * as parser from 'recast/parsers/typescript'
-
-interface TemplateOptions<T> {
-  template: string
-  variables: T
-  includeBooleanTransform?: boolean
-}
-
-export function processTemplate<T extends object>(options: TemplateOptions<T>): string {
-  const {template, variables, includeBooleanTransform = false} = options
-  const ast = parse(template.trimStart(), {parser})
-
-  traverse(ast, {
-    StringLiteral: {
-      enter({node}) {
-        const value = node.value
-        if (!value.startsWith('%') || !value.endsWith('%')) {
-          return
-        }
-        const variableName = value.slice(1, -1) as keyof T
-        if (!(variableName in variables)) {
-          throw new Error(`Template variable '${value}' not defined`)
-        }
-        const newValue = variables[variableName]
-        /*
-         * although there are valid non-strings in our config,
-         * they're not in StringLiteral nodes, so assume undefined
-         */
-        node.value = typeof newValue === 'string' ? newValue : ''
-      },
-    },
-    ...(includeBooleanTransform && {
-      Identifier: {
-        enter(path) {
-          if (!path.node.name.startsWith('__BOOL__')) {
-            return
-          }
-          const variableName = path.node.name.replace(/^__BOOL__(.+?)__$/, '$1') as keyof T
-          if (!(variableName in variables)) {
-            throw new Error(`Template variable '${variableName.toString()}' not defined`)
-          }
-          const value = variables[variableName]
-          if (typeof value !== 'boolean') {
-            throw new Error(`Expected boolean value for '${variableName.toString()}'`)
-          }
-          path.replaceWith({type: 'BooleanLiteral', value})
-        },
-      },
-    }),
-  })
-
-  return print(ast, {quote: 'single'}).code
-}

package/src/actions/init-project/templates/coreApp.ts

@@ -1,31 +0,0 @@
-import {type ProjectTemplate} from '../initProject'
-
-const coreAppTemplate: ProjectTemplate = {
-  dependencies: {
-    '@sanity/sdk': '^0.0.0-alpha',
-    '@sanity/sdk-react': '^0.0.0-alpha',
-    'react': '^19',
-    'react-dom': '^19',
-  },
-  devDependencies: {
-    /*
-     * this will be changed to eslint-config sanity,
-     *  eslint.config generation will be a fast follow
-     */
-    '@sanity/eslint-config-studio': '^5.0.1',
-    '@types/react': '^18.0.25',
-    'eslint': '^9.9.0',
-    'prettier': '^3.0.2',
-    'sanity': '^3',
-    'typescript': '^5.1.6',
-  },
-  appLocation: './src/App.tsx',
-  scripts: {
-    // this will eventually run a concurrently process with another in-flight utility
-    dev: 'sanity app dev',
-    build: 'sanity app build',
-    start: 'sanity app start',
-  },
-}
-
-export default coreAppTemplate

package/templates/core-app/src/App.tsx

@@ -1,26 +0,0 @@
-import {createSanityInstance} from '@sanity/sdk'
-import {SanityProvider} from '@sanity/sdk-react/context'
-
-export function App() {
-
-  const sanityConfig = {
-    auth: {
-      authScope: 'global'
-    }
-    /* 
-     * Apps can access several different projects!
-     * Add the below configuration if you want to connect to a specific project.
-     */
-    // projectId: 'my-project-id',
-    // dataset: 'my-dataset',
-  }
-
-  const sanityInstance = createSanityInstance(sanityConfig)
-  return (
-    <SanityProvider sanityInstance={sanityInstance}>
-      Hello world!
-    </SanityProvider>
-  )
-}
-
-export default App