fix: remove unused exports (#7618)

sheremet-va · web-flow · commit 33d0538521fa · 2025-05-19T14:36:51.000+02:00
diff --git a/packages/browser/rollup.config.js b/packages/browser/rollup.config.js
@@ -13,6 +13,7 @@ const external = [
   ...Object.keys(pkg.dependencies),
   ...Object.keys(pkg.peerDependencies || {}),
   /^@?vitest(\/|$)/,
+  '@vitest/browser/utils',
   'worker_threads',
   'node:worker_threads',
   'vite',
@@ -98,6 +99,7 @@ export default () =>
         file: 'dist/context.js',
         format: 'esm',
       },
+      external: ['@vitest/browser/utils'],
       plugins: [
         oxc({
           transform: { target: 'node18' },
diff --git a/packages/browser/src/client/tester/logger.ts b/packages/browser/src/client/tester/logger.ts
@@ -1,4 +1,4 @@
-import { format, stringify } from 'vitest/utils'
+import { format, stringify } from 'vitest/internal/browser'
 import { getConfig } from '../utils'
 import { rpc } from './rpc'
 import { getBrowserRunner } from './runner'
diff --git a/packages/browser/src/client/tester/public-utils.ts b/packages/browser/src/client/tester/public-utils.ts
@@ -1,8 +1,8 @@
 import type { Locator, LocatorSelectors } from '@vitest/browser/context'
-import type { StringifyOptions } from 'vitest/utils'
+import type { StringifyOptions } from 'vitest/internal/browser'
 import { page } from '@vitest/browser/context'
 import { asLocator } from 'ivya'
-import { stringify } from 'vitest/utils'
+import { stringify } from 'vitest/internal/browser'
 
 export function getElementLocatorSelectors(element: Element): LocatorSelectors {
   const locator = page.elementLocator(element)
diff --git a/packages/browser/src/client/tester/rpc.ts b/packages/browser/src/client/tester/rpc.ts
@@ -1,5 +1,5 @@
 import type { VitestBrowserClient } from '@vitest/browser/client'
-import { getSafeTimers } from 'vitest/utils'
+import { getSafeTimers } from 'vitest/internal/browser'
 
 const { get } = Reflect
 
diff --git a/packages/browser/src/client/tester/runner.ts b/packages/browser/src/client/tester/runner.ts
@@ -4,9 +4,14 @@ import type { VitestExecutor } from 'vitest/execute'
 import type { VitestBrowserClientMocker } from './mocker'
 import { globalChannel, onCancel } from '@vitest/browser/client'
 import { page, userEvent } from '@vitest/browser/context'
-import { loadDiffConfig, loadSnapshotSerializers, takeCoverageInsideWorker } from 'vitest/browser'
+import {
+  loadDiffConfig,
+  loadSnapshotSerializers,
+  originalPositionFor,
+  takeCoverageInsideWorker,
+  TraceMap,
+} from 'vitest/internal/browser'
 import { NodeBenchmarkRunner, VitestTestRunner } from 'vitest/runners'
-import { originalPositionFor, TraceMap } from 'vitest/utils'
 import { createStackString, parseStacktrace } from '../../../../utils/src/source-map'
 import { executor, getWorkerState } from '../utils'
 import { rpc } from './rpc'
diff --git a/packages/browser/src/client/tester/snapshot.ts b/packages/browser/src/client/tester/snapshot.ts
@@ -1,7 +1,7 @@
 import type { VitestBrowserClient } from '@vitest/browser/client'
+import type { ParsedStack } from 'vitest/internal/browser'
 import type { SnapshotEnvironment } from 'vitest/snapshot'
-import type { ParsedStack } from 'vitest/utils'
-import { originalPositionFor, TraceMap } from 'vitest/utils'
+import { originalPositionFor, TraceMap } from 'vitest/internal/browser'
 
 export class VitestBrowserSnapshotEnvironment implements SnapshotEnvironment {
   private sourceMaps = new Map<string, any>()
diff --git a/packages/browser/src/client/tester/tester.ts b/packages/browser/src/client/tester/tester.ts
@@ -9,7 +9,7 @@ import {
   startCoverageInsideWorker,
   startTests,
   stopCoverageInsideWorker,
-} from 'vitest/browser'
+} from 'vitest/internal/browser'
 import { executor, getBrowserState, getConfig, getWorkerState } from '../utils'
 import { setupDialogsSpy } from './dialog'
 import { setupConsoleLogSpy } from './logger'
diff --git a/packages/browser/src/node/plugin.ts b/packages/browser/src/node/plugin.ts
@@ -190,8 +190,7 @@ export default (parentServer: ParentBrowserProject, base = '/'): Plugin[] => {
 
         const exclude = [
           'vitest',
-          'vitest/utils',
-          'vitest/browser',
+          'vitest/internal/browser',
           'vitest/runners',
           '@vitest/browser',
           '@vitest/browser/client',
diff --git a/packages/browser/utils.d.ts b/packages/browser/utils.d.ts
@@ -3,7 +3,7 @@
 // fortunately, the file is quite small
 
 import { LocatorSelectors, Locator } from '@vitest/browser/context'
-import { StringifyOptions } from 'vitest/utils'
+import { StringifyOptions } from 'vitest/internal/browser'
 
 export type PrettyDOMOptions = Omit<StringifyOptions, 'maxLength'>
 
diff --git a/packages/utils/src/display.ts b/packages/utils/src/display.ts
@@ -21,7 +21,7 @@ interface Options {
   stylize: (value: string, styleType: string) => string
 }
 
-type LoupeOptions = Partial<Options>
+export type LoupeOptions = Partial<Options>
 
 const {
   AsymmetricMatcher,
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -4,7 +4,7 @@ export {
   objDisplay,
   stringify,
 } from './display'
-export type { StringifyOptions } from './display'
+export type { LoupeOptions, StringifyOptions } from './display'
 
 export {
   assertTypes,
diff --git a/packages/vitest/package.json b/packages/vitest/package.json
@@ -58,7 +58,7 @@
       "types": "./dist/workers.d.ts",
       "import": "./dist/workers.js"
     },
-    "./browser": {
+    "./internal/browser": {
       "types": "./dist/browser.d.ts",
       "default": "./dist/browser.js"
     },
@@ -74,10 +74,6 @@
       "types": "./dist/environments.d.ts",
       "default": "./dist/environments.js"
     },
-    "./utils": {
-      "types": "./dist/utils.d.ts",
-      "default": "./dist/utils.js"
-    },
     "./config": {
       "types": "./config.d.ts",
       "require": "./dist/config.cjs",
diff --git a/packages/vitest/rollup.config.js b/packages/vitest/rollup.config.js
@@ -28,7 +28,6 @@ const entries = {
   'mocker': 'src/public/mocker.ts',
   'spy': 'src/integrations/spy.ts',
   'coverage': 'src/public/coverage.ts',
-  'utils': 'src/public/utils.ts',
   'execute': 'src/public/execute.ts',
   'reporters': 'src/public/reporters.ts',
   // TODO: advanced docs
@@ -55,7 +54,6 @@ const dtsEntries = {
   suite: 'src/public/suite.ts',
   config: 'src/public/config.ts',
   coverage: 'src/public/coverage.ts',
-  utils: 'src/public/utils.ts',
   execute: 'src/public/execute.ts',
   reporters: 'src/public/reporters.ts',
   mocker: 'src/public/mocker.ts',
diff --git a/packages/vitest/src/integrations/run-once.ts b/packages/vitest/src/integrations/run-once.ts
diff --git a/packages/vitest/src/integrations/utils.ts b/packages/vitest/src/integrations/utils.ts
diff --git a/packages/vitest/src/node/test-run.ts b/packages/vitest/src/node/test-run.ts
@@ -1,5 +1,5 @@
 import type { File as RunnerTestFile, TaskEventPack, TaskResultPack, TaskUpdateEvent } from '@vitest/runner'
-import type { SerializedError } from '../public/utils'
+import type { SerializedError } from '@vitest/utils'
 import type { UserConsoleLog } from '../types/general'
 import type { Vitest } from './core'
 import type { TestProject } from './project'
diff --git a/packages/vitest/src/public/browser.ts b/packages/vitest/src/public/browser.ts
@@ -11,3 +11,14 @@ export {
 } from '../runtime/setup-common'
 export { collectTests, processError, startTests } from '@vitest/runner'
 export * as SpyModule from '@vitest/spy'
+export {
+  format,
+  getSafeTimers,
+  inspect,
+  stringify,
+} from '@vitest/utils'
+export type { LoupeOptions, ParsedStack, StringifyOptions } from '@vitest/utils'
+export {
+  originalPositionFor,
+  TraceMap,
+} from '@vitest/utils/source-map'
diff --git a/packages/vitest/src/public/index.ts b/packages/vitest/src/public/index.ts
@@ -107,9 +107,7 @@ export type {
 } from '../api/types'
 export { assert, chai, createExpect, expect, should } from '../integrations/chai'
 export { inject } from '../integrations/inject'
-export { isFirstRun, runOnce } from '../integrations/run-once'
 
-export { getRunningMode, isWatchMode } from '../integrations/utils'
 export { vi, vitest } from '../integrations/vi'
 export type { VitestUtils } from '../integrations/vi'
 export { bench } from '../runtime/benchmark'
diff --git a/packages/vitest/src/public/utils.ts b/packages/vitest/src/public/utils.ts
diff --git a/packages/vitest/src/runtime/setup-common.ts b/packages/vitest/src/runtime/setup-common.ts
@@ -5,11 +5,9 @@ import type { SerializedConfig } from './config'
 import type { VitestExecutor } from './execute'
 import { addSerializer } from '@vitest/snapshot'
 import { setSafeTimers } from '@vitest/utils'
-import { resetRunOnceCounter } from '../integrations/run-once'
 
 let globalSetup = false
 export async function setupCommonEnv(config: SerializedConfig): Promise<void> {
-  resetRunOnceCounter()
   setupDefines(config.defines)
   setupEnv(config.env)
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/browser/test/utils.test.ts b/test/browser/test/utils.test.ts
@@ -2,7 +2,7 @@ import { commands } from '@vitest/browser/context'
 import { prettyDOM } from '@vitest/browser/utils'
 import { afterEach, expect, it, test } from 'vitest'
 
-import { inspect } from 'vitest/utils'
+import { inspect } from 'vitest/internal/browser'
 
 afterEach(() => {
   document.body.innerHTML = ''
diff --git a/test/core/package.json b/test/core/package.json
@@ -36,6 +36,7 @@
     "vite-node": "workspace:*",
     "vitest": "workspace:*",
     "vitest-environment-custom": "file:./vitest-environment-custom",
+    "vitest-package-exports": "^0.1.1",
     "vue": "catalog:",
     "zustand": "^4.5.6"
   }
diff --git a/test/core/test/exports.test.ts b/test/core/test/exports.test.ts
diff --git a/tsconfig.base.json b/tsconfig.base.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { format, stringify } from 'vitest/utils'`
	`1`	`+import { format, stringify } from 'vitest/internal/browser'`
`2`	`2`	`import { getConfig } from '../utils'`
`3`	`3`	`import { rpc } from './rpc'`
`4`	`4`	`import { getBrowserRunner } from './runner'`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ interface Options {`
`21`	`21`	`stylize: (value: string, styleType: string) => string`
`22`	`22`	`}`
`23`	`23`
`24`		`-type LoupeOptions = Partial<Options>`
	`24`	`+export type LoupeOptions = Partial<Options>`
`25`	`25`
`26`	`26`	`const {`
`27`	`27`	`AsymmetricMatcher,`