From b1db66a1a942b6b634b100183c3a8632c60c0c27 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 10 Sep 2024 16:46:19 +0800 Subject: [PATCH] chore(deps): upgrade to TypeScript 5.6 --- package.json | 4 +- packages-private/tsconfig.json | 7 ++ packages/compiler-core/__tests__/testUtils.ts | 11 +- .../__tests__/transforms/vFor.spec.ts | 6 +- packages/compiler-sfc/__tests__/utils.ts | 5 +- .../runtime-core/src/components/KeepAlive.ts | 2 +- packages/runtime-test/src/index.ts | 2 +- packages/runtime-test/src/nodeOps.ts | 32 ++++-- packages/runtime-test/src/patchProp.ts | 2 +- packages/runtime-test/src/serialize.ts | 2 +- packages/runtime-test/src/triggerEvent.ts | 2 +- packages/vue-compat/__tests__/utils.ts | 2 +- packages/vue/__tests__/e2e/commits.mock.ts | 2 +- packages/vue/__tests__/e2e/e2eUtils.ts | 51 ++++++--- pnpm-lock.yaml | 103 ++++++++++-------- tsconfig.build-node.json | 16 --- ....build-browser.json => tsconfig.build.json | 8 +- tsconfig.json | 4 +- 18 files changed, 155 insertions(+), 106 deletions(-) create mode 100644 packages-private/tsconfig.json delete mode 100644 tsconfig.build-node.json rename tsconfig.build-browser.json => tsconfig.build.json (70%) diff --git a/package.json b/package.json index 58055ffe9c8..e4d1e8250ad 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "node scripts/dev.js", "build": "node scripts/build.js", - "build-dts": "tsc -p tsconfig.build-browser.json && tsc -p tsconfig.build-node.json && rollup -c rollup.dts.config.js", + "build-dts": "tsc -p tsconfig.build.json --noCheck && rollup -c rollup.dts.config.js", "clean": "rimraf --glob packages/*/dist temp .eslintcache", "size": "run-s \"size-*\" && tsx scripts/usage-size.ts", "size-global": "node scripts/build.js vue runtime-dom -f global -p --size", @@ -105,7 +105,7 @@ "todomvc-app-css": "^2.4.3", "tslib": "^2.7.0", "tsx": "^4.19.0", - "typescript": "~5.5.4", + "typescript": "~5.6.2", "typescript-eslint": "^8.4.0", "vite": "catalog:", "vitest": "^2.0.5" diff --git a/packages-private/tsconfig.json b/packages-private/tsconfig.json new file mode 100644 index 00000000000..1c287a7500c --- /dev/null +++ b/packages-private/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "isolatedDeclarations": false + }, + "include": ["."] +} diff --git a/packages/compiler-core/__tests__/testUtils.ts b/packages/compiler-core/__tests__/testUtils.ts index 9618a482add..a2525e0cab9 100644 --- a/packages/compiler-core/__tests__/testUtils.ts +++ b/packages/compiler-core/__tests__/testUtils.ts @@ -3,6 +3,8 @@ import { ElementTypes, Namespaces, NodeTypes, + type Property, + type SimpleExpressionNode, type VNodeCall, locStub, } from '../src' @@ -22,7 +24,10 @@ const bracketsRE = /^\[|\]$/g // e.g. // - createObjectMatcher({ 'foo': '[bar]' }) matches { foo: bar } // - createObjectMatcher({ '[foo]': 'bar' }) matches { [foo]: "bar" } -export function createObjectMatcher(obj: Record) { +export function createObjectMatcher(obj: Record): { + type: NodeTypes + properties: Partial[] +} { return { type: NodeTypes.JS_OBJECT_EXPRESSION, properties: Object.keys(obj).map(key => ({ @@ -31,7 +36,7 @@ export function createObjectMatcher(obj: Record) { type: NodeTypes.SIMPLE_EXPRESSION, content: key.replace(bracketsRE, ''), isStatic: !leadingBracketRE.test(key), - }, + } as SimpleExpressionNode, value: isString(obj[key]) ? { type: NodeTypes.SIMPLE_EXPRESSION, @@ -78,7 +83,7 @@ type Flags = PatchFlags | ShapeFlags export function genFlagText( flag: Flags | Flags[], names: { [k: number]: string } = PatchFlagNames, -) { +): string { if (isArray(flag)) { let f = 0 flag.forEach(ff => { diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts index d0e95fcbcb3..fead2476ac5 100644 --- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts +++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts @@ -13,6 +13,7 @@ import { type ForNode, type InterpolationNode, NodeTypes, + type RootNode, type SimpleExpressionNode, } from '../../src/ast' import { ErrorCodes } from '../../src/errors' @@ -24,7 +25,10 @@ import { createObjectMatcher } from '../testUtils' export function parseWithForTransform( template: string, options: CompilerOptions = {}, -) { +): { + root: RootNode + node: ForNode & { codegenNode: ForCodegenNode } +} { const ast = parse(template, options) transform(ast, { nodeTransforms: [ diff --git a/packages/compiler-sfc/__tests__/utils.ts b/packages/compiler-sfc/__tests__/utils.ts index 5498ede2717..5a58a6b58ae 100644 --- a/packages/compiler-sfc/__tests__/utils.ts +++ b/packages/compiler-sfc/__tests__/utils.ts @@ -1,5 +1,6 @@ import { type SFCParseOptions, + type SFCScriptBlock, type SFCScriptCompileOptions, compileScript, parse, @@ -12,7 +13,7 @@ export function compileSFCScript( src: string, options?: Partial, parseOptions?: SFCParseOptions, -) { +): SFCScriptBlock { const { descriptor, errors } = parse(src, parseOptions) if (errors.length) { console.warn(errors[0]) @@ -23,7 +24,7 @@ export function compileSFCScript( }) } -export function assertCode(code: string) { +export function assertCode(code: string): void { // parse the generated code to make sure it is valid try { babelParse(code, { diff --git a/packages/runtime-core/src/components/KeepAlive.ts b/packages/runtime-core/src/components/KeepAlive.ts index dd1d1f5a6e3..5976f3a4b33 100644 --- a/packages/runtime-core/src/components/KeepAlive.ts +++ b/packages/runtime-core/src/components/KeepAlive.ts @@ -350,7 +350,7 @@ const KeepAliveImpl: ComponentOptions = { keys.add(key) // prune oldest entry if (max && keys.size > parseInt(max as string, 10)) { - pruneCacheEntry(keys.values().next().value) + pruneCacheEntry(keys.values().next().value!) } } // avoid vnode being unmounted diff --git a/packages/runtime-test/src/index.ts b/packages/runtime-test/src/index.ts index ba11f60c2c1..b754509cb20 100644 --- a/packages/runtime-test/src/index.ts +++ b/packages/runtime-test/src/index.ts @@ -17,7 +17,7 @@ export const render = baseRender as RootRenderFunction export const createApp = baseCreateApp as CreateAppFunction // convenience for one-off render validations -export function renderToString(vnode: VNode) { +export function renderToString(vnode: VNode): string { const root = nodeOps.createElement('div') render(vnode, root) return serializeInner(root) diff --git a/packages/runtime-test/src/nodeOps.ts b/packages/runtime-test/src/nodeOps.ts index e338fd52000..933a0f73eeb 100644 --- a/packages/runtime-test/src/nodeOps.ts +++ b/packages/runtime-test/src/nodeOps.ts @@ -57,11 +57,11 @@ export interface NodeOp { let nodeId: number = 0 let recordedNodeOps: NodeOp[] = [] -export function logNodeOp(op: NodeOp) { +export function logNodeOp(op: NodeOp): void { recordedNodeOps.push(op) } -export function resetOps() { +export function resetOps(): void { recordedNodeOps = [] } @@ -128,7 +128,7 @@ function createComment(text: string): TestComment { return node } -function setText(node: TestText, text: string) { +function setText(node: TestText, text: string): void { logNodeOp({ type: NodeOpTypes.SET_TEXT, targetNode: node, @@ -137,7 +137,11 @@ function setText(node: TestText, text: string) { node.text = text } -function insert(child: TestNode, parent: TestElement, ref?: TestNode | null) { +function insert( + child: TestNode, + parent: TestElement, + ref?: TestNode | null, +): void { let refIndex if (ref) { refIndex = parent.children.indexOf(ref) @@ -166,7 +170,7 @@ function insert(child: TestNode, parent: TestElement, ref?: TestNode | null) { } } -function remove(child: TestNode, logOp = true) { +function remove(child: TestNode, logOp = true): void { const parent = child.parentNode if (parent) { if (logOp) { @@ -188,7 +192,7 @@ function remove(child: TestNode, logOp = true) { } } -function setElementText(el: TestElement, text: string) { +function setElementText(el: TestElement, text: string): void { logNodeOp({ type: NodeOpTypes.SET_ELEMENT_TEXT, targetNode: el, @@ -228,11 +232,23 @@ function querySelector(): never { throw new Error('querySelector not supported in test renderer.') } -function setScopeId(el: TestElement, id: string) { +function setScopeId(el: TestElement, id: string): void { el.props[id] = '' } -export const nodeOps = { +export const nodeOps: { + insert: typeof insert + remove: typeof remove + createElement: typeof createElement + createText: typeof createText + createComment: typeof createComment + setText: typeof setText + setElementText: typeof setElementText + parentNode: typeof parentNode + nextSibling: typeof nextSibling + querySelector: typeof querySelector + setScopeId: typeof setScopeId +} = { insert, remove, createElement, diff --git a/packages/runtime-test/src/patchProp.ts b/packages/runtime-test/src/patchProp.ts index f10b5364746..8b4479b8dc6 100644 --- a/packages/runtime-test/src/patchProp.ts +++ b/packages/runtime-test/src/patchProp.ts @@ -6,7 +6,7 @@ export function patchProp( key: string, prevValue: any, nextValue: any, -) { +): void { logNodeOp({ type: NodeOpTypes.PATCH, targetNode: el, diff --git a/packages/runtime-test/src/serialize.ts b/packages/runtime-test/src/serialize.ts index e8871945be1..87efa6cd911 100644 --- a/packages/runtime-test/src/serialize.ts +++ b/packages/runtime-test/src/serialize.ts @@ -23,7 +23,7 @@ export function serializeInner( node: TestElement, indent: number = 0, depth: number = 0, -) { +): string { const newLine = indent ? `\n` : `` return node.children.length ? newLine + diff --git a/packages/runtime-test/src/triggerEvent.ts b/packages/runtime-test/src/triggerEvent.ts index 94ccd2badcd..4b037d62af3 100644 --- a/packages/runtime-test/src/triggerEvent.ts +++ b/packages/runtime-test/src/triggerEvent.ts @@ -5,7 +5,7 @@ export function triggerEvent( el: TestElement, event: string, payload: any[] = [], -) { +): void { const { eventListeners } = el if (eventListeners) { const listener = eventListeners[event] diff --git a/packages/vue-compat/__tests__/utils.ts b/packages/vue-compat/__tests__/utils.ts index 18e6516a4a6..1d862422761 100644 --- a/packages/vue-compat/__tests__/utils.ts +++ b/packages/vue-compat/__tests__/utils.ts @@ -2,7 +2,7 @@ export function triggerEvent( target: Element, event: string, process?: (e: any) => any, -) { +): Event { const e = new Event(event, { bubbles: true, cancelable: true, diff --git a/packages/vue/__tests__/e2e/commits.mock.ts b/packages/vue/__tests__/e2e/commits.mock.ts index 4a793e25aea..8e3f153446d 100644 --- a/packages/vue/__tests__/e2e/commits.mock.ts +++ b/packages/vue/__tests__/e2e/commits.mock.ts @@ -548,4 +548,4 @@ export default { ], }, ], -} +} as any diff --git a/packages/vue/__tests__/e2e/e2eUtils.ts b/packages/vue/__tests__/e2e/e2eUtils.ts index 87e99ac7b5d..8512dcaae47 100644 --- a/packages/vue/__tests__/e2e/e2eUtils.ts +++ b/packages/vue/__tests__/e2e/e2eUtils.ts @@ -31,7 +31,27 @@ export async function expectByPolling( } } -export function setupPuppeteer(args?: string[]) { +interface PuppeteerUtils { + page: () => Page + click(selector: string, options?: ClickOptions): Promise + count(selector: string): Promise + text(selector: string): Promise + value(selector: string): Promise + html(selector: string): Promise + classList(selector: string): Promise + children(selector: string): Promise + isVisible(selector: string): Promise + isChecked(selector: string): Promise + isFocused(selector: string): Promise + setValue(selector: string, value: string): Promise + typeValue(selector: string, value: string): Promise + enterValue(selector: string, value: string): Promise + clearValue(selector: string): Promise + timeout(time: number): Promise + nextFrame(): Promise +} + +export function setupPuppeteer(args?: string[]): PuppeteerUtils { let browser: Browser let page: Page @@ -69,35 +89,38 @@ export function setupPuppeteer(args?: string[]) { await browser.close() }) - async function click(selector: string, options?: ClickOptions) { + async function click( + selector: string, + options?: ClickOptions, + ): Promise { await page.click(selector, options) } - async function count(selector: string) { + async function count(selector: string): Promise { return (await page.$$(selector)).length } - async function text(selector: string) { - return await page.$eval(selector, node => node.textContent) + async function text(selector: string): Promise { + return page.$eval(selector, node => node.textContent) } - async function value(selector: string) { - return await page.$eval(selector, node => (node as HTMLInputElement).value) + async function value(selector: string): Promise { + return page.$eval(selector, node => (node as HTMLInputElement).value) } - async function html(selector: string) { - return await page.$eval(selector, node => node.innerHTML) + async function html(selector: string): Promise { + return page.$eval(selector, node => node.innerHTML) } - async function classList(selector: string) { - return await page.$eval(selector, (node: any) => [...node.classList]) + async function classList(selector: string): Promise { + return page.$eval(selector, (node: any) => [...node.classList]) } - async function children(selector: string) { - return await page.$eval(selector, (node: any) => [...node.children]) + async function children(selector: string): Promise { + return page.$eval(selector, (node: any) => [...node.children]) } - async function isVisible(selector: string) { + async function isVisible(selector: string): Promise { const display = await page.$eval(selector, node => { return window.getComputedStyle(node).display }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 00c10b3e31f..886c15f5290 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -91,10 +91,10 @@ importers: version: 9.9.1 eslint-plugin-import-x: specifier: ^3.1.0 - version: 3.1.0(eslint@9.9.1)(typescript@5.5.4) + version: 3.1.0(eslint@9.9.1)(typescript@5.6.2) eslint-plugin-vitest: specifier: ^0.5.4 - version: 0.5.4(eslint@9.9.1)(typescript@5.5.4)(vitest@2.0.5(@types/node@20.16.5)(jsdom@25.0.0)(sass@1.78.0)) + version: 0.5.4(eslint@9.9.1)(typescript@5.6.2)(vitest@2.0.5(@types/node@20.16.5)(jsdom@25.0.0)(sass@1.78.0)) estree-walker: specifier: 'catalog:' version: 2.0.2 @@ -133,7 +133,7 @@ importers: version: 3.0.3 puppeteer: specifier: ~23.3.0 - version: 23.3.0(typescript@5.5.4) + version: 23.3.0(typescript@5.6.2) rimraf: specifier: ^6.0.1 version: 6.0.1 @@ -142,7 +142,7 @@ importers: version: 4.21.2 rollup-plugin-dts: specifier: ^6.1.1 - version: 6.1.1(rollup@4.21.2)(typescript@5.5.4) + version: 6.1.1(rollup@4.21.2)(typescript@5.6.2) rollup-plugin-esbuild: specifier: ^6.1.1 version: 6.1.1(esbuild@0.23.1)(rollup@4.21.2) @@ -171,11 +171,11 @@ importers: specifier: ^4.19.0 version: 4.19.0 typescript: - specifier: ~5.5.4 - version: 5.5.4 + specifier: ~5.6.2 + version: 5.6.2 typescript-eslint: specifier: ^8.4.0 - version: 8.4.0(eslint@9.9.1)(typescript@5.5.4) + version: 8.4.0(eslint@9.9.1)(typescript@5.6.2) vite: specifier: 'catalog:' version: 5.4.0(@types/node@20.16.5)(sass@1.78.0) @@ -3258,6 +3258,11 @@ packages: engines: {node: '>=14.17'} hasBin: true + typescript@5.6.2: + resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + engines: {node: '>=14.17'} + hasBin: true + uglify-js@3.19.1: resolution: {integrity: sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A==} engines: {node: '>=0.8.0'} @@ -3987,34 +3992,34 @@ snapshots: '@types/node': 20.16.5 optional: true - '@typescript-eslint/eslint-plugin@8.4.0(@typescript-eslint/parser@8.4.0(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4)': + '@typescript-eslint/eslint-plugin@8.4.0(@typescript-eslint/parser@8.4.0(eslint@9.9.1)(typescript@5.6.2))(eslint@9.9.1)(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 8.4.0(eslint@9.9.1)(typescript@5.5.4) + '@typescript-eslint/parser': 8.4.0(eslint@9.9.1)(typescript@5.6.2) '@typescript-eslint/scope-manager': 8.4.0 - '@typescript-eslint/type-utils': 8.4.0(eslint@9.9.1)(typescript@5.5.4) - '@typescript-eslint/utils': 8.4.0(eslint@9.9.1)(typescript@5.5.4) + '@typescript-eslint/type-utils': 8.4.0(eslint@9.9.1)(typescript@5.6.2) + '@typescript-eslint/utils': 8.4.0(eslint@9.9.1)(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.4.0 eslint: 9.9.1 graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.5.4) + ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.4.0(eslint@9.9.1)(typescript@5.5.4)': + '@typescript-eslint/parser@8.4.0(eslint@9.9.1)(typescript@5.6.2)': dependencies: '@typescript-eslint/scope-manager': 8.4.0 '@typescript-eslint/types': 8.4.0 - '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.4.0 debug: 4.3.6 eslint: 9.9.1 optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - supports-color @@ -4028,14 +4033,14 @@ snapshots: '@typescript-eslint/types': 8.4.0 '@typescript-eslint/visitor-keys': 8.4.0 - '@typescript-eslint/type-utils@8.4.0(eslint@9.9.1)(typescript@5.5.4)': + '@typescript-eslint/type-utils@8.4.0(eslint@9.9.1)(typescript@5.6.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.5.4) - '@typescript-eslint/utils': 8.4.0(eslint@9.9.1)(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.6.2) + '@typescript-eslint/utils': 8.4.0(eslint@9.9.1)(typescript@5.6.2) debug: 4.3.6 - ts-api-utils: 1.3.0(typescript@5.5.4) + ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - eslint - supports-color @@ -4044,7 +4049,7 @@ snapshots: '@typescript-eslint/types@8.4.0': {} - '@typescript-eslint/typescript-estree@7.18.0(typescript@5.5.4)': + '@typescript-eslint/typescript-estree@7.18.0(typescript@5.6.2)': dependencies: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 @@ -4053,13 +4058,13 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.5.4) + ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.4.0(typescript@5.5.4)': + '@typescript-eslint/typescript-estree@8.4.0(typescript@5.6.2)': dependencies: '@typescript-eslint/types': 8.4.0 '@typescript-eslint/visitor-keys': 8.4.0 @@ -4068,29 +4073,29 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.5.4) + ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.18.0(eslint@9.9.1)(typescript@5.5.4)': + '@typescript-eslint/utils@7.18.0(eslint@9.9.1)(typescript@5.6.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1) '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) eslint: 9.9.1 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@8.4.0(eslint@9.9.1)(typescript@5.5.4)': + '@typescript-eslint/utils@8.4.0(eslint@9.9.1)(typescript@5.6.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1) '@typescript-eslint/scope-manager': 8.4.0 '@typescript-eslint/types': 8.4.0 - '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 8.4.0(typescript@5.6.2) eslint: 9.9.1 transitivePeerDependencies: - supports-color @@ -4549,14 +4554,14 @@ snapshots: core-util-is@1.0.3: {} - cosmiconfig@9.0.0(typescript@5.5.4): + cosmiconfig@9.0.0(typescript@5.6.2): dependencies: env-paths: 2.2.1 import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 cross-spawn@7.0.3: dependencies: @@ -4747,9 +4752,9 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import-x@3.1.0(eslint@9.9.1)(typescript@5.5.4): + eslint-plugin-import-x@3.1.0(eslint@9.9.1)(typescript@5.6.2): dependencies: - '@typescript-eslint/utils': 7.18.0(eslint@9.9.1)(typescript@5.5.4) + '@typescript-eslint/utils': 7.18.0(eslint@9.9.1)(typescript@5.6.2) debug: 4.3.6 doctrine: 3.0.0 eslint: 9.9.1 @@ -4764,9 +4769,9 @@ snapshots: - supports-color - typescript - eslint-plugin-vitest@0.5.4(eslint@9.9.1)(typescript@5.5.4)(vitest@2.0.5(@types/node@20.16.5)(jsdom@25.0.0)(sass@1.78.0)): + eslint-plugin-vitest@0.5.4(eslint@9.9.1)(typescript@5.6.2)(vitest@2.0.5(@types/node@20.16.5)(jsdom@25.0.0)(sass@1.78.0)): dependencies: - '@typescript-eslint/utils': 7.18.0(eslint@9.9.1)(typescript@5.5.4) + '@typescript-eslint/utils': 7.18.0(eslint@9.9.1)(typescript@5.6.2) eslint: 9.9.1 optionalDependencies: vitest: 2.0.5(@types/node@20.16.5)(jsdom@25.0.0)(sass@1.78.0) @@ -5813,11 +5818,11 @@ snapshots: - supports-color - utf-8-validate - puppeteer@23.3.0(typescript@5.5.4): + puppeteer@23.3.0(typescript@5.6.2): dependencies: '@puppeteer/browsers': 2.4.0 chromium-bidi: 0.6.5(devtools-protocol@0.0.1330662) - cosmiconfig: 9.0.0(typescript@5.5.4) + cosmiconfig: 9.0.0(typescript@5.6.2) devtools-protocol: 0.0.1330662 puppeteer-core: 23.3.0 typed-query-selector: 2.12.0 @@ -5914,11 +5919,11 @@ snapshots: glob: 11.0.0 package-json-from-dist: 1.0.0 - rollup-plugin-dts@6.1.1(rollup@4.21.2)(typescript@5.5.4): + rollup-plugin-dts@6.1.1(rollup@4.21.2)(typescript@5.6.2): dependencies: magic-string: 0.30.11 rollup: 4.21.2 - typescript: 5.5.4 + typescript: 5.6.2 optionalDependencies: '@babel/code-frame': 7.24.7 @@ -6242,9 +6247,9 @@ snapshots: dependencies: punycode: 2.3.1 - ts-api-utils@1.3.0(typescript@5.5.4): + ts-api-utils@1.3.0(typescript@5.6.2): dependencies: - typescript: 5.5.4 + typescript: 5.6.2 tslib@2.7.0: {} @@ -6265,19 +6270,21 @@ snapshots: typed-query-selector@2.12.0: {} - typescript-eslint@8.4.0(eslint@9.9.1)(typescript@5.5.4): + typescript-eslint@8.4.0(eslint@9.9.1)(typescript@5.6.2): dependencies: - '@typescript-eslint/eslint-plugin': 8.4.0(@typescript-eslint/parser@8.4.0(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4) - '@typescript-eslint/parser': 8.4.0(eslint@9.9.1)(typescript@5.5.4) - '@typescript-eslint/utils': 8.4.0(eslint@9.9.1)(typescript@5.5.4) + '@typescript-eslint/eslint-plugin': 8.4.0(@typescript-eslint/parser@8.4.0(eslint@9.9.1)(typescript@5.6.2))(eslint@9.9.1)(typescript@5.6.2) + '@typescript-eslint/parser': 8.4.0(eslint@9.9.1)(typescript@5.6.2) + '@typescript-eslint/utils': 8.4.0(eslint@9.9.1)(typescript@5.6.2) optionalDependencies: - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - eslint - supports-color typescript@5.5.4: {} + typescript@5.6.2: {} + uglify-js@3.19.1: optional: true diff --git a/tsconfig.build-node.json b/tsconfig.build-node.json deleted file mode 100644 index 045e23f03b8..00000000000 --- a/tsconfig.build-node.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "types": ["node"], - "declaration": true, - "emitDeclarationOnly": true, - "stripInternal": true, - "composite": false - }, - "include": [ - "packages/global.d.ts", - "packages/compiler-sfc/src", - "packages/compiler-ssr/src", - "packages/server-renderer/src" - ] -} diff --git a/tsconfig.build-browser.json b/tsconfig.build.json similarity index 70% rename from tsconfig.build-browser.json rename to tsconfig.build.json index 79e90602e9e..fc36b251d51 100644 --- a/tsconfig.build-browser.json +++ b/tsconfig.build.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "types": [], + "types": ["node"], "declaration": true, "emitDeclarationOnly": true, "stripInternal": true, @@ -16,6 +16,10 @@ "packages/runtime-core/src", "packages/runtime-dom/src", "packages/reactivity/src", - "packages/shared/src" + "packages/shared/src", + "packages/global.d.ts", + "packages/compiler-sfc/src", + "packages/compiler-ssr/src", + "packages/server-renderer/src" ] } diff --git a/tsconfig.json b/tsconfig.json index a12850af027..9896083cf14 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -32,11 +32,9 @@ "include": [ "packages/global.d.ts", "packages/*/src", - "packages-private/*/src", - "packages/runtime-dom/types/jsx.d.ts", "packages/*/__tests__", - "packages-private/dts-test", "packages/vue/jsx-runtime", + "packages/runtime-dom/types/jsx.d.ts", "scripts/*", "rollup.*.js" ],