Move auto-instrumentation bundler plugins to browser package

integrations/browser-js/package.json

@@ -10,6 +10,22 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "default": "./dist/index.js"
+    },
+    "./vite": {
+      "types": "./dist/bundler/vite.d.ts",
+      "import": "./dist/bundler/vite.js"
+    },
+    "./webpack": {
+      "types": "./dist/bundler/webpack.d.ts",
+      "import": "./dist/bundler/webpack.js"
+    },
+    "./esbuild": {
+      "types": "./dist/bundler/esbuild.d.ts",
+      "import": "./dist/bundler/esbuild.js"
+    },
+    "./rollup": {
+      "types": "./dist/bundler/rollup.d.ts",
+      "import": "./dist/bundler/rollup.js"
     }
   },
   "files": [
@@ -23,8 +39,12 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
+    "@apm-js-collab/code-transformer": "^0.9.0",
     "als-browser": "^1.0.1",
-    "braintrust": ">=3.0.0-rc.29"
+    "braintrust": ">=3.0.0-rc.29",
+    "dc-browser": "^1.0.3",
+    "module-details-from-path": "^1.0.4",
+    "unplugin": "^2.3.5"
   },
   "devDependencies": {
     "@types/node": "^20.10.5",

js/src/auto-instrumentations/bundler/esbuild.ts → integrations/browser-js/src/bundler/esbuild.ts

@@ -3,7 +3,7 @@
  *
  * Usage:
  * ```typescript
- * import { esbuildPlugin } from '@braintrust/auto-instrumentations/bundler/esbuild';
+ * import { esbuildPlugin } from '@braintrust/browser/esbuild';
  *
  * await esbuild.build({
  *   plugins: [esbuildPlugin()],

js/src/auto-instrumentations/bundler/plugin.ts → integrations/browser-js/src/bundler/plugin.ts

@@ -20,11 +20,13 @@ import { extname, join, sep } from "path";
 import { readFileSync } from "fs";
 import { fileURLToPath } from "url";
 import moduleDetailsFromPath from "module-details-from-path";
-import { openaiConfigs } from "../configs/openai";
-import { anthropicConfigs } from "../configs/anthropic";
-import { aiSDKConfigs } from "../configs/ai-sdk";
-import { claudeAgentSDKConfigs } from "../configs/claude-agent-sdk";
-import { googleGenAIConfigs } from "../configs/google-genai";
+import {
+  openaiConfigs,
+  anthropicConfigs,
+  aiSDKConfigs,
+  claudeAgentSDKConfigs,
+  googleGenAIConfigs,
+} from "braintrust/auto-instrumentation-configs";
 
 export interface BundlerPluginOptions {
   /**

js/src/auto-instrumentations/bundler/rollup.ts → integrations/browser-js/src/bundler/rollup.ts

@@ -3,7 +3,7 @@
  *
  * Usage:
  * ```typescript
- * import { rollupPlugin } from '@braintrust/auto-instrumentations/bundler/rollup';
+ * import { rollupPlugin } from '@braintrust/browser/rollup';
  *
  * export default {
  *   plugins: [rollupPlugin()]

integrations/browser-js/src/bundler/types/module-details-from-path.d.ts

@@ -0,0 +1,11 @@
+declare module "module-details-from-path" {
+  interface ModuleDetails {
+    name: string;
+    basedir: string;
+    path: string;
+  }
+
+  function moduleDetailsFromPath(filePath: string): ModuleDetails | null;
+
+  export = moduleDetailsFromPath;
+}

js/src/auto-instrumentations/bundler/vite.ts → integrations/browser-js/src/bundler/vite.ts

@@ -3,7 +3,7 @@
  *
  * Usage:
  * ```typescript
- * import { vitePlugin } from '@braintrust/auto-instrumentations/bundler/vite';
+ * import { vitePlugin } from '@braintrust/browser/vite';
  *
  * export default {
  *   plugins: [vitePlugin()],

js/src/auto-instrumentations/bundler/webpack.ts → integrations/browser-js/src/bundler/webpack.ts

@@ -3,7 +3,7 @@
  *
  * Usage:
  * ```javascript
- * import { webpackPlugin } from 'braintrust/auto-instrumentations/bundler/webpack';
+ * import { webpackPlugin } from '@braintrust/browser/webpack';
  *
  * export default {
  *   plugins: [webpackPlugin()],

integrations/browser-js/tsconfig.json

@@ -8,7 +8,12 @@
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "paths": {
+      "braintrust/auto-instrumentation-configs": [
+        "../../js/dist/auto-instrumentations/index"
+      ]
+    }
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]

integrations/browser-js/tsup.config.ts

@@ -1,14 +1,30 @@
 import { defineConfig } from "tsup";
 
-export default defineConfig({
-  entry: ["src/index.ts"],
-  format: ["esm"],
-  dts: true,
-  sourcemap: true,
-  clean: true,
-  external: ["braintrust", "zod"],
-  target: "es2022",
-  platform: "browser",
-  outDir: "./dist",
-  treeshake: true,
-});
+export default defineConfig([
+  {
+    entry: ["src/index.ts"],
+    format: ["esm"],
+    dts: true,
+    sourcemap: true,
+    clean: true,
+    external: ["braintrust", "zod"],
+    target: "es2022",
+    platform: "browser",
+    outDir: "./dist",
+    treeshake: true,
+  },
+  {
+    entry: {
+      "bundler/vite": "src/bundler/vite.ts",
+      "bundler/webpack": "src/bundler/webpack.ts",
+      "bundler/esbuild": "src/bundler/esbuild.ts",
+      "bundler/rollup": "src/bundler/rollup.ts",
+    },
+    format: ["esm"],
+    dts: true,
+    platform: "node",
+    external: ["braintrust", "@apm-js-collab/code-transformer", "zod"],
+    outDir: "./dist",
+    clean: false,
+  },
+]);

js/package.json

@@ -75,29 +75,10 @@
       "require": "./dist/instrumentation/index.js"
     },
     "./hook.mjs": "./dist/auto-instrumentations/hook.mjs",
-    "./vite": {
-      "types": "./dist/auto-instrumentations/bundler/vite.d.ts",
-      "import": "./dist/auto-instrumentations/bundler/vite.mjs",
-      "module": "./dist/auto-instrumentations/bundler/vite.mjs",
-      "require": "./dist/auto-instrumentations/bundler/vite.js"
-    },
-    "./webpack": {
-      "types": "./dist/auto-instrumentations/bundler/webpack.d.ts",
-      "import": "./dist/auto-instrumentations/bundler/webpack.mjs",
-      "module": "./dist/auto-instrumentations/bundler/webpack.mjs",
-      "require": "./dist/auto-instrumentations/bundler/webpack.js"
-    },
-    "./esbuild": {
-      "types": "./dist/auto-instrumentations/bundler/esbuild.d.ts",
-      "import": "./dist/auto-instrumentations/bundler/esbuild.mjs",
-      "module": "./dist/auto-instrumentations/bundler/esbuild.mjs",
-      "require": "./dist/auto-instrumentations/bundler/esbuild.js"
-    },
-    "./rollup": {
-      "types": "./dist/auto-instrumentations/bundler/rollup.d.ts",
-      "import": "./dist/auto-instrumentations/bundler/rollup.mjs",
-      "module": "./dist/auto-instrumentations/bundler/rollup.mjs",
-      "require": "./dist/auto-instrumentations/bundler/rollup.js"
+    "./auto-instrumentation-configs": {
+      "types": "./dist/auto-instrumentations/index.d.ts",
+      "import": "./dist/auto-instrumentations/index.mjs",
+      "require": "./dist/auto-instrumentations/index.cjs"
     }
   },
   "files": [
@@ -173,6 +154,7 @@
     "async": "^3.2.5",
     "autoevals": "^0.0.131",
     "cross-env": "^7.0.3",
+    "dc-browser": "^1.0.3",
     "eslint-plugin-node-import": "^1.0.5",
     "jiti": "^2.6.1",
     "openai": "6.25.0",
@@ -204,7 +186,6 @@
     "cli-progress": "^3.12.0",
     "cli-table3": "^0.6.5",
     "cors": "^2.8.5",
-    "dc-browser": "^1.0.3",
     "dotenv": "^16.4.5",
     "esbuild": "^0.27.0",
     "eventsource-parser": "^1.1.2",
@@ -218,7 +199,6 @@
     "simple-git": "^3.21.0",
     "source-map": "^0.7.4",
     "termi-link": "^1.0.1",
-    "unplugin": "^2.3.5",
     "uuid": "^9.0.1",
     "zod-to-json-schema": "^3.25.0"
   },

js/tests/auto-instrumentations/error-handling.test.ts

@@ -76,8 +76,7 @@ describe("Error Handling", () => {
 
       fs.writeFileSync(entryPoint, testCode);
 
-      const { esbuildPlugin } =
-        await import("../../src/auto-instrumentations/bundler/esbuild.js");
+      const { esbuildPlugin } = await import("@braintrust/browser/esbuild");
 
       await esbuild.build({
         entryPoints: [entryPoint],
@@ -136,8 +135,7 @@ describe("Error Handling", () => {
 
       fs.writeFileSync(entryPoint, testCode);
 
-      const { esbuildPlugin } =
-        await import("../../src/auto-instrumentations/bundler/esbuild.js");
+      const { esbuildPlugin } = await import("@braintrust/browser/esbuild");
 
       await esbuild.build({
         entryPoints: [entryPoint],
@@ -187,8 +185,7 @@ describe("Error Handling", () => {
 
       fs.writeFileSync(entryPoint, testCode);
 
-      const { esbuildPlugin } =
-        await import("../../src/auto-instrumentations/bundler/esbuild.js");
+      const { esbuildPlugin } = await import("@braintrust/browser/esbuild");
 
       await esbuild.build({
         entryPoints: [entryPoint],
@@ -231,8 +228,7 @@ describe("Error Handling", () => {
 
       fs.writeFileSync(entryPoint, testCode);
 
-      const { esbuildPlugin } =
-        await import("../../src/auto-instrumentations/bundler/esbuild.js");
+      const { esbuildPlugin } = await import("@braintrust/browser/esbuild");
 
       await esbuild.build({
         entryPoints: [entryPoint],
@@ -284,8 +280,7 @@ describe("Error Handling", () => {
 
       fs.writeFileSync(entryPoint, testCode);
 
-      const { esbuildPlugin } =
-        await import("../../src/auto-instrumentations/bundler/esbuild.js");
+      const { esbuildPlugin } = await import("@braintrust/browser/esbuild");
 
       await esbuild.build({
         entryPoints: [entryPoint],
@@ -339,8 +334,7 @@ describe("Error Handling", () => {
 
       fs.writeFileSync(entryPoint, testCode);
 
-      const { esbuildPlugin } =
-        await import("../../src/auto-instrumentations/bundler/esbuild.js");
+      const { esbuildPlugin } = await import("@braintrust/browser/esbuild");
 
       await esbuild.build({
         entryPoints: [entryPoint],
@@ -403,8 +397,7 @@ describe("Error Handling", () => {
 
       fs.writeFileSync(entryPoint, testCode);
 
-      const { esbuildPlugin } =
-        await import("../../src/auto-instrumentations/bundler/esbuild.js");
+      const { esbuildPlugin } = await import("@braintrust/browser/esbuild");
 
       await esbuild.build({
         entryPoints: [entryPoint],