@sanity/cli 3.75.0 → 3.75.1-canary.151

package/lib/_chunks-cjs/cli.js

@@ -46584,7 +46584,8 @@ import {defineCliConfig} from 'sanity/cli'
 
 export default defineCliConfig({
   __experimental_coreAppConfiguration: {
-    appLocation: '%appLocation%'
+    organizationId: '%organizationId%',
+    appLocation: '%appLocation%',
   },
 })
 `;
@@ -47008,7 +47009,10 @@ async function bootstrapLocalTemplate(opts, context) {
   }), studioConfig = createStudioConfig({
     template: template.configTemplate,
     variables
-  }), cliConfig = isCoreAppTemplate ? createCoreAppCliConfig({ appLocation: template.appLocation }) : createCliConfig({
+  }), cliConfig = isCoreAppTemplate ? createCoreAppCliConfig({
+    appLocation: template.appLocation,
+    organizationId: variables.organizationId
+  }) : createCliConfig({
     projectId: variables.projectId,
     dataset: variables.dataset,
     autoUpdates: variables.autoUpdates
@@ -47048,7 +47052,7 @@ const portMap = {
   blitzjs: 3e3,
   gatsby: 8e3,
   remix: 3e3,
-  astro: 3e3,
+  astro: 4321,
   hexo: 4e3,
   eleventy: 8080,
   docusaurus: 3e3,
@@ -52642,9 +52646,10 @@ ${err.message}`);
     const user = await getUserData(apiClient);
     success("You are logged in as %s using %s", user.email, getProviderName(user.provider));
   } else unattended || (trace.log({ step: "login" }), await getOrCreateUser());
+  const isCoreAppTemplate = cliFlags.template ? determineCoreAppTemplate(cliFlags.template) : !1;
   let introMessage = "Fetching existing projects";
-  cliFlags.quickstart && (introMessage = "Eject your existing project's Sanity configuration"), success(introMessage), print("");
-  const flags = await prepareFlags(), isCoreAppTemplate = cliFlags.template ? determineCoreAppTemplate(cliFlags.template) : !1, { projectId, displayName, isFirstProject, datasetName, schemaUrl } = await getProjectDetails(), sluggedName = lodashExports.deburr(displayName.toLowerCase()).replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
+  cliFlags.quickstart && (introMessage = "Eject your existing project's Sanity configuration"), isCoreAppTemplate || (success(introMessage), print(""));
+  const flags = await prepareFlags(), { projectId, displayName, isFirstProject, datasetName, schemaUrl, organizationId } = await getProjectDetails(), sluggedName = lodashExports.deburr(displayName.toLowerCase()).replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
   if (bareOutput) {
     success("Below are your project details"), print(""), print(`Project ID: ${chalk2.cyan(projectId)}`), print(`Dataset: ${chalk2.cyan(datasetName)}`), print(
       `
@@ -52867,13 +52872,16 @@ ${chalk2.green("Success!")} Now, use these commands to continue:
         isFirstProject: data.isFirstProject
       }), data;
     }
-    if (isCoreAppTemplate)
+    if (isCoreAppTemplate) {
+      const organizations = await apiClient({ requireUser: !0, requireProject: !1 }).request({ uri: "/organizations" });
       return {
         projectId: "",
         displayName: "",
+        datasetName: "",
         isFirstProject: !1,
-        datasetName: ""
+        organizationId: await getOrganizationId(organizations)
       };
+    }
     loadEnv.debug("Prompting user to select or create a project");
     const project = await getOrCreateProject();
     loadEnv.debug(`Project with name ${project.displayName} selected`), loadEnv.debug("Prompting user to select or create a dataset");
@@ -53090,7 +53098,8 @@ The default dataset configuration has a public dataset named "production".`;
       autoUpdates,
       dataset: datasetName,
       projectId,
-      projectName: displayName || answers.projectName
+      projectName: displayName || answers.projectName,
+      organizationId
     };
     return remoteTemplateInfo ? bootstrapRemoteTemplate(
       {
@@ -53176,10 +53185,10 @@ The default dataset configuration has a public dataset named "production".`;
     return cliFlags;
   }
   async function getOrganizationId(organizations) {
-    let organizationId = flags.organization;
+    let orgId = flags.organization;
     if (unattended)
-      return organizationId || void 0;
-    if (organizations.length > 0 && !organizationId) {
+      return orgId || void 0;
+    if (organizations.length > 0 && !orgId) {
       loadEnv.debug(`User has ${organizations.length} organization(s), checking attach access`);
       const withGrant = await getOrganizationsWithAttachGrant(organizations);
       if (withGrant.length === 0) {
@@ -53195,17 +53204,17 @@ The default dataset configuration has a public dataset named "production".`;
           name: `${organization.name} [${organization.id}]`
         }))
       ], chosenOrg = await prompt2.single({
-        message: "Select organization to attach project to",
+        message: `Select organization to attach ${isCoreAppTemplate ? "application" : "project"} to`,
         type: "list",
         choices: organizationChoices
       });
-      chosenOrg && chosenOrg !== "none" && (organizationId = chosenOrg);
-    } else organizationId ? loadEnv.debug("User has defined organization flag explicitly (%s)", organizationId) : organizations.length === 0 && loadEnv.debug("User has no organizations, skipping selection prompt");
-    return organizationId || void 0;
+      chosenOrg && chosenOrg !== "none" && (orgId = chosenOrg);
+    } else orgId ? loadEnv.debug("User has defined organization flag explicitly (%s)", orgId) : organizations.length === 0 && loadEnv.debug("User has no organizations, skipping selection prompt");
+    return orgId || void 0;
   }
-  async function hasProjectAttachGrant(organizationId) {
+  async function hasProjectAttachGrant(orgId) {
     const requiredGrantGroup = "sanity.organization.projects", requiredGrant = "attach";
-    return ((await apiClient({ requireProject: !1, requireUser: !0 }).clone().config({ apiVersion: "v2021-06-07" }).request({ uri: `organizations/${organizationId}/grants` }))[requiredGrantGroup] || []).some(
+    return ((await apiClient({ requireProject: !1, requireUser: !0 }).clone().config({ apiVersion: "v2021-06-07" }).request({ uri: `organizations/${orgId}/grants` }))[requiredGrantGroup] || []).some(
       (resource) => resource.grants && resource.grants.some((grant) => grant.name === requiredGrant)
     );
   }
@@ -78648,14 +78657,14 @@ function installProcessExitHack(finalTask) {
 }
 async function runCli(cliRoot, { cliVersion }) {
   installUnhandledRejectionsHandler();
-  const pkg = { name: "@sanity/cli", version: cliVersion }, args = parseArguments(), isInit = args.groupOrCommand === "init" && args.argsWithoutOptions[0] !== "plugin", cwd = getCurrentWorkingDirectory();
+  const pkg = { name: "@sanity/cli", version: cliVersion }, args = parseArguments(), isInit = args.groupOrCommand === "init" && args.argsWithoutOptions[0] !== "plugin", isCoreApp = args.groupOrCommand === "app", cwd = getCurrentWorkingDirectory();
   let workDir;
   try {
-    workDir = isInit ? process.cwd() : loadEnv.resolveRootDir(cwd);
+    workDir = isInit ? process.cwd() : loadEnv.resolveRootDir(cwd, isCoreApp);
   } catch (err) {
     console.error(chalk__default.default.red(err.message)), process.exit(1);
   }
-  loadAndSetEnvFromDotEnvFiles({ workDir, cmd: args.groupOrCommand }), maybeFixMissingWindowsEnvVar(), await runUpdateCheck({ pkg, cwd, workDir }).notify(), telemetryDisclosure(), loadEnv.debug(`Reading CLI config from "${workDir}"`);
+  loadAndSetEnvFromDotEnvFiles({ workDir, cmd: args.groupOrCommand, isCoreApp }), maybeFixMissingWindowsEnvVar(), await runUpdateCheck({ pkg, cwd, workDir }).notify(), telemetryDisclosure(), loadEnv.debug(`Reading CLI config from "${workDir}"`);
   const cliConfig = await getCliConfig.getCliConfig(workDir, { forked: !0 });
   cliConfig || loadEnv.debug("No CLI config found");
   const { logger: telemetry2, flush: flushTelemetry } = createTelemetryStore({
@@ -78681,7 +78690,8 @@ async function runCli(cliRoot, { cliVersion }) {
     workDir,
     corePath: await getCoreModulePath(workDir, cliConfig),
     cliConfig,
-    telemetry: telemetry2
+    telemetry: telemetry2,
+    isCoreApp
   };
   warnOnNonProductionEnvironment(), warnOnInferredProjectDir(isInit, cwd, workDir);
   const core2 = args.coreOptions, commands = await mergeCommands(baseCommands, options2.corePath, { cliVersion });
@@ -78781,7 +78791,11 @@ function warnOnNonProductionEnvironment() {
     )
   );
 }
-function loadAndSetEnvFromDotEnvFiles({ workDir, cmd }) {
+function loadAndSetEnvFromDotEnvFiles({
+  workDir,
+  cmd,
+  isCoreApp
+}) {
   if (fs$1.existsSync(path__default.default.join(workDir, "sanity.json"))) {
     loadEnv.debug("sanity.json exists, assuming v2 project and loading .env files using old behavior");
     const env = process.env.SANITY_ACTIVE_ENV || process.env.NODE_ENV || "development";
@@ -78793,7 +78807,7 @@ function loadAndSetEnvFromDotEnvFiles({ workDir, cmd }) {
   let mode2 = process.env.SANITY_ACTIVE_ENV;
   !mode2 && (isProdCmd || process.env.NODE_ENV === "production") ? mode2 = "production" : mode2 || (mode2 = "development"), mode2 === "production" && !isProdCmd && console.warn(chalk__default.default.yellow(`[WARN] Running in ${sanityEnv} environment mode
 `)), loadEnv.debug("Loading environment files using %s mode", mode2);
-  const studioEnv = loadEnv.loadEnv(mode2, workDir, ["SANITY_STUDIO_"]);
+  const studioEnv = loadEnv.loadEnv(mode2, workDir, isCoreApp ? ["VITE_"] : ["SANITY_STUDIO_"]);
   process.env = { ...process.env, ...studioEnv };
 }
 function maybeFixMissingWindowsEnvVar() {