@sanity/cli 6.0.0-alpha.8 → 6.0.0

package/dist/actions/deploy/deployStudioSchemasAndManifests.worker.js

@@ -0,0 +1,120 @@
+import { isMainThread, parentPort, workerData } from 'node:worker_threads';
+import { getStudioWorkspaces, subdebug } from '@sanity/cli-core';
+import { extractWorkspaceManifest } from '../manifest/extractWorkspaceManifest.js';
+import { writeManifestFile } from '../manifest/writeManifestFile.js';
+import { updateWorkspacesSchemas } from '../schema/updateWorkspaceSchema.js';
+import { uploadSchemaToLexicon } from '../schema/uploadSchemaToLexicon.js';
+import { extractValidationFromSchemaError } from '../schema/utils/extractValidationFromSchemaError.js';
+import { deployStudioSchemasAndManifestsWorkerData } from './types.js';
+const debug = subdebug('deployStudioSchemasAndManifests.worker');
+async function main() {
+    if (isMainThread || !parentPort) {
+        throw new Error('Should only be run in a worker!');
+    }
+    const { configPath, isExternal, outPath, projectId, schemaRequired, verbose, workDir } = deployStudioSchemasAndManifestsWorkerData.parse(workerData);
+    try {
+        debug('Deploying studio schemas and manifests from config path %s', configPath);
+        const workspaces = await getStudioWorkspaces(configPath);
+        debug('Workspaces %o', workspaces);
+        if (workspaces.length === 0) {
+            throw new Error('No workspaces found');
+        }
+        debug('Handling deployment for %s', isExternal ? 'external' : 'internal');
+        let studioManifest = null;
+        if (isExternal) {
+            ;
+            [studioManifest] = await handleExternalDeployment({
+                projectId,
+                schemaRequired,
+                verbose,
+                workDir,
+                workspaces
+            });
+        } else {
+            ;
+            [studioManifest] = await handleInternalDeployment({
+                outPath,
+                projectId,
+                verbose,
+                workDir,
+                workspaces
+            });
+        }
+        parentPort.postMessage({
+            studioManifest,
+            type: 'success'
+        });
+    } catch (error) {
+        debug('Error deploying studio schemas and manifests', error);
+        const validation = await extractValidationFromSchemaError(error, workDir);
+        parentPort.postMessage({
+            error: error instanceof Error ? error.message : String(error),
+            type: 'error',
+            validation
+        });
+    }
+}
+async function writeWorkspaceToDist({ outPath, workDir, workspaces }) {
+    // Get the create manifest workspace
+    const workspaceManifests = await extractWorkspaceManifest(workspaces, workDir);
+    await writeManifestFile({
+        outPath,
+        workDir,
+        workspaceManifests
+    });
+}
+/**
+ * External deployments:
+ * 1. Update the workspace schemas to the /schemas endpoint IF --schema-required is passed
+ * 2. Update server-side schemas
+ */ async function handleExternalDeployment({ projectId, schemaRequired, verbose, workDir, workspaces }) {
+    const [studioManifest] = await Promise.all([
+        uploadSchemaToLexicon({
+            projectId,
+            verbose,
+            workDir,
+            workspaces
+        }),
+        schemaRequired ? updateWorkspacesSchemas({
+            verbose,
+            workspaces
+        }) : undefined
+    ]);
+    return [
+        studioManifest
+    ];
+}
+/**
+ *
+ * Internal deployments:
+ * 1. Write the workspace manifests to the dist directory
+ * 2. Update the workspaces schemas to the /schemas endpoint
+ * 3. Update server-side schemas
+ *
+ * @param workspaces - The workspaces to deploy
+ */ async function handleInternalDeployment({ outPath, projectId, verbose, workDir, workspaces }) {
+    const [studioManifest] = await Promise.all([
+        uploadSchemaToLexicon({
+            projectId,
+            verbose,
+            workDir,
+            workspaces
+        }),
+        writeWorkspaceToDist({
+            outPath,
+            workDir,
+            workspaces
+        }),
+        // Updates the workspaces schemas to /schemas endpoint
+        updateWorkspacesSchemas({
+            verbose,
+            workspaces
+        })
+    ]);
+    return [
+        studioManifest
+    ];
+}
+await main();
+
+//# sourceMappingURL=deployStudioSchemasAndManifests.worker.js.map

package/dist/actions/deploy/deployStudioSchemasAndManifests.worker.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/deploy/deployStudioSchemasAndManifests.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {getStudioWorkspaces, subdebug} from '@sanity/cli-core'\nimport {type StudioManifest, type Workspace} from 'sanity'\n\nimport {extractWorkspaceManifest} from '../manifest/extractWorkspaceManifest.js'\nimport {writeManifestFile} from '../manifest/writeManifestFile.js'\nimport {updateWorkspacesSchemas} from '../schema/updateWorkspaceSchema.js'\nimport {uploadSchemaToLexicon} from '../schema/uploadSchemaToLexicon.js'\nimport {extractValidationFromSchemaError} from '../schema/utils/extractValidationFromSchemaError.js'\nimport {deployStudioSchemasAndManifestsWorkerData} from './types.js'\n\nconst debug = subdebug('deployStudioSchemasAndManifests.worker')\n\nasync function main() {\n  if (isMainThread || !parentPort) {\n    throw new Error('Should only be run in a worker!')\n  }\n\n  const {configPath, isExternal, outPath, projectId, schemaRequired, verbose, workDir} =\n    deployStudioSchemasAndManifestsWorkerData.parse(workerData)\n\n  try {\n    debug('Deploying studio schemas and manifests from config path %s', configPath)\n    const workspaces = await getStudioWorkspaces(configPath)\n    debug('Workspaces %o', workspaces)\n\n    if (workspaces.length === 0) {\n      throw new Error('No workspaces found')\n    }\n\n    debug('Handling deployment for %s', isExternal ? 'external' : 'internal')\n\n    let studioManifest: StudioManifest | null = null\n\n    if (isExternal) {\n      ;[studioManifest] = await handleExternalDeployment({\n        projectId,\n        schemaRequired,\n        verbose,\n        workDir,\n        workspaces,\n      })\n    } else {\n      ;[studioManifest] = await handleInternalDeployment({\n        outPath,\n        projectId,\n        verbose,\n        workDir,\n        workspaces,\n      })\n    }\n\n    parentPort.postMessage({\n      studioManifest,\n      type: 'success',\n    })\n  } catch (error) {\n    debug('Error deploying studio schemas and manifests', error)\n    const validation = await extractValidationFromSchemaError(error, workDir)\n    parentPort.postMessage({\n      error: error instanceof Error ? error.message : String(error),\n      type: 'error',\n      validation,\n    })\n  }\n}\n\nasync function writeWorkspaceToDist({\n  outPath,\n  workDir,\n  workspaces,\n}: {\n  outPath: string\n  workDir: string\n  workspaces: Workspace[]\n}) {\n  // Get the create manifest workspace\n  const workspaceManifests = await extractWorkspaceManifest(workspaces, workDir)\n\n  await writeManifestFile({\n    outPath,\n    workDir,\n    workspaceManifests,\n  })\n}\n\n/**\n * External deployments:\n * 1. Update the workspace schemas to the /schemas endpoint IF --schema-required is passed\n * 2. Update server-side schemas\n */\nasync function handleExternalDeployment({\n  projectId,\n  schemaRequired,\n  verbose,\n  workDir,\n  workspaces,\n}: {\n  projectId: string\n  schemaRequired: boolean\n  verbose: boolean\n  workDir: string\n  workspaces: Workspace[]\n}): Promise<[StudioManifest | null]> {\n  const [studioManifest] = await Promise.all([\n    uploadSchemaToLexicon({\n      projectId,\n      verbose,\n      workDir,\n      workspaces,\n    }),\n    schemaRequired ? updateWorkspacesSchemas({verbose, workspaces}) : undefined,\n  ])\n\n  return [studioManifest]\n}\n\n/**\n *\n * Internal deployments:\n * 1. Write the workspace manifests to the dist directory\n * 2. Update the workspaces schemas to the /schemas endpoint\n * 3. Update server-side schemas\n *\n * @param workspaces - The workspaces to deploy\n */\nasync function handleInternalDeployment({\n  outPath,\n  projectId,\n  verbose,\n  workDir,\n  workspaces,\n}: {\n  outPath: string\n  projectId: string\n  verbose: boolean\n  workDir: string\n  workspaces: Workspace[]\n}): Promise<[StudioManifest | null]> {\n  const [studioManifest] = await Promise.all([\n    uploadSchemaToLexicon({\n      projectId,\n      verbose,\n      workDir,\n      workspaces,\n    }),\n    writeWorkspaceToDist({outPath, workDir, workspaces}),\n    // Updates the workspaces schemas to /schemas endpoint\n    updateWorkspacesSchemas({\n      verbose,\n      workspaces,\n    }),\n  ])\n\n  return [studioManifest]\n}\n\nawait main()\n"],"names":["isMainThread","parentPort","workerData","getStudioWorkspaces","subdebug","extractWorkspaceManifest","writeManifestFile","updateWorkspacesSchemas","uploadSchemaToLexicon","extractValidationFromSchemaError","deployStudioSchemasAndManifestsWorkerData","debug","main","Error","configPath","isExternal","outPath","projectId","schemaRequired","verbose","workDir","parse","workspaces","length","studioManifest","handleExternalDeployment","handleInternalDeployment","postMessage","type","error","validation","message","String","writeWorkspaceToDist","workspaceManifests","Promise","all","undefined"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,mBAAmB,EAAEC,QAAQ,QAAO,mBAAkB;AAG9D,SAAQC,wBAAwB,QAAO,0CAAyC;AAChF,SAAQC,iBAAiB,QAAO,mCAAkC;AAClE,SAAQC,uBAAuB,QAAO,qCAAoC;AAC1E,SAAQC,qBAAqB,QAAO,qCAAoC;AACxE,SAAQC,gCAAgC,QAAO,sDAAqD;AACpG,SAAQC,yCAAyC,QAAO,aAAY;AAEpE,MAAMC,QAAQP,SAAS;AAEvB,eAAeQ;IACb,IAAIZ,gBAAgB,CAACC,YAAY;QAC/B,MAAM,IAAIY,MAAM;IAClB;IAEA,MAAM,EAACC,UAAU,EAAEC,UAAU,EAAEC,OAAO,EAAEC,SAAS,EAAEC,cAAc,EAAEC,OAAO,EAAEC,OAAO,EAAC,GAClFV,0CAA0CW,KAAK,CAACnB;IAElD,IAAI;QACFS,MAAM,8DAA8DG;QACpE,MAAMQ,aAAa,MAAMnB,oBAAoBW;QAC7CH,MAAM,iBAAiBW;QAEvB,IAAIA,WAAWC,MAAM,KAAK,GAAG;YAC3B,MAAM,IAAIV,MAAM;QAClB;QAEAF,MAAM,8BAA8BI,aAAa,aAAa;QAE9D,IAAIS,iBAAwC;QAE5C,IAAIT,YAAY;;YACb,CAACS,eAAe,GAAG,MAAMC,yBAAyB;gBACjDR;gBACAC;gBACAC;gBACAC;gBACAE;YACF;QACF,OAAO;;YACJ,CAACE,eAAe,GAAG,MAAME,yBAAyB;gBACjDV;gBACAC;gBACAE;gBACAC;gBACAE;YACF;QACF;QAEArB,WAAW0B,WAAW,CAAC;YACrBH;YACAI,MAAM;QACR;IACF,EAAE,OAAOC,OAAO;QACdlB,MAAM,gDAAgDkB;QACtD,MAAMC,aAAa,MAAMrB,iCAAiCoB,OAAOT;QACjEnB,WAAW0B,WAAW,CAAC;YACrBE,OAAOA,iBAAiBhB,QAAQgB,MAAME,OAAO,GAAGC,OAAOH;YACvDD,MAAM;YACNE;QACF;IACF;AACF;AAEA,eAAeG,qBAAqB,EAClCjB,OAAO,EACPI,OAAO,EACPE,UAAU,EAKX;IACC,oCAAoC;IACpC,MAAMY,qBAAqB,MAAM7B,yBAAyBiB,YAAYF;IAEtE,MAAMd,kBAAkB;QACtBU;QACAI;QACAc;IACF;AACF;AAEA;;;;CAIC,GACD,eAAeT,yBAAyB,EACtCR,SAAS,EACTC,cAAc,EACdC,OAAO,EACPC,OAAO,EACPE,UAAU,EAOX;IACC,MAAM,CAACE,eAAe,GAAG,MAAMW,QAAQC,GAAG,CAAC;QACzC5B,sBAAsB;YACpBS;YACAE;YACAC;YACAE;QACF;QACAJ,iBAAiBX,wBAAwB;YAACY;YAASG;QAAU,KAAKe;KACnE;IAED,OAAO;QAACb;KAAe;AACzB;AAEA;;;;;;;;CAQC,GACD,eAAeE,yBAAyB,EACtCV,OAAO,EACPC,SAAS,EACTE,OAAO,EACPC,OAAO,EACPE,UAAU,EAOX;IACC,MAAM,CAACE,eAAe,GAAG,MAAMW,QAAQC,GAAG,CAAC;QACzC5B,sBAAsB;YACpBS;YACAE;YACAC;YACAE;QACF;QACAW,qBAAqB;YAACjB;YAASI;YAASE;QAAU;QAClD,sDAAsD;QACtDf,wBAAwB;YACtBY;YACAG;QACF;KACD;IAED,OAAO;QAACE;KAAe;AACzB;AAEA,MAAMZ"}

package/dist/actions/deploy/findUserApplicationForStudio.js

@@ -3,15 +3,17 @@
  */ import { select, Separator, spinner } from '@sanity/cli-core/ux';
 import { createUserApplication, getUserApplication, getUserApplications } from '../../services/userApplications.js';
 import { deployDebug } from './deployDebug.js';
+import { normalizeUrl, validateUrl } from './urlUtils.js';
 export async function findUserApplicationForStudio(options) {
-    const { appHost, appId, output, projectId } = options;
+    const { appHost, appId, output, projectId, urlType = 'internal' } = options;
     const spin = spinner('Checking project info').start();
     const userApplication = await findUserApplication({
         appHost,
         appId,
         output,
         projectId,
-        spin
+        spin,
+        urlType
     });
     spin.succeed();
     if (userApplication) {
@@ -23,10 +25,12 @@ export async function findUserApplicationForStudio(options) {
     // Get existing user applications (if any),
     // based on the configured project ID
     if (projectId) {
-        userApplications = await getUserApplications({
+        const allApps = await getUserApplications({
             appType: 'studio',
             projectId
         });
+        // Filter by urlType so external deploys only see external studios and vice versa
+        userApplications = allApps?.filter((app)=>app.urlType === urlType) ?? [];
     }
     // If no applications are found, return null
     if (!userApplications?.length) {
@@ -34,6 +38,8 @@ export async function findUserApplicationForStudio(options) {
     }
     // If there are user applications, allow the user to select one of the existing host names,
     // or to create a new one
+    const newLabel = urlType === 'external' ? 'Register new external studio URL' : 'Create new studio hostname';
+    const selectMessage = urlType === 'external' ? 'Select existing external studio, or register a new one' : 'Select existing studio hostname, or create a new one';
     const choices = userApplications.map((app)=>({
             name: app.title ?? app.appHost,
             value: app.appHost
@@ -41,13 +47,13 @@ export async function findUserApplicationForStudio(options) {
     const selected = await select({
         choices: [
             {
-                name: 'Create new studio hostname',
+                name: newLabel,
                 value: 'NEW_STUDIO'
             },
             new Separator(),
             ...choices
         ],
-        message: 'Select existing studio hostname, or create a new one'
+        message: selectMessage
     });
     // If the user wants to create a new deployed application, return null
     if (selected === 'NEW_STUDIO') {
@@ -57,7 +63,7 @@ export async function findUserApplicationForStudio(options) {
     return userApplications.find((app)=>app.appHost === selected);
 }
 async function findUserApplication(options) {
-    const { appHost, appId, output, projectId } = options;
+    const { appHost, appId, output, projectId, urlType } = options;
     let { spin } = options;
     let userApplication = null;
     // If the config has an appId, check for apps with that ID
@@ -83,9 +89,21 @@ async function findUserApplication(options) {
     }
     // As a fallback, if studioHost (deprecated) is configured, check for apps with that host
     if (appHost) {
+        // For external URLs, validate and normalize before lookup/creation
+        const resolvedHost = urlType === 'external' ? normalizeUrl(appHost) : appHost;
+        if (urlType === 'external') {
+            const validation = validateUrl(resolvedHost);
+            if (validation !== true) {
+                spin.fail();
+                output.error(validation, {
+                    exit: 1
+                });
+                return null;
+            }
+        }
         try {
             userApplication = await getUserApplication({
-                appHost,
+                appHost: resolvedHost,
                 isSdkApp: false,
                 projectId
             });
@@ -95,16 +113,21 @@ async function findUserApplication(options) {
             }
             // Otherwise, try to create an app with the configured host
             try {
-                output.log('Your project has not been assigned a studio hostname.');
-                output.log(`Creating https://${appHost}.sanity.studio`);
+                if (urlType === 'external') {
+                    output.log('Your project has not been registered with an external studio URL.');
+                    output.log(`Registering ${resolvedHost}`);
+                } else {
+                    output.log('Your project has not been assigned a studio hostname.');
+                    output.log(`Creating https://${resolvedHost}.sanity.studio`);
+                }
                 output.log('');
-                spin = spinner('Creating studio hostname').start();
+                spin = spinner(urlType === 'external' ? 'Registering external studio' : 'Creating studio hostname').start();
                 const response = await createUserApplication({
                     appType: 'studio',
                     body: {
-                        appHost,
+                        appHost: resolvedHost,
                         type: 'studio',
-                        urlType: 'internal'
+                        urlType
                     },
                     projectId
                 });

package/dist/actions/deploy/findUserApplicationForStudio.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/deploy/findUserApplicationForStudio.ts"],"sourcesContent":["/**\n * Helper functions to find a user application for a Sanity studio.\n */\n\nimport {type Output} from '@sanity/cli-core'\nimport {select, Separator, spinner, type SpinnerInstance} from '@sanity/cli-core/ux'\n\nimport {\n  createUserApplication,\n  getUserApplication,\n  getUserApplications,\n  type UserApplication,\n} from '../../services/userApplications.js'\nimport {deployDebug} from './deployDebug.js'\n\ninterface FindUserApplicationForStudioOptions {\n  output: Output\n  projectId: string\n\n  appHost?: string\n  appId?: string\n}\n\nexport async function findUserApplicationForStudio(options: FindUserApplicationForStudioOptions) {\n  const {appHost, appId, output, projectId} = options\n\n  const spin = spinner('Checking project info').start()\n\n  const userApplication = await findUserApplication({\n    appHost,\n    appId,\n    output,\n    projectId,\n    spin,\n  })\n\n  spin.succeed()\n\n  if (userApplication) {\n    return userApplication\n  }\n\n  // No user application found, so let's list out the existing user applications\n  // along with an option to create a new one\n  let userApplications: Array<UserApplication> = []\n\n  // Get existing user applications (if any),\n  // based on the configured project ID\n  if (projectId) {\n    userApplications = await getUserApplications({\n      appType: 'studio',\n      projectId,\n    })\n  }\n\n  // If no applications are found, return null\n  if (!userApplications?.length) {\n    return null\n  }\n\n  // If there are user applications, allow the user to select one of the existing host names,\n  // or to create a new one\n  const choices = userApplications.map((app) => ({\n    name: app.title ?? app.appHost,\n    value: app.appHost,\n  }))\n\n  const selected = await select({\n    choices: [\n      {name: 'Create new studio hostname', value: 'NEW_STUDIO'},\n      new Separator(),\n      ...choices,\n    ],\n    message: 'Select existing studio hostname, or create a new one',\n  })\n\n  // If the user wants to create a new deployed application, return null\n  if (selected === 'NEW_STUDIO') {\n    return null\n  }\n\n  // Otherwise, return the selected user application\n  return userApplications.find((app) => app.appHost === selected)!\n}\n\ninterface FindUserApplicationFromConfigOptions {\n  output: Output\n  projectId: string\n  spin: SpinnerInstance\n\n  appHost?: string\n  appId?: string\n}\n\nasync function findUserApplication(\n  options: FindUserApplicationFromConfigOptions,\n): Promise<UserApplication | null> {\n  const {appHost, appId, output, projectId} = options\n  let {spin} = options\n\n  let userApplication: UserApplication | null = null\n\n  // If the config has an appId, check for apps with that ID\n  if (appId) {\n    try {\n      userApplication = await getUserApplication({appId, isSdkApp: false, projectId})\n\n      if (userApplication) {\n        return userApplication\n      }\n\n      // If appID is specified but no app is found with it, throw an error\n      throw new Error(`Cannot find app with app ID ${appId}`)\n    } catch (error) {\n      spin.fail()\n      deployDebug('Error finding user application', error)\n      output.error(`Error finding user application: ${error?.message}`, {exit: 1})\n    }\n  }\n\n  // As a fallback, if studioHost (deprecated) is configured, check for apps with that host\n  if (appHost) {\n    try {\n      userApplication = await getUserApplication({appHost, isSdkApp: false, projectId})\n\n      // We've found the application — return it\n      if (userApplication) {\n        return userApplication\n      }\n\n      // Otherwise, try to create an app with the configured host\n      try {\n        output.log('Your project has not been assigned a studio hostname.')\n        output.log(`Creating https://${appHost}.sanity.studio`)\n        output.log('')\n        spin = spinner('Creating studio hostname').start()\n\n        const response = await createUserApplication({\n          appType: 'studio',\n          body: {\n            appHost,\n            type: 'studio',\n            urlType: 'internal',\n          },\n          projectId,\n        })\n        spin.succeed()\n\n        return response\n      } catch (e) {\n        spin.fail()\n        // if the name is taken, it should return a 409 so we relay to the user\n        if ([402, 409].includes(e?.statusCode)) {\n          output.error(e?.response?.body?.message || 'Bad request', {exit: 1})\n          return null\n        }\n        // otherwise, it's a fatal error\n        deployDebug('Error creating user application from config', e)\n        output.error(\n          `Error creating user application from config: ${e instanceof Error ? e.message : e}`,\n          {exit: 1},\n        )\n      }\n    } catch (error) {\n      spin.fail()\n      deployDebug('Error finding user application', error)\n      output.error(\n        `Error finding user application: ${error instanceof Error ? error.message : error.toString()}`,\n        {exit: 1},\n      )\n    }\n  }\n\n  // If no appID and no appHost, just return and proceed to check for studios with the project ID\n  return null\n}\n"],"names":["select","Separator","spinner","createUserApplication","getUserApplication","getUserApplications","deployDebug","findUserApplicationForStudio","options","appHost","appId","output","projectId","spin","start","userApplication","findUserApplication","succeed","userApplications","appType","length","choices","map","app","name","title","value","selected","message","find","isSdkApp","Error","error","fail","exit","log","response","body","type","urlType","e","includes","statusCode","toString"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/deploy/findUserApplicationForStudio.ts"],"sourcesContent":["/**\n * Helper functions to find a user application for a Sanity studio.\n */\n\nimport {type Output} from '@sanity/cli-core'\nimport {select, Separator, spinner, type SpinnerInstance} from '@sanity/cli-core/ux'\n\nimport {\n  createUserApplication,\n  getUserApplication,\n  getUserApplications,\n  type UserApplication,\n} from '../../services/userApplications.js'\nimport {deployDebug} from './deployDebug.js'\nimport {normalizeUrl, validateUrl} from './urlUtils.js'\n\ninterface FindUserApplicationForStudioOptions {\n  output: Output\n  projectId: string\n\n  appHost?: string\n  appId?: string\n  urlType?: 'external' | 'internal'\n}\n\nexport async function findUserApplicationForStudio(options: FindUserApplicationForStudioOptions) {\n  const {appHost, appId, output, projectId, urlType = 'internal'} = options\n\n  const spin = spinner('Checking project info').start()\n\n  const userApplication = await findUserApplication({\n    appHost,\n    appId,\n    output,\n    projectId,\n    spin,\n    urlType,\n  })\n\n  spin.succeed()\n\n  if (userApplication) {\n    return userApplication\n  }\n\n  // No user application found, so let's list out the existing user applications\n  // along with an option to create a new one\n  let userApplications: Array<UserApplication> = []\n\n  // Get existing user applications (if any),\n  // based on the configured project ID\n  if (projectId) {\n    const allApps = await getUserApplications({\n      appType: 'studio',\n      projectId,\n    })\n    // Filter by urlType so external deploys only see external studios and vice versa\n    userApplications = allApps?.filter((app) => app.urlType === urlType) ?? []\n  }\n\n  // If no applications are found, return null\n  if (!userApplications?.length) {\n    return null\n  }\n\n  // If there are user applications, allow the user to select one of the existing host names,\n  // or to create a new one\n  const newLabel =\n    urlType === 'external' ? 'Register new external studio URL' : 'Create new studio hostname'\n  const selectMessage =\n    urlType === 'external'\n      ? 'Select existing external studio, or register a new one'\n      : 'Select existing studio hostname, or create a new one'\n\n  const choices = userApplications.map((app) => ({\n    name: app.title ?? app.appHost,\n    value: app.appHost,\n  }))\n\n  const selected = await select({\n    choices: [{name: newLabel, value: 'NEW_STUDIO'}, new Separator(), ...choices],\n    message: selectMessage,\n  })\n\n  // If the user wants to create a new deployed application, return null\n  if (selected === 'NEW_STUDIO') {\n    return null\n  }\n\n  // Otherwise, return the selected user application\n  return userApplications.find((app) => app.appHost === selected)!\n}\n\ninterface FindUserApplicationFromConfigOptions {\n  output: Output\n  projectId: string\n  spin: SpinnerInstance\n  urlType: 'external' | 'internal'\n\n  appHost?: string\n  appId?: string\n}\n\nasync function findUserApplication(\n  options: FindUserApplicationFromConfigOptions,\n): Promise<UserApplication | null> {\n  const {appHost, appId, output, projectId, urlType} = options\n  let {spin} = options\n\n  let userApplication: UserApplication | null = null\n\n  // If the config has an appId, check for apps with that ID\n  if (appId) {\n    try {\n      userApplication = await getUserApplication({appId, isSdkApp: false, projectId})\n\n      if (userApplication) {\n        return userApplication\n      }\n\n      // If appID is specified but no app is found with it, throw an error\n      throw new Error(`Cannot find app with app ID ${appId}`)\n    } catch (error) {\n      spin.fail()\n      deployDebug('Error finding user application', error)\n      output.error(`Error finding user application: ${error?.message}`, {exit: 1})\n    }\n  }\n\n  // As a fallback, if studioHost (deprecated) is configured, check for apps with that host\n  if (appHost) {\n    // For external URLs, validate and normalize before lookup/creation\n    const resolvedHost = urlType === 'external' ? normalizeUrl(appHost) : appHost\n\n    if (urlType === 'external') {\n      const validation = validateUrl(resolvedHost)\n      if (validation !== true) {\n        spin.fail()\n        output.error(validation, {exit: 1})\n        return null\n      }\n    }\n\n    try {\n      userApplication = await getUserApplication({\n        appHost: resolvedHost,\n        isSdkApp: false,\n        projectId,\n      })\n\n      // We've found the application — return it\n      if (userApplication) {\n        return userApplication\n      }\n\n      // Otherwise, try to create an app with the configured host\n      try {\n        if (urlType === 'external') {\n          output.log('Your project has not been registered with an external studio URL.')\n          output.log(`Registering ${resolvedHost}`)\n        } else {\n          output.log('Your project has not been assigned a studio hostname.')\n          output.log(`Creating https://${resolvedHost}.sanity.studio`)\n        }\n        output.log('')\n        spin = spinner(\n          urlType === 'external' ? 'Registering external studio' : 'Creating studio hostname',\n        ).start()\n\n        const response = await createUserApplication({\n          appType: 'studio',\n          body: {\n            appHost: resolvedHost,\n            type: 'studio',\n            urlType,\n          },\n          projectId,\n        })\n        spin.succeed()\n\n        return response\n      } catch (e) {\n        spin.fail()\n        // if the name is taken, it should return a 409 so we relay to the user\n        if ([402, 409].includes(e?.statusCode)) {\n          output.error(e?.response?.body?.message || 'Bad request', {exit: 1})\n          return null\n        }\n        // otherwise, it's a fatal error\n        deployDebug('Error creating user application from config', e)\n        output.error(\n          `Error creating user application from config: ${e instanceof Error ? e.message : e}`,\n          {exit: 1},\n        )\n      }\n    } catch (error) {\n      spin.fail()\n      deployDebug('Error finding user application', error)\n      output.error(\n        `Error finding user application: ${error instanceof Error ? error.message : error.toString()}`,\n        {exit: 1},\n      )\n    }\n  }\n\n  // If no appID and no appHost, just return and proceed to check for studios with the project ID\n  return null\n}\n"],"names":["select","Separator","spinner","createUserApplication","getUserApplication","getUserApplications","deployDebug","normalizeUrl","validateUrl","findUserApplicationForStudio","options","appHost","appId","output","projectId","urlType","spin","start","userApplication","findUserApplication","succeed","userApplications","allApps","appType","filter","app","length","newLabel","selectMessage","choices","map","name","title","value","selected","message","find","isSdkApp","Error","error","fail","exit","resolvedHost","validation","log","response","body","type","e","includes","statusCode","toString"],"mappings":"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"}

package/dist/actions/deploy/types.js

@@ -1,3 +1,12 @@
-export { };
+import { z } from 'zod';
+export const deployStudioSchemasAndManifestsWorkerData = z.object({
+    configPath: z.string(),
+    isExternal: z.boolean(),
+    outPath: z.string(),
+    projectId: z.string(),
+    schemaRequired: z.boolean(),
+    verbose: z.boolean(),
+    workDir: z.string()
+});
 
 //# sourceMappingURL=types.js.map

package/dist/actions/deploy/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/deploy/types.ts"],"sourcesContent":["import {type CliConfig, type Output} from '@sanity/cli-core'\n\nimport {DeployCommand} from '../../commands/deploy.js'\n\nexport type DeployFlags = DeployCommand['flags']\n\nexport interface DeployAppOptions {\n  cliConfig: CliConfig\n  exit: (code?: number) => void\n  flags: DeployFlags\n  output: Output\n  sourceDir: string\n  workDir: string\n}\n"],"names":[],"mappings":"AAMA,WAOC"}
+{"version":3,"sources":["../../../src/actions/deploy/types.ts"],"sourcesContent":["import {type CliConfig, type Output, type ProjectRootResult} from '@sanity/cli-core'\nimport {z} from 'zod'\n\nimport {DeployCommand} from '../../commands/deploy.js'\n\nexport type DeployFlags = DeployCommand['flags']\n\nexport interface DeployAppOptions {\n  cliConfig: CliConfig\n  flags: DeployFlags\n  output: Output\n  projectRoot: ProjectRootResult\n  sourceDir: string\n}\n\nexport const deployStudioSchemasAndManifestsWorkerData = z.object({\n  configPath: z.string(),\n  isExternal: z.boolean(),\n  outPath: z.string(),\n  projectId: z.string(),\n  schemaRequired: z.boolean(),\n  verbose: z.boolean(),\n  workDir: z.string(),\n})\n\nexport type DeployStudioSchemasAndManifestsWorkerData = z.infer<\n  typeof deployStudioSchemasAndManifestsWorkerData\n>\n"],"names":["z","deployStudioSchemasAndManifestsWorkerData","object","configPath","string","isExternal","boolean","outPath","projectId","schemaRequired","verbose","workDir"],"mappings":"AACA,SAAQA,CAAC,QAAO,MAAK;AAcrB,OAAO,MAAMC,4CAA4CD,EAAEE,MAAM,CAAC;IAChEC,YAAYH,EAAEI,MAAM;IACpBC,YAAYL,EAAEM,OAAO;IACrBC,SAASP,EAAEI,MAAM;IACjBI,WAAWR,EAAEI,MAAM;IACnBK,gBAAgBT,EAAEM,OAAO;IACzBI,SAASV,EAAEM,OAAO;IAClBK,SAASX,EAAEI,MAAM;AACnB,GAAE"}

package/dist/actions/deploy/urlUtils.js

@@ -0,0 +1,21 @@
+/**
+ * Validates that the given string is a valid http or https URL.
+ * Returns `true` if valid, or an error message string if invalid.
+ */ export function validateUrl(url) {
+    try {
+        const parsed = new URL(url);
+        if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+            return 'URL must use http or https protocol';
+        }
+        return true;
+    } catch  {
+        return 'Invalid URL. Please enter a valid http or https URL';
+    }
+}
+/**
+ * Normalizes a URL by removing trailing slashes.
+ */ export function normalizeUrl(url) {
+    return url.replace(/\/+$/, '');
+}
+
+//# sourceMappingURL=urlUtils.js.map

package/dist/actions/deploy/urlUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/deploy/urlUtils.ts"],"sourcesContent":["/**\n * Validates that the given string is a valid http or https URL.\n * Returns `true` if valid, or an error message string if invalid.\n */\nexport function validateUrl(url: string): string | true {\n  try {\n    const parsed = new URL(url)\n    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {\n      return 'URL must use http or https protocol'\n    }\n    return true\n  } catch {\n    return 'Invalid URL. Please enter a valid http or https URL'\n  }\n}\n\n/**\n * Normalizes a URL by removing trailing slashes.\n */\nexport function normalizeUrl(url: string): string {\n  return url.replace(/\\/+$/, '')\n}\n"],"names":["validateUrl","url","parsed","URL","protocol","normalizeUrl","replace"],"mappings":"AAAA;;;CAGC,GACD,OAAO,SAASA,YAAYC,GAAW;IACrC,IAAI;QACF,MAAMC,SAAS,IAAIC,IAAIF;QACvB,IAAIC,OAAOE,QAAQ,KAAK,WAAWF,OAAOE,QAAQ,KAAK,UAAU;YAC/D,OAAO;QACT;QACA,OAAO;IACT,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA;;CAEC,GACD,OAAO,SAASC,aAAaJ,GAAW;IACtC,OAAOA,IAAIK,OAAO,CAAC,QAAQ;AAC7B"}

package/dist/actions/dev/getDashboardAppUrl.js

@@ -0,0 +1,48 @@
+import { getSanityUrl, subdebug } from '@sanity/cli-core';
+const debug = subdebug('dev:getDashboardAppURL');
+const DEFAULT_TIMEOUT = 5000;
+const getDefaultDashboardURL = ({ organizationId, url })=>{
+    return getSanityUrl(`/@${organizationId}?${new URLSearchParams({
+        dev: url
+    }).toString()}`);
+};
+/**
+ * Gets the dashboard URL from API or uses the default dashboard URL
+ */ export const getDashboardAppURL = async ({ httpHost = 'localhost', httpPort = 3333, organizationId })=>{
+    const url = `http://${httpHost}:${httpPort}`;
+    const abortController = new AbortController();
+    // Wait for 5 seconds before aborting the request
+    const timer = setTimeout(()=>abortController.abort(), DEFAULT_TIMEOUT);
+    try {
+        const queryParams = new URLSearchParams({
+            organizationId,
+            url
+        });
+        const res = await globalThis.fetch(getSanityUrl(`/api/dashboard/mode/development/resolve-url?${queryParams.toString()}`), {
+            signal: abortController.signal
+        });
+        if (!res.ok) {
+            debug(`Failed to fetch dashboard URL: ${res.statusText}`);
+            return getDefaultDashboardURL({
+                organizationId,
+                url
+            });
+        }
+        const body = await res.json();
+        // <dashboard-app-url>/<orgniazationId>?dev=<dev-server-url>
+        return body?.url ?? getDefaultDashboardURL({
+            organizationId,
+            url
+        });
+    } catch (err) {
+        debug(`Failed to fetch dashboard URL: ${err instanceof Error ? err.message : String(err)}`);
+        return getDefaultDashboardURL({
+            organizationId,
+            url
+        });
+    } finally{
+        clearTimeout(timer);
+    }
+};
+
+//# sourceMappingURL=getDashboardAppUrl.js.map

package/dist/actions/dev/getDashboardAppUrl.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/dev/getDashboardAppUrl.ts"],"sourcesContent":["import {getSanityUrl, subdebug} from '@sanity/cli-core'\n\nconst debug = subdebug('dev:getDashboardAppURL')\n\nconst DEFAULT_TIMEOUT = 5000\n\nconst getDefaultDashboardURL = ({\n  organizationId,\n  url,\n}: {\n  organizationId: string\n  url: string\n}): string => {\n  return getSanityUrl(\n    `/@${organizationId}?${new URLSearchParams({\n      dev: url,\n    }).toString()}`,\n  )\n}\n\n/**\n * Gets the dashboard URL from API or uses the default dashboard URL\n */\nexport const getDashboardAppURL = async ({\n  httpHost = 'localhost',\n  httpPort = 3333,\n  organizationId,\n}: {\n  httpHost?: string\n  httpPort?: number\n  organizationId: string\n}): Promise<string> => {\n  const url = `http://${httpHost}:${httpPort}`\n\n  const abortController = new AbortController()\n  // Wait for 5 seconds before aborting the request\n  const timer = setTimeout(() => abortController.abort(), DEFAULT_TIMEOUT)\n  try {\n    const queryParams = new URLSearchParams({\n      organizationId,\n      url,\n    })\n\n    const res = await globalThis.fetch(\n      getSanityUrl(`/api/dashboard/mode/development/resolve-url?${queryParams.toString()}`),\n      {\n        signal: abortController.signal,\n      },\n    )\n\n    if (!res.ok) {\n      debug(`Failed to fetch dashboard URL: ${res.statusText}`)\n      return getDefaultDashboardURL({organizationId, url})\n    }\n\n    const body = await res.json()\n    // <dashboard-app-url>/<orgniazationId>?dev=<dev-server-url>\n    return body?.url ?? getDefaultDashboardURL({organizationId, url})\n  } catch (err) {\n    debug(`Failed to fetch dashboard URL: ${err instanceof Error ? err.message : String(err)}`)\n    return getDefaultDashboardURL({organizationId, url})\n  } finally {\n    clearTimeout(timer)\n  }\n}\n"],"names":["getSanityUrl","subdebug","debug","DEFAULT_TIMEOUT","getDefaultDashboardURL","organizationId","url","URLSearchParams","dev","toString","getDashboardAppURL","httpHost","httpPort","abortController","AbortController","timer","setTimeout","abort","queryParams","res","globalThis","fetch","signal","ok","statusText","body","json","err","Error","message","String","clearTimeout"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,QAAQ,QAAO,mBAAkB;AAEvD,MAAMC,QAAQD,SAAS;AAEvB,MAAME,kBAAkB;AAExB,MAAMC,yBAAyB,CAAC,EAC9BC,cAAc,EACdC,GAAG,EAIJ;IACC,OAAON,aACL,CAAC,EAAE,EAAEK,eAAe,CAAC,EAAE,IAAIE,gBAAgB;QACzCC,KAAKF;IACP,GAAGG,QAAQ,IAAI;AAEnB;AAEA;;CAEC,GACD,OAAO,MAAMC,qBAAqB,OAAO,EACvCC,WAAW,WAAW,EACtBC,WAAW,IAAI,EACfP,cAAc,EAKf;IACC,MAAMC,MAAM,CAAC,OAAO,EAAEK,SAAS,CAAC,EAAEC,UAAU;IAE5C,MAAMC,kBAAkB,IAAIC;IAC5B,iDAAiD;IACjD,MAAMC,QAAQC,WAAW,IAAMH,gBAAgBI,KAAK,IAAId;IACxD,IAAI;QACF,MAAMe,cAAc,IAAIX,gBAAgB;YACtCF;YACAC;QACF;QAEA,MAAMa,MAAM,MAAMC,WAAWC,KAAK,CAChCrB,aAAa,CAAC,4CAA4C,EAAEkB,YAAYT,QAAQ,IAAI,GACpF;YACEa,QAAQT,gBAAgBS,MAAM;QAChC;QAGF,IAAI,CAACH,IAAII,EAAE,EAAE;YACXrB,MAAM,CAAC,+BAA+B,EAAEiB,IAAIK,UAAU,EAAE;YACxD,OAAOpB,uBAAuB;gBAACC;gBAAgBC;YAAG;QACpD;QAEA,MAAMmB,OAAO,MAAMN,IAAIO,IAAI;QAC3B,4DAA4D;QAC5D,OAAOD,MAAMnB,OAAOF,uBAAuB;YAACC;YAAgBC;QAAG;IACjE,EAAE,OAAOqB,KAAK;QACZzB,MAAM,CAAC,+BAA+B,EAAEyB,eAAeC,QAAQD,IAAIE,OAAO,GAAGC,OAAOH,MAAM;QAC1F,OAAOvB,uBAAuB;YAACC;YAAgBC;QAAG;IACpD,SAAU;QACRyB,aAAahB;IACf;AACF,EAAC"}

package/dist/actions/dev/getDevServerConfig.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { getSanityEnvVar } from '@sanity/cli-core';
 import { spinner } from '@sanity/cli-core/ux';
 import { getSharedServerConfig } from '../../util/getSharedServerConfig.js';
 export function getDevServerConfig({ cliConfig, flags, output, workDir }) {
@@ -12,16 +13,19 @@ export function getDevServerConfig({ cliConfig, flags, output, workDir }) {
         workDir
     });
     configSpinner.succeed();
+    const isApp = cliConfig && 'app' in cliConfig;
     const env = process.env;
     const reactStrictMode = env.SANITY_STUDIO_REACT_STRICT_MODE ? env.SANITY_STUDIO_REACT_STRICT_MODE === 'true' : Boolean(cliConfig?.reactStrictMode);
-    if (env.SANITY_STUDIO_BASEPATH && cliConfig?.project?.basePath) {
-        output.warn(`Overriding configured base path (${cliConfig.project.basePath}) with value from environment variable (${env.SANITY_STUDIO_BASEPATH})`);
+    const envBasePath = getSanityEnvVar('BASEPATH', isApp ?? false);
+    if (envBasePath && cliConfig?.project?.basePath) {
+        output.warn(`Overriding configured base path (${cliConfig.project.basePath}) with value from environment variable (${envBasePath})`);
     }
     return {
         ...baseConfig,
         reactCompiler: cliConfig && 'reactCompiler' in cliConfig ? cliConfig.reactCompiler : undefined,
         reactStrictMode,
-        staticPath: path.join(workDir, 'static')
+        staticPath: path.join(workDir, 'static'),
+        typegen: cliConfig?.typegen
     };
 }
 

package/dist/actions/dev/getDevServerConfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/dev/getDevServerConfig.ts"],"sourcesContent":["import path from 'node:path'\n\nimport {type CliConfig, type Output} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\n\nimport {type DevServerOptions} from '../../server/devServer.js'\nimport {getSharedServerConfig} from '../../util/getSharedServerConfig.js'\nimport {type DevFlags} from './types.js'\n\nexport function getDevServerConfig({\n  cliConfig,\n  flags,\n  output,\n  workDir,\n}: {\n  cliConfig?: CliConfig\n  flags: DevFlags\n  output: Output\n  workDir: string\n}): Omit<DevServerOptions, 'spinner'> {\n  const configSpinner = spinner('Checking configuration files...')\n\n  const baseConfig = getSharedServerConfig({\n    cliConfig,\n    flags: {\n      host: flags.host,\n      port: flags.port,\n    },\n    workDir,\n  })\n\n  configSpinner.succeed()\n\n  const env = process.env\n  const reactStrictMode = env.SANITY_STUDIO_REACT_STRICT_MODE\n    ? env.SANITY_STUDIO_REACT_STRICT_MODE === 'true'\n    : Boolean(cliConfig?.reactStrictMode)\n\n  if (env.SANITY_STUDIO_BASEPATH && cliConfig?.project?.basePath) {\n    output.warn(\n      `Overriding configured base path (${cliConfig.project.basePath}) with value from environment variable (${env.SANITY_STUDIO_BASEPATH})`,\n    )\n  }\n\n  return {\n    ...baseConfig,\n    reactCompiler: cliConfig && 'reactCompiler' in cliConfig ? cliConfig.reactCompiler : undefined,\n    reactStrictMode,\n    staticPath: path.join(workDir, 'static'),\n  }\n}\n"],"names":["path","spinner","getSharedServerConfig","getDevServerConfig","cliConfig","flags","output","workDir","configSpinner","baseConfig","host","port","succeed","env","process","reactStrictMode","SANITY_STUDIO_REACT_STRICT_MODE","Boolean","SANITY_STUDIO_BASEPATH","project","basePath","warn","reactCompiler","undefined","staticPath","join"],"mappings":"AAAA,OAAOA,UAAU,YAAW;AAG5B,SAAQC,OAAO,QAAO,sBAAqB;AAG3C,SAAQC,qBAAqB,QAAO,sCAAqC;AAGzE,OAAO,SAASC,mBAAmB,EACjCC,SAAS,EACTC,KAAK,EACLC,MAAM,EACNC,OAAO,EAMR;IACC,MAAMC,gBAAgBP,QAAQ;IAE9B,MAAMQ,aAAaP,sBAAsB;QACvCE;QACAC,OAAO;YACLK,MAAML,MAAMK,IAAI;YAChBC,MAAMN,MAAMM,IAAI;QAClB;QACAJ;IACF;IAEAC,cAAcI,OAAO;IAErB,MAAMC,MAAMC,QAAQD,GAAG;IACvB,MAAME,kBAAkBF,IAAIG,+BAA+B,GACvDH,IAAIG,+BAA+B,KAAK,SACxCC,QAAQb,WAAWW;IAEvB,IAAIF,IAAIK,sBAAsB,IAAId,WAAWe,SAASC,UAAU;QAC9Dd,OAAOe,IAAI,CACT,CAAC,iCAAiC,EAAEjB,UAAUe,OAAO,CAACC,QAAQ,CAAC,wCAAwC,EAAEP,IAAIK,sBAAsB,CAAC,CAAC,CAAC;IAE1I;IAEA,OAAO;QACL,GAAGT,UAAU;QACba,eAAelB,aAAa,mBAAmBA,YAAYA,UAAUkB,aAAa,GAAGC;QACrFR;QACAS,YAAYxB,KAAKyB,IAAI,CAAClB,SAAS;IACjC;AACF"}
+{"version":3,"sources":["../../../src/actions/dev/getDevServerConfig.ts"],"sourcesContent":["import path from 'node:path'\n\nimport {type CliConfig, getSanityEnvVar, type Output} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\n\nimport {type DevServerOptions} from '../../server/devServer.js'\nimport {getSharedServerConfig} from '../../util/getSharedServerConfig.js'\nimport {type DevFlags} from './types.js'\n\nexport function getDevServerConfig({\n  cliConfig,\n  flags,\n  output,\n  workDir,\n}: {\n  cliConfig?: CliConfig\n  flags: DevFlags\n  output: Output\n  workDir: string\n}): Omit<DevServerOptions, 'spinner'> {\n  const configSpinner = spinner('Checking configuration files...')\n\n  const baseConfig = getSharedServerConfig({\n    cliConfig,\n    flags: {\n      host: flags.host,\n      port: flags.port,\n    },\n    workDir,\n  })\n\n  configSpinner.succeed()\n\n  const isApp = cliConfig && 'app' in cliConfig\n  const env = process.env\n  const reactStrictMode = env.SANITY_STUDIO_REACT_STRICT_MODE\n    ? env.SANITY_STUDIO_REACT_STRICT_MODE === 'true'\n    : Boolean(cliConfig?.reactStrictMode)\n\n  const envBasePath = getSanityEnvVar('BASEPATH', isApp ?? false)\n  if (envBasePath && cliConfig?.project?.basePath) {\n    output.warn(\n      `Overriding configured base path (${cliConfig.project.basePath}) with value from environment variable (${envBasePath})`,\n    )\n  }\n\n  return {\n    ...baseConfig,\n    reactCompiler: cliConfig && 'reactCompiler' in cliConfig ? cliConfig.reactCompiler : undefined,\n    reactStrictMode,\n    staticPath: path.join(workDir, 'static'),\n    typegen: cliConfig?.typegen,\n  }\n}\n"],"names":["path","getSanityEnvVar","spinner","getSharedServerConfig","getDevServerConfig","cliConfig","flags","output","workDir","configSpinner","baseConfig","host","port","succeed","isApp","env","process","reactStrictMode","SANITY_STUDIO_REACT_STRICT_MODE","Boolean","envBasePath","project","basePath","warn","reactCompiler","undefined","staticPath","join","typegen"],"mappings":"AAAA,OAAOA,UAAU,YAAW;AAE5B,SAAwBC,eAAe,QAAoB,mBAAkB;AAC7E,SAAQC,OAAO,QAAO,sBAAqB;AAG3C,SAAQC,qBAAqB,QAAO,sCAAqC;AAGzE,OAAO,SAASC,mBAAmB,EACjCC,SAAS,EACTC,KAAK,EACLC,MAAM,EACNC,OAAO,EAMR;IACC,MAAMC,gBAAgBP,QAAQ;IAE9B,MAAMQ,aAAaP,sBAAsB;QACvCE;QACAC,OAAO;YACLK,MAAML,MAAMK,IAAI;YAChBC,MAAMN,MAAMM,IAAI;QAClB;QACAJ;IACF;IAEAC,cAAcI,OAAO;IAErB,MAAMC,QAAQT,aAAa,SAASA;IACpC,MAAMU,MAAMC,QAAQD,GAAG;IACvB,MAAME,kBAAkBF,IAAIG,+BAA+B,GACvDH,IAAIG,+BAA+B,KAAK,SACxCC,QAAQd,WAAWY;IAEvB,MAAMG,cAAcnB,gBAAgB,YAAYa,SAAS;IACzD,IAAIM,eAAef,WAAWgB,SAASC,UAAU;QAC/Cf,OAAOgB,IAAI,CACT,CAAC,iCAAiC,EAAElB,UAAUgB,OAAO,CAACC,QAAQ,CAAC,wCAAwC,EAAEF,YAAY,CAAC,CAAC;IAE3H;IAEA,OAAO;QACL,GAAGV,UAAU;QACbc,eAAenB,aAAa,mBAAmBA,YAAYA,UAAUmB,aAAa,GAAGC;QACrFR;QACAS,YAAY1B,KAAK2B,IAAI,CAACnB,SAAS;QAC/BoB,SAASvB,WAAWuB;IACtB;AACF"}

package/dist/actions/dev/startAppDevServer.js

@@ -1,8 +1,8 @@
-import { chalk } from '@sanity/cli-core/ux';
+import { styleText } from 'node:util';
 import { startDevServer } from '../../server/devServer.js';
 import { gracefulServerDeath } from '../../server/gracefulServerDeath.js';
 import { devDebug } from './devDebug.js';
-import { getCoreAppURL } from './getCoreAppUrl.js';
+import { getDashboardAppURL } from './getDashboardAppUrl.js';
 import { getDevServerConfig } from './getDevServerConfig.js';
 export async function startAppDevServer(options) {
     const { cliConfig, flags, output, workDir } = options;
@@ -34,14 +34,17 @@ export async function startAppDevServer(options) {
         });
         const { port } = server.config.server;
         const httpHost = config.httpHost || 'localhost';
-        const coreAppUrl = getCoreAppURL({
+        const dashboardAppUrl = await getDashboardAppURL({
             httpHost,
             httpPort: port,
             organizationId
         });
         output.log(`Dev server started on port ${port}`);
         output.log(`View your app in the Sanity dashboard here:`);
-        output.log(chalk.blue(chalk.underline(coreAppUrl)));
+        output.log(styleText([
+            'blue',
+            'underline'
+        ], dashboardAppUrl));
         return {
             close
         };

package/dist/actions/dev/startAppDevServer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/dev/startAppDevServer.ts"],"sourcesContent":["import {chalk} from '@sanity/cli-core/ux'\n\nimport {startDevServer} from '../../server/devServer.js'\nimport {gracefulServerDeath} from '../../server/gracefulServerDeath.js'\nimport {devDebug} from './devDebug.js'\nimport {getCoreAppURL} from './getCoreAppUrl.js'\nimport {getDevServerConfig} from './getDevServerConfig.js'\nimport {type DevActionOptions} from './types.js'\n\nexport async function startAppDevServer(\n  options: DevActionOptions,\n): Promise<{close?: () => Promise<void>}> {\n  const {cliConfig, flags, output, workDir} = options\n\n  if (!flags['load-in-dashboard']) {\n    output.warn(`Apps cannot run without the Sanity dashboard`)\n    output.warn(`Starting dev server with the --load-in-dashboard flag set to true`)\n  }\n\n  let organizationId: string | undefined\n  if (cliConfig && 'app' in cliConfig && cliConfig.app?.organizationId) {\n    organizationId = cliConfig.app.organizationId\n  }\n\n  if (!organizationId) {\n    output.error(`Apps require an organization ID (orgId) specified in your sanity.cli.ts file`, {\n      exit: 1,\n    })\n    return {}\n  }\n\n  const config = getDevServerConfig({cliConfig, flags, output, workDir})\n\n  try {\n    output.log('Starting dev server')\n\n    const {close, server} = await startDevServer({...config, isApp: true})\n\n    const {port} = server.config.server\n    const httpHost = config.httpHost || 'localhost'\n\n    const coreAppUrl = getCoreAppURL({\n      httpHost,\n      httpPort: port,\n      organizationId,\n    })\n\n    output.log(`Dev server started on port ${port}`)\n    output.log(`View your app in the Sanity dashboard here:`)\n    output.log(chalk.blue(chalk.underline(coreAppUrl)))\n\n    return {close}\n  } catch (err) {\n    devDebug('Error starting app dev server', err)\n    throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err)\n  }\n}\n"],"names":["chalk","startDevServer","gracefulServerDeath","devDebug","getCoreAppURL","getDevServerConfig","startAppDevServer","options","cliConfig","flags","output","workDir","warn","organizationId","app","error","exit","config","log","close","server","isApp","port","httpHost","coreAppUrl","httpPort","blue","underline","err"],"mappings":"AAAA,SAAQA,KAAK,QAAO,sBAAqB;AAEzC,SAAQC,cAAc,QAAO,4BAA2B;AACxD,SAAQC,mBAAmB,QAAO,sCAAqC;AACvE,SAAQC,QAAQ,QAAO,gBAAe;AACtC,SAAQC,aAAa,QAAO,qBAAoB;AAChD,SAAQC,kBAAkB,QAAO,0BAAyB;AAG1D,OAAO,eAAeC,kBACpBC,OAAyB;IAEzB,MAAM,EAACC,SAAS,EAAEC,KAAK,EAAEC,MAAM,EAAEC,OAAO,EAAC,GAAGJ;IAE5C,IAAI,CAACE,KAAK,CAAC,oBAAoB,EAAE;QAC/BC,OAAOE,IAAI,CAAC,CAAC,4CAA4C,CAAC;QAC1DF,OAAOE,IAAI,CAAC,CAAC,iEAAiE,CAAC;IACjF;IAEA,IAAIC;IACJ,IAAIL,aAAa,SAASA,aAAaA,UAAUM,GAAG,EAAED,gBAAgB;QACpEA,iBAAiBL,UAAUM,GAAG,CAACD,cAAc;IAC/C;IAEA,IAAI,CAACA,gBAAgB;QACnBH,OAAOK,KAAK,CAAC,CAAC,4EAA4E,CAAC,EAAE;YAC3FC,MAAM;QACR;QACA,OAAO,CAAC;IACV;IAEA,MAAMC,SAASZ,mBAAmB;QAACG;QAAWC;QAAOC;QAAQC;IAAO;IAEpE,IAAI;QACFD,OAAOQ,GAAG,CAAC;QAEX,MAAM,EAACC,KAAK,EAAEC,MAAM,EAAC,GAAG,MAAMnB,eAAe;YAAC,GAAGgB,MAAM;YAAEI,OAAO;QAAI;QAEpE,MAAM,EAACC,IAAI,EAAC,GAAGF,OAAOH,MAAM,CAACG,MAAM;QACnC,MAAMG,WAAWN,OAAOM,QAAQ,IAAI;QAEpC,MAAMC,aAAapB,cAAc;YAC/BmB;YACAE,UAAUH;YACVT;QACF;QAEAH,OAAOQ,GAAG,CAAC,CAAC,2BAA2B,EAAEI,MAAM;QAC/CZ,OAAOQ,GAAG,CAAC,CAAC,2CAA2C,CAAC;QACxDR,OAAOQ,GAAG,CAAClB,MAAM0B,IAAI,CAAC1B,MAAM2B,SAAS,CAACH;QAEtC,OAAO;YAACL;QAAK;IACf,EAAE,OAAOS,KAAK;QACZzB,SAAS,iCAAiCyB;QAC1C,MAAM1B,oBAAoB,OAAOe,OAAOM,QAAQ,EAAEN,OAAOQ,QAAQ,EAAEG;IACrE;AACF"}
+{"version":3,"sources":["../../../src/actions/dev/startAppDevServer.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {startDevServer} from '../../server/devServer.js'\nimport {gracefulServerDeath} from '../../server/gracefulServerDeath.js'\nimport {devDebug} from './devDebug.js'\nimport {getDashboardAppURL} from './getDashboardAppUrl.js'\nimport {getDevServerConfig} from './getDevServerConfig.js'\nimport {type DevActionOptions} from './types.js'\n\nexport async function startAppDevServer(\n  options: DevActionOptions,\n): Promise<{close?: () => Promise<void>}> {\n  const {cliConfig, flags, output, workDir} = options\n\n  if (!flags['load-in-dashboard']) {\n    output.warn(`Apps cannot run without the Sanity dashboard`)\n    output.warn(`Starting dev server with the --load-in-dashboard flag set to true`)\n  }\n\n  let organizationId: string | undefined\n  if (cliConfig && 'app' in cliConfig && cliConfig.app?.organizationId) {\n    organizationId = cliConfig.app.organizationId\n  }\n\n  if (!organizationId) {\n    output.error(`Apps require an organization ID (orgId) specified in your sanity.cli.ts file`, {\n      exit: 1,\n    })\n    return {}\n  }\n\n  const config = getDevServerConfig({cliConfig, flags, output, workDir})\n\n  try {\n    output.log('Starting dev server')\n\n    const {close, server} = await startDevServer({...config, isApp: true})\n\n    const {port} = server.config.server\n    const httpHost = config.httpHost || 'localhost'\n\n    const dashboardAppUrl = await getDashboardAppURL({\n      httpHost,\n      httpPort: port,\n      organizationId,\n    })\n    output.log(`Dev server started on port ${port}`)\n    output.log(`View your app in the Sanity dashboard here:`)\n    output.log(styleText(['blue', 'underline'], dashboardAppUrl))\n\n    return {close}\n  } catch (err) {\n    devDebug('Error starting app dev server', err)\n    throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err)\n  }\n}\n"],"names":["styleText","startDevServer","gracefulServerDeath","devDebug","getDashboardAppURL","getDevServerConfig","startAppDevServer","options","cliConfig","flags","output","workDir","warn","organizationId","app","error","exit","config","log","close","server","isApp","port","httpHost","dashboardAppUrl","httpPort","err"],"mappings":"AAAA,SAAQA,SAAS,QAAO,YAAW;AAEnC,SAAQC,cAAc,QAAO,4BAA2B;AACxD,SAAQC,mBAAmB,QAAO,sCAAqC;AACvE,SAAQC,QAAQ,QAAO,gBAAe;AACtC,SAAQC,kBAAkB,QAAO,0BAAyB;AAC1D,SAAQC,kBAAkB,QAAO,0BAAyB;AAG1D,OAAO,eAAeC,kBACpBC,OAAyB;IAEzB,MAAM,EAACC,SAAS,EAAEC,KAAK,EAAEC,MAAM,EAAEC,OAAO,EAAC,GAAGJ;IAE5C,IAAI,CAACE,KAAK,CAAC,oBAAoB,EAAE;QAC/BC,OAAOE,IAAI,CAAC,CAAC,4CAA4C,CAAC;QAC1DF,OAAOE,IAAI,CAAC,CAAC,iEAAiE,CAAC;IACjF;IAEA,IAAIC;IACJ,IAAIL,aAAa,SAASA,aAAaA,UAAUM,GAAG,EAAED,gBAAgB;QACpEA,iBAAiBL,UAAUM,GAAG,CAACD,cAAc;IAC/C;IAEA,IAAI,CAACA,gBAAgB;QACnBH,OAAOK,KAAK,CAAC,CAAC,4EAA4E,CAAC,EAAE;YAC3FC,MAAM;QACR;QACA,OAAO,CAAC;IACV;IAEA,MAAMC,SAASZ,mBAAmB;QAACG;QAAWC;QAAOC;QAAQC;IAAO;IAEpE,IAAI;QACFD,OAAOQ,GAAG,CAAC;QAEX,MAAM,EAACC,KAAK,EAAEC,MAAM,EAAC,GAAG,MAAMnB,eAAe;YAAC,GAAGgB,MAAM;YAAEI,OAAO;QAAI;QAEpE,MAAM,EAACC,IAAI,EAAC,GAAGF,OAAOH,MAAM,CAACG,MAAM;QACnC,MAAMG,WAAWN,OAAOM,QAAQ,IAAI;QAEpC,MAAMC,kBAAkB,MAAMpB,mBAAmB;YAC/CmB;YACAE,UAAUH;YACVT;QACF;QACAH,OAAOQ,GAAG,CAAC,CAAC,2BAA2B,EAAEI,MAAM;QAC/CZ,OAAOQ,GAAG,CAAC,CAAC,2CAA2C,CAAC;QACxDR,OAAOQ,GAAG,CAAClB,UAAU;YAAC;YAAQ;SAAY,EAAEwB;QAE5C,OAAO;YAACL;QAAK;IACf,EAAE,OAAOO,KAAK;QACZvB,SAAS,iCAAiCuB;QAC1C,MAAMxB,oBAAoB,OAAOe,OAAOM,QAAQ,EAAEN,OAAOQ,QAAQ,EAAEC;IACrE;AACF"}

package/dist/actions/dev/startStudioDevServer.js

@@ -1,20 +1,20 @@
+import { styleText } from 'node:util';
 import { isInteractive } from '@sanity/cli-core';
-import { chalk, confirm, logSymbols, spinner } from '@sanity/cli-core/ux';
+import { confirm, logSymbols, spinner } from '@sanity/cli-core/ux';
 import semver from 'semver';
 import { startDevServer } from '../../server/devServer.js';
 import { gracefulServerDeath } from '../../server/gracefulServerDeath.js';
 import { getProjectById } from '../../services/projects.js';
 import { getAppId } from '../../util/appId.js';
 import { compareDependencyVersions } from '../../util/compareDependencyVersions.js';
+import { getLocalPackageVersion } from '../../util/getLocalPackageVersion.js';
 import { getPackageManagerChoice } from '../../util/packageManager/packageManagerChoice.js';
 import { upgradePackages } from '../../util/packageManager/upgradePackages.js';
-import { readModuleVersion } from '../../util/readModuleVersion.js';
-import { warnAboutMissingAppId } from '../../util/warnAboutMissingAppId.js';
 import { checkRequiredDependencies } from '../build/checkRequiredDependencies.js';
 import { checkStudioDependencyVersions } from '../build/checkStudioDependencyVersions.js';
 import { shouldAutoUpdate } from '../build/shouldAutoUpdate.js';
 import { devDebug } from './devDebug.js';
-import { getCoreAppURL } from './getCoreAppUrl.js';
+import { getDashboardAppURL } from './getDashboardAppUrl.js';
 import { getDevServerConfig } from './getDevServerConfig.js';
 export async function startStudioDevServer(options) {
     const { cliConfig, flags, output, workDir } = options;
@@ -57,27 +57,25 @@ export async function startStudioDevServer(options) {
         } catch (err) {
             output.warn(`Failed to compare local versions against auto-updating versions: ${err}`);
         }
-        if (!appId) {
-            warnAboutMissingAppId({
-                appType: 'studio',
-                output,
-                projectId
-            });
+        if (result?.unresolvedPrerelease.length) {
+            for (const mod of result.unresolvedPrerelease){
+                output.warn(`Your local version of ${mod.pkg} (${mod.version}) is a prerelease not available on the auto-updates CDN. The locally installed version will be used.`);
+            }
         }
         // mismatch between local and auto-updating dependencies
-        if (result?.length) {
-            const message = `The following local package versions are different from the versions currently served at runtime.\n` + `When using auto updates, we recommend that you run with the same versions locally as will be used when deploying.\n\n` + `${result.map((mod)=>` - ${mod.pkg} (local version: ${mod.installed}, runtime version: ${mod.remote})`).join('\n')}\n\n`;
+        if (result?.mismatched.length) {
+            const message = `The following local package versions are different from the versions currently served at runtime.\n` + `When using auto updates, we recommend that you run with the same versions locally as will be used when deploying.\n\n` + `${result.mismatched.map((mod)=>` - ${mod.pkg} (local version: ${mod.installed}, runtime version: ${mod.remote})`).join('\n')}\n\n`;
             if (isInteractive()) {
                 const shouldUpgrade = await confirm({
                     default: true,
-                    message: chalk.yellow(`${message}Do you want to upgrade local versions?`)
+                    message: styleText('yellow', `${message}Do you want to upgrade local versions?`)
                 });
                 if (shouldUpgrade) {
                     await upgradePackages({
                         packageManager: (await getPackageManagerChoice(workDir, {
                             interactive: false
                         })).chosen,
-                        packages: result.map((res)=>[
+                        packages: result.mismatched.map((res)=>[
                                 res.pkg,
                                 res.remote
                             ])
@@ -88,10 +86,13 @@ export async function startStudioDevServer(options) {
                 }
             } else {
                 // In this case we warn the user but we don't ask them if they want to upgrade because it's not interactive.
-                output.log(chalk.yellow(message));
+                output.log(styleText('yellow', message));
             }
         }
     }
+    if (cliConfig?.schemaExtraction?.enabled) {
+        output.log(`${logSymbols.info} Running dev server with schema extraction enabled`);
+    }
     const config = getDevServerConfig({
         cliConfig,
         flags,
@@ -125,18 +126,21 @@ export async function startStudioDevServer(options) {
             spin.succeed();
             output.log(`Dev server started on port ${port}`);
             output.log(`View your studio in the Sanity dashboard here:`);
-            output.log(chalk.blue(chalk.underline(getCoreAppURL({
+            output.log(styleText([
+                'blue',
+                'underline'
+            ], await getDashboardAppURL({
                 httpHost,
                 httpPort: port,
                 organizationId: organizationId
-            }))));
+            })));
         } else {
             const startupDuration = Date.now() - startTime;
             const url = `http://${httpHost || 'localhost'}:${port}${config.basePath}`;
             const appType = 'Sanity Studio';
-            const viteVersion = await readModuleVersion(import.meta.url, 'vite');
+            const viteVersion = await getLocalPackageVersion('vite', import.meta.url);
             spin.succeed();
-            loggerInfo(`${appType} ` + `using ${chalk.cyan(`vite@${viteVersion}`)} ` + `ready in ${chalk.cyan(`${Math.ceil(startupDuration)}ms`)} ` + `and running at ${chalk.cyan(url)}`);
+            loggerInfo(`${appType} ` + `using ${styleText('cyan', `vite@${viteVersion}`)} ` + `ready in ${styleText('cyan', `${Math.ceil(startupDuration)}ms`)} ` + `and running at ${styleText('cyan', url)}`);
         }
         return {
             close