@sanity/cli 6.0.0-alpha.17 → 6.0.0-alpha.19

package/dist/actions/deploy/deployApp.js

@@ -8,7 +8,6 @@ import { createDeployment } from '../../services/userApplications.js';
 import { getAppId } from '../../util/appId.js';
 import { NO_ORGANIZATION_ID } from '../../util/errorMessages.js';
 import { getLocalPackageVersion } from '../../util/getLocalPackageVersion.js';
-import { warnAboutMissingAppId } from '../../util/warnAboutMissingAppId.js';
 import { buildApp } from '../build/buildApp.js';
 import { shouldAutoUpdate } from '../build/shouldAutoUpdate.js';
 import { extractAppManifest } from '../manifest/extractAppManifest.js';
@@ -55,19 +54,13 @@ import { findUserApplicationForApp } from './findUserApplicationForApp.js';
             userApplication = await createUserApplicationForApp(organizationId);
             deployDebug(`User application created`, userApplication);
         }
-        // Warn about missing app ID if auto updates are enabled
-        if (isAutoUpdating && !appId) {
-            warnAboutMissingAppId({
-                appType: 'app',
-                output
-            });
-        }
         // Always build the project, unless --no-build is passed
         const shouldBuild = flags.build;
         if (shouldBuild) {
             deployDebug(`Building app`);
             await buildApp({
                 autoUpdatesEnabled: isAutoUpdating,
+                calledFromDeploy: true,
                 cliConfig,
                 flags,
                 outDir: sourceDir,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/deploy/deployApp.ts"],"sourcesContent":["import {basename, dirname} from 'node:path'\nimport {styleText} from 'node:util'\nimport {createGzip} from 'node:zlib'\n\nimport {CLIError} from '@oclif/core/errors'\nimport {spinner} from '@sanity/cli-core/ux'\nimport {pack} from 'tar-fs'\n\nimport {createDeployment} from '../../services/userApplications.js'\nimport {getAppId} from '../../util/appId.js'\nimport {NO_ORGANIZATION_ID} from '../../util/errorMessages.js'\nimport {getLocalPackageVersion} from '../../util/getLocalPackageVersion.js'\nimport {warnAboutMissingAppId} from '../../util/warnAboutMissingAppId.js'\nimport {buildApp} from '../build/buildApp.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.js'\nimport {extractAppManifest} from '../manifest/extractAppManifest.js'\nimport {type AppManifest} from '../manifest/types.js'\nimport {checkDir} from './checkDir.js'\nimport {createUserApplicationForApp} from './createUserApplicationForApp.js'\nimport {deployDebug} from './deployDebug.js'\nimport {findUserApplicationForApp} from './findUserApplicationForApp.js'\nimport {type DeployAppOptions} from './types.js'\n\n/**\n * Deploy a Sanity application.\n *\n * @internal\n */\nexport async function deployApp(options: DeployAppOptions) {\n  const {cliConfig, flags, output, sourceDir, workDir} = options\n\n  const organizationId = cliConfig.app?.organizationId\n  const appId = getAppId(cliConfig)\n  const isAutoUpdating = shouldAutoUpdate({cliConfig, flags, output})\n  const installedSdkVersion = await getLocalPackageVersion('@sanity/sdk-react', workDir)\n\n  if (!installedSdkVersion) {\n    output.error(`Failed to find installed @sanity/sdk-react version`, {exit: 1})\n    return\n  }\n\n  if (!organizationId) {\n    output.error(NO_ORGANIZATION_ID, {exit: 1})\n    return\n  }\n\n  let spin = spinner('Verifying local content...')\n\n  try {\n    let userApplication = await findUserApplicationForApp({\n      cliConfig,\n      organizationId,\n      output,\n    })\n\n    deployDebug(`User application found`, userApplication)\n\n    if (!userApplication) {\n      deployDebug(`No user application found. Creating a new one`)\n\n      userApplication = await createUserApplicationForApp(organizationId)\n      deployDebug(`User application created`, userApplication)\n    }\n\n    // Warn about missing app ID if auto updates are enabled\n    if (isAutoUpdating && !appId) {\n      warnAboutMissingAppId({appType: 'app', output})\n    }\n\n    // Always build the project, unless --no-build is passed\n    const shouldBuild = flags.build\n    if (shouldBuild) {\n      deployDebug(`Building app`)\n      await buildApp({\n        autoUpdatesEnabled: isAutoUpdating,\n        cliConfig,\n        flags,\n        outDir: sourceDir,\n        output,\n        workDir,\n      })\n    }\n\n    // Ensure that the directory exists, is a directory and seems to have valid content\n    spin = spin.start()\n    try {\n      await checkDir(sourceDir)\n      spin.succeed()\n    } catch (err) {\n      spin.fail()\n      deployDebug('Error checking directory', err)\n      output.error('Error checking directory', {exit: 1})\n      return\n    }\n\n    // Create a tarball of the given directory\n    const parentDir = dirname(sourceDir)\n    const base = basename(sourceDir)\n    const tarball = pack(parentDir, {entries: [base]}).pipe(createGzip())\n    let manifest: AppManifest | undefined\n    try {\n      manifest = await extractAppManifest({flags, workDir})\n    } catch (err) {\n      const message = err instanceof Error ? err.message : String(err)\n      deployDebug('Error extracting app manifest', err)\n      output.warn(`Error extracting app manifest: ${message}`)\n    }\n\n    spin = spinner('Deploying...').start()\n    await createDeployment({\n      applicationId: userApplication.id,\n      isApp: true,\n      isAutoUpdating,\n      manifest,\n      tarball,\n      version: installedSdkVersion,\n    })\n\n    spin.succeed()\n\n    // And let the user know we're done\n    output.log(`\\n🚀 ${styleText('bold', 'Success!')} Application deployed`)\n\n    if (!appId) {\n      output.log(`\\n════ ${styleText('bold', 'Next step:')} ════`)\n      output.log(\n        styleText(\n          'bold',\n          '\\nAdd the deployment.appId to your sanity.cli.js or sanity.cli.ts file:',\n        ),\n      )\n      output.log(`\n${styleText(\n  'dim',\n  `app: {\n  // your application config here…\n}`,\n)},\n${styleText(\n  ['bold', 'green'],\n  `deployment: {\n  appId: '${userApplication.id}',\n}\\n`,\n)}`)\n    }\n  } catch (error) {\n    spin.clear()\n    // Don't throw generic error if user cancels\n    if (error.name === 'ExitPromptError') {\n      output.error('Deployment cancelled by user', {exit: 1})\n      return\n    }\n    // If the error is a CLIError, we can just output the message & error options (if any), while ensuring we exit\n    if (error instanceof CLIError) {\n      const {message, ...errorOptions} = error\n      output.error(message, {...errorOptions, exit: 1})\n      return\n    }\n\n    deployDebug('Error deploying application', error)\n    output.error(`Error deploying application: ${error}`, {exit: 1})\n  }\n}\n"],"names":["basename","dirname","styleText","createGzip","CLIError","spinner","pack","createDeployment","getAppId","NO_ORGANIZATION_ID","getLocalPackageVersion","warnAboutMissingAppId","buildApp","shouldAutoUpdate","extractAppManifest","checkDir","createUserApplicationForApp","deployDebug","findUserApplicationForApp","deployApp","options","cliConfig","flags","output","sourceDir","workDir","organizationId","app","appId","isAutoUpdating","installedSdkVersion","error","exit","spin","userApplication","appType","shouldBuild","build","autoUpdatesEnabled","outDir","start","succeed","err","fail","parentDir","base","tarball","entries","pipe","manifest","message","Error","String","warn","applicationId","id","isApp","version","log","clear","name","errorOptions"],"mappings":"AAAA,SAAQA,QAAQ,EAAEC,OAAO,QAAO,YAAW;AAC3C,SAAQC,SAAS,QAAO,YAAW;AACnC,SAAQC,UAAU,QAAO,YAAW;AAEpC,SAAQC,QAAQ,QAAO,qBAAoB;AAC3C,SAAQC,OAAO,QAAO,sBAAqB;AAC3C,SAAQC,IAAI,QAAO,SAAQ;AAE3B,SAAQC,gBAAgB,QAAO,qCAAoC;AACnE,SAAQC,QAAQ,QAAO,sBAAqB;AAC5C,SAAQC,kBAAkB,QAAO,8BAA6B;AAC9D,SAAQC,sBAAsB,QAAO,uCAAsC;AAC3E,SAAQC,qBAAqB,QAAO,sCAAqC;AACzE,SAAQC,QAAQ,QAAO,uBAAsB;AAC7C,SAAQC,gBAAgB,QAAO,+BAA8B;AAC7D,SAAQC,kBAAkB,QAAO,oCAAmC;AAEpE,SAAQC,QAAQ,QAAO,gBAAe;AACtC,SAAQC,2BAA2B,QAAO,mCAAkC;AAC5E,SAAQC,WAAW,QAAO,mBAAkB;AAC5C,SAAQC,yBAAyB,QAAO,iCAAgC;AAGxE;;;;CAIC,GACD,OAAO,eAAeC,UAAUC,OAAyB;IACvD,MAAM,EAACC,SAAS,EAAEC,KAAK,EAAEC,MAAM,EAAEC,SAAS,EAAEC,OAAO,EAAC,GAAGL;IAEvD,MAAMM,iBAAiBL,UAAUM,GAAG,EAAED;IACtC,MAAME,QAAQpB,SAASa;IACvB,MAAMQ,iBAAiBhB,iBAAiB;QAACQ;QAAWC;QAAOC;IAAM;IACjE,MAAMO,sBAAsB,MAAMpB,uBAAuB,qBAAqBe;IAE9E,IAAI,CAACK,qBAAqB;QACxBP,OAAOQ,KAAK,CAAC,CAAC,kDAAkD,CAAC,EAAE;YAACC,MAAM;QAAC;QAC3E;IACF;IAEA,IAAI,CAACN,gBAAgB;QACnBH,OAAOQ,KAAK,CAACtB,oBAAoB;YAACuB,MAAM;QAAC;QACzC;IACF;IAEA,IAAIC,OAAO5B,QAAQ;IAEnB,IAAI;QACF,IAAI6B,kBAAkB,MAAMhB,0BAA0B;YACpDG;YACAK;YACAH;QACF;QAEAN,YAAY,CAAC,sBAAsB,CAAC,EAAEiB;QAEtC,IAAI,CAACA,iBAAiB;YACpBjB,YAAY,CAAC,6CAA6C,CAAC;YAE3DiB,kBAAkB,MAAMlB,4BAA4BU;YACpDT,YAAY,CAAC,wBAAwB,CAAC,EAAEiB;QAC1C;QAEA,wDAAwD;QACxD,IAAIL,kBAAkB,CAACD,OAAO;YAC5BjB,sBAAsB;gBAACwB,SAAS;gBAAOZ;YAAM;QAC/C;QAEA,wDAAwD;QACxD,MAAMa,cAAcd,MAAMe,KAAK;QAC/B,IAAID,aAAa;YACfnB,YAAY,CAAC,YAAY,CAAC;YAC1B,MAAML,SAAS;gBACb0B,oBAAoBT;gBACpBR;gBACAC;gBACAiB,QAAQf;gBACRD;gBACAE;YACF;QACF;QAEA,mFAAmF;QACnFQ,OAAOA,KAAKO,KAAK;QACjB,IAAI;YACF,MAAMzB,SAASS;YACfS,KAAKQ,OAAO;QACd,EAAE,OAAOC,KAAK;YACZT,KAAKU,IAAI;YACT1B,YAAY,4BAA4ByB;YACxCnB,OAAOQ,KAAK,CAAC,4BAA4B;gBAACC,MAAM;YAAC;YACjD;QACF;QAEA,0CAA0C;QAC1C,MAAMY,YAAY3C,QAAQuB;QAC1B,MAAMqB,OAAO7C,SAASwB;QACtB,MAAMsB,UAAUxC,KAAKsC,WAAW;YAACG,SAAS;gBAACF;aAAK;QAAA,GAAGG,IAAI,CAAC7C;QACxD,IAAI8C;QACJ,IAAI;YACFA,WAAW,MAAMnC,mBAAmB;gBAACQ;gBAAOG;YAAO;QACrD,EAAE,OAAOiB,KAAK;YACZ,MAAMQ,UAAUR,eAAeS,QAAQT,IAAIQ,OAAO,GAAGE,OAAOV;YAC5DzB,YAAY,iCAAiCyB;YAC7CnB,OAAO8B,IAAI,CAAC,CAAC,+BAA+B,EAAEH,SAAS;QACzD;QAEAjB,OAAO5B,QAAQ,gBAAgBmC,KAAK;QACpC,MAAMjC,iBAAiB;YACrB+C,eAAepB,gBAAgBqB,EAAE;YACjCC,OAAO;YACP3B;YACAoB;YACAH;YACAW,SAAS3B;QACX;QAEAG,KAAKQ,OAAO;QAEZ,mCAAmC;QACnClB,OAAOmC,GAAG,CAAC,CAAC,KAAK,EAAExD,UAAU,QAAQ,YAAY,qBAAqB,CAAC;QAEvE,IAAI,CAAC0B,OAAO;YACVL,OAAOmC,GAAG,CAAC,CAAC,OAAO,EAAExD,UAAU,QAAQ,cAAc,KAAK,CAAC;YAC3DqB,OAAOmC,GAAG,CACRxD,UACE,QACA;YAGJqB,OAAOmC,GAAG,CAAC,CAAC;AAClB,EAAExD,UACA,OACA,CAAC;;CAEF,CAAC,EACA;AACF,EAAEA,UACA;gBAAC;gBAAQ;aAAQ,EACjB,CAAC;UACO,EAAEgC,gBAAgBqB,EAAE,CAAC;GAC5B,CAAC,GACD;QACC;IACF,EAAE,OAAOxB,OAAO;QACdE,KAAK0B,KAAK;QACV,4CAA4C;QAC5C,IAAI5B,MAAM6B,IAAI,KAAK,mBAAmB;YACpCrC,OAAOQ,KAAK,CAAC,gCAAgC;gBAACC,MAAM;YAAC;YACrD;QACF;QACA,8GAA8G;QAC9G,IAAID,iBAAiB3B,UAAU;YAC7B,MAAM,EAAC8C,OAAO,EAAE,GAAGW,cAAa,GAAG9B;YACnCR,OAAOQ,KAAK,CAACmB,SAAS;gBAAC,GAAGW,YAAY;gBAAE7B,MAAM;YAAC;YAC/C;QACF;QAEAf,YAAY,+BAA+Bc;QAC3CR,OAAOQ,KAAK,CAAC,CAAC,6BAA6B,EAAEA,OAAO,EAAE;YAACC,MAAM;QAAC;IAChE;AACF"}
+{"version":3,"sources":["../../../src/actions/deploy/deployApp.ts"],"sourcesContent":["import {basename, dirname} from 'node:path'\nimport {styleText} from 'node:util'\nimport {createGzip} from 'node:zlib'\n\nimport {CLIError} from '@oclif/core/errors'\nimport {spinner} from '@sanity/cli-core/ux'\nimport {pack} from 'tar-fs'\n\nimport {createDeployment} from '../../services/userApplications.js'\nimport {getAppId} from '../../util/appId.js'\nimport {NO_ORGANIZATION_ID} from '../../util/errorMessages.js'\nimport {getLocalPackageVersion} from '../../util/getLocalPackageVersion.js'\nimport {buildApp} from '../build/buildApp.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.js'\nimport {extractAppManifest} from '../manifest/extractAppManifest.js'\nimport {type AppManifest} from '../manifest/types.js'\nimport {checkDir} from './checkDir.js'\nimport {createUserApplicationForApp} from './createUserApplicationForApp.js'\nimport {deployDebug} from './deployDebug.js'\nimport {findUserApplicationForApp} from './findUserApplicationForApp.js'\nimport {type DeployAppOptions} from './types.js'\n\n/**\n * Deploy a Sanity application.\n *\n * @internal\n */\nexport async function deployApp(options: DeployAppOptions) {\n  const {cliConfig, flags, output, sourceDir, workDir} = options\n\n  const organizationId = cliConfig.app?.organizationId\n  const appId = getAppId(cliConfig)\n  const isAutoUpdating = shouldAutoUpdate({cliConfig, flags, output})\n  const installedSdkVersion = await getLocalPackageVersion('@sanity/sdk-react', workDir)\n\n  if (!installedSdkVersion) {\n    output.error(`Failed to find installed @sanity/sdk-react version`, {exit: 1})\n    return\n  }\n\n  if (!organizationId) {\n    output.error(NO_ORGANIZATION_ID, {exit: 1})\n    return\n  }\n\n  let spin = spinner('Verifying local content...')\n\n  try {\n    let userApplication = await findUserApplicationForApp({\n      cliConfig,\n      organizationId,\n      output,\n    })\n\n    deployDebug(`User application found`, userApplication)\n\n    if (!userApplication) {\n      deployDebug(`No user application found. Creating a new one`)\n\n      userApplication = await createUserApplicationForApp(organizationId)\n      deployDebug(`User application created`, userApplication)\n    }\n\n    // Always build the project, unless --no-build is passed\n    const shouldBuild = flags.build\n    if (shouldBuild) {\n      deployDebug(`Building app`)\n      await buildApp({\n        autoUpdatesEnabled: isAutoUpdating,\n        calledFromDeploy: true,\n        cliConfig,\n        flags,\n        outDir: sourceDir,\n        output,\n        workDir,\n      })\n    }\n\n    // Ensure that the directory exists, is a directory and seems to have valid content\n    spin = spin.start()\n    try {\n      await checkDir(sourceDir)\n      spin.succeed()\n    } catch (err) {\n      spin.fail()\n      deployDebug('Error checking directory', err)\n      output.error('Error checking directory', {exit: 1})\n      return\n    }\n\n    // Create a tarball of the given directory\n    const parentDir = dirname(sourceDir)\n    const base = basename(sourceDir)\n    const tarball = pack(parentDir, {entries: [base]}).pipe(createGzip())\n    let manifest: AppManifest | undefined\n    try {\n      manifest = await extractAppManifest({flags, workDir})\n    } catch (err) {\n      const message = err instanceof Error ? err.message : String(err)\n      deployDebug('Error extracting app manifest', err)\n      output.warn(`Error extracting app manifest: ${message}`)\n    }\n\n    spin = spinner('Deploying...').start()\n    await createDeployment({\n      applicationId: userApplication.id,\n      isApp: true,\n      isAutoUpdating,\n      manifest,\n      tarball,\n      version: installedSdkVersion,\n    })\n\n    spin.succeed()\n\n    // And let the user know we're done\n    output.log(`\\n🚀 ${styleText('bold', 'Success!')} Application deployed`)\n\n    if (!appId) {\n      output.log(`\\n════ ${styleText('bold', 'Next step:')} ════`)\n      output.log(\n        styleText(\n          'bold',\n          '\\nAdd the deployment.appId to your sanity.cli.js or sanity.cli.ts file:',\n        ),\n      )\n      output.log(`\n${styleText(\n  'dim',\n  `app: {\n  // your application config here…\n}`,\n)},\n${styleText(\n  ['bold', 'green'],\n  `deployment: {\n  appId: '${userApplication.id}',\n}\\n`,\n)}`)\n    }\n  } catch (error) {\n    spin.clear()\n    // Don't throw generic error if user cancels\n    if (error.name === 'ExitPromptError') {\n      output.error('Deployment cancelled by user', {exit: 1})\n      return\n    }\n    // If the error is a CLIError, we can just output the message & error options (if any), while ensuring we exit\n    if (error instanceof CLIError) {\n      const {message, ...errorOptions} = error\n      output.error(message, {...errorOptions, exit: 1})\n      return\n    }\n\n    deployDebug('Error deploying application', error)\n    output.error(`Error deploying application: ${error}`, {exit: 1})\n  }\n}\n"],"names":["basename","dirname","styleText","createGzip","CLIError","spinner","pack","createDeployment","getAppId","NO_ORGANIZATION_ID","getLocalPackageVersion","buildApp","shouldAutoUpdate","extractAppManifest","checkDir","createUserApplicationForApp","deployDebug","findUserApplicationForApp","deployApp","options","cliConfig","flags","output","sourceDir","workDir","organizationId","app","appId","isAutoUpdating","installedSdkVersion","error","exit","spin","userApplication","shouldBuild","build","autoUpdatesEnabled","calledFromDeploy","outDir","start","succeed","err","fail","parentDir","base","tarball","entries","pipe","manifest","message","Error","String","warn","applicationId","id","isApp","version","log","clear","name","errorOptions"],"mappings":"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"}

package/dist/actions/deploy/deployStudio.js

@@ -60,6 +60,7 @@ export async function deployStudio(options) {
             deployDebug(`Building studio`);
             await buildStudio({
                 autoUpdatesEnabled: isAutoUpdating,
+                calledFromDeploy: true,
                 cliConfig,
                 flags,
                 outDir: sourceDir,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/deploy/deployStudio.ts"],"sourcesContent":["import {basename, dirname} from 'node:path'\nimport {styleText} from 'node:util'\nimport {createGzip} from 'node:zlib'\n\nimport {CLIError} from '@oclif/core/errors'\nimport {spinner} from '@sanity/cli-core/ux'\nimport {pack} from 'tar-fs'\n\nimport {createDeployment} from '../../services/userApplications.js'\nimport {getAppId} from '../../util/appId.js'\nimport {NO_PROJECT_ID} from '../../util/errorMessages.js'\nimport {getLocalPackageVersion} from '../../util/getLocalPackageVersion.js'\nimport {buildStudio} from '../build/buildStudio.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.js'\nimport {checkDir} from './checkDir.js'\nimport {createStudioUserApplication} from './createStudioUserApplication.js'\nimport {deployDebug} from './deployDebug.js'\nimport {findUserApplicationForStudio} from './findUserApplicationForStudio.js'\nimport {type DeployAppOptions} from './types.js'\n\nexport async function deployStudio(options: DeployAppOptions) {\n  const {cliConfig, flags, output, sourceDir, workDir} = options\n\n  const appHost = cliConfig.studioHost\n  const appId = getAppId(cliConfig)\n  const projectId = cliConfig.api?.projectId\n  const installedSanityVersion = await getLocalPackageVersion('sanity', workDir)\n  const isAutoUpdating = shouldAutoUpdate({cliConfig, flags, output})\n\n  if (!installedSanityVersion) {\n    output.error(`Failed to find installed sanity version`, {exit: 1})\n    return\n  }\n\n  if (!projectId) {\n    output.error(NO_PROJECT_ID, {exit: 1})\n    return\n  }\n\n  let spin = spinner('Verifying local content')\n\n  try {\n    let userApplication = await findUserApplicationForStudio({\n      appHost,\n      appId,\n      output,\n      projectId,\n    })\n\n    if (!userApplication) {\n      // otherwise, prompt the user for a hostname\n      output.log('Your project has not been assigned a studio hostname.')\n      output.log('To deploy your Sanity Studio to our hosted sanity.studio service,')\n      output.log('you will need one. Please enter the part you want to use.')\n\n      userApplication = await createStudioUserApplication(projectId)\n\n      deployDebug('Created user application', userApplication)\n    }\n\n    deployDebug('Found user application', userApplication)\n\n    // Always build the project, unless --no-build is passed\n    const shouldBuild = flags.build\n    if (shouldBuild) {\n      deployDebug(`Building studio`)\n      await buildStudio({\n        autoUpdatesEnabled: isAutoUpdating,\n        cliConfig,\n        flags,\n        outDir: sourceDir,\n        output,\n        workDir,\n      })\n    }\n\n    // TODO: Implement schema deployment\n    // await deploySchemasAction(\n    //   {\n    //     'extract-manifest': shouldBuild,\n    //     'manifest-dir': `${sourceDir}/static`,\n    //     'schema-required': flags['schema-required'],\n    //     'verbose': flags.verbose,\n    //   },\n    //   {...context, manifestExtractor: createManifestExtractor(context)},\n    // )\n\n    // Ensure that the directory exists, is a directory and seems to have valid content\n    spin = spin.start()\n    try {\n      await checkDir(sourceDir)\n      spin.succeed()\n    } catch (err) {\n      spin.fail()\n      deployDebug('Error checking directory', err)\n      output.error('Error checking directory', {exit: 1})\n    }\n\n    // Create a tarball of the given directory\n    const parentDir = dirname(sourceDir)\n    const base = basename(sourceDir)\n    const tarball = pack(parentDir, {entries: [base]}).pipe(createGzip())\n\n    spin = spinner('Deploying to sanity.studio').start()\n\n    const {location} = await createDeployment({\n      applicationId: userApplication.id,\n      isApp: false,\n      isAutoUpdating,\n      projectId,\n      tarball,\n      version: installedSanityVersion,\n    })\n\n    spin.succeed()\n\n    // And let the user know we're done\n    output.log(`\\nSuccess! Studio deployed to ${styleText('cyan', location || 'unknown URL')}`)\n\n    if (!appId) {\n      output.log(`\\nAdd ${styleText('cyan', `deployment: { appId: '${userApplication.id}' }`)}`)\n      output.log(`to sanity.cli.js or sanity.cli.ts`)\n      output.log(`to avoid prompting on next deploy.`)\n    }\n  } catch (error) {\n    // if the error is a CLIError, we can just output the message and exit\n    if (error instanceof CLIError) {\n      output.error(error.message, {exit: 1})\n      return\n    }\n\n    spin.fail()\n    deployDebug('Error deploying studio', error)\n    output.error(`Error deploying studio: ${error}`, {exit: 1})\n  }\n}\n"],"names":["basename","dirname","styleText","createGzip","CLIError","spinner","pack","createDeployment","getAppId","NO_PROJECT_ID","getLocalPackageVersion","buildStudio","shouldAutoUpdate","checkDir","createStudioUserApplication","deployDebug","findUserApplicationForStudio","deployStudio","options","cliConfig","flags","output","sourceDir","workDir","appHost","studioHost","appId","projectId","api","installedSanityVersion","isAutoUpdating","error","exit","spin","userApplication","log","shouldBuild","build","autoUpdatesEnabled","outDir","start","succeed","err","fail","parentDir","base","tarball","entries","pipe","location","applicationId","id","isApp","version","message"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/deploy/deployStudio.ts"],"sourcesContent":["import {basename, dirname} from 'node:path'\nimport {styleText} from 'node:util'\nimport {createGzip} from 'node:zlib'\n\nimport {CLIError} from '@oclif/core/errors'\nimport {spinner} from '@sanity/cli-core/ux'\nimport {pack} from 'tar-fs'\n\nimport {createDeployment} from '../../services/userApplications.js'\nimport {getAppId} from '../../util/appId.js'\nimport {NO_PROJECT_ID} from '../../util/errorMessages.js'\nimport {getLocalPackageVersion} from '../../util/getLocalPackageVersion.js'\nimport {buildStudio} from '../build/buildStudio.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.js'\nimport {checkDir} from './checkDir.js'\nimport {createStudioUserApplication} from './createStudioUserApplication.js'\nimport {deployDebug} from './deployDebug.js'\nimport {findUserApplicationForStudio} from './findUserApplicationForStudio.js'\nimport {type DeployAppOptions} from './types.js'\n\nexport async function deployStudio(options: DeployAppOptions) {\n  const {cliConfig, flags, output, sourceDir, workDir} = options\n\n  const appHost = cliConfig.studioHost\n  const appId = getAppId(cliConfig)\n  const projectId = cliConfig.api?.projectId\n  const installedSanityVersion = await getLocalPackageVersion('sanity', workDir)\n  const isAutoUpdating = shouldAutoUpdate({cliConfig, flags, output})\n\n  if (!installedSanityVersion) {\n    output.error(`Failed to find installed sanity version`, {exit: 1})\n    return\n  }\n\n  if (!projectId) {\n    output.error(NO_PROJECT_ID, {exit: 1})\n    return\n  }\n\n  let spin = spinner('Verifying local content')\n\n  try {\n    let userApplication = await findUserApplicationForStudio({\n      appHost,\n      appId,\n      output,\n      projectId,\n    })\n\n    if (!userApplication) {\n      // otherwise, prompt the user for a hostname\n      output.log('Your project has not been assigned a studio hostname.')\n      output.log('To deploy your Sanity Studio to our hosted sanity.studio service,')\n      output.log('you will need one. Please enter the part you want to use.')\n\n      userApplication = await createStudioUserApplication(projectId)\n\n      deployDebug('Created user application', userApplication)\n    }\n\n    deployDebug('Found user application', userApplication)\n\n    // Always build the project, unless --no-build is passed\n    const shouldBuild = flags.build\n    if (shouldBuild) {\n      deployDebug(`Building studio`)\n      await buildStudio({\n        autoUpdatesEnabled: isAutoUpdating,\n        calledFromDeploy: true,\n        cliConfig,\n        flags,\n        outDir: sourceDir,\n        output,\n        workDir,\n      })\n    }\n\n    // TODO: Implement schema deployment\n    // await deploySchemasAction(\n    //   {\n    //     'extract-manifest': shouldBuild,\n    //     'manifest-dir': `${sourceDir}/static`,\n    //     'schema-required': flags['schema-required'],\n    //     'verbose': flags.verbose,\n    //   },\n    //   {...context, manifestExtractor: createManifestExtractor(context)},\n    // )\n\n    // Ensure that the directory exists, is a directory and seems to have valid content\n    spin = spin.start()\n    try {\n      await checkDir(sourceDir)\n      spin.succeed()\n    } catch (err) {\n      spin.fail()\n      deployDebug('Error checking directory', err)\n      output.error('Error checking directory', {exit: 1})\n    }\n\n    // Create a tarball of the given directory\n    const parentDir = dirname(sourceDir)\n    const base = basename(sourceDir)\n    const tarball = pack(parentDir, {entries: [base]}).pipe(createGzip())\n\n    spin = spinner('Deploying to sanity.studio').start()\n\n    const {location} = await createDeployment({\n      applicationId: userApplication.id,\n      isApp: false,\n      isAutoUpdating,\n      projectId,\n      tarball,\n      version: installedSanityVersion,\n    })\n\n    spin.succeed()\n\n    // And let the user know we're done\n    output.log(`\\nSuccess! Studio deployed to ${styleText('cyan', location || 'unknown URL')}`)\n\n    if (!appId) {\n      output.log(`\\nAdd ${styleText('cyan', `deployment: { appId: '${userApplication.id}' }`)}`)\n      output.log(`to sanity.cli.js or sanity.cli.ts`)\n      output.log(`to avoid prompting on next deploy.`)\n    }\n  } catch (error) {\n    // if the error is a CLIError, we can just output the message and exit\n    if (error instanceof CLIError) {\n      output.error(error.message, {exit: 1})\n      return\n    }\n\n    spin.fail()\n    deployDebug('Error deploying studio', error)\n    output.error(`Error deploying studio: ${error}`, {exit: 1})\n  }\n}\n"],"names":["basename","dirname","styleText","createGzip","CLIError","spinner","pack","createDeployment","getAppId","NO_PROJECT_ID","getLocalPackageVersion","buildStudio","shouldAutoUpdate","checkDir","createStudioUserApplication","deployDebug","findUserApplicationForStudio","deployStudio","options","cliConfig","flags","output","sourceDir","workDir","appHost","studioHost","appId","projectId","api","installedSanityVersion","isAutoUpdating","error","exit","spin","userApplication","log","shouldBuild","build","autoUpdatesEnabled","calledFromDeploy","outDir","start","succeed","err","fail","parentDir","base","tarball","entries","pipe","location","applicationId","id","isApp","version","message"],"mappings":"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"}

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()}/@${organizationId}?${new URLSearchParams({\n    dev: url,\n  }).toString()}`\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,OAAO,GAAGN,eAAe,EAAE,EAAEK,eAAe,CAAC,EAAE,IAAIE,gBAAgB;QACjEC,KAAKF;IACP,GAAGG,QAAQ,IAAI;AACjB;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,CAChC,GAAGrB,eAAe,4CAA4C,EAAEkB,YAAYT,QAAQ,IAAI,EACxF;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

@@ -2,7 +2,7 @@ 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,7 +34,7 @@ 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
@@ -44,7 +44,7 @@ export async function startAppDevServer(options) {
         output.log(styleText([
             'blue',
             'underline'
-        ], coreAppUrl));
+        ], dashboardAppUrl));
         return {
             close
         };

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

@@ -1 +1 @@
-{"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 {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(styleText(['blue', '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":["styleText","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","err"],"mappings":"AAAA,SAAQA,SAAS,QAAO,YAAW;AAEnC,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,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"}
+{"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

@@ -10,12 +10,11 @@ import { compareDependencyVersions } from '../../util/compareDependencyVersions.
 import { getLocalPackageVersion } from '../../util/getLocalPackageVersion.js';
 import { getPackageManagerChoice } from '../../util/packageManager/packageManagerChoice.js';
 import { upgradePackages } from '../../util/packageManager/upgradePackages.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;
@@ -58,16 +57,14 @@ 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,
@@ -78,7 +75,7 @@ export async function startStudioDevServer(options) {
                         packageManager: (await getPackageManagerChoice(workDir, {
                             interactive: false
                         })).chosen,
-                        packages: result.map((res)=>[
+                        packages: result.mismatched.map((res)=>[
                                 res.pkg,
                                 res.remote
                             ])
@@ -93,6 +90,9 @@ export async function startStudioDevServer(options) {
             }
         }
     }
+    if (cliConfig?.schemaExtraction?.enabled) {
+        output.log(`${logSymbols.info} Running dev server with schema extraction enabled`);
+    }
     const config = getDevServerConfig({
         cliConfig,
         flags,
@@ -129,7 +129,7 @@ export async function startStudioDevServer(options) {
             output.log(styleText([
                 'blue',
                 'underline'
-            ], getCoreAppURL({
+            ], await getDashboardAppURL({
                 httpHost,
                 httpPort: port,
                 organizationId: organizationId

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/dev/startStudioDevServer.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {isInteractive} from '@sanity/cli-core'\nimport {confirm, logSymbols, spinner} from '@sanity/cli-core/ux'\nimport semver from 'semver'\n\nimport {startDevServer} from '../../server/devServer.js'\nimport {gracefulServerDeath} from '../../server/gracefulServerDeath.js'\nimport {getProjectById} from '../../services/projects.js'\nimport {getAppId} from '../../util/appId.js'\nimport {compareDependencyVersions} from '../../util/compareDependencyVersions.js'\nimport {getLocalPackageVersion} from '../../util/getLocalPackageVersion.js'\nimport {getPackageManagerChoice} from '../../util/packageManager/packageManagerChoice.js'\nimport {upgradePackages} from '../../util/packageManager/upgradePackages.js'\nimport {warnAboutMissingAppId} from '../../util/warnAboutMissingAppId.js'\nimport {checkRequiredDependencies} from '../build/checkRequiredDependencies.js'\nimport {checkStudioDependencyVersions} from '../build/checkStudioDependencyVersions.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.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 startStudioDevServer(\n  options: DevActionOptions,\n): Promise<{close?: () => Promise<void>}> {\n  const {cliConfig, flags, output, workDir} = options\n  const projectId = cliConfig?.api?.projectId\n  let organizationId: string | undefined\n\n  const loadInDashboard = flags['load-in-dashboard']\n\n  // Check studio dependency versions\n  await checkStudioDependencyVersions(workDir, output)\n\n  const {installedSanityVersion} = await checkRequiredDependencies(options)\n\n  // Check if auto-updates are enabled\n  const autoUpdatesEnabled = shouldAutoUpdate({cliConfig, flags, output})\n\n  if (autoUpdatesEnabled) {\n    // Get the clean version without build metadata: https://semver.org/#spec-item-10\n    const cleanSanityVersion = semver.parse(installedSanityVersion)?.version\n    if (!cleanSanityVersion) {\n      throw new Error(`Failed to parse installed Sanity version: ${installedSanityVersion}`)\n    }\n\n    const sanityDependencies = [\n      {name: 'sanity', version: cleanSanityVersion},\n      {name: '@sanity/vision', version: cleanSanityVersion},\n    ]\n\n    output.log(`${logSymbols.info} Running with auto-updates enabled`)\n\n    // Check local versions against deployed versions\n    let result: Awaited<ReturnType<typeof compareDependencyVersions>> | undefined\n\n    const appId = getAppId(cliConfig)\n\n    try {\n      result = await compareDependencyVersions(sanityDependencies, workDir, {appId})\n    } catch (err) {\n      output.warn(`Failed to compare local versions against auto-updating versions: ${err}`)\n    }\n\n    if (!appId) {\n      warnAboutMissingAppId({\n        appType: 'studio',\n        output,\n        projectId,\n      })\n    }\n\n    // mismatch between local and auto-updating dependencies\n    if (result?.length) {\n      const message =\n        `The following local package versions are different from the versions currently served at runtime.\\n` +\n        `When using auto updates, we recommend that you run with the same versions locally as will be used when deploying.\\n\\n` +\n        `${result.map((mod) => ` - ${mod.pkg} (local version: ${mod.installed}, runtime version: ${mod.remote})`).join('\\n')}\\n\\n`\n\n      if (isInteractive()) {\n        const shouldUpgrade = await confirm({\n          default: true,\n          message: styleText('yellow', `${message}Do you want to upgrade local versions?`),\n        })\n        if (shouldUpgrade) {\n          await upgradePackages(\n            {\n              packageManager: (await getPackageManagerChoice(workDir, {interactive: false})).chosen,\n              packages: result.map((res) => [res.pkg, res.remote]),\n            },\n            {output, workDir},\n          )\n        }\n      } else {\n        // In this case we warn the user but we don't ask them if they want to upgrade because it's not interactive.\n        output.log(styleText('yellow', message))\n      }\n    }\n  }\n\n  const config = getDevServerConfig({cliConfig, flags, output, workDir})\n\n  if (loadInDashboard) {\n    if (!projectId) {\n      output.error('Project Id is required to load in dashboard', {exit: 1})\n    }\n\n    try {\n      const project = await getProjectById(projectId!)\n      organizationId = project.organizationId!\n    } catch (error) {\n      devDebug('Error getting organization id from project id', error)\n      output.error('Failed to get organization id from project id', {exit: 1})\n    }\n  }\n\n  try {\n    const startTime = Date.now()\n    const spin = spinner('Starting dev server').start()\n    const {close, server} = await startDevServer(config)\n\n    const {info: loggerInfo} = server.config.logger\n    const {port} = server.config.server\n    const httpHost = config.httpHost || 'localhost'\n\n    if (loadInDashboard) {\n      spin.succeed()\n\n      output.log(`Dev server started on port ${port}`)\n      output.log(`View your studio in the Sanity dashboard here:`)\n      output.log(\n        styleText(\n          ['blue', 'underline'],\n          getCoreAppURL({\n            httpHost,\n            httpPort: port,\n            organizationId: organizationId!,\n          }),\n        ),\n      )\n    } else {\n      const startupDuration = Date.now() - startTime\n      const url = `http://${httpHost || 'localhost'}:${port}${config.basePath}`\n      const appType = 'Sanity Studio'\n\n      const viteVersion = await getLocalPackageVersion('vite', import.meta.url)\n      spin.succeed()\n\n      loggerInfo(\n        `${appType} ` +\n          `using ${styleText('cyan', `vite@${viteVersion}`)} ` +\n          `ready in ${styleText('cyan', `${Math.ceil(startupDuration)}ms`)} ` +\n          `and running at ${styleText('cyan', url)}`,\n      )\n    }\n\n    return {close}\n  } catch (err) {\n    devDebug('Error starting studio dev server', err)\n    throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err)\n  }\n}\n"],"names":["styleText","isInteractive","confirm","logSymbols","spinner","semver","startDevServer","gracefulServerDeath","getProjectById","getAppId","compareDependencyVersions","getLocalPackageVersion","getPackageManagerChoice","upgradePackages","warnAboutMissingAppId","checkRequiredDependencies","checkStudioDependencyVersions","shouldAutoUpdate","devDebug","getCoreAppURL","getDevServerConfig","startStudioDevServer","options","cliConfig","flags","output","workDir","projectId","api","organizationId","loadInDashboard","installedSanityVersion","autoUpdatesEnabled","cleanSanityVersion","parse","version","Error","sanityDependencies","name","log","info","result","appId","err","warn","appType","length","message","map","mod","pkg","installed","remote","join","shouldUpgrade","default","packageManager","interactive","chosen","packages","res","config","error","exit","project","startTime","Date","now","spin","start","close","server","loggerInfo","logger","port","httpHost","succeed","httpPort","startupDuration","url","basePath","viteVersion","Math","ceil"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/dev/startStudioDevServer.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {isInteractive} from '@sanity/cli-core'\nimport {confirm, logSymbols, spinner} from '@sanity/cli-core/ux'\nimport semver from 'semver'\n\nimport {startDevServer} from '../../server/devServer.js'\nimport {gracefulServerDeath} from '../../server/gracefulServerDeath.js'\nimport {getProjectById} from '../../services/projects.js'\nimport {getAppId} from '../../util/appId.js'\nimport {compareDependencyVersions} from '../../util/compareDependencyVersions.js'\nimport {getLocalPackageVersion} from '../../util/getLocalPackageVersion.js'\nimport {getPackageManagerChoice} from '../../util/packageManager/packageManagerChoice.js'\nimport {upgradePackages} from '../../util/packageManager/upgradePackages.js'\nimport {checkRequiredDependencies} from '../build/checkRequiredDependencies.js'\nimport {checkStudioDependencyVersions} from '../build/checkStudioDependencyVersions.js'\nimport {shouldAutoUpdate} from '../build/shouldAutoUpdate.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 startStudioDevServer(\n  options: DevActionOptions,\n): Promise<{close?: () => Promise<void>}> {\n  const {cliConfig, flags, output, workDir} = options\n  const projectId = cliConfig?.api?.projectId\n  let organizationId: string | undefined\n\n  const loadInDashboard = flags['load-in-dashboard']\n\n  // Check studio dependency versions\n  await checkStudioDependencyVersions(workDir, output)\n\n  const {installedSanityVersion} = await checkRequiredDependencies(options)\n\n  // Check if auto-updates are enabled\n  const autoUpdatesEnabled = shouldAutoUpdate({cliConfig, flags, output})\n\n  if (autoUpdatesEnabled) {\n    // Get the clean version without build metadata: https://semver.org/#spec-item-10\n    const cleanSanityVersion = semver.parse(installedSanityVersion)?.version\n    if (!cleanSanityVersion) {\n      throw new Error(`Failed to parse installed Sanity version: ${installedSanityVersion}`)\n    }\n\n    const sanityDependencies = [\n      {name: 'sanity', version: cleanSanityVersion},\n      {name: '@sanity/vision', version: cleanSanityVersion},\n    ]\n\n    output.log(`${logSymbols.info} Running with auto-updates enabled`)\n\n    // Check local versions against deployed versions\n    let result: Awaited<ReturnType<typeof compareDependencyVersions>> | undefined\n\n    const appId = getAppId(cliConfig)\n\n    try {\n      result = await compareDependencyVersions(sanityDependencies, workDir, {appId})\n    } catch (err) {\n      output.warn(`Failed to compare local versions against auto-updating versions: ${err}`)\n    }\n\n    if (result?.unresolvedPrerelease.length) {\n      for (const mod of result.unresolvedPrerelease) {\n        output.warn(\n          `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.`,\n        )\n      }\n    }\n\n    // mismatch between local and auto-updating dependencies\n    if (result?.mismatched.length) {\n      const message =\n        `The following local package versions are different from the versions currently served at runtime.\\n` +\n        `When using auto updates, we recommend that you run with the same versions locally as will be used when deploying.\\n\\n` +\n        `${result.mismatched.map((mod) => ` - ${mod.pkg} (local version: ${mod.installed}, runtime version: ${mod.remote})`).join('\\n')}\\n\\n`\n\n      if (isInteractive()) {\n        const shouldUpgrade = await confirm({\n          default: true,\n          message: styleText('yellow', `${message}Do you want to upgrade local versions?`),\n        })\n        if (shouldUpgrade) {\n          await upgradePackages(\n            {\n              packageManager: (await getPackageManagerChoice(workDir, {interactive: false})).chosen,\n              packages: result.mismatched.map((res) => [res.pkg, res.remote]),\n            },\n            {output, workDir},\n          )\n        }\n      } else {\n        // In this case we warn the user but we don't ask them if they want to upgrade because it's not interactive.\n        output.log(styleText('yellow', message))\n      }\n    }\n  }\n\n  if (cliConfig?.schemaExtraction?.enabled) {\n    output.log(`${logSymbols.info} Running dev server with schema extraction enabled`)\n  }\n\n  const config = getDevServerConfig({cliConfig, flags, output, workDir})\n\n  if (loadInDashboard) {\n    if (!projectId) {\n      output.error('Project Id is required to load in dashboard', {exit: 1})\n    }\n\n    try {\n      const project = await getProjectById(projectId!)\n      organizationId = project.organizationId!\n    } catch (error) {\n      devDebug('Error getting organization id from project id', error)\n      output.error('Failed to get organization id from project id', {exit: 1})\n    }\n  }\n\n  try {\n    const startTime = Date.now()\n    const spin = spinner('Starting dev server').start()\n    const {close, server} = await startDevServer(config)\n\n    const {info: loggerInfo} = server.config.logger\n    const {port} = server.config.server\n    const httpHost = config.httpHost || 'localhost'\n\n    if (loadInDashboard) {\n      spin.succeed()\n\n      output.log(`Dev server started on port ${port}`)\n      output.log(`View your studio in the Sanity dashboard here:`)\n      output.log(\n        styleText(\n          ['blue', 'underline'],\n          await getDashboardAppURL({\n            httpHost,\n            httpPort: port,\n            organizationId: organizationId!,\n          }),\n        ),\n      )\n    } else {\n      const startupDuration = Date.now() - startTime\n      const url = `http://${httpHost || 'localhost'}:${port}${config.basePath}`\n      const appType = 'Sanity Studio'\n\n      const viteVersion = await getLocalPackageVersion('vite', import.meta.url)\n      spin.succeed()\n\n      loggerInfo(\n        `${appType} ` +\n          `using ${styleText('cyan', `vite@${viteVersion}`)} ` +\n          `ready in ${styleText('cyan', `${Math.ceil(startupDuration)}ms`)} ` +\n          `and running at ${styleText('cyan', url)}`,\n      )\n    }\n\n    return {close}\n  } catch (err) {\n    devDebug('Error starting studio dev server', err)\n    throw gracefulServerDeath('dev', config.httpHost, config.httpPort, err)\n  }\n}\n"],"names":["styleText","isInteractive","confirm","logSymbols","spinner","semver","startDevServer","gracefulServerDeath","getProjectById","getAppId","compareDependencyVersions","getLocalPackageVersion","getPackageManagerChoice","upgradePackages","checkRequiredDependencies","checkStudioDependencyVersions","shouldAutoUpdate","devDebug","getDashboardAppURL","getDevServerConfig","startStudioDevServer","options","cliConfig","flags","output","workDir","projectId","api","organizationId","loadInDashboard","installedSanityVersion","autoUpdatesEnabled","cleanSanityVersion","parse","version","Error","sanityDependencies","name","log","info","result","appId","err","warn","unresolvedPrerelease","length","mod","pkg","mismatched","message","map","installed","remote","join","shouldUpgrade","default","packageManager","interactive","chosen","packages","res","schemaExtraction","enabled","config","error","exit","project","startTime","Date","now","spin","start","close","server","loggerInfo","logger","port","httpHost","succeed","httpPort","startupDuration","url","basePath","appType","viteVersion","Math","ceil"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/documents/types.ts"],"sourcesContent":["import {type Output} from '@sanity/cli-core'\nimport {type ClientConfig} from '@sanity/client'\nimport {type ValidationMarker} from '@sanity/types'\n\nimport {type ValidateDocumentsCommand} from '../../commands/documents/validate.js'\nimport {\n  type WorkerChannel,\n  type WorkerChannelEvent,\n  type WorkerChannelReceiver,\n  type WorkerChannelStream,\n} from '../../util/workerChannels.js'\n\nexport type Level = ValidationMarker['level']\n\n/** @internal */\nexport interface ValidateDocumentsWorkerData {\n  workDir: string\n\n  clientConfig?: Partial<ClientConfig>\n  dataset?: string\n  level?: ValidationMarker['level']\n  maxCustomValidationConcurrency?: number\n  maxFetchConcurrency?: number\n  ndjsonFilePath?: string\n  projectId?: string\n  studioHost?: string\n  workspace?: string\n}\n\n/** @internal */\nexport type ValidationWorkerChannel = WorkerChannel<{\n  exportFinished: WorkerChannelEvent<{totalDocumentsToValidate: number}>\n  exportProgress: WorkerChannelStream<{documentCount: number; downloadedCount: number}>\n  loadedDocumentCount: WorkerChannelEvent<{documentCount: number}>\n  loadedReferenceIntegrity: WorkerChannelEvent\n  loadedWorkspace: WorkerChannelEvent<{\n    basePath: string\n    dataset: string\n    name: string\n    projectId: string\n  }>\n  validation: WorkerChannelStream<{\n    documentId: string\n    documentType: string\n    intentUrl?: string\n    level: ValidationMarker['level']\n    markers: ValidationMarker[]\n    revision: string\n    validatedCount: number\n  }>\n}>\n\nexport type BuiltInValidationReporter = (options: {\n  flags: ValidateDocumentsCommand['flags']\n  output: Output\n  worker: WorkerChannelReceiver<ValidationWorkerChannel>\n}) => Promise<Level>\n"],"names":[],"mappings":"AAoDA,WAIoB"}
+{"version":3,"sources":["../../../src/actions/documents/types.ts"],"sourcesContent":["import {type Output} from '@sanity/cli-core'\nimport {type ClientConfig} from '@sanity/client'\nimport {type ValidationMarker} from '@sanity/types'\nimport {type WorkerChannel, type WorkerChannelReceiver} from '@sanity/worker-channels'\n\nimport {type ValidateDocumentsCommand} from '../../commands/documents/validate.js'\n\nexport type Level = ValidationMarker['level']\n\n/** @internal */\nexport interface ValidateDocumentsWorkerData {\n  workDir: string\n\n  clientConfig?: Partial<ClientConfig>\n  dataset?: string\n  level?: ValidationMarker['level']\n  maxCustomValidationConcurrency?: number\n  maxFetchConcurrency?: number\n  ndjsonFilePath?: string\n  projectId?: string\n  studioHost?: string\n  workspace?: string\n}\n\n/** @internal */\nexport type ValidationWorkerChannel = WorkerChannel.Definition<{\n  exportFinished: WorkerChannel.Event<{totalDocumentsToValidate: number}>\n  exportProgress: WorkerChannel.Stream<{documentCount: number; downloadedCount: number}>\n  loadedDocumentCount: WorkerChannel.Event<{documentCount: number}>\n  loadedReferenceIntegrity: WorkerChannel.Event\n  loadedWorkspace: WorkerChannel.Event<{\n    basePath: string\n    dataset: string\n    name: string\n    projectId: string\n  }>\n  validation: WorkerChannel.Stream<{\n    documentId: string\n    documentType: string\n    intentUrl?: string\n    level: ValidationMarker['level']\n    markers: ValidationMarker[]\n    revision: string\n    validatedCount: number\n  }>\n}>\n\n/**\n * Combines the package's receiver API with a `dispose()` method that\n * unsubscribes from worker messages AND terminates the worker thread.\n */\nexport interface ValidationReceiver {\n  dispose: () => Promise<number>\n  event: WorkerChannelReceiver<ValidationWorkerChannel>['event']\n  stream: WorkerChannelReceiver<ValidationWorkerChannel>['stream']\n}\n\nexport type BuiltInValidationReporter = (options: {\n  flags: ValidateDocumentsCommand['flags']\n  output: Output\n  worker: ValidationReceiver\n}) => Promise<Level>\n"],"names":[],"mappings":"AAyDA,WAIoB"}

package/dist/actions/documents/validate.js

@@ -1,5 +1,5 @@
 import { createStudioWorker, getGlobalCliClient } from '@sanity/cli-core';
-import { createReceiver } from '../../util/workerChannels.js';
+import { WorkerChannelReceiver } from '@sanity/worker-channels';
 import { DOCUMENTS_API_VERSION } from './constants.js';
 const defaultReporter = ({ dispose, stream })=>{
     async function* createValidationGenerator() {
@@ -54,7 +54,16 @@ export async function validateDocuments(options) {
             workspace
         }
     });
-    return reporter(createReceiver(worker));
+    const receiver = WorkerChannelReceiver.from(worker);
+    const validationReceiver = {
+        dispose: async ()=>{
+            receiver.unsubscribe();
+            return worker.terminate();
+        },
+        event: receiver.event,
+        stream: receiver.stream
+    };
+    return reporter(validationReceiver);
 }
 
 //# sourceMappingURL=validate.js.map

package/dist/actions/documents/validate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/documents/validate.ts"],"sourcesContent":["import {createStudioWorker, getGlobalCliClient} from '@sanity/cli-core'\nimport {type ClientConfig} from '@sanity/client'\nimport {type ValidationMarker} from '@sanity/types'\n\nimport {createReceiver, type WorkerChannelReceiver} from '../../util/workerChannels.js'\nimport {DOCUMENTS_API_VERSION} from './constants.js'\nimport {Level, type ValidateDocumentsWorkerData, type ValidationWorkerChannel} from './types.js'\n\ninterface ValidateDocumentsOptions<TReturn = unknown> {\n  dataset?: string // override\n  level?: Level\n  maxCustomValidationConcurrency?: number\n  maxFetchConcurrency?: number\n  ndjsonFilePath?: string\n  projectId?: string // override\n  reporter?: (worker: WorkerChannelReceiver<ValidationWorkerChannel>) => TReturn\n  studioHost?: string\n  workDir?: string\n  workspace?: string\n}\n\ninterface DocumentValidationResult {\n  documentId: string\n  documentType: string\n  level: ValidationMarker['level']\n  markers: ValidationMarker[]\n  revision: string\n}\n\nconst defaultReporter = ({dispose, stream}: WorkerChannelReceiver<ValidationWorkerChannel>) => {\n  async function* createValidationGenerator() {\n    for await (const {documentId, documentType, level, markers, revision} of stream.validation()) {\n      const result: DocumentValidationResult = {\n        documentId,\n        documentType,\n        level,\n        markers,\n        revision,\n      }\n\n      yield result\n    }\n\n    await dispose()\n  }\n\n  return createValidationGenerator()\n}\n\nexport function validateDocuments<TReturn>(\n  options: Required<Pick<ValidateDocumentsOptions<TReturn>, 'reporter'>> &\n    ValidateDocumentsOptions<TReturn>,\n): Promise<TReturn>\nexport function validateDocuments(\n  options: ValidateDocumentsOptions,\n): Promise<AsyncIterable<DocumentValidationResult>>\nexport async function validateDocuments(options: ValidateDocumentsOptions): Promise<unknown> {\n  const {\n    dataset,\n    level,\n    maxCustomValidationConcurrency,\n    maxFetchConcurrency,\n    ndjsonFilePath,\n    projectId,\n    reporter = defaultReporter,\n    workDir = process.cwd(),\n    workspace,\n  } = options\n\n  const apiClient = await getGlobalCliClient({\n    apiVersion: DOCUMENTS_API_VERSION,\n    requireUser: true,\n  })\n\n  const clientConfig: ClientConfig = {\n    ...apiClient.config(),\n    // we set this explictly to true because we pass in a token via the\n    // `clientConfiguration` object and also mock a browser environment in\n    // this worker which triggers the browser warning\n    ignoreBrowserTokenWarning: true,\n    // Removing from object so config can be serialized\n    // before sent to validation worker\n    requester: undefined,\n    // we set this explictly to true because the default client configuration\n    // from the CLI comes configured with `useProjectHostname: false` when\n    // `requireProject` is set to false\n    useProjectHostname: true,\n  }\n\n  const worker = createStudioWorker(new URL('validateDocuments.worker.js', import.meta.url), {\n    name: 'validateDocuments',\n    studioRootPath: workDir,\n    workerData: {\n      // removes props in the config that make this object fail to serialize\n      clientConfig: structuredClone(clientConfig),\n      dataset,\n      level,\n      maxCustomValidationConcurrency,\n      maxFetchConcurrency,\n      ndjsonFilePath,\n      projectId,\n      studioHost: options.studioHost,\n      workDir,\n      workspace,\n    } satisfies ValidateDocumentsWorkerData,\n  })\n\n  return reporter(createReceiver<ValidationWorkerChannel>(worker))\n}\n"],"names":["createStudioWorker","getGlobalCliClient","createReceiver","DOCUMENTS_API_VERSION","defaultReporter","dispose","stream","createValidationGenerator","documentId","documentType","level","markers","revision","validation","result","validateDocuments","options","dataset","maxCustomValidationConcurrency","maxFetchConcurrency","ndjsonFilePath","projectId","reporter","workDir","process","cwd","workspace","apiClient","apiVersion","requireUser","clientConfig","config","ignoreBrowserTokenWarning","requester","undefined","useProjectHostname","worker","URL","url","name","studioRootPath","workerData","structuredClone","studioHost"],"mappings":"AAAA,SAAQA,kBAAkB,EAAEC,kBAAkB,QAAO,mBAAkB;AAIvE,SAAQC,cAAc,QAAmC,+BAA8B;AACvF,SAAQC,qBAAqB,QAAO,iBAAgB;AAwBpD,MAAMC,kBAAkB,CAAC,EAACC,OAAO,EAAEC,MAAM,EAAiD;IACxF,gBAAgBC;QACd,WAAW,MAAM,EAACC,UAAU,EAAEC,YAAY,EAAEC,KAAK,EAAEC,OAAO,EAAEC,QAAQ,EAAC,IAAIN,OAAOO,UAAU,GAAI;YAC5F,MAAMC,SAAmC;gBACvCN;gBACAC;gBACAC;gBACAC;gBACAC;YACF;YAEA,MAAME;QACR;QAEA,MAAMT;IACR;IAEA,OAAOE;AACT;AASA,OAAO,eAAeQ,kBAAkBC,OAAiC;IACvE,MAAM,EACJC,OAAO,EACPP,KAAK,EACLQ,8BAA8B,EAC9BC,mBAAmB,EACnBC,cAAc,EACdC,SAAS,EACTC,WAAWlB,eAAe,EAC1BmB,UAAUC,QAAQC,GAAG,EAAE,EACvBC,SAAS,EACV,GAAGV;IAEJ,MAAMW,YAAY,MAAM1B,mBAAmB;QACzC2B,YAAYzB;QACZ0B,aAAa;IACf;IAEA,MAAMC,eAA6B;QACjC,GAAGH,UAAUI,MAAM,EAAE;QACrB,mEAAmE;QACnE,sEAAsE;QACtE,iDAAiD;QACjDC,2BAA2B;QAC3B,mDAAmD;QACnD,mCAAmC;QACnCC,WAAWC;QACX,yEAAyE;QACzE,sEAAsE;QACtE,mCAAmC;QACnCC,oBAAoB;IACtB;IAEA,MAAMC,SAASpC,mBAAmB,IAAIqC,IAAI,+BAA+B,YAAYC,GAAG,GAAG;QACzFC,MAAM;QACNC,gBAAgBjB;QAChBkB,YAAY;YACV,sEAAsE;YACtEX,cAAcY,gBAAgBZ;YAC9Bb;YACAP;YACAQ;YACAC;YACAC;YACAC;YACAsB,YAAY3B,QAAQ2B,UAAU;YAC9BpB;YACAG;QACF;IACF;IAEA,OAAOJ,SAASpB,eAAwCkC;AAC1D"}
+{"version":3,"sources":["../../../src/actions/documents/validate.ts"],"sourcesContent":["import {createStudioWorker, getGlobalCliClient} from '@sanity/cli-core'\nimport {type ClientConfig} from '@sanity/client'\nimport {type ValidationMarker} from '@sanity/types'\nimport {WorkerChannelReceiver} from '@sanity/worker-channels'\n\nimport {DOCUMENTS_API_VERSION} from './constants.js'\nimport {\n  Level,\n  type ValidateDocumentsWorkerData,\n  type ValidationReceiver,\n  type ValidationWorkerChannel,\n} from './types.js'\n\ninterface ValidateDocumentsOptions<TReturn = unknown> {\n  dataset?: string // override\n  level?: Level\n  maxCustomValidationConcurrency?: number\n  maxFetchConcurrency?: number\n  ndjsonFilePath?: string\n  projectId?: string // override\n  reporter?: (worker: ValidationReceiver) => TReturn\n  studioHost?: string\n  workDir?: string\n  workspace?: string\n}\n\ninterface DocumentValidationResult {\n  documentId: string\n  documentType: string\n  level: ValidationMarker['level']\n  markers: ValidationMarker[]\n  revision: string\n}\n\nconst defaultReporter = ({dispose, stream}: ValidationReceiver) => {\n  async function* createValidationGenerator() {\n    for await (const {documentId, documentType, level, markers, revision} of stream.validation()) {\n      const result: DocumentValidationResult = {\n        documentId,\n        documentType,\n        level,\n        markers,\n        revision,\n      }\n\n      yield result\n    }\n\n    await dispose()\n  }\n\n  return createValidationGenerator()\n}\n\nexport function validateDocuments<TReturn>(\n  options: Required<Pick<ValidateDocumentsOptions<TReturn>, 'reporter'>> &\n    ValidateDocumentsOptions<TReturn>,\n): Promise<TReturn>\nexport function validateDocuments(\n  options: ValidateDocumentsOptions,\n): Promise<AsyncIterable<DocumentValidationResult>>\nexport async function validateDocuments(options: ValidateDocumentsOptions): Promise<unknown> {\n  const {\n    dataset,\n    level,\n    maxCustomValidationConcurrency,\n    maxFetchConcurrency,\n    ndjsonFilePath,\n    projectId,\n    reporter = defaultReporter,\n    workDir = process.cwd(),\n    workspace,\n  } = options\n\n  const apiClient = await getGlobalCliClient({\n    apiVersion: DOCUMENTS_API_VERSION,\n    requireUser: true,\n  })\n\n  const clientConfig: ClientConfig = {\n    ...apiClient.config(),\n    // we set this explictly to true because we pass in a token via the\n    // `clientConfiguration` object and also mock a browser environment in\n    // this worker which triggers the browser warning\n    ignoreBrowserTokenWarning: true,\n    // Removing from object so config can be serialized\n    // before sent to validation worker\n    requester: undefined,\n    // we set this explictly to true because the default client configuration\n    // from the CLI comes configured with `useProjectHostname: false` when\n    // `requireProject` is set to false\n    useProjectHostname: true,\n  }\n\n  const worker = createStudioWorker(new URL('validateDocuments.worker.js', import.meta.url), {\n    name: 'validateDocuments',\n    studioRootPath: workDir,\n    workerData: {\n      // removes props in the config that make this object fail to serialize\n      clientConfig: structuredClone(clientConfig),\n      dataset,\n      level,\n      maxCustomValidationConcurrency,\n      maxFetchConcurrency,\n      ndjsonFilePath,\n      projectId,\n      studioHost: options.studioHost,\n      workDir,\n      workspace,\n    } satisfies ValidateDocumentsWorkerData,\n  })\n\n  const receiver = WorkerChannelReceiver.from<ValidationWorkerChannel>(worker)\n  const validationReceiver: ValidationReceiver = {\n    dispose: async () => {\n      receiver.unsubscribe()\n      return worker.terminate()\n    },\n    event: receiver.event,\n    stream: receiver.stream,\n  }\n\n  return reporter(validationReceiver)\n}\n"],"names":["createStudioWorker","getGlobalCliClient","WorkerChannelReceiver","DOCUMENTS_API_VERSION","defaultReporter","dispose","stream","createValidationGenerator","documentId","documentType","level","markers","revision","validation","result","validateDocuments","options","dataset","maxCustomValidationConcurrency","maxFetchConcurrency","ndjsonFilePath","projectId","reporter","workDir","process","cwd","workspace","apiClient","apiVersion","requireUser","clientConfig","config","ignoreBrowserTokenWarning","requester","undefined","useProjectHostname","worker","URL","url","name","studioRootPath","workerData","structuredClone","studioHost","receiver","from","validationReceiver","unsubscribe","terminate","event"],"mappings":"AAAA,SAAQA,kBAAkB,EAAEC,kBAAkB,QAAO,mBAAkB;AAGvE,SAAQC,qBAAqB,QAAO,0BAAyB;AAE7D,SAAQC,qBAAqB,QAAO,iBAAgB;AA6BpD,MAAMC,kBAAkB,CAAC,EAACC,OAAO,EAAEC,MAAM,EAAqB;IAC5D,gBAAgBC;QACd,WAAW,MAAM,EAACC,UAAU,EAAEC,YAAY,EAAEC,KAAK,EAAEC,OAAO,EAAEC,QAAQ,EAAC,IAAIN,OAAOO,UAAU,GAAI;YAC5F,MAAMC,SAAmC;gBACvCN;gBACAC;gBACAC;gBACAC;gBACAC;YACF;YAEA,MAAME;QACR;QAEA,MAAMT;IACR;IAEA,OAAOE;AACT;AASA,OAAO,eAAeQ,kBAAkBC,OAAiC;IACvE,MAAM,EACJC,OAAO,EACPP,KAAK,EACLQ,8BAA8B,EAC9BC,mBAAmB,EACnBC,cAAc,EACdC,SAAS,EACTC,WAAWlB,eAAe,EAC1BmB,UAAUC,QAAQC,GAAG,EAAE,EACvBC,SAAS,EACV,GAAGV;IAEJ,MAAMW,YAAY,MAAM1B,mBAAmB;QACzC2B,YAAYzB;QACZ0B,aAAa;IACf;IAEA,MAAMC,eAA6B;QACjC,GAAGH,UAAUI,MAAM,EAAE;QACrB,mEAAmE;QACnE,sEAAsE;QACtE,iDAAiD;QACjDC,2BAA2B;QAC3B,mDAAmD;QACnD,mCAAmC;QACnCC,WAAWC;QACX,yEAAyE;QACzE,sEAAsE;QACtE,mCAAmC;QACnCC,oBAAoB;IACtB;IAEA,MAAMC,SAASpC,mBAAmB,IAAIqC,IAAI,+BAA+B,YAAYC,GAAG,GAAG;QACzFC,MAAM;QACNC,gBAAgBjB;QAChBkB,YAAY;YACV,sEAAsE;YACtEX,cAAcY,gBAAgBZ;YAC9Bb;YACAP;YACAQ;YACAC;YACAC;YACAC;YACAsB,YAAY3B,QAAQ2B,UAAU;YAC9BpB;YACAG;QACF;IACF;IAEA,MAAMkB,WAAW1C,sBAAsB2C,IAAI,CAA0BT;IACrE,MAAMU,qBAAyC;QAC7CzC,SAAS;YACPuC,SAASG,WAAW;YACpB,OAAOX,OAAOY,SAAS;QACzB;QACAC,OAAOL,SAASK,KAAK;QACrB3C,QAAQsC,SAAStC,MAAM;IACzB;IAEA,OAAOgB,SAASwB;AAClB"}

package/dist/actions/documents/validateDocuments.worker.js

@@ -6,17 +6,17 @@ import { Readable } from 'node:stream';
 import { workerData as _workerData, isMainThread, parentPort } from 'node:worker_threads';
 import { getStudioWorkspaces, isRecord, resolveLocalPackage } from '@sanity/cli-core';
 import { createClient } from '@sanity/client';
+import { WorkerChannelReporter } from '@sanity/worker-channels';
 import pMap from 'p-map';
 import { checkDocumentAvailability, exportDocuments, getDocumentCount } from '../../services/documents.js';
 import { extractDocumentsFromNdjsonOrTarball } from '../../util/extractDocumentsFromNdjsonOrTarball.js';
 import { getWorkspace } from '../../util/getWorkspace.js';
 import { DOCUMENT_VALIDATION_TIMEOUT, getReferenceIds, isValidId, levelValues, MAX_VALIDATION_CONCURRENCY, REFERENCE_INTEGRITY_BATCH_SIZE, shouldIncludeDocument } from '../../util/validation/validateDocumentsUtils.js';
-import { createReporter } from '../../util/workerChannels.js';
 const { clientConfig, dataset, level, maxCustomValidationConcurrency, maxFetchConcurrency, ndjsonFilePath, projectId, studioHost, workDir, workspace: workspaceName } = _workerData;
 if (isMainThread || !parentPort) {
     throw new Error('This module must be run as a worker thread');
 }
-const report = createReporter(parentPort);
+const report = WorkerChannelReporter.from(parentPort);
 // eslint-disable-next-line n/no-unsupported-features/node-builtins
 async function* readerToGenerator(reader) {
     while(true){