Skip to content

Commit b76a927

Browse files
authored
refactor(vitest): move public exports to public folder (#6218)
1 parent 56dbfa6 commit b76a927

13 files changed

+41
-41
lines changed

packages/vitest/rollup.config.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ const entries = {
2020
'index': 'src/public/index.ts',
2121
'cli': 'src/node/cli.ts',
2222
'node': 'src/public/node.ts',
23-
'suite': 'src/suite.ts',
24-
'browser': 'src/browser.ts',
25-
'runners': 'src/runners.ts',
23+
'suite': 'src/public/suite.ts',
24+
'browser': 'src/public/browser.ts',
25+
'runners': 'src/public/runners.ts',
2626
'environments': 'src/public/environments.ts',
2727
'spy': 'src/integrations/spy.ts',
28-
'coverage': 'src/coverage.ts',
28+
'coverage': 'src/public/coverage.ts',
2929
'utils': 'src/public/utils.ts',
3030
'execute': 'src/public/execute.ts',
3131
'reporters': 'src/public/reporters.ts',
3232
// TODO: advanced docs
33-
'workers': 'src/workers.ts',
33+
'workers': 'src/public/workers.ts',
3434

3535
// for performance reasons we bundle them separately so we don't import everything at once
3636
'worker': 'src/runtime/worker.ts',
@@ -41,23 +41,23 @@ const entries = {
4141

4242
'workers/runVmTests': 'src/runtime/runVmTests.ts',
4343

44-
'snapshot': 'src/snapshot.ts',
44+
'snapshot': 'src/public/snapshot.ts',
4545
}
4646

4747
const dtsEntries = {
4848
index: 'src/public/index.ts',
4949
node: 'src/public/node.ts',
5050
environments: 'src/public/environments.ts',
51-
browser: 'src/browser.ts',
52-
runners: 'src/runners.ts',
53-
suite: 'src/suite.ts',
54-
config: 'src/config.ts',
55-
coverage: 'src/coverage.ts',
51+
browser: 'src/public/browser.ts',
52+
runners: 'src/public/runners.ts',
53+
suite: 'src/public/suite.ts',
54+
config: 'src/public/config.ts',
55+
coverage: 'src/public/coverage.ts',
5656
utils: 'src/public/utils.ts',
5757
execute: 'src/public/execute.ts',
5858
reporters: 'src/public/reporters.ts',
59-
workers: 'src/workers.ts',
60-
snapshot: 'src/snapshot.ts',
59+
workers: 'src/public/workers.ts',
60+
snapshot: 'src/public/snapshot.ts',
6161
}
6262

6363
const external = [
@@ -114,7 +114,7 @@ export default ({ watch }) =>
114114
onwarn,
115115
},
116116
{
117-
input: 'src/config.ts',
117+
input: 'src/public/config.ts',
118118
output: [
119119
{
120120
file: 'dist/config.cjs',

packages/vitest/src/coverage.ts

-1
This file was deleted.

packages/vitest/src/node/types/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1065,4 +1065,4 @@ export type ProjectConfig = Omit<
10651065
}
10661066
}
10671067

1068-
export type { UserWorkspaceConfig } from '../../config'
1068+
export type { UserWorkspaceConfig } from '../../public/config'

packages/vitest/src/browser.ts renamed to packages/vitest/src/public/browser.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ export {
33
setupCommonEnv,
44
loadDiffConfig,
55
loadSnapshotSerializers,
6-
} from './runtime/setup-common'
6+
} from '../runtime/setup-common'
77
export {
88
takeCoverageInsideWorker,
99
stopCoverageInsideWorker,
1010
getCoverageProvider,
1111
startCoverageInsideWorker,
12-
} from './integrations/coverage'
13-
export * as SpyModule from './integrations/spy'
12+
} from '../integrations/coverage'
13+
export * as SpyModule from '../integrations/spy'

packages/vitest/src/config.ts renamed to packages/vitest/src/public/config.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import './node/types/vite'
1+
import '../node/types/vite'
22

33
import type { ConfigEnv, UserConfig as ViteUserConfig } from 'vite'
4-
import type { ProjectConfig } from './node/types/config'
4+
import type { ProjectConfig } from '../node/types/config'
55

66
export interface UserWorkspaceConfig extends ViteUserConfig {
77
test?: ProjectConfig
@@ -14,9 +14,9 @@ export {
1414
defaultInclude,
1515
defaultExclude,
1616
coverageConfigDefaults,
17-
} from './defaults'
17+
} from '../defaults'
1818
export { mergeConfig } from 'vite'
19-
export { extraInlineDeps } from './constants'
19+
export { extraInlineDeps } from '../constants'
2020
export type { Plugin } from 'vite'
2121

2222
export type { ConfigEnv, ViteUserConfig as UserConfig }
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { BaseCoverageProvider } from '../utils/coverage'

packages/vitest/src/public/runners.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { VitestTestRunner } from '../runtime/runners/test'
2+
export { NodeBenchmarkRunner } from '../runtime/runners/benchmark'
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export type { SnapshotEnvironment } from '@vitest/snapshot/environment'
2-
export { VitestNodeSnapshotEnvironment as VitestSnapshotEnvironment } from './integrations/snapshot/environments/node'
2+
export { VitestNodeSnapshotEnvironment as VitestSnapshotEnvironment } from '../integrations/snapshot/environments/node'

packages/vitest/src/suite.ts renamed to packages/vitest/src/public/suite.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ export {
88
setHooks,
99
} from '@vitest/runner'
1010
export { createChainable } from '@vitest/runner/utils'
11-
export { getBenchFn, getBenchOptions } from './runtime/benchmark'
11+
export { getBenchFn, getBenchOptions } from '../runtime/benchmark'

packages/vitest/src/public/workers.ts

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export {
2+
createForksRpcOptions,
3+
createThreadsRpcOptions,
4+
unwrapSerializableConfig,
5+
} from '../runtime/workers/utils'
6+
export { provideWorkerState } from '../runtime/utils'
7+
export { run as runVitestWorker, collect as collectVitestWorkerTests } from '../runtime/worker'
8+
export { runVmTests } from '../runtime/workers/vm'
9+
export { runBaseTests } from '../runtime/workers/base'
10+
export type { WorkerRpcOptions, VitestWorker } from '../runtime/workers/types'

packages/vitest/src/runners.ts

-2
This file was deleted.

packages/vitest/src/workers.ts

-10
This file was deleted.

tsconfig.base.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"vitest/globals": ["./packages/vitest/globals.d.ts"],
2424
"vitest/node": ["./packages/vitest/src/public/node.ts"],
2525
"vitest/execute": ["./packages/vitest/src/public/execute.ts"],
26-
"vitest/config": ["./packages/vitest/src/config.ts"],
27-
"vitest/coverage": ["./packages/vitest/src/coverage.ts"],
28-
"vitest/browser": ["./packages/vitest/src/browser.ts"],
29-
"vitest/runners": ["./packages/vitest/src/runners.ts"],
26+
"vitest/config": ["./packages/vitest/src/public/config.ts"],
27+
"vitest/coverage": ["./packages/vitest/src/public/coverage.ts"],
28+
"vitest/browser": ["./packages/vitest/src/public/browser.ts"],
29+
"vitest/runners": ["./packages/vitest/src/public/runners.ts"],
3030
"vite-node": ["./packages/vite-node/src/index.ts"],
3131
"vite-node/client": ["./packages/vite-node/src/client.ts"],
3232
"vite-node/server": ["./packages/vite-node/src/server.ts"],

0 commit comments

Comments
 (0)