fix: avoid masquerading types as mjs (#425)

lukasIO · web-flow · commit 3e57767f87a5 · 2025-06-09T16:28:43.000+02:00
diff --git a/.changeset/smart-poems-attack.md b/.changeset/smart-poems-attack.md
@@ -0,0 +1,14 @@
+---
+"@livekit/agents": patch
+"@livekit/agents-plugin-cartesia": patch
+"@livekit/agents-plugin-deepgram": patch
+"@livekit/agents-plugin-elevenlabs": patch
+"@livekit/agents-plugin-livekit": patch
+"@livekit/agents-plugin-neuphonic": patch
+"@livekit/agents-plugin-openai": patch
+"@livekit/agents-plugin-resemble": patch
+"@livekit/agents-plugin-silero": patch
+"@livekit/agents-plugins-test": patch
+---
+
+fix: avoid masquerading types as mjs
diff --git a/agents/package.json b/agents/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./index.d.cts",
+      "default": "./index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
+    "build": "tsup --onSuccess \"pnpm build:types\"",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.ts\"",
diff --git a/agents/src/ipc/inference_proc_executor.ts b/agents/src/ipc/inference_proc_executor.ts
@@ -55,7 +55,7 @@ export class InferenceProcExecutor extends SupervisedProc implements InferenceEx
   }
 
   createProcess(): ChildProcess {
-    return fork(new URL(import.meta.resolve('./inference_proc_lazy_main.js')), [
+    return fork(new URL('./inference_proc_lazy_main.js', import.meta.url), [
       JSON.stringify(this.#runners),
     ]);
   }
diff --git a/agents/src/ipc/job_proc_executor.ts b/agents/src/ipc/job_proc_executor.ts
@@ -64,7 +64,7 @@ export class JobProcExecutor extends SupervisedProc implements JobExecutor {
   }
 
   createProcess(): ChildProcess {
-    return fork(new URL(import.meta.resolve('./job_proc_lazy_main.js')), [this.#agent]);
+    return fork(new URL('./job_proc_lazy_main.js', import.meta.url), [this.#agent]);
   }
 
   async mainTask(proc: ChildProcess) {
diff --git a/package.json b/package.json
@@ -42,7 +42,8 @@
     "turbo": "^1.13.3",
     "typedoc": "^0.25.13",
     "typescript": "^5.4.5",
-    "vitest": "^1.6.0"
+    "vitest": "^1.6.0",
+    "tsup": "^8.4.0"
   },
   "packageManager": "pnpm@9.7.0"
 }
diff --git a/plugins/cartesia/package.json b/plugins/cartesia/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
+    "build": "tsup --onSuccess \"pnpm build:types\"",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\"",
diff --git a/plugins/deepgram/package.json b/plugins/deepgram/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
+    "build": "tsup --onSuccess \"pnpm build:types\"",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\"",
diff --git a/plugins/elevenlabs/package.json b/plugins/elevenlabs/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
+    "build": "tsup --onSuccess \"pnpm build:types\"",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\"",
diff --git a/plugins/livekit/package.json b/plugins/livekit/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\" && cp src/turn_detector.onnx dist/",
+    "build": "tsup --onSuccess \"pnpm build:types\" && cp src/turn_detector.onnx dist/",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\"",
diff --git a/plugins/livekit/src/index.ts b/plugins/livekit/src/index.ts
@@ -6,6 +6,6 @@ import * as turnDetector from './turn_detector.js';
 
 InferenceRunner.registerRunner(
   turnDetector.EOURunner.INFERENCE_METHOD,
-  import.meta.resolve('./turn_detector.js'),
+  new URL('./turn_detector.js', import.meta.url).toString(),
 );
 export { turnDetector };
diff --git a/plugins/neuphonic/package.json b/plugins/neuphonic/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
+    "build": "tsup --onSuccess \"pnpm build:types\"",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\"",
diff --git a/plugins/openai/package.json b/plugins/openai/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
+    "build": "tsup --onSuccess \"pnpm build:types\"",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\"",
diff --git a/plugins/resemble/package.json b/plugins/resemble/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
+    "build": "tsup --onSuccess \"pnpm build:types\"",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\"",
diff --git a/plugins/silero/package.json b/plugins/silero/package.json
@@ -6,10 +6,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "author": "LiveKit",
@@ -22,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\" && cp src/silero_vad.onnx dist/",
+    "build": "tsup --onSuccess \"pnpm build:types\" && cp src/silero_vad.onnx dist/",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "clean": "rm -rf dist",
     "clean:build": "pnpm clean && pnpm build",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\"",
diff --git a/plugins/test/package.json b/plugins/test/package.json
@@ -11,10 +11,13 @@
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
-    ".": {
+    "import": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "default": "./dist/index.js"
+    },
+    "require": {
+      "types": "./dist/index.d.cts",
+      "default": "./dist/index.cjs"
     }
   },
   "files": [
@@ -23,7 +26,8 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\" && cp src/long.wav dist/",
+    "build": "tsup --onSuccess \"pnpm build:types\" && cp src/long.wav dist/",
+    "build:types": "tsc --declaration --emitDeclarationOnly && node ../../scripts/copyDeclarationOutput.js",
     "lint": "eslint -f unix \"src/**/*.{ts,js}\""
   },
   "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/copyDeclarationOutput.js b/scripts/copyDeclarationOutput.js
@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: 2025 LiveKit, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+// @ts-check
+import fs from 'fs';
+import path from 'path';
+
+/**
+ * @param {string} dir
+ * @param {(filePath: string) => void} callback
+ */
+const walkDir = (dir, callback) => {
+  fs.readdirSync(dir).forEach((f) => {
+    const dirPath = path.join(dir, f);
+    const isDirectory = fs.statSync(dirPath).isDirectory();
+    isDirectory ? walkDir(dirPath, callback) : callback(path.join(dir, f));
+  });
+};
+
+/**
+ * @param {string} dir
+ * @param {(filePath: string) => void} callback
+ */
+walkDir('dist', (filePath) => {
+  if (filePath.endsWith('.d.ts')) {
+    const newPath = filePath.replace(/\.d\.ts$/, '.d.cts');
+    fs.copyFileSync(filePath, newPath);
+  }
+});
+console.log('copied declaration .d.ts files to .d.cts files');
diff --git a/tsup.config.ts b/tsup.config.ts
@@ -1,11 +1,11 @@
-import { Options } from 'tsup';
+import type { Options } from 'tsup';
 
 const defaultOptions: Options = {
   entry: ['src/**/*.ts'],
   format: ['cjs', 'esm'],
   splitting: false,
   sourcemap: true,
-  // for the type maps to work, we use tsc's declaration-only command
+  // for the type maps to work, we use tsc's declaration-only command on the success callback
   dts: false,
   clean: true,
   target: 'node16',

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ export class InferenceProcExecutor extends SupervisedProc implements InferenceEx`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`createProcess(): ChildProcess {`
`58`		`- return fork(new URL(import.meta.resolve('./inference_proc_lazy_main.js')), [`
	`58`	`+ return fork(new URL('./inference_proc_lazy_main.js', import.meta.url), [`
`59`	`59`	`JSON.stringify(this.#runners),`
`60`	`60`	`]);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export class JobProcExecutor extends SupervisedProc implements JobExecutor {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`createProcess(): ChildProcess {`
`67`		`- return fork(new URL(import.meta.resolve('./job_proc_lazy_main.js')), [this.#agent]);`
	`67`	`+ return fork(new URL('./job_proc_lazy_main.js', import.meta.url), [this.#agent]);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`async mainTask(proc: ChildProcess) {`