refactor: change core-app template to app-quickstart (#8948)

Author: binoy14

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

@@ -9,11 +9,11 @@ import {type CliCommandContext} from '../../types'
 import {copy} from '../../util/copy'
 import {getAndWriteJourneySchemaWorker} from '../../util/journeyConfig'
 import {resolveLatestVersions} from '../../util/resolveLatestVersions'
+import {createAppCliConfig} from './createAppCliConfig'
 import {createCliConfig} from './createCliConfig'
-import {createCoreAppCliConfig} from './createCoreAppCliConfig'
 import {createPackageManifest} from './createPackageManifest'
 import {createStudioConfig, type GenerateConfigOptions} from './createStudioConfig'
-import {determineCoreAppTemplate} from './determineCoreAppTemplate'
+import {determineAppTemplate} from './determineAppTemplate'
 import {type ProjectTemplate} from './initProject'
 import templates from './templates'
 import {updateInitialTemplateMetadata} from './updateInitialTemplateMetadata'
@@ -40,7 +40,7 @@ export async function bootstrapLocalTemplate(
   const {outputPath, templateName, useTypeScript, packageName, variables} = opts
   const sourceDir = path.join(templatesDir, templateName)
   const sharedDir = path.join(templatesDir, 'shared')
-  const isCoreAppTemplate = determineCoreAppTemplate(templateName)
+  const isAppTemplate = determineAppTemplate(templateName)
 
   // Check that we have a template info file (dependencies, plugins etc)
   const template = templates[templateName]
@@ -83,16 +83,16 @@ 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),
+    ...(isAppTemplate ? {} : studioDependencies.dependencies),
+    ...(isAppTemplate ? {} : studioDependencies.devDependencies),
     ...(template.dependencies || {}),
     ...(template.devDependencies || {}),
   })
   spinner.succeed()
 
   // Use the resolved version for the given dependency
   const dependencies = Object.keys({
-    ...(isCoreAppTemplate ? {} : studioDependencies.dependencies),
+    ...(isAppTemplate ? {} : studioDependencies.dependencies),
     ...template.dependencies,
   }).reduce(
     (deps, dependency) => {
@@ -103,7 +103,7 @@ export async function bootstrapLocalTemplate(
   )
 
   const devDependencies = Object.keys({
-    ...(isCoreAppTemplate ? {} : studioDependencies.devDependencies),
+    ...(isAppTemplate ? {} : studioDependencies.devDependencies),
     ...template.devDependencies,
   }).reduce(
     (deps, dependency) => {
@@ -129,8 +129,8 @@ export async function bootstrapLocalTemplate(
   })
 
   // ...and a CLI config (`sanity.cli.[ts|js]`)
-  const cliConfig = isCoreAppTemplate
-    ? createCoreAppCliConfig({
+  const cliConfig = isAppTemplate
+    ? createAppCliConfig({
         appLocation: template.appLocation!,
         organizationId: variables.organizationId,
       })
@@ -145,7 +145,7 @@ export async function bootstrapLocalTemplate(
   await Promise.all(
     [
       ...[
-        isCoreAppTemplate
+        isAppTemplate
           ? Promise.resolve(null)
           : writeFileIfNotExists(`sanity.config.${codeExt}`, studioConfig),
       ],

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

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

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

@@ -1,4 +1,4 @@
-const coreAppTemplates = ['core-app']
+const appTemplates = ['app-quickstart']
 
 /**
  * Determine if a given template is a studio template.
@@ -8,6 +8,6 @@ const coreAppTemplates = ['core-app']
  * @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)
+export function determineAppTemplate(templateName: string): boolean {
+  return appTemplates.includes(templateName)
 }

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

@@ -49,7 +49,7 @@ import {createProject} from '../project/createProject'
 import {bootstrapLocalTemplate} from './bootstrapLocalTemplate'
 import {bootstrapRemoteTemplate} from './bootstrapRemoteTemplate'
 import {type GenerateConfigOptions} from './createStudioConfig'
-import {determineCoreAppTemplate} from './determineCoreAppTemplate'
+import {determineAppTemplate} from './determineAppTemplate'
 import {absolutify, validateEmptyPath} from './fsUtils'
 import {tryGitInit} from './git'
 import {promptForDatasetName} from './promptForDatasetName'
@@ -278,14 +278,14 @@ export default async function initSanity(
   }
 
   // skip project / dataset prompting
-  const isCoreAppTemplate = cliFlags.template ? determineCoreAppTemplate(cliFlags.template) : false // Default to false
+  const isAppTemplate = cliFlags.template ? determineAppTemplate(cliFlags.template) : false // Default to false
 
   let introMessage = 'Fetching existing projects'
   if (cliFlags.quickstart) {
     introMessage = "Eject your existing project's Sanity configuration"
   }
 
-  if (!isCoreAppTemplate) {
+  if (!isAppTemplate) {
     success(introMessage)
     print('')
   }
@@ -678,13 +678,13 @@ export default async function initSanity(
   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`,
+      `${chalk.cyan(devCommand)} - to run ${isAppTemplate ? 'your Sanity application' : '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`,
+      `Then: ${chalk.cyan(devCommand)} -to run ${isAppTemplate ? 'your Sanity application' : 'Sanity Studio'}\n`,
     )
   }
 
@@ -748,18 +748,18 @@ export default async function initSanity(
       return data
     }
 
-    if (isCoreAppTemplate) {
+    if (isAppTemplate) {
       const client = apiClient({requireUser: true, requireProject: false})
       const organizations = await client.request({uri: '/organizations'})
 
-      const coreAppOrganizationId = await getOrganizationId(organizations)
+      const appOrganizationId = await getOrganizationId(organizations)
 
       return {
         projectId: '',
         displayName: '',
         datasetName: '',
         isFirstProject: false,
-        organizationId: coreAppOrganizationId,
+        organizationId: appOrganizationId,
       }
     }
 

packages/@sanity/cli/src/actions/init-project/templates/coreApp.ts packages/@sanity/cli/src/actions/init-project/templates/appQuickstart.ts

@@ -1,9 +1,9 @@
 import {type ProjectTemplate} from '../initProject'
 
-const coreAppTemplate: ProjectTemplate = {
+const appTemplate: ProjectTemplate = {
   dependencies: {
-    '@sanity/sdk': '^0.0.0-alpha',
-    '@sanity/sdk-react': '^0.0.0-alpha',
+    '@sanity/sdk': '^0.0.0-rc',
+    '@sanity/sdk-react': '^0.0.0-rc',
     'react': '^19',
     'react-dom': '^19',
   },
@@ -27,4 +27,4 @@ const coreAppTemplate: ProjectTemplate = {
   },
 }
 
-export default coreAppTemplate
+export default appTemplate

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

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

packages/@sanity/cli/src/types.ts

@@ -351,7 +351,7 @@ export interface CliConfig {
    * Signals to `sanity` commands that this is not a studio.
    * @internal
    */
-  __experimental_coreAppConfiguration?: {
+  __experimental_appConfiguration?: {
     organizationId?: string
     appLocation?: string
     appId?: string

packages/@sanity/cli/templates/core-app/src/App.tsx

@@ -1,5 +1,5 @@
 import {type SanityConfig} from '@sanity/sdk'
-import {SanityApp} from '@sanity/sdk-react/components'
+import {SanityApp} from '@sanity/sdk-react'
 import {ExampleComponent} from './ExampleComponent'
 import './App.css'
 
@@ -14,7 +14,7 @@ export function App() {
 
   return (
     <div className="app-container">
-      <SanityApp sanityConfigs={sanityConfigs}>
+      <SanityApp sanityConfigs={sanityConfigs} fallback={<div>Loading...</div>}>
         {/* add your own components here! */}
         <ExampleComponent />
       </SanityApp>

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

@@ -3,14 +3,14 @@ import path from 'node:path'
 
 import {describe, expect} from 'vitest'
 
-import {determineCoreAppTemplate} from '../src/actions/init-project/determineCoreAppTemplate'
+import {determineAppTemplate} from '../src/actions/init-project/determineAppTemplate'
 import templates from '../src/actions/init-project/templates'
 import {describeCliTest, testConcurrent} from './shared/describe'
 import {baseTestPath, cliProjectId, getTestRunArgs, runSanityCmdCommand} from './shared/environment'
 
 describeCliTest('CLI: `sanity init v3`', () => {
   // filter out non-studio apps for now, until we add things they can auto-update
-  describe.each(Object.keys(templates).filter((template) => !determineCoreAppTemplate(template)))(
+  describe.each(Object.keys(templates).filter((template) => !determineAppTemplate(template)))(
     'for template %s',
     (template) => {
       testConcurrent('adds autoUpdates: true to cli config', async () => {