@sanity/cli 3.91.1-next.23.8af6f8d288 → 3.91.1-next.24.3717582803

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.91.1-next.23.8af6f8d288",
+  "version": "3.91.1-next.24.3717582803",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -59,11 +59,11 @@
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/client": "^7.4.1",
-    "@sanity/codegen": "3.91.1-next.23.8af6f8d288",
+    "@sanity/codegen": "3.91.1-next.24.3717582803",
     "@sanity/runtime-cli": "^7.6.5",
     "@sanity/telemetry": "^0.8.0",
     "@sanity/template-validator": "^2.4.3",
-    "@sanity/util": "3.91.1-next.23.8af6f8d288",
+    "@sanity/util": "3.91.1-next.24.3717582803",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -83,7 +83,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.91.1-next.23.8af6f8d288",
+    "@sanity/types": "3.91.1-next.24.3717582803",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -135,5 +135,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "8af6f8d288d3ddc1d9a60f4b1430a33e48b18fdb"
+  "gitHead": "37175828033f8c6a7e3302fa5e39d8a19b35c11a"
 }

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

@@ -888,7 +888,7 @@ export default async function initSanity(
 
       return createProject(apiClient, {
         displayName: projectName,
-        organizationId: await getOrganizationId(organizations),
+        organizationId: cliFlags.organization || (await getOrganizationId(organizations)),
         subscription: selectedPlan ? {planId: selectedPlan} : undefined,
         metadata: {coupon: intendedCoupon},
       }).then((response) => ({
@@ -924,7 +924,7 @@ export default async function initSanity(
           message: 'Your project name:',
           default: 'My Sanity Project',
         }),
-        organizationId: await getOrganizationId(organizations),
+        organizationId: cliFlags.organization || (await getOrganizationId(organizations)),
         subscription: selectedPlan ? {planId: selectedPlan} : undefined,
         metadata: {coupon: intendedCoupon},
       }).then((response) => ({
@@ -1237,13 +1237,29 @@ export default async function initSanity(
           '`--project <id>` or `--create-project <name>` must be specified in unattended mode',
         )
       }
+
+      if (createProjectName && !cliFlags.organization) {
+        throw new Error(
+          '--create-project is not supported in unattended mode without an organization, please specify an organization with `--organization <id>`',
+        )
+      }
     }
 
     if (createProjectName) {
       debug('--create-project specified, creating a new project')
+
+      let orgForCreateProjectFlag = cliFlags.organization
+      if (!orgForCreateProjectFlag) {
+        debug('no organization specified, selecting one')
+        const client = apiClient({requireUser: true, requireProject: false})
+        const organizations = await client.request({uri: '/organizations'})
+        orgForCreateProjectFlag = await getOrganizationId(organizations)
+      }
+
+      debug('creating a new project')
       const createdProject = await createProject(apiClient, {
         displayName: createProjectName.trim(),
-        organizationId: cliFlags.organization || undefined,
+        organizationId: orgForCreateProjectFlag,
         subscription: selectedPlan ? {planId: selectedPlan} : undefined,
         metadata: {coupon: intendedCoupon},
       })
@@ -1335,13 +1351,6 @@ export default async function initSanity(
   }
 
   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
-    // user name. If they _have_ specified an organization, we'll use that.
-    if (unattended || flags.organization) {
-      return flags.organization || undefined
-    }
-
     // If the user has no organizations, prompt them to create one with the same name as
     // their user, but allow them to customize it if they want
     if (organizations.length === 0) {