diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 5f25da869..77b9461e6 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -18,17 +18,6 @@ ], "groupName": "all non-major examples dependencies", "groupSlug": "all-minor-patch-examples" - }, - { - "excludePackagePatterns": [ - "@vitest/test-" - ], - "matchUpdateTypes": [ - "minor", - "patch" - ], - "groupName": "all non-major dependencies", - "groupSlug": "all-minor-patch" } ], "ignoreDeps": [ diff --git a/package.json b/package.json index f2563f912..e0ac57cbe 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "test:ci": "CI=true pnpm -r --stream --filter !test-fails --filter !test-browser --filter !test-esm --filter !test-browser run test --allowOnly", "test:ci:vm-threads": "CI=true pnpm -r --stream --filter !test-fails --filter !test-coverage --filter !test-single-thread --filter !test-browser --filter !test-esm --filter !test-browser run test --allowOnly --pool vmThreads", "test:ci:no-threads": "CI=true pnpm -r --stream --filter !test-fails --filter !test-vm-threads --filter !test-coverage --filter !test-watch --filter !test-bail --filter !test-esm --filter !test-browser run test --allowOnly --pool forks", - "typecheck": "tsc --noEmit", - "typecheck:why": "tsc --noEmit --explainFiles > explainTypes.txt", + "typecheck": "tsc -p tsconfig.check.json --noEmit", + "typecheck:why": "tsc -p tsconfig.check.json --noEmit --explainFiles > explainTypes.txt", "ui:build": "vite build packages/ui", "ui:dev": "vite packages/ui", "ui:test": "npm -C packages/ui run test:run", @@ -40,7 +40,6 @@ "devDependencies": { "@antfu/eslint-config": "^0.39.6", "@antfu/ni": "^0.21.4", - "@rollup/plugin-alias": "^5.0.0", "@rollup/plugin-commonjs": "^25.0.4", "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.2.1", diff --git a/packages/browser/rollup.config.js b/packages/browser/rollup.config.js index b63072012..5f7481420 100644 --- a/packages/browser/rollup.config.js +++ b/packages/browser/rollup.config.js @@ -3,7 +3,6 @@ import dts from 'rollup-plugin-dts' import resolve from '@rollup/plugin-node-resolve' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' -import alias from '@rollup/plugin-alias' import pkg from './package.json' assert { type: 'json' } const external = [ @@ -14,16 +13,13 @@ const external = [ ] const plugins = [ - alias({ - entries: [{ find: /^node:(.+)$/, replacement: '$1' }], - }), resolve({ preferBuiltins: true, }), json(), commonjs(), esbuild({ - target: 'node14', + target: 'node18', }), ] diff --git a/packages/browser/src/client/main.ts b/packages/browser/src/client/main.ts index e3ff443e9..7a5344ac1 100644 --- a/packages/browser/src/client/main.ts +++ b/packages/browser/src/client/main.ts @@ -1,7 +1,7 @@ import { createClient } from '@vitest/ws-client' import type { ResolvedConfig } from 'vitest' import type { CancelReason, VitestRunner } from '@vitest/runner' -import type { VitestExecutor } from 'vitest/src/runtime/execute' +import type { VitestExecutor } from '../../../vitest/src/runtime/execute' import { createBrowserRunner } from './runner' import { importId } from './utils' import { setupConsoleLogSpy } from './logger' diff --git a/packages/browser/src/client/runner.ts b/packages/browser/src/client/runner.ts index faf74af71..5f5693bc5 100644 --- a/packages/browser/src/client/runner.ts +++ b/packages/browser/src/client/runner.ts @@ -1,6 +1,6 @@ import type { File, TaskResultPack, Test } from '@vitest/runner' +import type { ResolvedConfig } from 'vitest' import { rpc } from './rpc' -import type { ResolvedConfig } from '#types' interface BrowserRunnerOptions { config: ResolvedConfig diff --git a/packages/browser/src/client/snapshot.ts b/packages/browser/src/client/snapshot.ts index b0d43a0e4..adf9180c2 100644 --- a/packages/browser/src/client/snapshot.ts +++ b/packages/browser/src/client/snapshot.ts @@ -1,5 +1,5 @@ +import type { SnapshotEnvironment } from 'vitest' import { rpc } from './rpc' -import type { SnapshotEnvironment } from '#types' export class BrowserSnapshotEnvironment implements SnapshotEnvironment { getVersion(): string { diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json index f264cd9af..5ca4cde0c 100644 --- a/packages/browser/tsconfig.json +++ b/packages/browser/tsconfig.json @@ -1,4 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "types": [ + "node", + "vite/client" + ] + }, "exclude": ["dist", "node_modules"] } diff --git a/packages/coverage-istanbul/rollup.config.js b/packages/coverage-istanbul/rollup.config.js index 7eaba0bd6..fef84f6e4 100644 --- a/packages/coverage-istanbul/rollup.config.js +++ b/packages/coverage-istanbul/rollup.config.js @@ -3,7 +3,6 @@ import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' -import alias from '@rollup/plugin-alias' import nodeResolve from '@rollup/plugin-node-resolve' import { join } from 'pathe' import pkg from './package.json' assert { type: 'json' } @@ -24,16 +23,11 @@ const external = [ ] const plugins = [ - alias({ - entries: [ - { find: /^node:(.+)$/, replacement: '$1' }, - ], - }), nodeResolve(), json(), commonjs(), esbuild({ - target: 'node14', + target: 'node18', }), ] diff --git a/packages/coverage-istanbul/tsconfig.json b/packages/coverage-istanbul/tsconfig.json new file mode 100644 index 000000000..8bcb003f8 --- /dev/null +++ b/packages/coverage-istanbul/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../tsconfig.base.json", + "include": ["./src/**/*.ts"], + "exclude": ["./dist"] +} diff --git a/packages/coverage-v8/rollup.config.js b/packages/coverage-v8/rollup.config.js index 15844d9de..3872be2e1 100644 --- a/packages/coverage-v8/rollup.config.js +++ b/packages/coverage-v8/rollup.config.js @@ -3,7 +3,6 @@ import esbuild from 'rollup-plugin-esbuild' import dts from 'rollup-plugin-dts' import commonjs from '@rollup/plugin-commonjs' import json from '@rollup/plugin-json' -import alias from '@rollup/plugin-alias' import nodeResolve from '@rollup/plugin-node-resolve' import { join } from 'pathe' import pkg from './package.json' assert { type: 'json' } @@ -25,16 +24,11 @@ const external = [ ] const plugins = [ - alias({ - entries: [ - { find: /^node:(.+)$/, replacement: '$1' }, - ], - }), nodeResolve(), json(), commonjs(), esbuild({ - target: 'node14', + target: 'node18', }), ] diff --git a/packages/coverage-v8/tsconfig.json b/packages/coverage-v8/tsconfig.json new file mode 100644 index 000000000..8bcb003f8 --- /dev/null +++ b/packages/coverage-v8/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../tsconfig.base.json", + "include": ["./src/**/*.ts"], + "exclude": ["./dist"] +} diff --git a/packages/expect/tsconfig.json b/packages/expect/tsconfig.json new file mode 100644 index 000000000..8bcb003f8 --- /dev/null +++ b/packages/expect/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../tsconfig.base.json", + "include": ["./src/**/*.ts"], + "exclude": ["./dist"] +} diff --git a/packages/runner/tsconfig.json b/packages/runner/tsconfig.json new file mode 100644 index 000000000..8bcb003f8 --- /dev/null +++ b/packages/runner/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../tsconfig.base.json", + "include": ["./src/**/*.ts"], + "exclude": ["./dist"] +} diff --git a/packages/snapshot/src/port/inlineSnapshot.ts b/packages/snapshot/src/port/inlineSnapshot.ts index 3c82b66c5..67224e6b0 100644 --- a/packages/snapshot/src/port/inlineSnapshot.ts +++ b/packages/snapshot/src/port/inlineSnapshot.ts @@ -1,5 +1,5 @@ import type MagicString from 'magic-string' -import { getCallLastIndex, lineSplitRE, offsetToLineNumber, positionToOffset } from '@vitest/utils' +import { getCallLastIndex, lineSplitRE, offsetToLineNumber, positionToOffset } from '../../../utils/src/index' import type { SnapshotEnvironment } from '../types' export interface InlineSnapshot { diff --git a/packages/snapshot/src/port/state.ts b/packages/snapshot/src/port/state.ts index 7346681b3..dbaf25269 100644 --- a/packages/snapshot/src/port/state.ts +++ b/packages/snapshot/src/port/state.ts @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -import type { ParsedStack } from '@vitest/utils' -import { parseErrorStacktrace } from '@vitest/utils/source-map' import type { OptionsReceived as PrettyFormatOptions } from 'pretty-format' +import type { ParsedStack } from '../../../utils/src/index' +import { parseErrorStacktrace } from '../../../utils/src/source-map' import type { SnapshotData, SnapshotEnvironment, SnapshotMatchOptions, SnapshotResult, SnapshotStateOptions, SnapshotUpdateState } from '../types' import type { InlineSnapshot } from './inlineSnapshot' import { saveInlineSnapshots } from './inlineSnapshot' diff --git a/packages/snapshot/src/port/utils.ts b/packages/snapshot/src/port/utils.ts index 69e02e1c3..a1184f54b 100644 --- a/packages/snapshot/src/port/utils.ts +++ b/packages/snapshot/src/port/utils.ts @@ -10,7 +10,7 @@ import type { OptionsReceived as PrettyFormatOptions } from 'pretty-format' import { format as prettyFormat, } from 'pretty-format' -import { isObject } from '@vitest/utils' +import { isObject } from '../../../utils/src/index' import type { SnapshotData, SnapshotStateOptions } from '../types' import type { SnapshotEnvironment } from '../types/environment' import { getSerializers } from './plugins' diff --git a/packages/snapshot/tsconfig.json b/packages/snapshot/tsconfig.json new file mode 100644 index 000000000..8bcb003f8 --- /dev/null +++ b/packages/snapshot/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../tsconfig.base.json", + "include": ["./src/**/*.ts"], + "exclude": ["./dist"] +} diff --git a/packages/spy/tsconfig.json b/packages/spy/tsconfig.json new file mode 100644 index 000000000..8bcb003f8 --- /dev/null +++ b/packages/spy/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "../../tsconfig.base.json", + "include": ["./src/**/*.ts"], + "exclude": ["./dist"] +} diff --git a/packages/ui/client/components/FileDetails.vue b/packages/ui/client/components/FileDetails.vue index c8b2c8c7c..a162e074a 100644 --- a/packages/ui/client/components/FileDetails.vue +++ b/packages/ui/client/components/FileDetails.vue @@ -1,10 +1,10 @@ diff --git a/packages/ui/client/components/TaskItem.vue b/packages/ui/client/components/TaskItem.vue index f9ba4ee05..db3bb3595 100644 --- a/packages/ui/client/components/TaskItem.vue +++ b/packages/ui/client/components/TaskItem.vue @@ -1,5 +1,5 @@