@sanity/cli 3.86.1 → 3.87.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.86.1",
+  "version": "3.87.0",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -58,12 +58,12 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.23.5",
-    "@sanity/client": "^6.29.0",
-    "@sanity/codegen": "3.86.1",
+    "@sanity/client": "^6.29.1",
+    "@sanity/codegen": "3.87.0",
     "@sanity/runtime-cli": "^3.0.0",
     "@sanity/telemetry": "^0.8.0",
     "@sanity/template-validator": "^2.4.3",
-    "@sanity/util": "3.86.1",
+    "@sanity/util": "3.87.0",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -77,13 +77,13 @@
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
-    "@repo/package.config": "0.0.0",
-    "@repo/test-config": "0.0.0",
+    "@repo/package.config": "3.87.0",
+    "@repo/test-config": "3.87.0",
     "@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.86.1",
+    "@sanity/types": "3.87.0",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -135,5 +135,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "9b19a1ca740b0a62231d80d6e9daaa8651478d39"
+  "gitHead": "97c3b32940f2324a9f0fc25097c33f1813374644"
 }

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

@@ -290,6 +290,8 @@ export default async function initSanity(
     print('')
   }
 
+  const isNextJs = detectedFramework?.slug === 'nextjs'
+
   const flags = await prepareFlags()
 
   // We're authenticated, now lets select or create a project (for studios) or org (for core apps)
@@ -313,14 +315,16 @@ export default async function initSanity(
   }
 
   let initNext = false
-  const isNextJs = detectedFramework?.slug === 'nextjs'
   if (isNextJs) {
-    initNext = await prompt.single({
-      type: 'confirm',
-      message:
-        'Would you like to add configuration files for a Sanity project in this Next.js folder?',
-      default: true,
-    })
+    initNext =
+      unattended ||
+      (await prompt.single({
+        type: 'confirm',
+        message:
+          'Would you like to add configuration files for a Sanity project in this Next.js folder?',
+        default: true,
+      }))
+
     trace.log({
       step: 'useDetectedFramework',
       selectedOption: initNext ? 'yes' : 'no',
@@ -750,9 +754,15 @@ export default async function initSanity(
 
     if (isAppTemplate) {
       const client = apiClient({requireUser: true, requireProject: false})
-      const organizations = await client.request({uri: '/organizations'})
+      const organizations = await client.request({
+        uri: '/organizations',
+        query: {
+          includeMembers: 'true',
+          includeImplicitMemberships: 'true',
+        },
+      })
 
-      const appOrganizationId = await getOrganizationId(organizations)
+      const appOrganizationId = await getOrganizationIdForAppTemplate(organizations)
 
       return {
         projectId: '',
@@ -1223,12 +1233,15 @@ export default async function initSanity(
 
     if (unattended) {
       debug('Unattended mode, validating required options')
-      const requiredForUnattended = ['dataset', 'output-path'] as const
-      requiredForUnattended.forEach((flag) => {
-        if (!cliFlags[flag]) {
-          throw new Error(`\`--${flag}\` must be specified in unattended mode`)
-        }
-      })
+
+      if (!cliFlags['dataset' as const]) {
+        throw new Error(`\`--dataset\` must be specified in unattended mode`)
+      }
+
+      // output-path is not used in unattended mode within nextjs
+      if (!isNextJs && !cliFlags['output-path' as const]) {
+        throw new Error(`\`--output-path\` must be specified in unattended mode`)
+      }
 
       if (!cliFlags.project && !createProjectName) {
         throw new Error(
@@ -1300,6 +1313,38 @@ export default async function initSanity(
     return organization
   }
 
+  async function getOrganizationIdForAppTemplate(organizations: ProjectOrganization[]) {
+    // If the user is using an app template, we don't need to check for attach access
+    const organizationChoices = [
+      ...organizations.map((organization) => ({
+        value: organization.id,
+        name: `${organization.name} [${organization.id}]`,
+      })),
+      new prompt.Separator(),
+      {value: '-new-', name: 'Create new organization'},
+      new prompt.Separator(),
+    ]
+
+    // If the user only has a single organization, we'll default to that one.
+    const defaultOrganizationId =
+      organizations.length === 1
+        ? organizations[0].id
+        : organizations.find((org) => org.name === user?.name)?.id
+
+    const chosenOrg = await prompt.single({
+      message: 'Select organization:',
+      type: 'list',
+      default: defaultOrganizationId || undefined,
+      choices: organizationChoices,
+    })
+
+    if (chosenOrg === '-new-') {
+      return createOrganization().then((org) => org.id)
+    }
+
+    return chosenOrg || undefined
+  }
+
   async function getOrganizationId(organizations: ProjectOrganization[]) {
     // In unattended mode, if the user hasn't specified an organization, sending null as
     // organization ID to the API will create a new organization for the user with their

package/src/cli.ts

@@ -56,9 +56,6 @@ export async function runCli(cliRoot: string, {cliVersion}: {cliVersion: string}
     process.exit(1)
   }
 
-  loadAndSetEnvFromDotEnvFiles({workDir, cmd: args.groupOrCommand})
-  maybeFixMissingWindowsEnvVar()
-
   // Check if there are updates available for the CLI, and notify if there is
   await runUpdateCheck({pkg, cwd, workDir}).notify()
 
@@ -67,11 +64,20 @@ export async function runCli(cliRoot: string, {cliVersion}: {cliVersion: string}
 
   // Try to figure out if we're in a v2 or v3 context by finding a config
   debug(`Reading CLI config from "${workDir}"`)
-  const cliConfig = await getCliConfig(workDir, {forked: true})
+  let cliConfig = await getCliConfig(workDir, {forked: true})
   if (!cliConfig) {
     debug('No CLI config found')
   }
 
+  // Figure out if the app is a studio or an app from the CLI config
+  const isApp = Boolean(cliConfig && 'app' in cliConfig)
+  // Load the environment variables from
+  loadAndSetEnvFromDotEnvFiles({workDir, cmd: args.groupOrCommand, isApp})
+  maybeFixMissingWindowsEnvVar()
+
+  // Reload the the cli config so env vars can work.
+  cliConfig = await getCliConfig(workDir, {forked: true})
+
   const {logger: telemetry, flush: flushTelemetry} = createTelemetryStore<TelemetryUserProperties>({
     projectId: cliConfig?.config?.api?.projectId,
     env: process.env,
@@ -274,7 +280,15 @@ function warnOnNonProductionEnvironment(): void {
   )
 }
 
-function loadAndSetEnvFromDotEnvFiles({workDir, cmd}: {workDir: string; cmd: string}) {
+function loadAndSetEnvFromDotEnvFiles({
+  workDir,
+  cmd,
+  isApp,
+}: {
+  workDir: string
+  cmd: string
+  isApp: boolean
+}) {
   /* eslint-disable no-process-env */
 
   // Do a cheap lookup for a sanity.json file. If there is one, assume it is a v2 project,
@@ -309,7 +323,7 @@ function loadAndSetEnvFromDotEnvFiles({workDir, cmd}: {workDir: string; cmd: str
 
   debug('Loading environment files using %s mode', mode)
 
-  const studioEnv = loadEnv(mode, workDir, ['SANITY_STUDIO_'])
+  const studioEnv = loadEnv(mode, workDir, [isApp ? 'SANITY_APP_' : 'SANITY_STUDIO_'])
   process.env = {...process.env, ...studioEnv}
   /* eslint-disable no-process-env */
 }

package/templates/app-sanity-ui/src/App.tsx

@@ -24,13 +24,13 @@ export function App() {
   }
 
   return (
-    <SanityApp config={sanityConfigs} fallback={<Loading />}>
-      <ThemeProvider theme={theme}>
+    <ThemeProvider theme={theme}>
+      <SanityApp config={sanityConfigs} fallback={<Loading />}>
         {/* add your own components here! */}
         <ExampleComponent />
-      </ThemeProvider>
-    </SanityApp>
-  )
+      </SanityApp>
+    </ThemeProvider>
+  );
 }
 
 export default App