@sanity/cli-core 0.1.0-alpha.15 → 0.1.0-alpha.16

package/dist/config/studio/getStudioWorkspaces.js

@@ -2,11 +2,13 @@ import { stat } from 'node:fs/promises';
 import { dirname } from 'node:path';
 import { isMainThread } from 'node:worker_threads';
 import { firstValueFrom, of } from 'rxjs';
+import { subdebug } from '../../debug.js';
 import { doImport } from '../../util/doImport.js';
 import { getEmptyAuth } from '../../util/getEmptyAuth.js';
 import { resolveLocalPackage } from '../../util/resolveLocalPackage.js';
 import { findStudioConfigPath } from '../util/findStudioConfigPath.js';
 import { isStudioConfig } from './isStudioConfig.js';
+const debug = subdebug('worker:getStudioWorkspaces');
 /**
  * Resolves the workspaces from the studio config.
  *
@@ -23,14 +25,18 @@ import { isStudioConfig } from './isStudioConfig.js';
     if (isDirectory) {
         configPath = await findStudioConfigPath(configPath);
     }
+    debug('Finding studio config path %s', configPath);
     let config = await doImport(configPath);
+    debug('Imported config %o', config);
     if (!isStudioConfig(config)) {
         if (!('default' in config) || !isStudioConfig(config.default)) {
+            debug('Invalid studio config format in "%s"', configPath);
             throw new TypeError(`Invalid studio config format in "${configPath}"`);
         }
         config = config.default;
     }
     const workDir = dirname(configPath);
+    debug('Work dir %s', workDir);
     const { resolveConfig } = await resolveLocalPackage('sanity', workDir);
     if (typeof resolveConfig !== 'function') {
         throw new TypeError('Expected `resolveConfig` from `sanity` to be a function');
@@ -50,6 +56,7 @@ import { isStudioConfig } from './isStudioConfig.js';
                 state: of(getEmptyAuth())
             }
         }));
+    debug('Unauthed workspaces %o', unauthedWorkspaces);
     return firstValueFrom(resolveConfig(unauthedWorkspaces));
 }
 

package/dist/config/studio/getStudioWorkspaces.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/config/studio/getStudioWorkspaces.ts"],"sourcesContent":["import {stat} from 'node:fs/promises'\nimport {dirname} from 'node:path'\nimport {isMainThread} from 'node:worker_threads'\n\nimport {firstValueFrom, of} from 'rxjs'\nimport {type Workspace} from 'sanity'\n\nimport {doImport} from '../../util/doImport.js'\nimport {getEmptyAuth} from '../../util/getEmptyAuth.js'\nimport {resolveLocalPackage} from '../../util/resolveLocalPackage.js'\nimport {findStudioConfigPath} from '../util/findStudioConfigPath.js'\nimport {isStudioConfig} from './isStudioConfig.js'\n\n/**\n * Resolves the workspaces from the studio config.\n *\n * NOTE: This function should only be called from a worker thread.\n *\n * @param configPath - The path to the studio config\n * @returns The workspaces\n * @internal\n */\nexport async function getStudioWorkspaces(configPath: string): Promise<Workspace[]> {\n  if (isMainThread) {\n    throw new Error('getStudioWorkspaces should only be called from a worker thread')\n  }\n  const isDirectory = (await stat(configPath)).isDirectory()\n  if (isDirectory) {\n    configPath = await findStudioConfigPath(configPath)\n  }\n  let config = await doImport(configPath)\n  if (!isStudioConfig(config)) {\n    if (!('default' in config) || !isStudioConfig(config.default)) {\n      throw new TypeError(`Invalid studio config format in \"${configPath}\"`)\n    }\n\n    config = config.default\n  }\n\n  const workDir = dirname(configPath)\n  const {resolveConfig} = await resolveLocalPackage<typeof import('sanity')>('sanity', workDir)\n  if (typeof resolveConfig !== 'function') {\n    throw new TypeError('Expected `resolveConfig` from `sanity` to be a function')\n  }\n\n  // We will also want to stub out some configuration - we don't need to resolve the\n  // users' logged in state, for instance - so let's disable the auth implementation.\n  const rawWorkspaces = Array.isArray(config)\n    ? config\n    : [{...config, basePath: config.basePath || '/', name: config.name || 'default'}]\n\n  const unauthedWorkspaces = rawWorkspaces.map((workspace) => ({\n    ...workspace,\n    auth: {state: of(getEmptyAuth())},\n  }))\n\n  return firstValueFrom(resolveConfig(unauthedWorkspaces))\n}\n"],"names":["stat","dirname","isMainThread","firstValueFrom","of","doImport","getEmptyAuth","resolveLocalPackage","findStudioConfigPath","isStudioConfig","getStudioWorkspaces","configPath","Error","isDirectory","config","default","TypeError","workDir","resolveConfig","rawWorkspaces","Array","isArray","basePath","name","unauthedWorkspaces","map","workspace","auth","state"],"mappings":"AAAA,SAAQA,IAAI,QAAO,mBAAkB;AACrC,SAAQC,OAAO,QAAO,YAAW;AACjC,SAAQC,YAAY,QAAO,sBAAqB;AAEhD,SAAQC,cAAc,EAAEC,EAAE,QAAO,OAAM;AAGvC,SAAQC,QAAQ,QAAO,yBAAwB;AAC/C,SAAQC,YAAY,QAAO,6BAA4B;AACvD,SAAQC,mBAAmB,QAAO,oCAAmC;AACrE,SAAQC,oBAAoB,QAAO,kCAAiC;AACpE,SAAQC,cAAc,QAAO,sBAAqB;AAElD;;;;;;;;CAQC,GACD,OAAO,eAAeC,oBAAoBC,UAAkB;IAC1D,IAAIT,cAAc;QAChB,MAAM,IAAIU,MAAM;IAClB;IACA,MAAMC,cAAc,AAAC,CAAA,MAAMb,KAAKW,WAAU,EAAGE,WAAW;IACxD,IAAIA,aAAa;QACfF,aAAa,MAAMH,qBAAqBG;IAC1C;IACA,IAAIG,SAAS,MAAMT,SAASM;IAC5B,IAAI,CAACF,eAAeK,SAAS;QAC3B,IAAI,CAAE,CAAA,aAAaA,MAAK,KAAM,CAACL,eAAeK,OAAOC,OAAO,GAAG;YAC7D,MAAM,IAAIC,UAAU,CAAC,iCAAiC,EAAEL,WAAW,CAAC,CAAC;QACvE;QAEAG,SAASA,OAAOC,OAAO;IACzB;IAEA,MAAME,UAAUhB,QAAQU;IACxB,MAAM,EAACO,aAAa,EAAC,GAAG,MAAMX,oBAA6C,UAAUU;IACrF,IAAI,OAAOC,kBAAkB,YAAY;QACvC,MAAM,IAAIF,UAAU;IACtB;IAEA,kFAAkF;IAClF,mFAAmF;IACnF,MAAMG,gBAAgBC,MAAMC,OAAO,CAACP,UAChCA,SACA;QAAC;YAAC,GAAGA,MAAM;YAAEQ,UAAUR,OAAOQ,QAAQ,IAAI;YAAKC,MAAMT,OAAOS,IAAI,IAAI;QAAS;KAAE;IAEnF,MAAMC,qBAAqBL,cAAcM,GAAG,CAAC,CAACC,YAAe,CAAA;YAC3D,GAAGA,SAAS;YACZC,MAAM;gBAACC,OAAOxB,GAAGE;YAAe;QAClC,CAAA;IAEA,OAAOH,eAAee,cAAcM;AACtC"}
+{"version":3,"sources":["../../../src/config/studio/getStudioWorkspaces.ts"],"sourcesContent":["import {stat} from 'node:fs/promises'\nimport {dirname} from 'node:path'\nimport {isMainThread} from 'node:worker_threads'\n\nimport {firstValueFrom, of} from 'rxjs'\nimport {type Workspace} from 'sanity'\n\nimport {subdebug} from '../../debug.js'\nimport {doImport} from '../../util/doImport.js'\nimport {getEmptyAuth} from '../../util/getEmptyAuth.js'\nimport {resolveLocalPackage} from '../../util/resolveLocalPackage.js'\nimport {findStudioConfigPath} from '../util/findStudioConfigPath.js'\nimport {isStudioConfig} from './isStudioConfig.js'\n\nconst debug = subdebug('worker:getStudioWorkspaces')\n\n/**\n * Resolves the workspaces from the studio config.\n *\n * NOTE: This function should only be called from a worker thread.\n *\n * @param configPath - The path to the studio config\n * @returns The workspaces\n * @internal\n */\nexport async function getStudioWorkspaces(configPath: string): Promise<Workspace[]> {\n  if (isMainThread) {\n    throw new Error('getStudioWorkspaces should only be called from a worker thread')\n  }\n  const isDirectory = (await stat(configPath)).isDirectory()\n  if (isDirectory) {\n    configPath = await findStudioConfigPath(configPath)\n  }\n  debug('Finding studio config path %s', configPath)\n  let config = await doImport(configPath)\n\n  debug('Imported config %o', config)\n  if (!isStudioConfig(config)) {\n    if (!('default' in config) || !isStudioConfig(config.default)) {\n      debug('Invalid studio config format in \"%s\"', configPath)\n      throw new TypeError(`Invalid studio config format in \"${configPath}\"`)\n    }\n\n    config = config.default\n  }\n\n  const workDir = dirname(configPath)\n  debug('Work dir %s', workDir)\n  const {resolveConfig} = await resolveLocalPackage<typeof import('sanity')>('sanity', workDir)\n  if (typeof resolveConfig !== 'function') {\n    throw new TypeError('Expected `resolveConfig` from `sanity` to be a function')\n  }\n\n  // We will also want to stub out some configuration - we don't need to resolve the\n  // users' logged in state, for instance - so let's disable the auth implementation.\n  const rawWorkspaces = Array.isArray(config)\n    ? config\n    : [{...config, basePath: config.basePath || '/', name: config.name || 'default'}]\n\n  const unauthedWorkspaces = rawWorkspaces.map((workspace) => ({\n    ...workspace,\n    auth: {state: of(getEmptyAuth())},\n  }))\n\n  debug('Unauthed workspaces %o', unauthedWorkspaces)\n\n  return firstValueFrom(resolveConfig(unauthedWorkspaces))\n}\n"],"names":["stat","dirname","isMainThread","firstValueFrom","of","subdebug","doImport","getEmptyAuth","resolveLocalPackage","findStudioConfigPath","isStudioConfig","debug","getStudioWorkspaces","configPath","Error","isDirectory","config","default","TypeError","workDir","resolveConfig","rawWorkspaces","Array","isArray","basePath","name","unauthedWorkspaces","map","workspace","auth","state"],"mappings":"AAAA,SAAQA,IAAI,QAAO,mBAAkB;AACrC,SAAQC,OAAO,QAAO,YAAW;AACjC,SAAQC,YAAY,QAAO,sBAAqB;AAEhD,SAAQC,cAAc,EAAEC,EAAE,QAAO,OAAM;AAGvC,SAAQC,QAAQ,QAAO,iBAAgB;AACvC,SAAQC,QAAQ,QAAO,yBAAwB;AAC/C,SAAQC,YAAY,QAAO,6BAA4B;AACvD,SAAQC,mBAAmB,QAAO,oCAAmC;AACrE,SAAQC,oBAAoB,QAAO,kCAAiC;AACpE,SAAQC,cAAc,QAAO,sBAAqB;AAElD,MAAMC,QAAQN,SAAS;AAEvB;;;;;;;;CAQC,GACD,OAAO,eAAeO,oBAAoBC,UAAkB;IAC1D,IAAIX,cAAc;QAChB,MAAM,IAAIY,MAAM;IAClB;IACA,MAAMC,cAAc,AAAC,CAAA,MAAMf,KAAKa,WAAU,EAAGE,WAAW;IACxD,IAAIA,aAAa;QACfF,aAAa,MAAMJ,qBAAqBI;IAC1C;IACAF,MAAM,iCAAiCE;IACvC,IAAIG,SAAS,MAAMV,SAASO;IAE5BF,MAAM,sBAAsBK;IAC5B,IAAI,CAACN,eAAeM,SAAS;QAC3B,IAAI,CAAE,CAAA,aAAaA,MAAK,KAAM,CAACN,eAAeM,OAAOC,OAAO,GAAG;YAC7DN,MAAM,wCAAwCE;YAC9C,MAAM,IAAIK,UAAU,CAAC,iCAAiC,EAAEL,WAAW,CAAC,CAAC;QACvE;QAEAG,SAASA,OAAOC,OAAO;IACzB;IAEA,MAAME,UAAUlB,QAAQY;IACxBF,MAAM,eAAeQ;IACrB,MAAM,EAACC,aAAa,EAAC,GAAG,MAAMZ,oBAA6C,UAAUW;IACrF,IAAI,OAAOC,kBAAkB,YAAY;QACvC,MAAM,IAAIF,UAAU;IACtB;IAEA,kFAAkF;IAClF,mFAAmF;IACnF,MAAMG,gBAAgBC,MAAMC,OAAO,CAACP,UAChCA,SACA;QAAC;YAAC,GAAGA,MAAM;YAAEQ,UAAUR,OAAOQ,QAAQ,IAAI;YAAKC,MAAMT,OAAOS,IAAI,IAAI;QAAS;KAAE;IAEnF,MAAMC,qBAAqBL,cAAcM,GAAG,CAAC,CAACC,YAAe,CAAA;YAC3D,GAAGA,SAAS;YACZC,MAAM;gBAACC,OAAO1B,GAAGG;YAAe;QAClC,CAAA;IAEAI,MAAM,0BAA0Be;IAEhC,OAAOvB,eAAeiB,cAAcM;AACtC"}

package/dist/config/studio/readStudioConfig.worker.js

@@ -1,18 +1,24 @@
 import { isMainThread, parentPort, workerData } from 'node:worker_threads';
 import { z } from 'zod';
+import { subdebug } from '../../debug.js';
 import { doImport } from '../../util/doImport.js';
 import { safeStructuredClone } from '../../util/safeStructuredClone.js';
 import { getStudioWorkspaces } from './getStudioWorkspaces.js';
 if (isMainThread || !parentPort) {
     throw new Error('Should only be run in a worker!');
 }
+const debug = subdebug('readStudioConfig.worker');
 const { configPath, resolvePlugins } = z.object({
     configPath: z.string(),
     resolvePlugins: z.boolean()
 }).parse(workerData);
+debug('Parsing config path %s', configPath);
 let { default: config } = await doImport(configPath);
+debug('Imported config %o', config);
 if (resolvePlugins) {
+    debug('Resolving workspaces');
     config = await getStudioWorkspaces(configPath);
+    debug('Resolved workspaces %o', config);
 }
 parentPort.postMessage(safeStructuredClone(config));
 

package/dist/config/studio/readStudioConfig.worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/config/studio/readStudioConfig.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {z} from 'zod'\n\nimport {doImport} from '../../util/doImport.js'\nimport {safeStructuredClone} from '../../util/safeStructuredClone.js'\nimport {getStudioWorkspaces} from './getStudioWorkspaces.js'\n\nif (isMainThread || !parentPort) {\n  throw new Error('Should only be run in a worker!')\n}\n\nconst {configPath, resolvePlugins} = z\n  .object({configPath: z.string(), resolvePlugins: z.boolean()})\n  .parse(workerData)\n\nlet {default: config} = await doImport(configPath)\n\nif (resolvePlugins) {\n  config = await getStudioWorkspaces(configPath)\n}\n\nparentPort.postMessage(safeStructuredClone(config))\n"],"names":["isMainThread","parentPort","workerData","z","doImport","safeStructuredClone","getStudioWorkspaces","Error","configPath","resolvePlugins","object","string","boolean","parse","default","config","postMessage"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,CAAC,QAAO,MAAK;AAErB,SAAQC,QAAQ,QAAO,yBAAwB;AAC/C,SAAQC,mBAAmB,QAAO,oCAAmC;AACrE,SAAQC,mBAAmB,QAAO,2BAA0B;AAE5D,IAAIN,gBAAgB,CAACC,YAAY;IAC/B,MAAM,IAAIM,MAAM;AAClB;AAEA,MAAM,EAACC,UAAU,EAAEC,cAAc,EAAC,GAAGN,EAClCO,MAAM,CAAC;IAACF,YAAYL,EAAEQ,MAAM;IAAIF,gBAAgBN,EAAES,OAAO;AAAE,GAC3DC,KAAK,CAACX;AAET,IAAI,EAACY,SAASC,MAAM,EAAC,GAAG,MAAMX,SAASI;AAEvC,IAAIC,gBAAgB;IAClBM,SAAS,MAAMT,oBAAoBE;AACrC;AAEAP,WAAWe,WAAW,CAACX,oBAAoBU"}
+{"version":3,"sources":["../../../src/config/studio/readStudioConfig.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {z} from 'zod'\n\nimport {subdebug} from '../../debug.js'\nimport {doImport} from '../../util/doImport.js'\nimport {safeStructuredClone} from '../../util/safeStructuredClone.js'\nimport {getStudioWorkspaces} from './getStudioWorkspaces.js'\n\nif (isMainThread || !parentPort) {\n  throw new Error('Should only be run in a worker!')\n}\n\nconst debug = subdebug('readStudioConfig.worker')\n\nconst {configPath, resolvePlugins} = z\n  .object({configPath: z.string(), resolvePlugins: z.boolean()})\n  .parse(workerData)\n\ndebug('Parsing config path %s', configPath)\n\nlet {default: config} = await doImport(configPath)\n\ndebug('Imported config %o', config)\n\nif (resolvePlugins) {\n  debug('Resolving workspaces')\n  config = await getStudioWorkspaces(configPath)\n  debug('Resolved workspaces %o', config)\n}\n\nparentPort.postMessage(safeStructuredClone(config))\n"],"names":["isMainThread","parentPort","workerData","z","subdebug","doImport","safeStructuredClone","getStudioWorkspaces","Error","debug","configPath","resolvePlugins","object","string","boolean","parse","default","config","postMessage"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,CAAC,QAAO,MAAK;AAErB,SAAQC,QAAQ,QAAO,iBAAgB;AACvC,SAAQC,QAAQ,QAAO,yBAAwB;AAC/C,SAAQC,mBAAmB,QAAO,oCAAmC;AACrE,SAAQC,mBAAmB,QAAO,2BAA0B;AAE5D,IAAIP,gBAAgB,CAACC,YAAY;IAC/B,MAAM,IAAIO,MAAM;AAClB;AAEA,MAAMC,QAAQL,SAAS;AAEvB,MAAM,EAACM,UAAU,EAAEC,cAAc,EAAC,GAAGR,EAClCS,MAAM,CAAC;IAACF,YAAYP,EAAEU,MAAM;IAAIF,gBAAgBR,EAAEW,OAAO;AAAE,GAC3DC,KAAK,CAACb;AAETO,MAAM,0BAA0BC;AAEhC,IAAI,EAACM,SAASC,MAAM,EAAC,GAAG,MAAMZ,SAASK;AAEvCD,MAAM,sBAAsBQ;AAE5B,IAAIN,gBAAgB;IAClBF,MAAM;IACNQ,SAAS,MAAMV,oBAAoBG;IACnCD,MAAM,0BAA0BQ;AAClC;AAEAhB,WAAWiB,WAAW,CAACZ,oBAAoBW"}

package/dist/loaders/studio/studioWorkerLoader.worker.js

@@ -1,6 +1,10 @@
 import { isMainThread } from 'node:worker_threads';
-import { createServer, createServerModuleRunner, loadEnv, mergeConfig } from 'vite';
+import { createServer, loadEnv, mergeConfig } from 'vite';
+import { ViteNodeRunner } from 'vite-node/client';
+import { ViteNodeServer } from 'vite-node/server';
+import { installSourcemapsSupport } from 'vite-node/source-map';
 import { getCliConfig } from '../../config/cli/getCliConfig.js';
+import { subdebug } from '../../debug.js';
 import { getStudioEnvironmentVariables } from '../../util/environment/getStudioEnvironmentVariables.js';
 import { setupBrowserStubs } from '../../util/environment/setupBrowserStubs.js';
 import { isRecord } from '../../util/isRecord.js';
@@ -12,12 +16,51 @@ const rootPath = process.env.STUDIO_WORKER_STUDIO_ROOT_PATH;
 if (!rootPath) {
     throw new Error('Missing `STUDIO_WORKER_STUDIO_ROOT_PATH` environment variable');
 }
+const debug = subdebug('studio:worker');
 const workerScriptPath = process.env.STUDIO_WORKER_TASK_FILE;
 if (!workerScriptPath) {
     throw new Error('Missing `STUDIO_WORKER_TASK_FILE` environment variable');
 }
 await setupBrowserStubs();
 const studioEnvVars = await getStudioEnvironmentVariables(rootPath);
+// Allow the CLI config (`sanity.cli.(js|ts)`) to define a `vite` property which can
+// extend/modify the default vite configuration for the studio.
+let cliConfig;
+try {
+    cliConfig = await getCliConfig(rootPath);
+} catch (err) {
+    debug('Failed to load CLI config: %o', err);
+    if (!isNotFoundError(err)) {
+        // eslint-disable-next-line no-console
+        console.warn('[warn] Failed to load CLI config:', err);
+    }
+}
+/**
+ * Fetches and caches modules from HTTP/HTTPS URLs.
+ * Vite's SSR transform treats `https://` imports as external and bypasses the plugin
+ * resolve pipeline entirely, so we intercept them at the ViteNodeRunner level instead.
+ */ const httpModuleCache = new Map();
+async function fetchHttpModule(url) {
+    const cached = httpModuleCache.get(url);
+    if (cached) return {
+        code: cached
+    };
+    debug('Fetching HTTP import: %s', url);
+    const response = await fetch(url, {
+        signal: AbortSignal.timeout(30_000)
+    });
+    if (!response.ok) {
+        throw new Error(`Failed to fetch module from ${url}: ${response.status} ${response.statusText}`);
+    }
+    const code = await response.text();
+    httpModuleCache.set(url, code);
+    return {
+        code
+    };
+}
+function isHttpsUrl(id) {
+    return id.startsWith('https://');
+}
 const defaultViteConfig = {
     build: {
         target: 'node'
@@ -28,27 +71,28 @@ const defaultViteConfig = {
             `process.env.${key}`,
             JSON.stringify(value)
         ])),
+    // TODO: Combine with `determineIsApp` from `@sanity/cli`
+    envPrefix: cliConfig && 'app' in cliConfig ? 'SANITY_APP_' : 'SANITY_STUDIO_',
+    esbuild: {
+        jsx: 'automatic'
+    },
     logLevel: 'error',
     optimizeDeps: {
-        disabled: true
+        include: undefined,
+        noDiscovery: true
     },
     root: rootPath,
     server: {
         hmr: false,
         watch: null
+    },
+    ssr: {
+        /**
+     * We don't want to externalize any dependencies, we want everything to run thru vite.
+     * Especially for CJS compatibility, etc.
+     */ noExternal: true
     }
 };
-// Allow the CLI config (`sanity.cli.(js|ts)`) to define a `vite` property which can
-// extend/modify the default vite configuration for the studio.
-let cliConfig;
-try {
-    cliConfig = await getCliConfig(rootPath);
-} catch (err) {
-    if (!isNotFoundError(err)) {
-        // eslint-disable-next-line no-console
-        console.warn('[warn] Failed to load CLI config:', err);
-    }
-}
 let viteConfig = defaultViteConfig;
 if (typeof cliConfig?.vite === 'function') {
     viteConfig = await cliConfig.vite(viteConfig, {
@@ -59,6 +103,7 @@ if (typeof cliConfig?.vite === 'function') {
 } else if (isRecord(cliConfig?.vite)) {
     viteConfig = mergeConfig(viteConfig, cliConfig.vite);
 }
+debug('Creating Vite server with config: %o', viteConfig);
 // Vite will build the files we give it - targetting Node.js instead of the browser.
 // We include the inject plugin in order to provide the stubs for the undefined global APIs.
 const server = await createServer(viteConfig);
@@ -68,18 +113,52 @@ await server.pluginContainer.buildStart({});
 // Note that Sanity also provides environment variables through `process.env.*` for compat reasons,
 // and so we need to do the same here.
 // @todo is this in line with sanity?
-const env = loadEnv(server.config.mode, server.config.envDir, '');
+const env = loadEnv(server.config.mode, server.config.envDir, viteConfig.envPrefix ?? '');
 for(const key in env){
     process.env[key] ??= env[key];
 }
-// Now we're using Vite's Module Runner (replaces vite-node in Vite 4+)
-const runner = await createServerModuleRunner(server.environments.ssr, {
-    hmr: false,
-    sourcemapInterceptor: 'prepareStackTrace'
+// Now we're providing the glue that ensures node-specific loading and execution works.
+const node = new ViteNodeServer(server);
+// Should make it easier to debug any crashes in the imported code…
+installSourcemapsSupport({
+    getSourceMap: (source)=>node.getSourceMap(source)
+});
+const runner = new ViteNodeRunner({
+    base: server.config.base,
+    async fetchModule (id) {
+        // Vite's SSR transform externalizes https:// imports, so Node's ESM loader
+        // would reject them. We fetch the module over HTTP and run it through Vite's
+        // SSR transform to rewrite ESM export/import syntax to the __vite_ssr_*
+        // format that ViteNodeRunner expects.
+        if (isHttpsUrl(id)) {
+            const { code: rawCode } = await fetchHttpModule(id);
+            const result = await server.ssrTransform(rawCode, null, id);
+            return {
+                code: result?.code || rawCode
+            };
+        }
+        return node.fetchModule(id);
+    },
+    resolveId (id, importer) {
+        // Prevent vite-node from trying to resolve HTTP URLs through Node's resolver
+        if (isHttpsUrl(id)) return {
+            id
+        };
+        // Resolve any import from an HTTP-fetched module against the remote origin
+        // (e.g. esm.sh returns `export * from '/pkg@1.0/es2022/pkg.mjs'`)
+        if (importer && isHttpsUrl(importer)) {
+            return {
+                id: new URL(id, importer).href
+            };
+        }
+        return node.resolveId(id, importer);
+    },
+    root: server.config.root
 });
-// Apply the `define` config from vite - imports environment variables
-await runner.import('/@vite/env');
-// Execute the worker script
-await runner.import(workerScriptPath);
+// Copied from `vite-node` - it appears that this applies the `define` config from
+// vite, but it also takes a surprisingly long time to execute. Not clear at this
+// point why this is, so we should investigate whether it's necessary or not.
+await runner.executeId('/@vite/env');
+await runner.executeId(workerScriptPath);
 
 //# sourceMappingURL=studioWorkerLoader.worker.js.map

package/dist/loaders/studio/studioWorkerLoader.worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/loaders/studio/studioWorkerLoader.worker.ts"],"sourcesContent":["import {isMainThread} from 'node:worker_threads'\n\nimport {createServer, createServerModuleRunner, type InlineConfig, loadEnv, mergeConfig} from 'vite'\n\nimport {getCliConfig} from '../../config/cli/getCliConfig.js'\nimport {type CliConfig} from '../../config/cli/types/cliConfig.js'\nimport {getStudioEnvironmentVariables} from '../../util/environment/getStudioEnvironmentVariables.js'\nimport {setupBrowserStubs} from '../../util/environment/setupBrowserStubs.js'\nimport {isRecord} from '../../util/isRecord.js'\nimport {isNotFoundError} from '../../util/NotFoundError.js'\n\nif (isMainThread) {\n  throw new Error('Should be child of thread, not the main thread')\n}\n\nconst rootPath = process.env.STUDIO_WORKER_STUDIO_ROOT_PATH\nif (!rootPath) {\n  throw new Error('Missing `STUDIO_WORKER_STUDIO_ROOT_PATH` environment variable')\n}\n\nconst workerScriptPath = process.env.STUDIO_WORKER_TASK_FILE\nif (!workerScriptPath) {\n  throw new Error('Missing `STUDIO_WORKER_TASK_FILE` environment variable')\n}\n\nawait setupBrowserStubs()\n\nconst studioEnvVars = await getStudioEnvironmentVariables(rootPath)\n\nconst defaultViteConfig: InlineConfig = {\n  build: {target: 'node'},\n  configFile: false, // @todo Should use `vite` prop from `sanity.cli.ts` (if any)\n  // Inject environment variables as compile-time constants for Vite\n  define: Object.fromEntries(\n    Object.entries(studioEnvVars).map(([key, value]) => [\n      `process.env.${key}`,\n      JSON.stringify(value),\n    ]),\n  ),\n  logLevel: 'error',\n  optimizeDeps: {disabled: true}, // @todo is this necessary? cant remember why was added\n  root: rootPath,\n  server: {\n    hmr: false,\n    watch: null,\n  },\n}\n\n// Allow the CLI config (`sanity.cli.(js|ts)`) to define a `vite` property which can\n// extend/modify the default vite configuration for the studio.\nlet cliConfig: CliConfig | undefined\ntry {\n  cliConfig = await getCliConfig(rootPath)\n} catch (err) {\n  if (!isNotFoundError(err)) {\n    // eslint-disable-next-line no-console\n    console.warn('[warn] Failed to load CLI config:', err)\n  }\n}\n\nlet viteConfig = defaultViteConfig\nif (typeof cliConfig?.vite === 'function') {\n  viteConfig = (await cliConfig.vite(viteConfig, {\n    command: 'build',\n    isSsrBuild: true,\n    mode: 'production',\n  })) as InlineConfig\n} else if (isRecord(cliConfig?.vite)) {\n  viteConfig = mergeConfig(viteConfig, cliConfig.vite)\n}\n\n// Vite will build the files we give it - targetting Node.js instead of the browser.\n// We include the inject plugin in order to provide the stubs for the undefined global APIs.\nconst server = await createServer(viteConfig)\n\n// Bit of a hack, but seems necessary based on the `node-vite` binary implementation\nawait server.pluginContainer.buildStart({})\n\n// Load environment variables from `.env` files in the same way as Vite does.\n// Note that Sanity also provides environment variables through `process.env.*` for compat reasons,\n// and so we need to do the same here.\n// @todo is this in line with sanity?\nconst env = loadEnv(server.config.mode, server.config.envDir, '')\nfor (const key in env) {\n  process.env[key] ??= env[key]\n}\n\n// Now we're using Vite's Module Runner (replaces vite-node in Vite 4+)\nconst runner = await createServerModuleRunner(server.environments.ssr, {\n  hmr: false,\n  sourcemapInterceptor: 'prepareStackTrace',\n})\n\n// Apply the `define` config from vite - imports environment variables\nawait runner.import('/@vite/env')\n\n// Execute the worker script\nawait runner.import(workerScriptPath)\n"],"names":["isMainThread","createServer","createServerModuleRunner","loadEnv","mergeConfig","getCliConfig","getStudioEnvironmentVariables","setupBrowserStubs","isRecord","isNotFoundError","Error","rootPath","process","env","STUDIO_WORKER_STUDIO_ROOT_PATH","workerScriptPath","STUDIO_WORKER_TASK_FILE","studioEnvVars","defaultViteConfig","build","target","configFile","define","Object","fromEntries","entries","map","key","value","JSON","stringify","logLevel","optimizeDeps","disabled","root","server","hmr","watch","cliConfig","err","console","warn","viteConfig","vite","command","isSsrBuild","mode","pluginContainer","buildStart","config","envDir","runner","environments","ssr","sourcemapInterceptor","import"],"mappings":"AAAA,SAAQA,YAAY,QAAO,sBAAqB;AAEhD,SAAQC,YAAY,EAAEC,wBAAwB,EAAqBC,OAAO,EAAEC,WAAW,QAAO,OAAM;AAEpG,SAAQC,YAAY,QAAO,mCAAkC;AAE7D,SAAQC,6BAA6B,QAAO,0DAAyD;AACrG,SAAQC,iBAAiB,QAAO,8CAA6C;AAC7E,SAAQC,QAAQ,QAAO,yBAAwB;AAC/C,SAAQC,eAAe,QAAO,8BAA6B;AAE3D,IAAIT,cAAc;IAChB,MAAM,IAAIU,MAAM;AAClB;AAEA,MAAMC,WAAWC,QAAQC,GAAG,CAACC,8BAA8B;AAC3D,IAAI,CAACH,UAAU;IACb,MAAM,IAAID,MAAM;AAClB;AAEA,MAAMK,mBAAmBH,QAAQC,GAAG,CAACG,uBAAuB;AAC5D,IAAI,CAACD,kBAAkB;IACrB,MAAM,IAAIL,MAAM;AAClB;AAEA,MAAMH;AAEN,MAAMU,gBAAgB,MAAMX,8BAA8BK;AAE1D,MAAMO,oBAAkC;IACtCC,OAAO;QAACC,QAAQ;IAAM;IACtBC,YAAY;IACZ,kEAAkE;IAClEC,QAAQC,OAAOC,WAAW,CACxBD,OAAOE,OAAO,CAACR,eAAeS,GAAG,CAAC,CAAC,CAACC,KAAKC,MAAM,GAAK;YAClD,CAAC,YAAY,EAAED,KAAK;YACpBE,KAAKC,SAAS,CAACF;SAChB;IAEHG,UAAU;IACVC,cAAc;QAACC,UAAU;IAAI;IAC7BC,MAAMvB;IACNwB,QAAQ;QACNC,KAAK;QACLC,OAAO;IACT;AACF;AAEA,oFAAoF;AACpF,+DAA+D;AAC/D,IAAIC;AACJ,IAAI;IACFA,YAAY,MAAMjC,aAAaM;AACjC,EAAE,OAAO4B,KAAK;IACZ,IAAI,CAAC9B,gBAAgB8B,MAAM;QACzB,sCAAsC;QACtCC,QAAQC,IAAI,CAAC,qCAAqCF;IACpD;AACF;AAEA,IAAIG,aAAaxB;AACjB,IAAI,OAAOoB,WAAWK,SAAS,YAAY;IACzCD,aAAc,MAAMJ,UAAUK,IAAI,CAACD,YAAY;QAC7CE,SAAS;QACTC,YAAY;QACZC,MAAM;IACR;AACF,OAAO,IAAItC,SAAS8B,WAAWK,OAAO;IACpCD,aAAatC,YAAYsC,YAAYJ,UAAUK,IAAI;AACrD;AAEA,oFAAoF;AACpF,4FAA4F;AAC5F,MAAMR,SAAS,MAAMlC,aAAayC;AAElC,oFAAoF;AACpF,MAAMP,OAAOY,eAAe,CAACC,UAAU,CAAC,CAAC;AAEzC,6EAA6E;AAC7E,mGAAmG;AACnG,sCAAsC;AACtC,qCAAqC;AACrC,MAAMnC,MAAMV,QAAQgC,OAAOc,MAAM,CAACH,IAAI,EAAEX,OAAOc,MAAM,CAACC,MAAM,EAAE;AAC9D,IAAK,MAAMvB,OAAOd,IAAK;IACrBD,QAAQC,GAAG,CAACc,IAAI,KAAKd,GAAG,CAACc,IAAI;AAC/B;AAEA,uEAAuE;AACvE,MAAMwB,SAAS,MAAMjD,yBAAyBiC,OAAOiB,YAAY,CAACC,GAAG,EAAE;IACrEjB,KAAK;IACLkB,sBAAsB;AACxB;AAEA,sEAAsE;AACtE,MAAMH,OAAOI,MAAM,CAAC;AAEpB,4BAA4B;AAC5B,MAAMJ,OAAOI,MAAM,CAACxC"}
+{"version":3,"sources":["../../../src/loaders/studio/studioWorkerLoader.worker.ts"],"sourcesContent":["import {isMainThread} from 'node:worker_threads'\n\nimport {createServer, type InlineConfig, loadEnv, mergeConfig} from 'vite'\nimport {ViteNodeRunner} from 'vite-node/client'\nimport {ViteNodeServer} from 'vite-node/server'\nimport {installSourcemapsSupport} from 'vite-node/source-map'\n\nimport {getCliConfig} from '../../config/cli/getCliConfig.js'\nimport {type CliConfig} from '../../config/cli/types/cliConfig.js'\nimport {subdebug} from '../../debug.js'\nimport {getStudioEnvironmentVariables} from '../../util/environment/getStudioEnvironmentVariables.js'\nimport {setupBrowserStubs} from '../../util/environment/setupBrowserStubs.js'\nimport {isRecord} from '../../util/isRecord.js'\nimport {isNotFoundError} from '../../util/NotFoundError.js'\n\nif (isMainThread) {\n  throw new Error('Should be child of thread, not the main thread')\n}\n\nconst rootPath = process.env.STUDIO_WORKER_STUDIO_ROOT_PATH\nif (!rootPath) {\n  throw new Error('Missing `STUDIO_WORKER_STUDIO_ROOT_PATH` environment variable')\n}\n\nconst debug = subdebug('studio:worker')\n\nconst workerScriptPath = process.env.STUDIO_WORKER_TASK_FILE\nif (!workerScriptPath) {\n  throw new Error('Missing `STUDIO_WORKER_TASK_FILE` environment variable')\n}\n\nawait setupBrowserStubs()\n\nconst studioEnvVars = await getStudioEnvironmentVariables(rootPath)\n\n// Allow the CLI config (`sanity.cli.(js|ts)`) to define a `vite` property which can\n// extend/modify the default vite configuration for the studio.\nlet cliConfig: CliConfig | undefined\ntry {\n  cliConfig = await getCliConfig(rootPath)\n} catch (err) {\n  debug('Failed to load CLI config: %o', err)\n  if (!isNotFoundError(err)) {\n    // eslint-disable-next-line no-console\n    console.warn('[warn] Failed to load CLI config:', err)\n  }\n}\n\n/**\n * Fetches and caches modules from HTTP/HTTPS URLs.\n * Vite's SSR transform treats `https://` imports as external and bypasses the plugin\n * resolve pipeline entirely, so we intercept them at the ViteNodeRunner level instead.\n */\nconst httpModuleCache = new Map<string, string>()\nasync function fetchHttpModule(url: string): Promise<{code: string}> {\n  const cached = httpModuleCache.get(url)\n  if (cached) return {code: cached}\n\n  debug('Fetching HTTP import: %s', url)\n  const response = await fetch(url, {signal: AbortSignal.timeout(30_000)})\n  if (!response.ok) {\n    throw new Error(`Failed to fetch module from ${url}: ${response.status} ${response.statusText}`)\n  }\n\n  const code = await response.text()\n  httpModuleCache.set(url, code)\n  return {code}\n}\n\nfunction isHttpsUrl(id: string): boolean {\n  return id.startsWith('https://')\n}\n\nconst defaultViteConfig: InlineConfig = {\n  build: {target: 'node'},\n  configFile: false, // @todo Should use `vite` prop from `sanity.cli.ts` (if any)\n  // Inject environment variables as compile-time constants for Vite\n  define: Object.fromEntries(\n    Object.entries(studioEnvVars).map(([key, value]) => [\n      `process.env.${key}`,\n      JSON.stringify(value),\n    ]),\n  ),\n  // TODO: Combine with `determineIsApp` from `@sanity/cli`\n  envPrefix: cliConfig && 'app' in cliConfig ? 'SANITY_APP_' : 'SANITY_STUDIO_',\n  esbuild: {\n    jsx: 'automatic',\n  },\n  logLevel: 'error',\n  optimizeDeps: {\n    include: undefined,\n    noDiscovery: true,\n  },\n  root: rootPath,\n  server: {\n    hmr: false,\n    watch: null,\n  },\n  ssr: {\n    /**\n     * We don't want to externalize any dependencies, we want everything to run thru vite.\n     * Especially for CJS compatibility, etc.\n     */\n    noExternal: true,\n  },\n}\n\nlet viteConfig = defaultViteConfig\nif (typeof cliConfig?.vite === 'function') {\n  viteConfig = (await cliConfig.vite(viteConfig, {\n    command: 'build',\n    isSsrBuild: true,\n    mode: 'production',\n  })) as InlineConfig\n} else if (isRecord(cliConfig?.vite)) {\n  viteConfig = mergeConfig(viteConfig, cliConfig.vite)\n}\n\ndebug('Creating Vite server with config: %o', viteConfig)\n// Vite will build the files we give it - targetting Node.js instead of the browser.\n// We include the inject plugin in order to provide the stubs for the undefined global APIs.\nconst server = await createServer(viteConfig)\n\n// Bit of a hack, but seems necessary based on the `node-vite` binary implementation\nawait server.pluginContainer.buildStart({})\n\n// Load environment variables from `.env` files in the same way as Vite does.\n// Note that Sanity also provides environment variables through `process.env.*` for compat reasons,\n// and so we need to do the same here.\n// @todo is this in line with sanity?\nconst env = loadEnv(server.config.mode, server.config.envDir, viteConfig.envPrefix ?? '')\nfor (const key in env) {\n  process.env[key] ??= env[key]\n}\n\n// Now we're providing the glue that ensures node-specific loading and execution works.\nconst node = new ViteNodeServer(server)\n\n// Should make it easier to debug any crashes in the imported code…\ninstallSourcemapsSupport({\n  getSourceMap: (source) => node.getSourceMap(source),\n})\n\nconst runner = new ViteNodeRunner({\n  base: server.config.base,\n  async fetchModule(id) {\n    // Vite's SSR transform externalizes https:// imports, so Node's ESM loader\n    // would reject them. We fetch the module over HTTP and run it through Vite's\n    // SSR transform to rewrite ESM export/import syntax to the __vite_ssr_*\n    // format that ViteNodeRunner expects.\n    if (isHttpsUrl(id)) {\n      const {code: rawCode} = await fetchHttpModule(id)\n      const result = await server.ssrTransform(rawCode, null, id)\n      return {code: result?.code || rawCode}\n    }\n    return node.fetchModule(id)\n  },\n  resolveId(id, importer) {\n    // Prevent vite-node from trying to resolve HTTP URLs through Node's resolver\n    if (isHttpsUrl(id)) return {id}\n    // Resolve any import from an HTTP-fetched module against the remote origin\n    // (e.g. esm.sh returns `export * from '/pkg@1.0/es2022/pkg.mjs'`)\n    if (importer && isHttpsUrl(importer)) {\n      return {id: new URL(id, importer).href}\n    }\n    return node.resolveId(id, importer)\n  },\n  root: server.config.root,\n})\n\n// Copied from `vite-node` - it appears that this applies the `define` config from\n// vite, but it also takes a surprisingly long time to execute. Not clear at this\n// point why this is, so we should investigate whether it's necessary or not.\nawait runner.executeId('/@vite/env')\n\nawait runner.executeId(workerScriptPath)\n"],"names":["isMainThread","createServer","loadEnv","mergeConfig","ViteNodeRunner","ViteNodeServer","installSourcemapsSupport","getCliConfig","subdebug","getStudioEnvironmentVariables","setupBrowserStubs","isRecord","isNotFoundError","Error","rootPath","process","env","STUDIO_WORKER_STUDIO_ROOT_PATH","debug","workerScriptPath","STUDIO_WORKER_TASK_FILE","studioEnvVars","cliConfig","err","console","warn","httpModuleCache","Map","fetchHttpModule","url","cached","get","code","response","fetch","signal","AbortSignal","timeout","ok","status","statusText","text","set","isHttpsUrl","id","startsWith","defaultViteConfig","build","target","configFile","define","Object","fromEntries","entries","map","key","value","JSON","stringify","envPrefix","esbuild","jsx","logLevel","optimizeDeps","include","undefined","noDiscovery","root","server","hmr","watch","ssr","noExternal","viteConfig","vite","command","isSsrBuild","mode","pluginContainer","buildStart","config","envDir","node","getSourceMap","source","runner","base","fetchModule","rawCode","result","ssrTransform","resolveId","importer","URL","href","executeId"],"mappings":"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"}

package/dist/util/doImport.js

@@ -9,8 +9,9 @@ import { pathToFileURL } from 'node:url';
     // Absolute paths in windows are not valid URLs and are not supported by import().
     // We need to convert the path to a file URL.
     // See: https://github.com/nodejs/node/issues/31710
+    const url = /^file:\/\//.test(source) ? source : pathToFileURL(source).href;
     // eslint-disable-next-line no-restricted-syntax
-    return import(/^file:\/\//.test(source) ? source : pathToFileURL(source).href);
+    return import(/* @vite-ignore */ url);
 }
 
 //# sourceMappingURL=doImport.js.map

package/dist/util/doImport.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/doImport.ts"],"sourcesContent":["// Only file that should be using dynamic import\nimport {pathToFileURL} from 'node:url'\n\n/**\n * This function is a replacement for built in dynamic import\n * This handles the case for windows file paths especially for absolute paths.\n *\n * @param source - File path\n */\nexport function doImport(source: string) {\n  // Absolute paths in windows are not valid URLs and are not supported by import().\n  // We need to convert the path to a file URL.\n  // See: https://github.com/nodejs/node/issues/31710\n  // eslint-disable-next-line no-restricted-syntax\n  return import(/^file:\\/\\//.test(source) ? source : pathToFileURL(source).href)\n}\n"],"names":["pathToFileURL","doImport","source","test","href"],"mappings":"AAAA,gDAAgD;AAChD,SAAQA,aAAa,QAAO,WAAU;AAEtC;;;;;CAKC,GACD,OAAO,SAASC,SAASC,MAAc;IACrC,kFAAkF;IAClF,6CAA6C;IAC7C,mDAAmD;IACnD,gDAAgD;IAChD,OAAO,MAAM,CAAC,aAAaC,IAAI,CAACD,UAAUA,SAASF,cAAcE,QAAQE,IAAI;AAC/E"}
+{"version":3,"sources":["../../src/util/doImport.ts"],"sourcesContent":["// Only file that should be using dynamic import\nimport {pathToFileURL} from 'node:url'\n\n/**\n * This function is a replacement for built in dynamic import\n * This handles the case for windows file paths especially for absolute paths.\n *\n * @param source - File path\n */\nexport function doImport(source: string) {\n  // Absolute paths in windows are not valid URLs and are not supported by import().\n  // We need to convert the path to a file URL.\n  // See: https://github.com/nodejs/node/issues/31710\n  const url = /^file:\\/\\//.test(source) ? source : pathToFileURL(source).href\n  // eslint-disable-next-line no-restricted-syntax\n  return import(\n    /* @vite-ignore */\n    url\n  )\n}\n"],"names":["pathToFileURL","doImport","source","url","test","href"],"mappings":"AAAA,gDAAgD;AAChD,SAAQA,aAAa,QAAO,WAAU;AAEtC;;;;;CAKC,GACD,OAAO,SAASC,SAASC,MAAc;IACrC,kFAAkF;IAClF,6CAA6C;IAC7C,mDAAmD;IACnD,MAAMC,MAAM,aAAaC,IAAI,CAACF,UAAUA,SAASF,cAAcE,QAAQG,IAAI;IAC3E,gDAAgD;IAChD,OAAO,MAAM,CACX,gBAAgB,GAChBF;AAEJ"}

package/dist/util/promisifyWorker.js

@@ -40,7 +40,7 @@ const debug = subdebug('worker');
         });
         worker.addListener('message', function onWorkerMessage(message) {
             settled = true;
-            debug(`Worker message: ${message}`);
+            debug('Worker message %o', message);
             resolve(message);
             cleanup();
         });

package/dist/util/promisifyWorker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/util/promisifyWorker.ts"],"sourcesContent":["import {type Worker} from 'node:worker_threads'\n\nimport {subdebug} from '../debug.js'\n\nconst debug = subdebug('worker')\n\n/**\n * Wraps a Node.js Worker in a Promise that resolves with the first message\n * the worker sends, and rejects on error, message deserialization failure,\n * or non-zero exit code. The worker is terminated after a message or error\n * is received.\n *\n * @param worker - The Worker instance to promisify\n * @returns A promise that resolves with the first message from the worker\n * @throws If the worker emits an error, a message deserialization error, or exits with a non-zero code\n * @internal\n */\nexport function promisifyWorker<T = unknown>(worker: Worker): Promise<T> {\n  return new Promise<T>((resolve, reject) => {\n    let settled = false\n\n    worker.addListener('error', function onWorkerError(err) {\n      settled = true\n      debug(`Worker error: ${err.message}`, err)\n      reject(new Error(`Worker error: ${err.message}`, {cause: err}))\n      cleanup()\n    })\n    // No cleanup() here — the worker is already dead after exiting,\n    // so there is nothing to terminate or remove listeners from.\n    worker.addListener('exit', function onWorkerExit(code) {\n      if (code > 0) {\n        debug(`Worker exited with code ${code}`)\n        reject(new Error(`Worker exited with code ${code}`))\n      } else if (!settled) {\n        debug('Worker exited with code 0 without sending a message')\n        reject(new Error('Worker exited without sending a message'))\n      }\n    })\n    worker.addListener('messageerror', function onWorkerMessageError(err) {\n      settled = true\n      debug(`Worker message error: ${err.message}`, err)\n      reject(new Error(`Failed to deserialize worker message: ${err}`))\n      cleanup()\n    })\n    worker.addListener('message', function onWorkerMessage(message) {\n      settled = true\n      debug(`Worker message: ${message}`)\n      resolve(message)\n      cleanup()\n    })\n\n    function cleanup() {\n      setImmediate(() => worker.terminate())\n      worker.removeAllListeners()\n    }\n  })\n}\n"],"names":["subdebug","debug","promisifyWorker","worker","Promise","resolve","reject","settled","addListener","onWorkerError","err","message","Error","cause","cleanup","onWorkerExit","code","onWorkerMessageError","onWorkerMessage","setImmediate","terminate","removeAllListeners"],"mappings":"AAEA,SAAQA,QAAQ,QAAO,cAAa;AAEpC,MAAMC,QAAQD,SAAS;AAEvB;;;;;;;;;;CAUC,GACD,OAAO,SAASE,gBAA6BC,MAAc;IACzD,OAAO,IAAIC,QAAW,CAACC,SAASC;QAC9B,IAAIC,UAAU;QAEdJ,OAAOK,WAAW,CAAC,SAAS,SAASC,cAAcC,GAAG;YACpDH,UAAU;YACVN,MAAM,CAAC,cAAc,EAAES,IAAIC,OAAO,EAAE,EAAED;YACtCJ,OAAO,IAAIM,MAAM,CAAC,cAAc,EAAEF,IAAIC,OAAO,EAAE,EAAE;gBAACE,OAAOH;YAAG;YAC5DI;QACF;QACA,gEAAgE;QAChE,6DAA6D;QAC7DX,OAAOK,WAAW,CAAC,QAAQ,SAASO,aAAaC,IAAI;YACnD,IAAIA,OAAO,GAAG;gBACZf,MAAM,CAAC,wBAAwB,EAAEe,MAAM;gBACvCV,OAAO,IAAIM,MAAM,CAAC,wBAAwB,EAAEI,MAAM;YACpD,OAAO,IAAI,CAACT,SAAS;gBACnBN,MAAM;gBACNK,OAAO,IAAIM,MAAM;YACnB;QACF;QACAT,OAAOK,WAAW,CAAC,gBAAgB,SAASS,qBAAqBP,GAAG;YAClEH,UAAU;YACVN,MAAM,CAAC,sBAAsB,EAAES,IAAIC,OAAO,EAAE,EAAED;YAC9CJ,OAAO,IAAIM,MAAM,CAAC,sCAAsC,EAAEF,KAAK;YAC/DI;QACF;QACAX,OAAOK,WAAW,CAAC,WAAW,SAASU,gBAAgBP,OAAO;YAC5DJ,UAAU;YACVN,MAAM,CAAC,gBAAgB,EAAEU,SAAS;YAClCN,QAAQM;YACRG;QACF;QAEA,SAASA;YACPK,aAAa,IAAMhB,OAAOiB,SAAS;YACnCjB,OAAOkB,kBAAkB;QAC3B;IACF;AACF"}
+{"version":3,"sources":["../../src/util/promisifyWorker.ts"],"sourcesContent":["import {type Worker} from 'node:worker_threads'\n\nimport {subdebug} from '../debug.js'\n\nconst debug = subdebug('worker')\n\n/**\n * Wraps a Node.js Worker in a Promise that resolves with the first message\n * the worker sends, and rejects on error, message deserialization failure,\n * or non-zero exit code. The worker is terminated after a message or error\n * is received.\n *\n * @param worker - The Worker instance to promisify\n * @returns A promise that resolves with the first message from the worker\n * @throws If the worker emits an error, a message deserialization error, or exits with a non-zero code\n * @internal\n */\nexport function promisifyWorker<T = unknown>(worker: Worker): Promise<T> {\n  return new Promise<T>((resolve, reject) => {\n    let settled = false\n\n    worker.addListener('error', function onWorkerError(err) {\n      settled = true\n      debug(`Worker error: ${err.message}`, err)\n      reject(new Error(`Worker error: ${err.message}`, {cause: err}))\n      cleanup()\n    })\n    // No cleanup() here — the worker is already dead after exiting,\n    // so there is nothing to terminate or remove listeners from.\n    worker.addListener('exit', function onWorkerExit(code) {\n      if (code > 0) {\n        debug(`Worker exited with code ${code}`)\n        reject(new Error(`Worker exited with code ${code}`))\n      } else if (!settled) {\n        debug('Worker exited with code 0 without sending a message')\n        reject(new Error('Worker exited without sending a message'))\n      }\n    })\n    worker.addListener('messageerror', function onWorkerMessageError(err) {\n      settled = true\n      debug(`Worker message error: ${err.message}`, err)\n      reject(new Error(`Failed to deserialize worker message: ${err}`))\n      cleanup()\n    })\n    worker.addListener('message', function onWorkerMessage(message) {\n      settled = true\n      debug('Worker message %o', message)\n      resolve(message)\n      cleanup()\n    })\n\n    function cleanup() {\n      setImmediate(() => worker.terminate())\n      worker.removeAllListeners()\n    }\n  })\n}\n"],"names":["subdebug","debug","promisifyWorker","worker","Promise","resolve","reject","settled","addListener","onWorkerError","err","message","Error","cause","cleanup","onWorkerExit","code","onWorkerMessageError","onWorkerMessage","setImmediate","terminate","removeAllListeners"],"mappings":"AAEA,SAAQA,QAAQ,QAAO,cAAa;AAEpC,MAAMC,QAAQD,SAAS;AAEvB;;;;;;;;;;CAUC,GACD,OAAO,SAASE,gBAA6BC,MAAc;IACzD,OAAO,IAAIC,QAAW,CAACC,SAASC;QAC9B,IAAIC,UAAU;QAEdJ,OAAOK,WAAW,CAAC,SAAS,SAASC,cAAcC,GAAG;YACpDH,UAAU;YACVN,MAAM,CAAC,cAAc,EAAES,IAAIC,OAAO,EAAE,EAAED;YACtCJ,OAAO,IAAIM,MAAM,CAAC,cAAc,EAAEF,IAAIC,OAAO,EAAE,EAAE;gBAACE,OAAOH;YAAG;YAC5DI;QACF;QACA,gEAAgE;QAChE,6DAA6D;QAC7DX,OAAOK,WAAW,CAAC,QAAQ,SAASO,aAAaC,IAAI;YACnD,IAAIA,OAAO,GAAG;gBACZf,MAAM,CAAC,wBAAwB,EAAEe,MAAM;gBACvCV,OAAO,IAAIM,MAAM,CAAC,wBAAwB,EAAEI,MAAM;YACpD,OAAO,IAAI,CAACT,SAAS;gBACnBN,MAAM;gBACNK,OAAO,IAAIM,MAAM;YACnB;QACF;QACAT,OAAOK,WAAW,CAAC,gBAAgB,SAASS,qBAAqBP,GAAG;YAClEH,UAAU;YACVN,MAAM,CAAC,sBAAsB,EAAES,IAAIC,OAAO,EAAE,EAAED;YAC9CJ,OAAO,IAAIM,MAAM,CAAC,sCAAsC,EAAEF,KAAK;YAC/DI;QACF;QACAX,OAAOK,WAAW,CAAC,WAAW,SAASU,gBAAgBP,OAAO;YAC5DJ,UAAU;YACVN,MAAM,qBAAqBU;YAC3BN,QAAQM;YACRG;QACF;QAEA,SAASA;YACPK,aAAa,IAAMhB,OAAOiB,SAAS;YACnCjB,OAAOkB,kBAAkB;QAC3B;IACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli-core",
-  "version": "0.1.0-alpha.15",
+  "version": "0.1.0-alpha.16",
   "description": "Sanity CLI core package",
   "keywords": [
     "sanity",
@@ -50,30 +50,31 @@
     "@inquirer/prompts": "^8.2.0",
     "@oclif/core": "^4.8.0",
     "@rexxars/jiti": "^2.6.2",
-    "@sanity/client": "^7.15.0",
-    "@sanity/types": "^5.11.0",
+    "@sanity/client": "^7.16.0",
+    "@sanity/types": "^5.12.0",
     "babel-plugin-react-compiler": "^1.0.0",
     "boxen": "^8.0.1",
     "configstore": "^7.0.0",
     "debug": "^4.4.3",
     "get-it": "^8.7.0",
-    "read-package-up": "^12.0.0",
     "get-tsconfig": "^4.13.6",
     "import-meta-resolve": "^4.2.0",
     "jsdom": "^27.4.0",
     "json-lexer": "^1.2.0",
     "log-symbols": "^7.0.1",
     "ora": "^9.0.0",
+    "read-package-up": "^12.0.0",
     "rxjs": "^7.8.2",
     "tinyglobby": "^0.2.15",
     "tsx": "^4.21.0",
     "typeid-js": "^1.2.0",
     "vite": "^7.3.1",
+    "vite-node": "^5.3.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {
     "@eslint/compat": "^2.0.2",
-    "@sanity/codegen": "^5.9.4",
+    "@sanity/codegen": "^5.10.1",
     "@sanity/pkg-utils": "^10.4.4",
     "@sanity/telemetry": "^0.8.1",
     "@swc/cli": "^0.8.0",
@@ -83,12 +84,12 @@
     "@types/node": "^20.19.33",
     "eslint": "^9.39.2",
     "publint": "^0.3.17",
-    "sanity": "^5.11.0",
+    "sanity": "^5.12.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18",
+    "@repo/package.config": "0.0.1",
     "@repo/tsconfig": "3.70.0",
-    "@sanity/eslint-config-cli": "0.0.0-alpha.2",
-    "@repo/package.config": "0.0.1"
+    "@sanity/eslint-config-cli": "0.0.0-alpha.2"
   },
   "peerDependencies": {
     "@sanity/telemetry": ">=0.8.1 <0.9.0"