@sanity/cli 3.70.1-export-comments.10 → 3.70.1-export-comments.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.70.1-export-comments.10+5e41abcc4d",
+  "version": "3.70.1-export-comments.43+6788f5af58",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -57,11 +57,11 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.23.5",
-    "@sanity/client": "^6.24.3",
-    "@sanity/codegen": "3.70.1-export-comments.10+5e41abcc4d",
+    "@sanity/client": "^6.25.0",
+    "@sanity/codegen": "3.70.1-export-comments.43+6788f5af58",
     "@sanity/telemetry": "^0.7.7",
     "@sanity/template-validator": "^2.3.2",
-    "@sanity/util": "3.70.1-export-comments.10+5e41abcc4d",
+    "@sanity/util": "3.70.1-export-comments.43+6788f5af58",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -81,7 +81,7 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.70.1-export-comments.10+5e41abcc4d",
+    "@sanity/types": "3.70.1-export-comments.43+6788f5af58",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -125,7 +125,7 @@
     "semver": "^7.3.5",
     "semver-compare": "^1.0.0",
     "tar": "^6.1.11",
-    "vite": "^5.4.11",
+    "vite": "^6.0.7",
     "vitest": "^2.1.8",
     "which": "^2.0.2",
     "xdg-basedir": "^4.0.0"
@@ -133,5 +133,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "5e41abcc4d6faada027294f4f26032b2e8bce85e"
+  "gitHead": "6788f5af58847b7a108d0597676df494a706826c"
 }

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

@@ -10,9 +10,9 @@ import {type CliCommandContext} from '../../types'
 import {getDefaultPortForFramework} from '../../util/frameworkPort'
 import {
   applyEnvVariables,
-  checkNeedsReadToken,
+  checkIfNeedsApiToken,
   downloadAndExtractRepo,
-  generateSanityApiReadToken,
+  generateSanityApiToken,
   getGitHubRawContentUrl,
   type RepoInfo,
   setCorsOrigin,
@@ -32,6 +32,7 @@ export interface BootstrapRemoteOptions {
 
 const SANITY_DEFAULT_PORT = 3333
 const READ_TOKEN_LABEL = 'Live Preview API'
+const WRITE_TOKEN_LABEL = 'App Write Token'
 const INITIAL_COMMIT_MESSAGE = 'Initial commit from Sanity CLI'
 
 export async function bootstrapRemoteTemplate(
@@ -65,12 +66,18 @@ export async function bootstrapRemoteTemplate(
 
   debug('Checking if template needs read token')
   const needsReadToken = await Promise.all(
-    (packages ?? ['']).map((pkg) => checkNeedsReadToken(join(outputPath, pkg))),
+    (packages ?? ['']).map((pkg) => checkIfNeedsApiToken(join(outputPath, pkg), 'read')),
+  ).then((results) => results.some(Boolean))
+  const needsWriteToken = await Promise.all(
+    (packages ?? ['']).map((pkg) => checkIfNeedsApiToken(join(outputPath, pkg), 'write')),
   ).then((results) => results.some(Boolean))
 
   debug('Applying environment variables')
   const readToken = needsReadToken
-    ? await generateSanityApiReadToken(READ_TOKEN_LABEL, variables.projectId, apiClient)
+    ? await generateSanityApiToken(READ_TOKEN_LABEL, 'read', variables.projectId, apiClient)
+    : undefined
+  const writeToken = needsWriteToken
+    ? await generateSanityApiToken(WRITE_TOKEN_LABEL, 'write', variables.projectId, apiClient)
     : undefined
 
   for (const pkg of packages ?? ['']) {
@@ -106,7 +113,6 @@ export async function bootstrapRemoteTemplate(
   if (corsAdded.length) {
     output.success(`CORS origins added (${corsAdded.map((p) => `localhost:${p}`).join(', ')})`)
   }
-  if (readToken) {
-    output.success(`API token generated (${READ_TOKEN_LABEL})`)
-  }
+  if (readToken) output.success(`API token generated (${READ_TOKEN_LABEL})`)
+  if (writeToken) output.success(`API token generated (${WRITE_TOKEN_LABEL})`)
 }

package/src/util/remoteTemplate.ts

@@ -18,12 +18,17 @@ const DISALLOWED_PATHS = [
 const ENV_VAR = {
   ...REQUIRED_ENV_VAR,
   READ_TOKEN: 'SANITY_API_READ_TOKEN',
+  WRITE_TOKEN: 'SANITY_API_WRITE_TOKEN',
 } as const
 
+const API_READ_TOKEN_ROLE = 'viewer'
+const API_WRITE_TOKEN_ROLE = 'editor'
+
 type EnvData = {
   projectId: string
   dataset: string
   readToken?: string
+  writeToken?: string
 }
 
 type GithubUrlString =
@@ -191,7 +196,7 @@ export async function downloadAndExtractRepo(
   )
 }
 
-export async function checkNeedsReadToken(root: string): Promise<boolean> {
+export async function checkIfNeedsApiToken(root: string, type: 'read' | 'write'): Promise<boolean> {
   try {
     const templatePath = await Promise.any(
       ENV_TEMPLATE_FILES.map(async (file) => {
@@ -199,9 +204,8 @@ export async function checkNeedsReadToken(root: string): Promise<boolean> {
         return file
       }),
     )
-
     const templateContent = await readFile(join(root, templatePath), 'utf8')
-    return templateContent.includes(ENV_VAR.READ_TOKEN)
+    return templateContent.includes(type === 'read' ? ENV_VAR.READ_TOKEN : ENV_VAR.WRITE_TOKEN)
   } catch {
     return false
   }
@@ -278,8 +282,9 @@ export async function tryApplyPackageName(root: string, name: string): Promise<v
   }
 }
 
-export async function generateSanityApiReadToken(
+export async function generateSanityApiToken(
   label: string,
+  type: 'read' | 'write',
   projectId: string,
   apiClient: CliApiClient,
 ): Promise<string> {
@@ -289,8 +294,8 @@ export async function generateSanityApiReadToken(
       uri: `/projects/${projectId}/tokens`,
       method: 'POST',
       body: {
-        label: `${label} (${Date.now()})`, // Add timestamp to ensure uniqueness
-        roleName: 'viewer',
+        label: `${label} (${Date.now()})`,
+        roleName: type === 'read' ? API_READ_TOKEN_ROLE : API_WRITE_TOKEN_ROLE,
       },
     })
   return response.key