@sanity/cli 3.57.1 → 3.57.2-manifests.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.57.1",
+  "version": "3.57.2-manifests.67+0246fa6e86",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -57,10 +57,10 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.23.5",
-    "@sanity/client": "^6.21.2",
-    "@sanity/codegen": "3.57.1",
+    "@sanity/client": "^6.21.3",
+    "@sanity/codegen": "3.57.2-manifests.67+0246fa6e86",
     "@sanity/telemetry": "^0.7.7",
-    "@sanity/util": "3.57.1",
+    "@sanity/util": "3.57.2-manifests.67+0246fa6e86",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -77,12 +77,12 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@repo/package.config": "3.57.1",
+    "@repo/package.config": "3.57.4",
     "@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.57.1",
+    "@sanity/types": "3.57.2-manifests.67+0246fa6e86",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -135,5 +135,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "22e2cfbed46c449541bd1ce0e9a7320071583ca2"
+  "gitHead": "0246fa6e86d13669d16c487d1667baf36981ed98"
 }

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

@@ -127,6 +127,7 @@ export async function bootstrapTemplate(
   const cliConfig = await createCliConfig({
     projectId: variables.projectId,
     dataset: variables.dataset,
+    autoUpdates: variables.autoUpdates,
   })
 
   // Write non-template files to disc

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

@@ -9,19 +9,26 @@ export default defineCliConfig({
   api: {
     projectId: '%projectId%',
     dataset: '%dataset%'
-  }
+  },
+  /**
+   * Enable auto-updates for studios.
+   * Learn more at https://www.sanity.io/docs/cli#auto-updates
+   */
+  autoUpdates: __BOOL__autoUpdates__,
 })
 `
 
 export interface GenerateCliConfigOptions {
   projectId: string
   dataset: string
+  autoUpdates: boolean
 }
 
 export function createCliConfig(options: GenerateCliConfigOptions): string {
   const variables = options
   const template = defaultTemplate.trimStart()
   const ast = parse(template, {parser})
+
   traverse(ast, {
     StringLiteral: {
       enter({node}) {
@@ -29,13 +36,35 @@ export function createCliConfig(options: GenerateCliConfigOptions): string {
         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`)
         }
-
-        node.value = variables[variableName] || ''
+        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})
       },
     },
   })

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

@@ -34,6 +34,7 @@ export interface GenerateConfigOptions {
   variables: {
     projectId: string
     dataset: string
+    autoUpdates: boolean
     projectName?: string
     sourceName?: string
     sourceTitle?: string
@@ -60,8 +61,12 @@ export function createStudioConfig(options: GenerateConfigOptions): string {
         if (!(variableName in variables)) {
           throw new Error(`Template variable '${value}' not defined`)
         }
-
-        node.value = variables[variableName] || ''
+        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 : ''
       },
     },
   })

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

@@ -240,7 +240,11 @@ export default async function initSanity(
     throw new Error('`--reconfigure` is deprecated - manual configuration is now required')
   }
 
-  const envFilename = typeof env === 'string' ? env : '.env'
+  let envFilenameDefault = '.env'
+  if (detectedFramework && detectedFramework.slug === 'nextjs') {
+    envFilenameDefault = '.env.local'
+  }
+  const envFilename = typeof env === 'string' ? env : envFilenameDefault
   if (!envFilename.startsWith('.env')) {
     throw new Error(`Env filename must start with .env`)
   }
@@ -433,10 +437,39 @@ export default async function initSanity(
     const appendEnv = unattended ? true : await promptForAppendEnv(prompt, envFilename)
 
     if (appendEnv) {
-      await createOrAppendEnvVars(envFilename, detectedFramework, {
-        log: true,
+      await createOrAppendEnvVars(envFilename, detectedFramework, {log: true})
+    }
+
+    if (embeddedStudio) {
+      const nextjsLocalDevOrigin = 'http://localhost:3000'
+      const existingCorsOrigins = await apiClient({api: {projectId}}).request({
+        method: 'GET',
+        uri: '/cors',
       })
+      const hasExistingCorsOrigin = existingCorsOrigins.some(
+        (item: {origin: string}) => item.origin === nextjsLocalDevOrigin,
+      )
+      if (!hasExistingCorsOrigin) {
+        await apiClient({api: {projectId}})
+          .request({
+            method: 'POST',
+            url: '/cors',
+            body: {origin: nextjsLocalDevOrigin, allowCredentials: true},
+            maxRedirects: 0,
+          })
+          .then((res) => {
+            print(
+              res.id
+                ? `Added ${nextjsLocalDevOrigin} to CORS origins`
+                : `Failed to add ${nextjsLocalDevOrigin} to CORS origins`,
+            )
+          })
+          .catch((error) => {
+            print(`Failed to add ${nextjsLocalDevOrigin} to CORS origins`, error)
+          })
+      }
     }
+
     const {chosen} = await getPackageManagerChoice(workDir, {interactive: false})
     trace.log({step: 'selectPackageManager', selectedOption: chosen})
     const packages = ['@sanity/vision@3', 'sanity@3', '@sanity/image-url@1', 'styled-components@6']
@@ -534,6 +567,12 @@ export default async function initSanity(
     trace.log({step: 'useTypeScript', selectedOption: useTypeScript ? 'yes' : 'no'})
   }
 
+  // we enable auto-updates by default, but allow users to specify otherwise
+  let autoUpdates = true
+  if (typeof cliFlags['auto-updates'] === 'boolean') {
+    autoUpdates = cliFlags['auto-updates']
+  }
+
   // Build a full set of resolved options
   const templateOptions: BootstrapOptions = {
     outputPath,
@@ -542,6 +581,7 @@ export default async function initSanity(
     schemaUrl,
     useTypeScript,
     variables: {
+      autoUpdates,
       dataset: datasetName,
       projectId,
       projectName: displayName || answers.projectName,

package/src/commands/init/initCommand.ts

@@ -27,6 +27,7 @@ Options
   --coupon <name> Optionally select a coupon for a new project (cannot be used with --project-plan)
   --no-typescript Do not use TypeScript for template files
   --package-manager <name> Specify which package manager to use [allowed: ${allowedPackageManagersString}]
+  --no-auto-updates Disable auto updates of studio versions
 
 Examples
   # Initialize a new project, prompt for required information along the way
@@ -60,6 +61,7 @@ export interface InitFlags {
 
   'visibility'?: string
   'typescript'?: boolean
+  'auto-updates'?: boolean
   /**
    * Used for initializing a project from a server schema that is saved in the Journey API
    * Overrides `project` option.

package/src/util/noSuchCommandText.ts

@@ -18,6 +18,7 @@ const coreCommands = [
   'graphql',
   'hook',
   'migration',
+  'manifest',
   'preview',
   'schema',
   'start',