fix(cli): correct worker strategy for new bundling

packages/@sanity/cli/package.config.ts

@@ -1,15 +1,38 @@
-import {defineConfig} from '@sanity/pkg-utils'
+/* eslint-disable no-sync */
+import fs from 'fs'
+import path from 'path'
+import {defineConfig, PkgExports} from '@sanity/pkg-utils'
 import baseConfig from '../../../package.config'
 
 export default defineConfig({
   ...baseConfig,
-  exports: (exports) => ({
-    ...exports,
+  exports: (existingExports) => ({
+    ...existingExports,
     './cli': {
       source: './src/cli.ts',
       require: './lib/cli.js',
       default: './lib/cli.js',
     },
+    ...getWorkerExports(),
   }),
   runtime: 'node',
 })
+
+function getWorkerExports(): PkgExports {
+  const workersDir = path.join(__dirname, 'src', 'workers')
+  const sourceFiles = fs
+    .readdirSync(workersDir)
+    .filter((file) => file.endsWith('.ts'))
+    .map((file) => path.basename(file, '.ts'))
+
+  const workers: PkgExports = {}
+  for (const name of sourceFiles) {
+    workers[`./workers/${name}`] = {
+      source: `./src/workers/${name}.ts`,
+      require: `./lib/workers/${name}.js`,
+      default: `./lib/workers/${name}.js`,
+    }
+  }
+
+  return workers
+}

packages/@sanity/cli/src/util/cliWorker.ts

@@ -9,12 +9,12 @@ import pkgDir from 'pkg-dir'
  * To make things worse, the built CLI makes it difficult to resolve paths to
  * built source files (that contains the unpackaged worker).
  *
- * This function takes a path _relative to the `src`/`lib` folder, resolves
+ * This function takes a path relative to the `src/workers` folder, resolves
  * the location of that within the installed location (eg global Sanity CLI)
  * and ensures we can resolve the actual module before trying to spawn the
  * worker thread.
  *
- * @param workerPath - _RELATIVE_ path (relative to `src`/`lib`) to the worker
+ * @param workerPath - _RELATIVE_ path (relative to `src/workers`) to the worker
  * @returns Full, absolute path to the worker
  * @internal
  */
@@ -24,11 +24,10 @@ export async function getCliWorkerPath(workerPath: string): Promise<string> {
     throw new Error('Failed to find root @sanity/cli module directory')
   }
 
-  const resolvedPath = path.resolve(cliDir, 'lib', workerPath)
-  const resolvedFile = require.resolve(resolvedPath)
-  if (!resolvedFile) {
-    throw new Error(`Unable to resolve path for worker: ${resolvedPath}`)
+  const resolvedPath = path.resolve(cliDir, 'lib', 'workers', workerPath)
+  try {
+    return require.resolve(resolvedPath)
+  } catch (err) {
+    throw new Error(`Unable to resolve path for worker: ${workerPath}`)
   }
-
-  return resolvedFile
 }

packages/@sanity/cli/src/util/clientWrapper.ts

@@ -43,6 +43,7 @@ export function getCliToken(): string | undefined {
   const userConfig = getUserConfig()
   return envAuthToken || userConfig.get('authToken')
 }
+
 export interface ClientRequirements {
   requireUser?: boolean
   requireProject?: boolean

packages/@sanity/cli/src/util/getCliConfig.ts

@@ -62,7 +62,7 @@ export function getCliConfigSync(cwd: string): CliConfigResult | null {
 }
 
 async function getCliConfigForked(cwd: string): Promise<CliConfigResult | null> {
-  const workerPath = await getCliWorkerPath('util/getCliConfig.worker')
+  const workerPath = await getCliWorkerPath('getCliConfig')
   return new Promise((resolve, reject) => {
     const worker = new Worker(workerPath, {workerData: cwd})
     worker.on('message', (message) => {

packages/@sanity/cli/src/util/getCliConfig.worker.ts → packages/@sanity/cli/src/workers/getCliConfig.ts

@@ -1,5 +1,5 @@
 import {parentPort, workerData} from 'worker_threads'
-import {getCliConfig} from './getCliConfig'
+import {getCliConfig} from '../util/getCliConfig'
 
 // We're communicating with a parent process through a message channel
 getCliConfig(workerData, {forked: false})