chore: Use DTS with rolldown

dev-packages/rollup-utils/npmHelpers.mjs

@@ -10,6 +10,7 @@ import * as path from 'path';
 import { fileURLToPath } from 'url';
 import deepMerge from 'deepmerge';
 import { defineConfig } from 'rolldown';
+import { dts as makeDtsPlugin } from 'rolldown-plugin-dts';
 import {
   makeDebugBuildStatementReplacePlugin,
   makeProductionReplacePlugin,
@@ -131,6 +132,12 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
   }
 
   if (emitEsm) {
+    const hasTypes = fs.existsSync(path.resolve(process.cwd(), './tsconfig.types.json'));
+    const dts = makeDtsPlugin({
+      tsconfig: path.resolve(process.cwd(), hasTypes ? './tsconfig.types.json' : './tsconfig.json'),
+      tsgo: true,
+    });
+
     if (splitDevProd) {
       variantSpecificConfigs.push({
         output: {
@@ -139,7 +146,9 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
           plugins: [makePackageNodeEsm()],
         },
       });
+
       variantSpecificConfigs.push({
+        plugins: [dts],
         output: {
           format: 'esm',
           dir: path.join(baseConfig.output.dir, 'esm/prod'),
@@ -148,6 +157,7 @@ export function makeNPMConfigVariants(baseConfig, options = {}) {
       });
     } else {
       variantSpecificConfigs.push({
+        plugins: [dts],
         output: {
           format: 'esm',
           dir: path.join(baseConfig.output.dir, 'esm'),

nx.json

@@ -41,13 +41,8 @@
     },
     "build:types": {
       "inputs": ["production", "^production"],
-      "dependsOn": ["^build:types"],
-      "outputs": [
-        "{projectRoot}/build/types",
-        "{projectRoot}/build/types-ts3.8",
-        "{projectRoot}/build/npm/types",
-        "{projectRoot}/build/npm/types-ts3.8"
-      ]
+      "dependsOn": ["build:transpile", "^build:transpile", "^build:types"],
+      "outputs": ["{projectRoot}/build/types", "{projectRoot}/build/npm/types"]
     },
     "lint": {
       "inputs": ["default"],

package.json

@@ -108,9 +108,9 @@
     "@size-limit/webpack": "~11.1.6",
     "@types/jsdom": "^21.1.6",
     "@types/node": "^18.19.1",
+    "@typescript/native-preview": "^7.0.0-dev.20251210.1",
     "@vitest/coverage-v8": "^3.2.4",
     "deepmerge": "^4.2.2",
-    "downlevel-dts": "~0.11.0",
     "es-check": "^7.2.1",
     "eslint": "8.57.0",
     "jsdom": "^21.1.2",
@@ -122,6 +122,7 @@
     "prettier-plugin-astro": "^0.14.1",
     "rimraf": "^5.0.10",
     "rolldown": "^1.0.0-beta.54",
+    "rolldown-plugin-dts": "^0.18.3",
     "size-limit": "~11.1.6",
     "ts-node": "10.9.1",
     "typescript": "~5.8.0",

packages/astro/package.json

@@ -23,17 +23,17 @@
   "main": "build/cjs/index.client.js",
   "module": "build/esm/index.server.js",
   "browser": "build/esm/index.client.js",
-  "types": "build/types/index.types.d.ts",
+  "types": "build/esm/index.types.d.ts",
   "exports": {
     ".": {
-      "types": "./build/types/index.types.d.ts",
+      "types": "./build/esm/index.types.d.ts",
       "node": "./build/esm/index.server.js",
       "browser": "./build/esm/index.client.js",
       "import": "./build/esm/index.client.js",
       "require": "./build/cjs/index.server.js"
     },
     "./middleware": {
-      "types": "./build/types/integration/middleware/index.types.d.ts",
+      "types": "./build/esm/integration/middleware/index.d.ts",
       "node": "./build/esm/integration/middleware/index.js",
       "import": "./build/esm/integration/middleware/index.js",
       "require": "./build/cjs/integration/middleware/index.js"
@@ -69,11 +69,10 @@
     "build": "run-p build:transpile build:types",
     "build:dev": "yarn build",
     "build:transpile": "rolldown -c rollup.npm.config.mjs",
-    "build:types": "tsc -p tsconfig.types.json",
+    "build:types": "echo \"Types included with build\"",
     "build:watch": "run-p build:transpile:watch build:types:watch",
     "build:dev:watch": "yarn build:watch",
     "build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",
-    "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
     "circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts && madge --circular src/index.types.ts",
     "clean": "rimraf build coverage sentry-astro-*.tgz",

packages/astro/rollup.npm.config.mjs

@@ -2,7 +2,12 @@ import { makeBaseNPMConfig, makeNPMConfigVariants, makeOtelLoaders } from '@sent
 
 const variants = makeNPMConfigVariants(
   makeBaseNPMConfig({
-    entrypoints: ['src/index.server.ts', 'src/index.client.ts', 'src/integration/middleware/index.ts'],
+    entrypoints: [
+      'src/index.server.ts',
+      'src/index.client.ts',
+      'src/index.types.ts',
+      'src/integration/middleware/index.ts',
+    ],
     packageSpecificConfig: {
       output: {
         dynamicImportInCjs: true,

packages/aws-serverless/package.json

@@ -16,16 +16,16 @@
   ],
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
-  "types": "build/npm/types/index.d.ts",
+  "types": "build/npm/esm/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "import": {
-        "types": "./build/npm/types/index.d.ts",
+        "types": "./build/npm/esm/index.d.ts",
         "default": "./build/npm/esm/index.js"
       },
       "require": {
-        "types": "./build/npm/types/index.d.ts",
+        "types": "./build/npm/esm/index.d.ts",
         "default": "./build/npm/cjs/index.js"
       }
     },
@@ -54,13 +54,6 @@
       }
     }
   },
-  "typesVersions": {
-    "<5.0": {
-      "build/npm/types/index.d.ts": [
-        "build/npm/types-ts3.8/index.d.ts"
-      ]
-    }
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -79,17 +72,14 @@
     "@vercel/nft": "^0.29.4"
   },
   "scripts": {
-    "build": "run-p build:transpile build:types",
+    "build": "run-s build:transpile build:types",
     "build:layer": "rimraf build/aws && rolldown -c rollup.lambda-extension.config.mjs && yarn ts-node scripts/buildLambdaLayer.ts",
-    "build:dev": "run-p build:transpile build:types",
+    "build:dev": "run-s build:transpile build:types",
     "build:transpile": "rolldown -c rollup.npm.config.mjs && yarn build:layer",
-    "build:types": "run-s build:types:core build:types:downlevel",
-    "build:types:core": "tsc -p tsconfig.types.json",
-    "build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8",
+    "build:types": "echo \"Types included with build\"",
     "build:watch": "run-p build:transpile:watch build:types:watch",
     "build:dev:watch": "yarn build:watch",
     "build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",
-    "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf build dist-awslambda-layer coverage sentry-serverless-*.tgz",

packages/browser-utils/package.json

@@ -14,44 +14,34 @@
   ],
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
-  "types": "build/types/index.d.ts",
+  "types": "build/esm/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "import": {
-        "types": "./build/types/index.d.ts",
+        "types": "./build/esm/index.d.ts",
         "default": "./build/esm/index.js"
       },
       "require": {
-        "types": "./build/types/index.d.ts",
+        "types": "./build/esm/index.d.ts",
         "default": "./build/cjs/index.js"
       }
     }
   },
-  "typesVersions": {
-    "<5.0": {
-      "build/types/index.d.ts": [
-        "build/types-ts3.8/index.d.ts"
-      ]
-    }
-  },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@sentry/core": "10.30.0"
   },
   "scripts": {
-    "build": "run-p build:transpile build:types",
+    "build": "run-s build:transpile build:types",
     "build:dev": "yarn build",
     "build:transpile": "rolldown -c rollup.npm.config.mjs",
-    "build:types": "run-s build:types:core build:types:downlevel",
-    "build:types:core": "tsc -p tsconfig.types.json",
-    "build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
+    "build:types": "echo \"Types included with build\"",
     "build:watch": "run-p build:transpile:watch build:types:watch",
     "build:dev:watch": "run-p build:transpile:watch build:types:watch",
     "build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",
-    "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
     "clean": "rimraf build coverage sentry-internal-browser-utils-*.tgz",
     "fix": "eslint . --format stylish --fix",

packages/browser/package.json

@@ -14,11 +14,11 @@
   ],
   "main": "build/npm/cjs/prod/index.js",
   "module": "build/npm/esm/prod/index.js",
-  "types": "build/npm/types/index.d.ts",
+  "types": "build/npm/esm/prod/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./build/npm/types/index.d.ts",
+      "types": "./build/npm/esm/prod/index.d.ts",
       "development": {
         "import": "./build/npm/esm/dev/index.js",
         "require": "./build/npm/cjs/dev/index.js"
@@ -33,13 +33,6 @@
       }
     }
   },
-  "typesVersions": {
-    "<5.0": {
-      "build/npm/types/index.d.ts": [
-        "build/npm/types-ts3.8/index.d.ts"
-      ]
-    }
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -55,18 +48,15 @@
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
-    "build": "run-p build:transpile build:bundle build:types",
-    "build:dev": "run-p build:transpile build:types",
+    "build": "run-s build:transpile build:types build:bundle",
+    "build:dev": "run-s build:transpile build:types",
     "build:bundle": "rolldown -c rollup.bundle.config.mjs",
     "build:transpile": "rolldown -c rollup.npm.config.mjs",
-    "build:types": "run-s build:types:core build:types:downlevel",
-    "build:types:core": "tsc -p tsconfig.types.json",
-    "build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8",
+    "build:types": "echo \"Types included with build\"",
     "build:watch": "run-p build:transpile:watch build:bundle:watch build:types:watch",
     "build:dev:watch": "run-p build:transpile:watch build:types:watch",
     "build:bundle:watch": "rolldown -c rollup.bundle.config.mjs --watch",
     "build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",
-    "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf build coverage .rpt2_cache sentry-browser-*.tgz",

packages/bun/package.json

@@ -19,22 +19,15 @@
     "./package.json": "./package.json",
     ".": {
       "import": {
-        "types": "./build/types/index.d.ts",
+        "types": "./build/esm/index.d.ts",
         "default": "./build/esm/index.js"
       },
       "require": {
-        "types": "./build/types/index.d.ts",
+        "types": "./build/esm/index.d.ts",
         "default": "./build/cjs/index.js"
       }
     }
   },
-  "typesVersions": {
-    "<5.0": {
-      "build/types/index.d.ts": [
-        "build/types-ts3.8/index.d.ts"
-      ]
-    }
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -46,16 +39,13 @@
     "bun-types": "^1.2.9"
   },
   "scripts": {
-    "build": "run-p build:transpile build:types",
+    "build": "run-s build:transpile build:types",
     "build:dev": "yarn build",
     "build:transpile": "rolldown -c rollup.npm.config.mjs",
-    "build:types": "run-s build:types:core build:types:downlevel",
-    "build:types:core": "tsc -p tsconfig.types.json",
-    "build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
+    "build:types": "echo \"Types included with build\"",
     "build:watch": "run-p build:transpile:watch build:types:watch",
     "build:dev:watch": "yarn build:watch",
     "build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",
-    "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf build coverage sentry-bun-*.tgz",

packages/cloudflare/package.json

@@ -19,32 +19,25 @@
     "./package.json": "./package.json",
     ".": {
       "import": {
-        "types": "./build/types/index.d.ts",
+        "types": "./build/esm/index.d.ts",
         "default": "./build/esm/index.js"
       },
       "require": {
-        "types": "./build/types/index.d.ts",
+        "types": "./build/esm/index.d.ts",
         "default": "./build/cjs/index.js"
       }
     },
     "./request": {
       "import": {
-        "types": "./build/types/request.d.ts",
+        "types": "./build/esm/request.d.ts",
         "default": "./build/esm/request.js"
       },
       "require": {
-        "types": "./build/types/request.d.ts",
+        "types": "./build/esm/request.d.ts",
         "default": "./build/cjs/request.js"
       }
     }
   },
-  "typesVersions": {
-    "<5.0": {
-      "build/types/index.d.ts": [
-        "build/types-ts3.8/index.d.ts"
-      ]
-    }
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -66,16 +59,13 @@
     "wrangler": "4.22.0"
   },
   "scripts": {
-    "build": "run-p build:transpile build:types",
+    "build": "run-s build:transpile build:types",
     "build:dev": "yarn build",
     "build:transpile": "rolldown -c rollup.npm.config.mjs",
-    "build:types": "run-s build:types:core build:types:downlevel",
-    "build:types:core": "tsc -p tsconfig.types.json",
-    "build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
+    "build:types": "echo \"Types included with build\"",
     "build:watch": "run-p build:transpile:watch build:types:watch",
     "build:dev:watch": "yarn build:watch",
     "build:transpile:watch": "rolldown -c rollup.npm.config.mjs --watch",
-    "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "npm pack",
     "circularDepCheck": "madge --circular src/index.ts",
     "clean": "rimraf build coverage sentry-cloudflare-*.tgz",