From b76a9279125c53e85bb0ab31b62863fc67335fa2 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 24 Jul 2024 16:48:56 +0200 Subject: [PATCH] refactor(vitest): move public exports to public folder (#6218) --- packages/vitest/rollup.config.js | 28 ++++++++++---------- packages/vitest/src/coverage.ts | 1 - packages/vitest/src/node/types/config.ts | 2 +- packages/vitest/src/{ => public}/browser.ts | 6 ++--- packages/vitest/src/{ => public}/config.ts | 8 +++--- packages/vitest/src/public/coverage.ts | 1 + packages/vitest/src/public/runners.ts | 2 ++ packages/vitest/src/{ => public}/snapshot.ts | 2 +- packages/vitest/src/{ => public}/suite.ts | 2 +- packages/vitest/src/public/workers.ts | 10 +++++++ packages/vitest/src/runners.ts | 2 -- packages/vitest/src/workers.ts | 10 ------- tsconfig.base.json | 8 +++--- 13 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 packages/vitest/src/coverage.ts rename packages/vitest/src/{ => public}/browser.ts (69%) rename packages/vitest/src/{ => public}/config.ts (93%) create mode 100644 packages/vitest/src/public/coverage.ts create mode 100644 packages/vitest/src/public/runners.ts rename packages/vitest/src/{ => public}/snapshot.ts (70%) rename packages/vitest/src/{ => public}/suite.ts (73%) create mode 100644 packages/vitest/src/public/workers.ts delete mode 100644 packages/vitest/src/runners.ts delete mode 100644 packages/vitest/src/workers.ts diff --git a/packages/vitest/rollup.config.js b/packages/vitest/rollup.config.js index afe9ff7b6e7e..46e6417ae7a0 100644 --- a/packages/vitest/rollup.config.js +++ b/packages/vitest/rollup.config.js @@ -20,17 +20,17 @@ const entries = { 'index': 'src/public/index.ts', 'cli': 'src/node/cli.ts', 'node': 'src/public/node.ts', - 'suite': 'src/suite.ts', - 'browser': 'src/browser.ts', - 'runners': 'src/runners.ts', + 'suite': 'src/public/suite.ts', + 'browser': 'src/public/browser.ts', + 'runners': 'src/public/runners.ts', 'environments': 'src/public/environments.ts', 'spy': 'src/integrations/spy.ts', - 'coverage': 'src/coverage.ts', + 'coverage': 'src/public/coverage.ts', 'utils': 'src/public/utils.ts', 'execute': 'src/public/execute.ts', 'reporters': 'src/public/reporters.ts', // TODO: advanced docs - 'workers': 'src/workers.ts', + 'workers': 'src/public/workers.ts', // for performance reasons we bundle them separately so we don't import everything at once 'worker': 'src/runtime/worker.ts', @@ -41,23 +41,23 @@ const entries = { 'workers/runVmTests': 'src/runtime/runVmTests.ts', - 'snapshot': 'src/snapshot.ts', + 'snapshot': 'src/public/snapshot.ts', } const dtsEntries = { index: 'src/public/index.ts', node: 'src/public/node.ts', environments: 'src/public/environments.ts', - browser: 'src/browser.ts', - runners: 'src/runners.ts', - suite: 'src/suite.ts', - config: 'src/config.ts', - coverage: 'src/coverage.ts', + browser: 'src/public/browser.ts', + runners: 'src/public/runners.ts', + 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', - workers: 'src/workers.ts', - snapshot: 'src/snapshot.ts', + workers: 'src/public/workers.ts', + snapshot: 'src/public/snapshot.ts', } const external = [ @@ -114,7 +114,7 @@ export default ({ watch }) => onwarn, }, { - input: 'src/config.ts', + input: 'src/public/config.ts', output: [ { file: 'dist/config.cjs', diff --git a/packages/vitest/src/coverage.ts b/packages/vitest/src/coverage.ts deleted file mode 100644 index 5dccd7b1fd9e..000000000000 --- a/packages/vitest/src/coverage.ts +++ /dev/null @@ -1 +0,0 @@ -export { BaseCoverageProvider } from './utils/coverage' diff --git a/packages/vitest/src/node/types/config.ts b/packages/vitest/src/node/types/config.ts index 0d87a4c87805..57cf97cce725 100644 --- a/packages/vitest/src/node/types/config.ts +++ b/packages/vitest/src/node/types/config.ts @@ -1065,4 +1065,4 @@ export type ProjectConfig = Omit< } } -export type { UserWorkspaceConfig } from '../../config' +export type { UserWorkspaceConfig } from '../../public/config' diff --git a/packages/vitest/src/browser.ts b/packages/vitest/src/public/browser.ts similarity index 69% rename from packages/vitest/src/browser.ts rename to packages/vitest/src/public/browser.ts index 2aedb49fb4f2..005fdf3e9cf0 100644 --- a/packages/vitest/src/browser.ts +++ b/packages/vitest/src/public/browser.ts @@ -3,11 +3,11 @@ export { setupCommonEnv, loadDiffConfig, loadSnapshotSerializers, -} from './runtime/setup-common' +} from '../runtime/setup-common' export { takeCoverageInsideWorker, stopCoverageInsideWorker, getCoverageProvider, startCoverageInsideWorker, -} from './integrations/coverage' -export * as SpyModule from './integrations/spy' +} from '../integrations/coverage' +export * as SpyModule from '../integrations/spy' diff --git a/packages/vitest/src/config.ts b/packages/vitest/src/public/config.ts similarity index 93% rename from packages/vitest/src/config.ts rename to packages/vitest/src/public/config.ts index afdec5969889..ee605beb662d 100644 --- a/packages/vitest/src/config.ts +++ b/packages/vitest/src/public/config.ts @@ -1,7 +1,7 @@ -import './node/types/vite' +import '../node/types/vite' import type { ConfigEnv, UserConfig as ViteUserConfig } from 'vite' -import type { ProjectConfig } from './node/types/config' +import type { ProjectConfig } from '../node/types/config' export interface UserWorkspaceConfig extends ViteUserConfig { test?: ProjectConfig @@ -14,9 +14,9 @@ export { defaultInclude, defaultExclude, coverageConfigDefaults, -} from './defaults' +} from '../defaults' export { mergeConfig } from 'vite' -export { extraInlineDeps } from './constants' +export { extraInlineDeps } from '../constants' export type { Plugin } from 'vite' export type { ConfigEnv, ViteUserConfig as UserConfig } diff --git a/packages/vitest/src/public/coverage.ts b/packages/vitest/src/public/coverage.ts new file mode 100644 index 000000000000..635589745416 --- /dev/null +++ b/packages/vitest/src/public/coverage.ts @@ -0,0 +1 @@ +export { BaseCoverageProvider } from '../utils/coverage' diff --git a/packages/vitest/src/public/runners.ts b/packages/vitest/src/public/runners.ts new file mode 100644 index 000000000000..9dbec1038021 --- /dev/null +++ b/packages/vitest/src/public/runners.ts @@ -0,0 +1,2 @@ +export { VitestTestRunner } from '../runtime/runners/test' +export { NodeBenchmarkRunner } from '../runtime/runners/benchmark' diff --git a/packages/vitest/src/snapshot.ts b/packages/vitest/src/public/snapshot.ts similarity index 70% rename from packages/vitest/src/snapshot.ts rename to packages/vitest/src/public/snapshot.ts index 11c007acb32d..3b34eb45a8a8 100644 --- a/packages/vitest/src/snapshot.ts +++ b/packages/vitest/src/public/snapshot.ts @@ -1,2 +1,2 @@ export type { SnapshotEnvironment } from '@vitest/snapshot/environment' -export { VitestNodeSnapshotEnvironment as VitestSnapshotEnvironment } from './integrations/snapshot/environments/node' +export { VitestNodeSnapshotEnvironment as VitestSnapshotEnvironment } from '../integrations/snapshot/environments/node' diff --git a/packages/vitest/src/suite.ts b/packages/vitest/src/public/suite.ts similarity index 73% rename from packages/vitest/src/suite.ts rename to packages/vitest/src/public/suite.ts index 141fa6e25e5c..d636dff75ad3 100644 --- a/packages/vitest/src/suite.ts +++ b/packages/vitest/src/public/suite.ts @@ -8,4 +8,4 @@ export { setHooks, } from '@vitest/runner' export { createChainable } from '@vitest/runner/utils' -export { getBenchFn, getBenchOptions } from './runtime/benchmark' +export { getBenchFn, getBenchOptions } from '../runtime/benchmark' diff --git a/packages/vitest/src/public/workers.ts b/packages/vitest/src/public/workers.ts new file mode 100644 index 000000000000..ddbd6fbc420d --- /dev/null +++ b/packages/vitest/src/public/workers.ts @@ -0,0 +1,10 @@ +export { + createForksRpcOptions, + createThreadsRpcOptions, + unwrapSerializableConfig, +} from '../runtime/workers/utils' +export { provideWorkerState } from '../runtime/utils' +export { run as runVitestWorker, collect as collectVitestWorkerTests } from '../runtime/worker' +export { runVmTests } from '../runtime/workers/vm' +export { runBaseTests } from '../runtime/workers/base' +export type { WorkerRpcOptions, VitestWorker } from '../runtime/workers/types' diff --git a/packages/vitest/src/runners.ts b/packages/vitest/src/runners.ts deleted file mode 100644 index ef5804e48c33..000000000000 --- a/packages/vitest/src/runners.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { VitestTestRunner } from './runtime/runners/test' -export { NodeBenchmarkRunner } from './runtime/runners/benchmark' diff --git a/packages/vitest/src/workers.ts b/packages/vitest/src/workers.ts deleted file mode 100644 index a138f0173e0e..000000000000 --- a/packages/vitest/src/workers.ts +++ /dev/null @@ -1,10 +0,0 @@ -export { - createForksRpcOptions, - createThreadsRpcOptions, - unwrapSerializableConfig, -} from './runtime/workers/utils' -export { provideWorkerState } from './runtime/utils' -export { run as runVitestWorker, collect as collectVitestWorkerTests } from './runtime/worker' -export { runVmTests } from './runtime/workers/vm' -export { runBaseTests } from './runtime/workers/base' -export type { WorkerRpcOptions, VitestWorker } from './runtime/workers/types' diff --git a/tsconfig.base.json b/tsconfig.base.json index 88390ce2f49a..5907b7d02575 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -23,10 +23,10 @@ "vitest/globals": ["./packages/vitest/globals.d.ts"], "vitest/node": ["./packages/vitest/src/public/node.ts"], "vitest/execute": ["./packages/vitest/src/public/execute.ts"], - "vitest/config": ["./packages/vitest/src/config.ts"], - "vitest/coverage": ["./packages/vitest/src/coverage.ts"], - "vitest/browser": ["./packages/vitest/src/browser.ts"], - "vitest/runners": ["./packages/vitest/src/runners.ts"], + "vitest/config": ["./packages/vitest/src/public/config.ts"], + "vitest/coverage": ["./packages/vitest/src/public/coverage.ts"], + "vitest/browser": ["./packages/vitest/src/public/browser.ts"], + "vitest/runners": ["./packages/vitest/src/public/runners.ts"], "vite-node": ["./packages/vite-node/src/index.ts"], "vite-node/client": ["./packages/vite-node/src/client.ts"], "vite-node/server": ["./packages/vite-node/src/server.ts"],