chore: use unplugin-isolated-decl with oxc-transform for dts build (#7609)

Co-authored-by: 三咲智子 Kevin Deng <[email protected]>

Author: hi-ogawa

package.json

@@ -53,6 +53,7 @@
     "esbuild": "^0.25.0",
     "eslint": "^9.21.0",
     "magic-string": "^0.30.17",
+    "oxc-transform": "^0.56.0",
     "pathe": "^2.0.3",
     "rimraf": "^6.0.1",
     "rollup": "^4.34.8",
@@ -62,6 +63,7 @@
     "tinyglobby": "^0.2.12",
     "tsx": "^4.19.3",
     "typescript": "^5.7.3",
+    "unplugin-isolated-decl": "^0.12.0",
     "vite": "^6.2.0",
     "vitest": "workspace:*",
     "zx": "^8.3.2"

packages/browser/rollup.config.js

@@ -3,8 +3,8 @@ import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import resolve from '@rollup/plugin-node-resolve'
 import { defineConfig } from 'rollup'
-import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
+import { createDtsUtils } from '../../scripts/build-utils.js'
 
 const require = createRequire(import.meta.url)
 const pkg = require('./package.json')
@@ -18,6 +18,13 @@ const external = [
   'vite',
 ]
 
+const dtsUtils = createDtsUtils()
+const dtsUtilsClient = createDtsUtils({
+  // need extra depth to avoid output conflict
+  isolatedDeclDir: '.types-client/tester',
+  cleanupDir: '.types-client',
+})
+
 const plugins = [
   resolve({
     preferBuiltins: true,
@@ -58,6 +65,7 @@ export default () =>
             }
           },
         },
+        ...dtsUtils.isolatedDecl(),
         ...plugins,
       ],
     },
@@ -74,7 +82,10 @@ export default () =>
         format: 'esm',
       },
       external,
-      plugins,
+      plugins: [
+        ...dtsUtilsClient.isolatedDecl(),
+        ...plugins,
+      ],
     },
     {
       input: './src/client/tester/context.ts',
@@ -118,32 +129,26 @@ export default () =>
       ],
     },
     {
-      input: input.index,
+      input: dtsUtils.dtsInput(input.index),
       output: {
-        file: 'dist/index.d.ts',
+        dir: 'dist',
+        entryFileNames: '[name].d.ts',
         format: 'esm',
       },
       external,
-      plugins: [
-        dts({
-          respectExternal: true,
-        }),
-      ],
+      plugins: dtsUtils.dts(),
     },
     {
-      input: {
+      input: dtsUtilsClient.dtsInput({
         'locators/index': './src/client/tester/locators/index.ts',
-      },
+      }),
       output: {
         dir: 'dist',
+        entryFileNames: '[name].d.ts',
         format: 'esm',
       },
       external,
-      plugins: [
-        dts({
-          respectExternal: true,
-        }),
-      ],
+      plugins: dtsUtilsClient.dts(),
     },
     // {
     //   input: './src/client/tester/jest-dom.ts',

packages/coverage-istanbul/rollup.config.js

@@ -3,8 +3,8 @@ import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import nodeResolve from '@rollup/plugin-node-resolve'
 import { join } from 'pathe'
-import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
+import { createDtsUtils } from '../../scripts/build-utils.js'
 
 const require = createRequire(import.meta.url)
 const pkg = require('./package.json')
@@ -21,7 +21,10 @@ const external = [
   /^@?vitest(\/|$)/,
 ]
 
+const dtsUtils = createDtsUtils()
+
 const plugins = [
+  ...dtsUtils.isolatedDecl(),
   nodeResolve(),
   json(),
   commonjs(),
@@ -41,13 +44,13 @@ export default () => [
     plugins,
   },
   {
-    input: entries,
+    input: dtsUtils.dtsInput(entries),
     output: {
       dir: join(process.cwd(), 'dist'),
       entryFileNames: '[name].d.ts',
       format: 'esm',
     },
     external,
-    plugins: [dts({ respectExternal: true })],
+    plugins: dtsUtils.dts(),
   },
 ]

packages/coverage-v8/rollup.config.js

@@ -3,8 +3,8 @@ import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import nodeResolve from '@rollup/plugin-node-resolve'
 import { join } from 'pathe'
-import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
+import { createDtsUtils } from '../../scripts/build-utils.js'
 
 const require = createRequire(import.meta.url)
 const pkg = require('./package.json')
@@ -23,7 +23,10 @@ const external = [
   /^@?vitest(\/|$)/,
 ]
 
+const dtsUtils = createDtsUtils()
+
 const plugins = [
+  ...dtsUtils.isolatedDecl(),
   nodeResolve(),
   json(),
   commonjs(),
@@ -43,13 +46,13 @@ export default () => [
     plugins,
   },
   {
-    input: entries,
+    input: dtsUtils.dtsInput(entries),
     output: {
       dir: join(process.cwd(), 'dist'),
       entryFileNames: '[name].d.ts',
       format: 'esm',
     },
     external,
-    plugins: [dts({ respectExternal: true })],
+    plugins: dtsUtils.dts(),
   },
 ]

packages/expect/rollup.config.js

@@ -1,8 +1,8 @@
 import { builtinModules, createRequire } from 'node:module'
 import { defineConfig } from 'rollup'
 import copy from 'rollup-plugin-copy'
-import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
+import { createDtsUtils } from '../../scripts/build-utils.js'
 
 const require = createRequire(import.meta.url)
 const pkg = require('./package.json')
@@ -14,7 +14,10 @@ const external = [
   /^@?vitest(\/|$)/,
 ]
 
+const dtsUtils = createDtsUtils()
+
 const plugins = [
+  ...dtsUtils.isolatedDecl(),
   esbuild({
     target: 'node14',
   }),
@@ -43,14 +46,14 @@ export default defineConfig([
     onwarn,
   },
   {
-    input: 'src/index.ts',
+    input: dtsUtils.dtsInput('src/index.ts'),
     output: {
       dir: 'dist',
       entryFileNames: '[name].d.ts',
       format: 'esm',
     },
     external,
-    plugins: [dts({ respectExternal: true })],
+    plugins: dtsUtils.dts(),
     onwarn,
   },
 ])

packages/mocker/rollup.config.js

@@ -3,8 +3,8 @@ import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import resolve from '@rollup/plugin-node-resolve'
 import { defineConfig } from 'rollup'
-import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
+import { createDtsUtils } from '../../scripts/build-utils.js'
 
 const require = createRequire(import.meta.url)
 const pkg = require('./package.json')
@@ -25,7 +25,11 @@ const external = [
   /^msw/,
 ]
 
+const dtsUtils = createDtsUtils()
+
+/** @type {import('rollup').Plugin[]} */
 const plugins = [
+  ...dtsUtils.isolatedDecl(),
   resolve({
     preferBuiltins: true,
   }),
@@ -50,14 +54,14 @@ export default defineConfig([
     onwarn,
   },
   {
-    input: entries,
+    input: dtsUtils.dtsInput(entries),
     output: {
       dir: 'dist',
       entryFileNames: '[name].d.ts',
       format: 'esm',
     },
     external,
-    plugins: [dts({ respectExternal: true })],
+    plugins: dtsUtils.dts(),
     onwarn,
   },
 ])

packages/pretty-format/rollup.config.js

@@ -3,8 +3,8 @@ import commonjs from '@rollup/plugin-commonjs'
 import json from '@rollup/plugin-json'
 import resolve from '@rollup/plugin-node-resolve'
 import { defineConfig } from 'rollup'
-import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
+import { createDtsUtils } from '../../scripts/build-utils.js'
 
 const require = createRequire(import.meta.url)
 const pkg = require('./package.json')
@@ -19,7 +19,10 @@ const external = [
   ...Object.keys(pkg.peerDependencies || {}),
 ]
 
+const dtsUtils = createDtsUtils()
+
 const plugins = [
+  ...dtsUtils.isolatedDecl(),
   resolve({
     preferBuiltins: true,
   }),
@@ -44,14 +47,14 @@ export default defineConfig([
     onwarn,
   },
   {
-    input: entries,
+    input: dtsUtils.dtsInput(entries),
     output: {
       dir: 'dist',
       entryFileNames: '[name].d.ts',
       format: 'esm',
     },
     external,
-    plugins: [dts({ respectExternal: true })],
+    plugins: dtsUtils.dts(),
     onwarn,
   },
 ])

packages/runner/rollup.config.js

@@ -1,8 +1,8 @@
 import { builtinModules, createRequire } from 'node:module'
 import json from '@rollup/plugin-json'
 import { defineConfig } from 'rollup'
-import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
+import { createDtsUtils } from '../../scripts/build-utils.js'
 
 const require = createRequire(import.meta.url)
 const pkg = require('./package.json')
@@ -20,7 +20,10 @@ const entries = {
   types: 'src/types.ts',
 }
 
+const dtsUtils = createDtsUtils()
+
 const plugins = [
+  ...dtsUtils.isolatedDecl(),
   esbuild({
     target: 'node14',
   }),
@@ -41,14 +44,14 @@ export default defineConfig([
     onwarn,
   },
   {
-    input: entries,
+    input: dtsUtils.dtsInput(entries),
     output: {
       dir: 'dist',
       entryFileNames: '[name].d.ts',
       format: 'esm',
     },
     external,
-    plugins: [dts({ respectExternal: true })],
+    plugins: dtsUtils.dts(),
     onwarn,
   },
 ])

packages/snapshot/rollup.config.js

@@ -2,8 +2,8 @@ import { builtinModules, createRequire } from 'node:module'
 import commonjs from '@rollup/plugin-commonjs'
 import nodeResolve from '@rollup/plugin-node-resolve'
 import { defineConfig } from 'rollup'
-import dts from 'rollup-plugin-dts'
 import esbuild from 'rollup-plugin-esbuild'
+import { createDtsUtils } from '../../scripts/build-utils.js'
 
 const require = createRequire(import.meta.url)
 const pkg = require('./package.json')
@@ -20,7 +20,10 @@ const entries = {
   manager: 'src/manager.ts',
 }
 
+const dtsUtils = createDtsUtils()
+
 const plugins = [
+  ...dtsUtils.isolatedDecl(),
   nodeResolve({
     preferBuiltins: true,
   }),
@@ -44,14 +47,14 @@ export default defineConfig([
     onwarn,
   },
   {
-    input: entries,
+    input: dtsUtils.dtsInput(entries),
     output: {
       dir: 'dist',
       entryFileNames: '[name].d.ts',
       format: 'esm',
     },
     external,
-    plugins: [dts({ respectExternal: true })],
+    plugins: dtsUtils.dts(),
     onwarn,
   },
 ])

packages/snapshot/src/port/state.ts

@@ -6,7 +6,7 @@
  */
 
 import type { OptionsReceived as PrettyFormatOptions } from '@vitest/pretty-format'
-import type { ParsedStack } from '../../../utils/src/index'
+import type { ParsedStack } from '@vitest/utils'
 import type {
   SnapshotData,
   SnapshotEnvironment,