From 04d2c05054c26b02fbc1d84839b0ed5cd36455b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= Date: Sat, 16 Dec 2023 14:54:37 +0100 Subject: [PATCH 01/35] fix(runtime-dom): cache event handlers by key/modifiers (#9851) close #9849 --- .../__tests__/directives/vOn.spec.ts | 28 +++++++++++++++++++ packages/runtime-dom/src/directives/vOn.ts | 17 +++++++---- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/packages/runtime-dom/__tests__/directives/vOn.spec.ts b/packages/runtime-dom/__tests__/directives/vOn.spec.ts index 2a4b02478..33ffec637 100644 --- a/packages/runtime-dom/__tests__/directives/vOn.spec.ts +++ b/packages/runtime-dom/__tests__/directives/vOn.spec.ts @@ -135,4 +135,32 @@ describe('runtime-dom: v-on directive', () => { handler(event, 'value', true) expect(fn).toBeCalledWith(event, 'value', true) }) + + it('withKeys cache wrapped listener separately for different modifiers', () => { + const el1 = document.createElement('button') + const el2 = document.createElement('button') + const fn = vi.fn() + const handler1 = withKeys(fn, ['a']) + const handler2 = withKeys(fn, ['b']) + expect(handler1 === handler2).toBe(false) + patchEvent(el1, 'onKeyup', null, handler1, null) + patchEvent(el2, 'onKeyup', null, handler2, null) + triggerEvent(el1, 'keyup', e => (e.key = 'a')) + triggerEvent(el2, 'keyup', e => (e.key = 'b')) + expect(fn).toBeCalledTimes(2) + }) + + it('withModifiers cache wrapped listener separately for different modifiers', () => { + const el1 = document.createElement('button') + const el2 = document.createElement('button') + const fn = vi.fn() + const handler1 = withModifiers(fn, ['ctrl']) + const handler2 = withModifiers(fn, ['shift']) + expect(handler1 === handler2).toBe(false) + patchEvent(el1, 'onClick', null, handler1, null) + patchEvent(el2, 'onClick', null, handler2, null) + triggerEvent(el1, 'click', e => (e.ctrlKey = true)) + triggerEvent(el2, 'click', e => (e.shiftKey = true)) + expect(fn).toBeCalledTimes(2) + }) }) diff --git a/packages/runtime-dom/src/directives/vOn.ts b/packages/runtime-dom/src/directives/vOn.ts index 8054efb9e..823c3fb4c 100644 --- a/packages/runtime-dom/src/directives/vOn.ts +++ b/packages/runtime-dom/src/directives/vOn.ts @@ -35,12 +35,14 @@ const modifierGuards: Record< export const withModifiers = < T extends (event: Event, ...args: unknown[]) => any >( - fn: T & { _withMods?: T }, + fn: T & { _withMods?: { [key: string]: T } }, modifiers: string[] ) => { + const cache = fn._withMods || (fn._withMods = {}) + const cacheKey = modifiers.join('.') return ( - fn._withMods || - (fn._withMods = ((event, ...args) => { + cache[cacheKey] || + (cache[cacheKey] = ((event, ...args) => { for (let i = 0; i < modifiers.length; i++) { const guard = modifierGuards[modifiers[i]] if (guard && guard(event, modifiers)) return @@ -66,7 +68,7 @@ const keyNames: Record = { * @private */ export const withKeys = any>( - fn: T & { _withKeys?: T }, + fn: T & { _withKeys?: { [k: string]: T } }, modifiers: string[] ) => { let globalKeyCodes: LegacyConfig['keyCodes'] @@ -88,9 +90,12 @@ export const withKeys = any>( } } + const cache: { [k: string]: T } = fn._withKeys || (fn._withKeys = {}) + const cacheKey = modifiers.join('.') + return ( - fn._withKeys || - (fn._withKeys = (event => { + cache[cacheKey] || + (cache[cacheKey] = (event => { if (!('key' in event)) { return } From 1d79b64ebce884d97136d71aa722347470b13e35 Mon Sep 17 00:00:00 2001 From: AlanYu <35493996+smallnine9@users.noreply.github.com> Date: Tue, 19 Dec 2023 16:59:47 +0800 Subject: [PATCH 02/35] feat(runtime-core): throw real error when scheduler detects infinite loop during dev (#7447) close #7437 --- packages/runtime-core/src/scheduler.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/runtime-core/src/scheduler.ts b/packages/runtime-core/src/scheduler.ts index 5b096b563..0b3175810 100644 --- a/packages/runtime-core/src/scheduler.ts +++ b/packages/runtime-core/src/scheduler.ts @@ -1,7 +1,6 @@ -import { ErrorCodes, callWithErrorHandling } from './errorHandling' +import { ErrorCodes, callWithErrorHandling, handleError } from './errorHandling' import { Awaited, isArray, NOOP } from '@vue/shared' import { ComponentInternalInstance, getComponentName } from './component' -import { warn } from './warning' export interface SchedulerJob extends Function { id?: number @@ -271,14 +270,16 @@ function checkRecursiveUpdates(seen: CountMap, fn: SchedulerJob) { if (count > RECURSION_LIMIT) { const instance = fn.ownerInstance const componentName = instance && getComponentName(instance.type) - warn( + handleError( `Maximum recursive updates exceeded${ componentName ? ` in component <${componentName}>` : `` }. ` + `This means you have a reactive effect that is mutating its own ` + `dependencies and thus recursively triggering itself. Possible sources ` + `include component template, render function, updated hook or ` + - `watcher source function.` + `watcher source function.`, + null, + ErrorCodes.APP_ERROR_HANDLER ) return true } else { From 24b1c1dd57fd55d998aa231a147500e010b10219 Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Tue, 19 Dec 2023 10:05:29 +0100 Subject: [PATCH 03/35] fix(types): extract properties from extended collections (#9854) close #9852 --- packages/dts-test/reactivity.test-d.ts | 23 +++++++++++++++++++++++ packages/reactivity/src/ref.ts | 9 +++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/packages/dts-test/reactivity.test-d.ts b/packages/dts-test/reactivity.test-d.ts index 431bbafbd..e0d8e207f 100644 --- a/packages/dts-test/reactivity.test-d.ts +++ b/packages/dts-test/reactivity.test-d.ts @@ -77,6 +77,18 @@ describe('should unwrap Map correctly', () => { expectType(wm2.get({})!.wrap) }) +describe('should unwrap extended Map correctly', () => { + class ExtendendMap1 extends Map }> { + foo = ref('foo') + bar = 1 + } + + const emap1 = reactive(new ExtendendMap1()) + expectType(emap1.foo) + expectType(emap1.bar) + expectType(emap1.get('a')!.wrap) +}) + describe('should unwrap Set correctly', () => { const set = reactive(new Set>()) expectType>>(set) @@ -90,3 +102,14 @@ describe('should unwrap Set correctly', () => { const ws2 = reactive(new WeakSet<{ wrap: Ref }>()) expectType>(ws2) }) + +describe('should unwrap extended Set correctly', () => { + class ExtendendSet1 extends Set<{ wrap: Ref }> { + foo = ref('foo') + bar = 1 + } + + const eset1 = reactive(new ExtendendSet1()) + expectType(eset1.foo) + expectType(eset1.bar) +}) diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts index a85c79c0b..e156a2e11 100644 --- a/packages/reactivity/src/ref.ts +++ b/packages/reactivity/src/ref.ts @@ -500,13 +500,14 @@ export type UnwrapRefSimple = T extends | { [RawSymbol]?: true } ? T : T extends Map - ? Map> + ? Map> & UnwrapRef>> : T extends WeakMap - ? WeakMap> + ? WeakMap> & + UnwrapRef>> : T extends Set - ? Set> + ? Set> & UnwrapRef>> : T extends WeakSet - ? WeakSet> + ? WeakSet> & UnwrapRef>> : T extends ReadonlyArray ? { [K in keyof T]: UnwrapRefSimple } : T extends object & { [ShallowReactiveMarker]?: never } From bae79ddf8564a2da4a5365cfeb8d811990f42335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E9=9B=BE=E4=B8=89=E8=AF=AD?= <32354856+baiwusanyu-c@users.noreply.github.com> Date: Tue, 19 Dec 2023 17:08:46 +0800 Subject: [PATCH 04/35] fix(compiler-core): fix v-on with modifiers on inline expression of undefined (#9866) close #9865 improve isMemberExpression check for undefined --- packages/compiler-core/__tests__/utils.spec.ts | 4 ++++ packages/compiler-core/src/utils.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/compiler-core/__tests__/utils.spec.ts b/packages/compiler-core/__tests__/utils.spec.ts index 45fa46fea..f2ea70cc5 100644 --- a/packages/compiler-core/__tests__/utils.spec.ts +++ b/packages/compiler-core/__tests__/utils.spec.ts @@ -122,6 +122,10 @@ describe('isMemberExpression', () => { expect(fn(`123[a]`)).toBe(true) expect(fn(`foo() as string`)).toBe(false) expect(fn(`a + b as string`)).toBe(false) + // #9865 + expect(fn('""')).toBe(false) + expect(fn('undefined')).toBe(false) + expect(fn('null')).toBe(false) }) }) diff --git a/packages/compiler-core/src/utils.ts b/packages/compiler-core/src/utils.ts index baffe5086..fe4141507 100644 --- a/packages/compiler-core/src/utils.ts +++ b/packages/compiler-core/src/utils.ts @@ -163,7 +163,7 @@ export const isMemberExpressionNode = __BROWSER__ return ( ret.type === 'MemberExpression' || ret.type === 'OptionalMemberExpression' || - ret.type === 'Identifier' + (ret.type === 'Identifier' && ret.name !== 'undefined') ) } catch (e) { return false From eb51b23d8512f15665d6f8bcdfd51582e0cd8ce8 Mon Sep 17 00:00:00 2001 From: edison Date: Tue, 19 Dec 2023 18:04:36 +0800 Subject: [PATCH 05/35] fix(compile-sfc): fix identifier prefixing edge case caused by reused AST (#9867) close #9853 close #9863 --- packages/compiler-core/src/babelUtils.ts | 38 +++++++++++++------ .../__tests__/compileTemplate.spec.ts | 30 +++++++++++++++ 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/packages/compiler-core/src/babelUtils.ts b/packages/compiler-core/src/babelUtils.ts index a9c1ebe9c..c00c18b3f 100644 --- a/packages/compiler-core/src/babelUtils.ts +++ b/packages/compiler-core/src/babelUtils.ts @@ -55,14 +55,24 @@ export function walkIdentifiers( // mark property in destructure pattern ;(node as any).inPattern = true } else if (isFunctionType(node)) { - // walk function expressions and add its arguments to known identifiers - // so that we don't prefix them - walkFunctionParams(node, id => markScopeIdentifier(node, id, knownIds)) + if (node.scopeIds) { + node.scopeIds.forEach(id => markKnownIds(id, knownIds)) + } else { + // walk function expressions and add its arguments to known identifiers + // so that we don't prefix them + walkFunctionParams(node, id => + markScopeIdentifier(node, id, knownIds) + ) + } } else if (node.type === 'BlockStatement') { - // #3445 record block-level local variables - walkBlockDeclarations(node, id => - markScopeIdentifier(node, id, knownIds) - ) + if (node.scopeIds) { + node.scopeIds.forEach(id => markKnownIds(id, knownIds)) + } else { + // #3445 record block-level local variables + walkBlockDeclarations(node, id => + markScopeIdentifier(node, id, knownIds) + ) + } } }, leave(node: Node & { scopeIds?: Set }, parent: Node | undefined) { @@ -227,6 +237,14 @@ export function extractIdentifiers( return nodes } +function markKnownIds(name: string, knownIds: Record) { + if (name in knownIds) { + knownIds[name]++ + } else { + knownIds[name] = 1 + } +} + function markScopeIdentifier( node: Node & { scopeIds?: Set }, child: Identifier, @@ -236,11 +254,7 @@ function markScopeIdentifier( if (node.scopeIds && node.scopeIds.has(name)) { return } - if (name in knownIds) { - knownIds[name]++ - } else { - knownIds[name] = 1 - } + markKnownIds(name, knownIds) ;(node.scopeIds || (node.scopeIds = new Set())).add(name) } diff --git a/packages/compiler-sfc/__tests__/compileTemplate.spec.ts b/packages/compiler-sfc/__tests__/compileTemplate.spec.ts index 95e1b7aa8..26a8b573f 100644 --- a/packages/compiler-sfc/__tests__/compileTemplate.spec.ts +++ b/packages/compiler-sfc/__tests__/compileTemplate.spec.ts @@ -4,6 +4,7 @@ import { SFCTemplateCompileOptions } from '../src/compileTemplate' import { parse, SFCTemplateBlock } from '../src/parse' +import { compileScript } from '../src' function compile(opts: Omit) { return compileTemplate({ @@ -397,6 +398,35 @@ test('dynamic v-on + static v-on should merged', () => { expect(result.code).toMatchSnapshot() }) +// #9853 regression found in Nuxt tests +// walkIdentifiers can get called multiple times on the same node +// due to #9729 calling it during SFC template usage check. +// conditions needed: +// 1. ` + + ` + const { descriptor } = parse(src) + // compileScript triggers importUsageCheck + compileScript(descriptor, { id: 'xxx' }) + const { code } = compileTemplate({ + id: 'xxx', + filename: 'test.vue', + ast: descriptor.template!.ast, + source: descriptor.template!.content + }) + expect(code).not.toMatch(`_ctx.t`) +}) + interface Pos { line: number column: number From 8f339ea144956b633d975731fbb7abf43e677612 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 19 Dec 2023 18:02:28 +0800 Subject: [PATCH 06/35] chore: reuse descriptor ast in compileScript inlineTemplate mode by default --- packages/compiler-sfc/src/compileScript.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts index 2f71e6f0a..5982b02ec 100644 --- a/packages/compiler-sfc/src/compileScript.ts +++ b/packages/compiler-sfc/src/compileScript.ts @@ -833,6 +833,7 @@ export function compileScript( // inline it right here const { code, ast, preamble, tips, errors } = compileTemplate({ filename, + ast: sfc.template.ast, source: sfc.template.content, inMap: sfc.template.map, ...options.templateOptions, From e8448b018d9f837c08eace90cab404a27f68e31a Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 19 Dec 2023 18:09:42 +0800 Subject: [PATCH 07/35] fix(ssr): fix hydration prop mismatch check for class on SVG elements --- packages/runtime-core/src/hydration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/runtime-core/src/hydration.ts b/packages/runtime-core/src/hydration.ts index b873a37dc..57ced5118 100644 --- a/packages/runtime-core/src/hydration.ts +++ b/packages/runtime-core/src/hydration.ts @@ -718,7 +718,7 @@ function propHasMismatch(el: Element, key: string, clientValue: any): boolean { let actual: any let expected: any if (key === 'class') { - actual = el.className + actual = el.getAttribute('class') expected = normalizeClass(clientValue) if (actual !== expected) { mismatchType = mismatchKey = `class` From 7c49a9c4d8adea88eb9af1d98437cf03ddc30128 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 19 Dec 2023 18:12:48 +0800 Subject: [PATCH 08/35] release: v3.3.13 --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- packages/compiler-core/package.json | 2 +- packages/compiler-dom/package.json | 2 +- packages/compiler-sfc/package.json | 2 +- packages/compiler-ssr/package.json | 2 +- packages/reactivity-transform/package.json | 2 +- packages/reactivity/package.json | 2 +- packages/runtime-core/package.json | 2 +- packages/runtime-dom/package.json | 2 +- packages/server-renderer/package.json | 2 +- packages/shared/package.json | 2 +- packages/vue-compat/package.json | 2 +- packages/vue/package.json | 2 +- 14 files changed, 24 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 697a618d8..d71b72737 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [3.3.13](https://github.com/vuejs/core/compare/v3.3.12...v3.3.13) (2023-12-19) + + +### Bug Fixes + +* **compiler-core:** fix v-on with modifiers on inline expression of undefined ([#9866](https://github.com/vuejs/core/issues/9866)) ([bae79dd](https://github.com/vuejs/core/commit/bae79ddf8564a2da4a5365cfeb8d811990f42335)), closes [#9865](https://github.com/vuejs/core/issues/9865) +* **runtime-dom:** cache event handlers by key/modifiers ([#9851](https://github.com/vuejs/core/issues/9851)) ([04d2c05](https://github.com/vuejs/core/commit/04d2c05054c26b02fbc1d84839b0ed5cd36455b6)), closes [#9849](https://github.com/vuejs/core/issues/9849) +* **types:** extract properties from extended collections ([#9854](https://github.com/vuejs/core/issues/9854)) ([24b1c1d](https://github.com/vuejs/core/commit/24b1c1dd57fd55d998aa231a147500e010b10219)), closes [#9852](https://github.com/vuejs/core/issues/9852) + + + ## [3.3.12](https://github.com/vuejs/core/compare/v3.3.11...v3.3.12) (2023-12-16) diff --git a/package.json b/package.json index f5f090392..61d41bfd8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "3.3.12", + "version": "3.3.13", "packageManager": "pnpm@8.12.0", "type": "module", "scripts": { diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json index 3ef0bc597..6d9df3f06 100644 --- a/packages/compiler-core/package.json +++ b/packages/compiler-core/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compiler-core", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/compiler-core", "main": "index.js", "module": "dist/compiler-core.esm-bundler.js", diff --git a/packages/compiler-dom/package.json b/packages/compiler-dom/package.json index d2de4b35e..2f052cd36 100644 --- a/packages/compiler-dom/package.json +++ b/packages/compiler-dom/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compiler-dom", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/compiler-dom", "main": "index.js", "module": "dist/compiler-dom.esm-bundler.js", diff --git a/packages/compiler-sfc/package.json b/packages/compiler-sfc/package.json index db05be865..f57831743 100644 --- a/packages/compiler-sfc/package.json +++ b/packages/compiler-sfc/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compiler-sfc", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/compiler-sfc", "main": "dist/compiler-sfc.cjs.js", "module": "dist/compiler-sfc.esm-browser.js", diff --git a/packages/compiler-ssr/package.json b/packages/compiler-ssr/package.json index 70a8fbc2c..0a653d185 100644 --- a/packages/compiler-ssr/package.json +++ b/packages/compiler-ssr/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compiler-ssr", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/compiler-ssr", "main": "dist/compiler-ssr.cjs.js", "types": "dist/compiler-ssr.d.ts", diff --git a/packages/reactivity-transform/package.json b/packages/reactivity-transform/package.json index c0268e9c4..2b6840556 100644 --- a/packages/reactivity-transform/package.json +++ b/packages/reactivity-transform/package.json @@ -1,6 +1,6 @@ { "name": "@vue/reactivity-transform", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/reactivity-transform", "main": "dist/reactivity-transform.cjs.js", "files": [ diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 10e40f205..1a0a0e3b9 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -1,6 +1,6 @@ { "name": "@vue/reactivity", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/reactivity", "main": "index.js", "module": "dist/reactivity.esm-bundler.js", diff --git a/packages/runtime-core/package.json b/packages/runtime-core/package.json index 46187a138..5744b2c0c 100644 --- a/packages/runtime-core/package.json +++ b/packages/runtime-core/package.json @@ -1,6 +1,6 @@ { "name": "@vue/runtime-core", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/runtime-core", "main": "index.js", "module": "dist/runtime-core.esm-bundler.js", diff --git a/packages/runtime-dom/package.json b/packages/runtime-dom/package.json index 7b4eb9060..26109898a 100644 --- a/packages/runtime-dom/package.json +++ b/packages/runtime-dom/package.json @@ -1,6 +1,6 @@ { "name": "@vue/runtime-dom", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/runtime-dom", "main": "index.js", "module": "dist/runtime-dom.esm-bundler.js", diff --git a/packages/server-renderer/package.json b/packages/server-renderer/package.json index e0bcfa42c..1210c1d02 100644 --- a/packages/server-renderer/package.json +++ b/packages/server-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@vue/server-renderer", - "version": "3.3.12", + "version": "3.3.13", "description": "@vue/server-renderer", "main": "index.js", "module": "dist/server-renderer.esm-bundler.js", diff --git a/packages/shared/package.json b/packages/shared/package.json index 848484781..ecf538cea 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@vue/shared", - "version": "3.3.12", + "version": "3.3.13", "description": "internal utils shared across @vue packages", "main": "index.js", "module": "dist/shared.esm-bundler.js", diff --git a/packages/vue-compat/package.json b/packages/vue-compat/package.json index cf6180b88..a00acf24a 100644 --- a/packages/vue-compat/package.json +++ b/packages/vue-compat/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compat", - "version": "3.3.12", + "version": "3.3.13", "description": "Vue 3 compatibility build for Vue 2", "main": "index.js", "module": "dist/vue.runtime.esm-bundler.js", diff --git a/packages/vue/package.json b/packages/vue/package.json index 317e0754f..fbcfdd0a4 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "vue", - "version": "3.3.12", + "version": "3.3.13", "description": "The progressive JavaScript framework for building modern web UI.", "main": "index.js", "module": "dist/vue.runtime.esm-bundler.js", From 42e0711381fe5fe1b93251991814500aea48b31b Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 19 Dec 2023 18:19:26 +0800 Subject: [PATCH 09/35] chore: remove merge leftover --- packages/reactivity-transform/package.json | 41 ---------------------- pnpm-lock.yaml | 25 ------------- 2 files changed, 66 deletions(-) delete mode 100644 packages/reactivity-transform/package.json diff --git a/packages/reactivity-transform/package.json b/packages/reactivity-transform/package.json deleted file mode 100644 index 2b6840556..000000000 --- a/packages/reactivity-transform/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "@vue/reactivity-transform", - "version": "3.3.13", - "description": "@vue/reactivity-transform", - "main": "dist/reactivity-transform.cjs.js", - "files": [ - "dist" - ], - "buildOptions": { - "formats": [ - "cjs" - ], - "prod": false - }, - "types": "dist/reactivity-transform.d.ts", - "repository": { - "type": "git", - "url": "git+https://github.com/vuejs/core.git", - "directory": "packages/reactivity-transform" - }, - "keywords": [ - "vue" - ], - "author": "Evan You", - "license": "MIT", - "bugs": { - "url": "https://github.com/vuejs/core/issues" - }, - "homepage": "https://github.com/vuejs/core/tree/dev/packages/reactivity-transform#readme", - "dependencies": { - "@babel/parser": "^7.23.5", - "@vue/compiler-core": "workspace:*", - "@vue/shared": "workspace:*", - "estree-walker": "^2.0.2", - "magic-string": "^0.30.5" - }, - "devDependencies": { - "@babel/core": "^7.23.5", - "@babel/types": "^7.23.5" - } -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 17a2fbd8d..b432c5bef 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -296,31 +296,6 @@ importers: specifier: workspace:* version: link:../shared - packages/reactivity-transform: - dependencies: - '@babel/parser': - specifier: ^7.23.5 - version: 7.23.5 - '@vue/compiler-core': - specifier: workspace:* - version: link:../compiler-core - '@vue/shared': - specifier: workspace:* - version: link:../shared - estree-walker: - specifier: ^2.0.2 - version: 2.0.2 - magic-string: - specifier: ^0.30.5 - version: 0.30.5 - devDependencies: - '@babel/core': - specifier: ^7.23.5 - version: 7.23.5 - '@babel/types': - specifier: ^7.23.5 - version: 7.23.5 - packages/runtime-core: dependencies: '@vue/reactivity': From 048dffd7ee421bfeca223bd83c6d695684d88aee Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 19 Dec 2023 18:23:57 +0800 Subject: [PATCH 10/35] release: v3.4.0-beta.4 --- CHANGELOG.md | 15 +++++++++++++++ package.json | 2 +- packages/compiler-core/package.json | 2 +- packages/compiler-dom/package.json | 2 +- packages/compiler-sfc/package.json | 2 +- packages/compiler-ssr/package.json | 2 +- packages/reactivity/package.json | 2 +- packages/runtime-core/package.json | 2 +- packages/runtime-dom/package.json | 2 +- packages/server-renderer/package.json | 2 +- packages/shared/package.json | 2 +- packages/vue-compat/package.json | 2 +- packages/vue/package.json | 2 +- 13 files changed, 27 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a894a5b1..ef1ee6186 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +# [3.4.0-beta.4](https://github.com/vuejs/core/compare/v3.3.13...v3.4.0-beta.4) (2023-12-19) + + +### Bug Fixes + +* **compile-sfc:** fix identifier prefixing edge case caused by reused AST ([#9867](https://github.com/vuejs/core/issues/9867)) ([eb51b23](https://github.com/vuejs/core/commit/eb51b23d8512f15665d6f8bcdfd51582e0cd8ce8)), closes [#9853](https://github.com/vuejs/core/issues/9853) [#9863](https://github.com/vuejs/core/issues/9863) +* **ssr:** fix hydration prop mismatch check for class on SVG elements ([e8448b0](https://github.com/vuejs/core/commit/e8448b018d9f837c08eace90cab404a27f68e31a)) + + +### Features + +* **runtime-core:** throw real error when scheduler detects infinite loop during dev ([#7447](https://github.com/vuejs/core/issues/7447)) ([1d79b64](https://github.com/vuejs/core/commit/1d79b64ebce884d97136d71aa722347470b13e35)), closes [#7437](https://github.com/vuejs/core/issues/7437) + + + ## [3.3.13](https://github.com/vuejs/core/compare/v3.3.12...v3.3.13) (2023-12-19) diff --git a/package.json b/package.json index 9fe772494..3bc9d1464 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "packageManager": "pnpm@8.12.0", "type": "module", "scripts": { diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json index 5981f3b43..b39f6addd 100644 --- a/packages/compiler-core/package.json +++ b/packages/compiler-core/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compiler-core", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "@vue/compiler-core", "main": "index.js", "module": "dist/compiler-core.esm-bundler.js", diff --git a/packages/compiler-dom/package.json b/packages/compiler-dom/package.json index 440040707..74289c6af 100644 --- a/packages/compiler-dom/package.json +++ b/packages/compiler-dom/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compiler-dom", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "@vue/compiler-dom", "main": "index.js", "module": "dist/compiler-dom.esm-bundler.js", diff --git a/packages/compiler-sfc/package.json b/packages/compiler-sfc/package.json index d5dd66784..2bc57ac19 100644 --- a/packages/compiler-sfc/package.json +++ b/packages/compiler-sfc/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compiler-sfc", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "@vue/compiler-sfc", "main": "dist/compiler-sfc.cjs.js", "module": "dist/compiler-sfc.esm-browser.js", diff --git a/packages/compiler-ssr/package.json b/packages/compiler-ssr/package.json index d77d9db78..679c8f1b8 100644 --- a/packages/compiler-ssr/package.json +++ b/packages/compiler-ssr/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compiler-ssr", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "@vue/compiler-ssr", "main": "dist/compiler-ssr.cjs.js", "types": "dist/compiler-ssr.d.ts", diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index a4d2de09a..32391cb3c 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -1,6 +1,6 @@ { "name": "@vue/reactivity", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "@vue/reactivity", "main": "index.js", "module": "dist/reactivity.esm-bundler.js", diff --git a/packages/runtime-core/package.json b/packages/runtime-core/package.json index d706d9770..f3c2e1484 100644 --- a/packages/runtime-core/package.json +++ b/packages/runtime-core/package.json @@ -1,6 +1,6 @@ { "name": "@vue/runtime-core", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "@vue/runtime-core", "main": "index.js", "module": "dist/runtime-core.esm-bundler.js", diff --git a/packages/runtime-dom/package.json b/packages/runtime-dom/package.json index 86b4da622..3c26f0e02 100644 --- a/packages/runtime-dom/package.json +++ b/packages/runtime-dom/package.json @@ -1,6 +1,6 @@ { "name": "@vue/runtime-dom", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "@vue/runtime-dom", "main": "index.js", "module": "dist/runtime-dom.esm-bundler.js", diff --git a/packages/server-renderer/package.json b/packages/server-renderer/package.json index f21ca9dc4..877c28729 100644 --- a/packages/server-renderer/package.json +++ b/packages/server-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@vue/server-renderer", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "@vue/server-renderer", "main": "index.js", "module": "dist/server-renderer.esm-bundler.js", diff --git a/packages/shared/package.json b/packages/shared/package.json index 725d2ed31..5b7a523c7 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@vue/shared", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "internal utils shared across @vue packages", "main": "index.js", "module": "dist/shared.esm-bundler.js", diff --git a/packages/vue-compat/package.json b/packages/vue-compat/package.json index 302b0ca77..aa9cf93e6 100644 --- a/packages/vue-compat/package.json +++ b/packages/vue-compat/package.json @@ -1,6 +1,6 @@ { "name": "@vue/compat", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "Vue 3 compatibility build for Vue 2", "main": "index.js", "module": "dist/vue.runtime.esm-bundler.js", diff --git a/packages/vue/package.json b/packages/vue/package.json index b81bee0ae..0333d24de 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "vue", - "version": "3.4.0-beta.3", + "version": "3.4.0-beta.4", "description": "The progressive JavaScript framework for building modern web UI.", "main": "index.js", "module": "dist/vue.runtime.esm-bundler.js", From f65846c0d4dc511d8d689b502c1efbfcedd3fbd5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:38:20 +0800 Subject: [PATCH 11/35] chore(deps): update all non-major dependencies (#9857) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 8 +- pnpm-lock.yaml | 204 ++++++++++++++++++++++++++----------------------- 2 files changed, 111 insertions(+), 101 deletions(-) diff --git a/package.json b/package.json index 61d41bfd8..262c60e40 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "version": "3.3.13", - "packageManager": "pnpm@8.12.0", + "packageManager": "pnpm@8.12.1", "type": "module", "scripts": { "dev": "node scripts/dev.js", @@ -69,7 +69,7 @@ "@rollup/plugin-replace": "^5.0.4", "@rollup/plugin-terser": "^0.4.4", "@types/hash-sum": "^1.0.2", - "@types/node": "^20.10.4", + "@types/node": "^20.10.5", "@typescript-eslint/parser": "^6.13.2", "@vitest/coverage-istanbul": "^1.0.4", "@vue/consolidate": "0.17.3", @@ -86,7 +86,7 @@ "lodash": "^4.17.21", "magic-string": "^0.30.5", "markdown-table": "^3.0.3", - "marked": "^11.0.1", + "marked": "^11.1.0", "minimist": "^1.2.8", "npm-run-all": "^4.1.5", "picocolors": "^1.0.0", @@ -105,7 +105,7 @@ "terser": "^5.22.0", "todomvc-app-css": "^2.4.3", "tslib": "^2.6.2", - "tsx": "^4.6.2", + "tsx": "^4.7.0", "typescript": "^5.2.2", "vite": "^5.0.5", "vitest": "^1.0.4" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1bf0bf73f..07b06d27a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 '@types/node': - specifier: ^20.10.4 - version: 20.10.4 + specifier: ^20.10.5 + version: 20.10.5 '@typescript-eslint/parser': specifier: ^6.13.2 version: 6.13.2(eslint@8.55.0)(typescript@5.2.2) @@ -90,8 +90,8 @@ importers: specifier: ^3.0.3 version: 3.0.3 marked: - specifier: ^11.0.1 - version: 11.0.1 + specifier: ^11.1.0 + version: 11.1.0 minimist: specifier: ^1.2.8 version: 1.2.8 @@ -147,17 +147,17 @@ importers: specifier: ^2.6.2 version: 2.6.2 tsx: - specifier: ^4.6.2 - version: 4.6.2 + specifier: ^4.7.0 + version: 4.7.0 typescript: specifier: ^5.2.2 version: 5.2.2 vite: specifier: ^5.0.5 - version: 5.0.6(@types/node@20.10.4)(terser@5.22.0) + version: 5.0.6(@types/node@20.10.5)(terser@5.22.0) vitest: specifier: ^1.0.4 - version: 1.0.4(@types/node@20.10.4)(jsdom@23.0.1)(terser@5.22.0) + version: 1.0.4(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) packages/compiler-core: dependencies: @@ -374,7 +374,7 @@ importers: version: 4.4.0(vite@5.0.6)(vue@packages+vue) vite: specifier: ^5.0.5 - version: 5.0.6(@types/node@20.10.4)(terser@5.22.0) + version: 5.0.6(@types/node@20.10.5)(terser@5.22.0) packages/shared: {} @@ -659,12 +659,21 @@ packages: vitest: '>=1.0.0-beta.4 || >=1' dependencies: '@codspeed/core': 2.3.1 - vite: 5.0.6(@types/node@20.10.4)(terser@5.22.0) - vitest: 1.0.4(@types/node@20.10.4)(jsdom@23.0.1)(terser@5.22.0) + vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0) + vitest: 1.0.4(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) dev: true - /@esbuild/android-arm64@0.18.20: - resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} + /@esbuild/aix-ppc64@0.19.10: + resolution: {integrity: sha512-Q+mk96KJ+FZ30h9fsJl+67IjNJm3x2eX+GBWGmocAKgzp27cowCOOqSdscX80s0SpdFXZnIv/+1xD1EctFx96Q==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64@0.19.10: + resolution: {integrity: sha512-1X4CClKhDgC3by7k8aOWZeBXQX8dHT5QAMCAQDArCLaYfkppoARvh0fit3X2Qs+MXDngKcHv6XXyQCpY0hkK1Q==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -681,8 +690,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.18.20: - resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} + /@esbuild/android-arm@0.19.10: + resolution: {integrity: sha512-7W0bK7qfkw1fc2viBfrtAEkDKHatYfHzr/jKAHNr9BvkYDXPcC6bodtm8AyLJNNuqClLNaeTLuwURt4PRT9d7w==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -699,8 +708,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.18.20: - resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} + /@esbuild/android-x64@0.19.10: + resolution: {integrity: sha512-O/nO/g+/7NlitUxETkUv/IvADKuZXyH4BHf/g/7laqKC4i/7whLpB0gvpPc2zpF0q9Q6FXS3TS75QHac9MvVWw==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -717,8 +726,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.18.20: - resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} + /@esbuild/darwin-arm64@0.19.10: + resolution: {integrity: sha512-YSRRs2zOpwypck+6GL3wGXx2gNP7DXzetmo5pHXLrY/VIMsS59yKfjPizQ4lLt5vEI80M41gjm2BxrGZ5U+VMA==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -735,8 +744,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.18.20: - resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} + /@esbuild/darwin-x64@0.19.10: + resolution: {integrity: sha512-alfGtT+IEICKtNE54hbvPg13xGBe4GkVxyGWtzr+yHO7HIiRJppPDhOKq3zstTcVf8msXb/t4eavW3jCDpMSmA==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -753,8 +762,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.18.20: - resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} + /@esbuild/freebsd-arm64@0.19.10: + resolution: {integrity: sha512-dMtk1wc7FSH8CCkE854GyGuNKCewlh+7heYP/sclpOG6Cectzk14qdUIY5CrKDbkA/OczXq9WesqnPl09mj5dg==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -771,8 +780,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.18.20: - resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} + /@esbuild/freebsd-x64@0.19.10: + resolution: {integrity: sha512-G5UPPspryHu1T3uX8WiOEUa6q6OlQh6gNl4CO4Iw5PS+Kg5bVggVFehzXBJY6X6RSOMS8iXDv2330VzaObm4Ag==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -789,8 +798,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.18.20: - resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} + /@esbuild/linux-arm64@0.19.10: + resolution: {integrity: sha512-QxaouHWZ+2KWEj7cGJmvTIHVALfhpGxo3WLmlYfJ+dA5fJB6lDEIg+oe/0//FuyVHuS3l79/wyBxbHr0NgtxJQ==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -807,8 +816,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.18.20: - resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} + /@esbuild/linux-arm@0.19.10: + resolution: {integrity: sha512-j6gUW5aAaPgD416Hk9FHxn27On28H4eVI9rJ4az7oCGTFW48+LcgNDBN+9f8rKZz7EEowo889CPKyeaD0iw9Kg==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -825,8 +834,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.18.20: - resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} + /@esbuild/linux-ia32@0.19.10: + resolution: {integrity: sha512-4ub1YwXxYjj9h1UIZs2hYbnTZBtenPw5NfXCRgEkGb0b6OJ2gpkMvDqRDYIDRjRdWSe/TBiZltm3Y3Q8SN1xNg==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -843,8 +852,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.18.20: - resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} + /@esbuild/linux-loong64@0.19.10: + resolution: {integrity: sha512-lo3I9k+mbEKoxtoIbM0yC/MZ1i2wM0cIeOejlVdZ3D86LAcFXFRdeuZmh91QJvUTW51bOK5W2BznGNIl4+mDaA==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -861,8 +870,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.18.20: - resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} + /@esbuild/linux-mips64el@0.19.10: + resolution: {integrity: sha512-J4gH3zhHNbdZN0Bcr1QUGVNkHTdpijgx5VMxeetSk6ntdt+vR1DqGmHxQYHRmNb77tP6GVvD+K0NyO4xjd7y4A==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -879,8 +888,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.18.20: - resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} + /@esbuild/linux-ppc64@0.19.10: + resolution: {integrity: sha512-tgT/7u+QhV6ge8wFMzaklOY7KqiyitgT1AUHMApau32ZlvTB/+efeCtMk4eXS+uEymYK249JsoiklZN64xt6oQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -897,8 +906,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.18.20: - resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} + /@esbuild/linux-riscv64@0.19.10: + resolution: {integrity: sha512-0f/spw0PfBMZBNqtKe5FLzBDGo0SKZKvMl5PHYQr3+eiSscfJ96XEknCe+JoOayybWUFQbcJTrk946i3j9uYZA==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -915,8 +924,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.18.20: - resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} + /@esbuild/linux-s390x@0.19.10: + resolution: {integrity: sha512-pZFe0OeskMHzHa9U38g+z8Yx5FNCLFtUnJtQMpwhS+r4S566aK2ci3t4NCP4tjt6d5j5uo4h7tExZMjeKoehAA==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -933,8 +942,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.18.20: - resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} + /@esbuild/linux-x64@0.19.10: + resolution: {integrity: sha512-SpYNEqg/6pZYoc+1zLCjVOYvxfZVZj6w0KROZ3Fje/QrM3nfvT2llI+wmKSrWuX6wmZeTapbarvuNNK/qepSgA==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -951,8 +960,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.18.20: - resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} + /@esbuild/netbsd-x64@0.19.10: + resolution: {integrity: sha512-ACbZ0vXy9zksNArWlk2c38NdKg25+L9pr/mVaj9SUq6lHZu/35nx2xnQVRGLrC1KKQqJKRIB0q8GspiHI3J80Q==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -969,8 +978,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.18.20: - resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} + /@esbuild/openbsd-x64@0.19.10: + resolution: {integrity: sha512-PxcgvjdSjtgPMiPQrM3pwSaG4kGphP+bLSb+cihuP0LYdZv1epbAIecHVl5sD3npkfYBZ0ZnOjR878I7MdJDFg==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -987,8 +996,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.18.20: - resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} + /@esbuild/sunos-x64@0.19.10: + resolution: {integrity: sha512-ZkIOtrRL8SEJjr+VHjmW0znkPs+oJXhlJbNwfI37rvgeMtk3sxOQevXPXjmAPZPigVTncvFqLMd+uV0IBSEzqA==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -1005,8 +1014,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.18.20: - resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} + /@esbuild/win32-arm64@0.19.10: + resolution: {integrity: sha512-+Sa4oTDbpBfGpl3Hn3XiUe4f8TU2JF7aX8cOfqFYMMjXp6ma6NJDztl5FDG8Ezx0OjwGikIHw+iA54YLDNNVfw==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -1023,8 +1032,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.18.20: - resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} + /@esbuild/win32-ia32@0.19.10: + resolution: {integrity: sha512-EOGVLK1oWMBXgfttJdPHDTiivYSjX6jDNaATeNOaCOFEVcfMjtbx7WVQwPSE1eIfCp/CaSF2nSrDtzc4I9f8TQ==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -1041,8 +1050,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.18.20: - resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} + /@esbuild/win32-x64@0.19.10: + resolution: {integrity: sha512-whqLG6Sc70AbU73fFYvuYzaE4MNMBIlR1Y/IrUeOXFrWHxBEjjbZaQ3IXIQS8wJdAzue2GwYZCjOrgrU1oUHoA==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -1562,8 +1571,8 @@ packages: resolution: {integrity: sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==} dev: true - /@types/node@20.10.4: - resolution: {integrity: sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==} + /@types/node@20.10.5: + resolution: {integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==} dependencies: undici-types: 5.26.5 dev: true @@ -1584,7 +1593,7 @@ packages: resolution: {integrity: sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==} requiresBuild: true dependencies: - '@types/node': 20.10.4 + '@types/node': 20.10.5 dev: true optional: true @@ -1724,7 +1733,7 @@ packages: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 5.0.6(@types/node@20.10.4)(terser@5.22.0) + vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0) vue: link:packages/vue dev: true @@ -1742,7 +1751,7 @@ packages: magicast: 0.3.2 picocolors: 1.0.0 test-exclude: 6.0.0 - vitest: 1.0.4(@types/node@20.10.4)(jsdom@23.0.1)(terser@5.22.0) + vitest: 1.0.4(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) transitivePeerDependencies: - supports-color dev: true @@ -2789,34 +2798,35 @@ packages: import-meta-resolve: 3.0.0 dev: true - /esbuild@0.18.20: - resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} + /esbuild@0.19.10: + resolution: {integrity: sha512-S1Y27QGt/snkNYrRcswgRFqZjaTG5a5xM3EQo97uNBnH505pdzSNe/HLBq1v0RO7iK/ngdbhJB6mDAp0OK+iUA==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.18.20 - '@esbuild/android-arm64': 0.18.20 - '@esbuild/android-x64': 0.18.20 - '@esbuild/darwin-arm64': 0.18.20 - '@esbuild/darwin-x64': 0.18.20 - '@esbuild/freebsd-arm64': 0.18.20 - '@esbuild/freebsd-x64': 0.18.20 - '@esbuild/linux-arm': 0.18.20 - '@esbuild/linux-arm64': 0.18.20 - '@esbuild/linux-ia32': 0.18.20 - '@esbuild/linux-loong64': 0.18.20 - '@esbuild/linux-mips64el': 0.18.20 - '@esbuild/linux-ppc64': 0.18.20 - '@esbuild/linux-riscv64': 0.18.20 - '@esbuild/linux-s390x': 0.18.20 - '@esbuild/linux-x64': 0.18.20 - '@esbuild/netbsd-x64': 0.18.20 - '@esbuild/openbsd-x64': 0.18.20 - '@esbuild/sunos-x64': 0.18.20 - '@esbuild/win32-arm64': 0.18.20 - '@esbuild/win32-ia32': 0.18.20 - '@esbuild/win32-x64': 0.18.20 + '@esbuild/aix-ppc64': 0.19.10 + '@esbuild/android-arm': 0.19.10 + '@esbuild/android-arm64': 0.19.10 + '@esbuild/android-x64': 0.19.10 + '@esbuild/darwin-arm64': 0.19.10 + '@esbuild/darwin-x64': 0.19.10 + '@esbuild/freebsd-arm64': 0.19.10 + '@esbuild/freebsd-x64': 0.19.10 + '@esbuild/linux-arm': 0.19.10 + '@esbuild/linux-arm64': 0.19.10 + '@esbuild/linux-ia32': 0.19.10 + '@esbuild/linux-loong64': 0.19.10 + '@esbuild/linux-mips64el': 0.19.10 + '@esbuild/linux-ppc64': 0.19.10 + '@esbuild/linux-riscv64': 0.19.10 + '@esbuild/linux-s390x': 0.19.10 + '@esbuild/linux-x64': 0.19.10 + '@esbuild/netbsd-x64': 0.19.10 + '@esbuild/openbsd-x64': 0.19.10 + '@esbuild/sunos-x64': 0.19.10 + '@esbuild/win32-arm64': 0.19.10 + '@esbuild/win32-ia32': 0.19.10 + '@esbuild/win32-x64': 0.19.10 dev: true /esbuild@0.19.5: @@ -4187,8 +4197,8 @@ packages: resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==} dev: true - /marked@11.0.1: - resolution: {integrity: sha512-P4kDhFEMlvLePBPRwOcMOv6+lYUbhfbSxJFs3Jb4Qx7v6K7l+k8Dxh9CEGfRvK71tL+qIFz5y7Pe4uzt4+/A3A==} + /marked@11.1.0: + resolution: {integrity: sha512-fvKJWAPEafVj1dwGwcPI5mBB/0pvViL6NlCbNDG1HOIRwwAU/jeMoFxfbRLuirO1wRH7m4yPvBqD/O1wyWvayw==} engines: {node: '>= 18'} hasBin: true dev: true @@ -5821,12 +5831,12 @@ packages: typescript: 5.2.2 dev: true - /tsx@4.6.2: - resolution: {integrity: sha512-QPpBdJo+ZDtqZgAnq86iY/PD2KYCUPSUGIunHdGwyII99GKH+f3z3FZ8XNFLSGQIA4I365ui8wnQpl8OKLqcsg==} + /tsx@4.7.0: + resolution: {integrity: sha512-I+t79RYPlEYlHn9a+KzwrvEwhJg35h/1zHsLC2JXvhC2mdynMv6Zxzvhv5EMV6VF5qJlLlkSnMVvdZV3PSIGcg==} engines: {node: '>=18.0.0'} hasBin: true dependencies: - esbuild: 0.18.20 + esbuild: 0.19.10 get-tsconfig: 4.7.2 optionalDependencies: fsevents: 2.3.3 @@ -5999,7 +6009,7 @@ packages: engines: {node: '>= 0.8'} dev: true - /vite-node@1.0.4(@types/node@20.10.4)(terser@5.22.0): + /vite-node@1.0.4(@types/node@20.10.5)(terser@5.22.0): resolution: {integrity: sha512-9xQQtHdsz5Qn8hqbV7UKqkm8YkJhzT/zr41Dmt5N7AlD8hJXw/Z7y0QiD5I8lnTthV9Rvcvi0QW7PI0Fq83ZPg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -6008,7 +6018,7 @@ packages: debug: 4.3.4 pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.6(@types/node@20.10.4)(terser@5.22.0) + vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0) transitivePeerDependencies: - '@types/node' - less @@ -6020,7 +6030,7 @@ packages: - terser dev: true - /vite@5.0.6(@types/node@20.10.4)(terser@5.22.0): + /vite@5.0.6(@types/node@20.10.5)(terser@5.22.0): resolution: {integrity: sha512-MD3joyAEBtV7QZPl2JVVUai6zHms3YOmLR+BpMzLlX2Yzjfcc4gTgNi09d/Rua3F4EtC8zdwPU8eQYyib4vVMQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -6048,7 +6058,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.10.4 + '@types/node': 20.10.5 esbuild: 0.19.5 postcss: 8.4.32 rollup: 4.4.1 @@ -6057,7 +6067,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.0.4(@types/node@20.10.4)(jsdom@23.0.1)(terser@5.22.0): + /vitest@1.0.4(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0): resolution: {integrity: sha512-s1GQHp/UOeWEo4+aXDOeFBJwFzL6mjycbQwwKWX2QcYfh/7tIerS59hWQ20mxzupTJluA2SdwiBuWwQHH67ckg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -6082,7 +6092,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.10.4 + '@types/node': 20.10.5 '@vitest/expect': 1.0.4 '@vitest/runner': 1.0.4 '@vitest/snapshot': 1.0.4 @@ -6102,8 +6112,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.1 tinypool: 0.8.1 - vite: 5.0.6(@types/node@20.10.4)(terser@5.22.0) - vite-node: 1.0.4(@types/node@20.10.4)(terser@5.22.0) + vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0) + vite-node: 1.0.4(@types/node@20.10.5)(terser@5.22.0) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From e01bb5bdaf16d19b712d37d78d228d228bde795a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:38:35 +0800 Subject: [PATCH 12/35] chore(deps): update compiler to ^7.23.6 (#9858) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- packages/compiler-core/package.json | 4 +- packages/compiler-sfc/package.json | 4 +- packages/reactivity-transform/package.json | 6 +- packages/vue-compat/package.json | 2 +- pnpm-lock.yaml | 195 ++++++++++----------- 6 files changed, 98 insertions(+), 117 deletions(-) diff --git a/package.json b/package.json index 262c60e40..e6b8d3866 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,8 @@ "node": ">=18.12.0" }, "devDependencies": { - "@babel/parser": "^7.23.5", - "@babel/types": "^7.23.5", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", "@codspeed/vitest-plugin": "^2.3.1", "@rollup/plugin-alias": "^5.0.1", "@rollup/plugin-commonjs": "^25.0.7", diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json index 6d9df3f06..72125ff72 100644 --- a/packages/compiler-core/package.json +++ b/packages/compiler-core/package.json @@ -32,12 +32,12 @@ }, "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme", "dependencies": { - "@babel/parser": "^7.23.5", + "@babel/parser": "^7.23.6", "@vue/shared": "workspace:*", "estree-walker": "^2.0.2", "source-map-js": "^1.0.2" }, "devDependencies": { - "@babel/types": "^7.23.5" + "@babel/types": "^7.23.6" } } diff --git a/packages/compiler-sfc/package.json b/packages/compiler-sfc/package.json index f57831743..a85a6d6b3 100644 --- a/packages/compiler-sfc/package.json +++ b/packages/compiler-sfc/package.json @@ -32,7 +32,7 @@ }, "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme", "dependencies": { - "@babel/parser": "^7.23.5", + "@babel/parser": "^7.23.6", "@vue/compiler-core": "workspace:*", "@vue/compiler-dom": "workspace:*", "@vue/compiler-ssr": "workspace:*", @@ -44,7 +44,7 @@ "source-map-js": "^1.0.2" }, "devDependencies": { - "@babel/types": "^7.23.5", + "@babel/types": "^7.23.6", "@vue/consolidate": "^0.17.3", "hash-sum": "^2.0.0", "lru-cache": "^10.1.0", diff --git a/packages/reactivity-transform/package.json b/packages/reactivity-transform/package.json index 2b6840556..d6d14130d 100644 --- a/packages/reactivity-transform/package.json +++ b/packages/reactivity-transform/package.json @@ -28,14 +28,14 @@ }, "homepage": "https://github.com/vuejs/core/tree/dev/packages/reactivity-transform#readme", "dependencies": { - "@babel/parser": "^7.23.5", + "@babel/parser": "^7.23.6", "@vue/compiler-core": "workspace:*", "@vue/shared": "workspace:*", "estree-walker": "^2.0.2", "magic-string": "^0.30.5" }, "devDependencies": { - "@babel/core": "^7.23.5", - "@babel/types": "^7.23.5" + "@babel/core": "^7.23.6", + "@babel/types": "^7.23.6" } } diff --git a/packages/vue-compat/package.json b/packages/vue-compat/package.json index a00acf24a..7a5aa3b3e 100644 --- a/packages/vue-compat/package.json +++ b/packages/vue-compat/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/vuejs/core/tree/main/packages/vue-compat#readme", "dependencies": { - "@babel/parser": "^7.23.5", + "@babel/parser": "^7.23.6", "estree-walker": "^2.0.2", "source-map-js": "^1.0.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 07b06d27a..17678e0c7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,11 +9,11 @@ importers: .: devDependencies: '@babel/parser': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 '@babel/types': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 '@codspeed/vitest-plugin': specifier: ^2.3.1 version: 2.3.1(vite@5.0.6)(vitest@1.0.4) @@ -162,8 +162,8 @@ importers: packages/compiler-core: dependencies: '@babel/parser': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 '@vue/shared': specifier: workspace:* version: link:../shared @@ -175,8 +175,8 @@ importers: version: 1.0.2 devDependencies: '@babel/types': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 packages/compiler-dom: dependencies: @@ -190,8 +190,8 @@ importers: packages/compiler-sfc: dependencies: '@babel/parser': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 '@vue/compiler-core': specifier: workspace:* version: link:../compiler-core @@ -221,8 +221,8 @@ importers: version: 1.0.2 devDependencies: '@babel/types': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 '@vue/consolidate': specifier: ^0.17.3 version: 0.17.3 @@ -290,8 +290,8 @@ importers: packages/reactivity-transform: dependencies: '@babel/parser': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 '@vue/compiler-core': specifier: workspace:* version: link:../compiler-core @@ -306,11 +306,11 @@ importers: version: 0.30.5 devDependencies: '@babel/core': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 '@babel/types': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 packages/runtime-core: dependencies: @@ -411,8 +411,8 @@ importers: packages/vue-compat: dependencies: '@babel/parser': - specifier: ^7.23.5 - version: 7.23.5 + specifier: ^7.23.6 + version: 7.23.6 estree-walker: specifier: ^2.0.2 version: 2.0.2 @@ -438,15 +438,6 @@ packages: '@jridgewell/trace-mapping': 0.3.20 dev: true - /@babel/code-frame@7.22.13: - resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} - engines: {node: '>=6.9.0'} - requiresBuild: true - dependencies: - '@babel/highlight': 7.22.20 - chalk: 2.4.2 - dev: true - /@babel/code-frame@7.23.5: resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==} engines: {node: '>=6.9.0'} @@ -455,25 +446,25 @@ packages: chalk: 2.4.2 dev: true - /@babel/compat-data@7.23.2: - resolution: {integrity: sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==} + /@babel/compat-data@7.23.5: + resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==} engines: {node: '>=6.9.0'} dev: true - /@babel/core@7.23.5: - resolution: {integrity: sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==} + /@babel/core@7.23.6: + resolution: {integrity: sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 '@babel/code-frame': 7.23.5 - '@babel/generator': 7.23.5 - '@babel/helper-compilation-targets': 7.22.15 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.5) - '@babel/helpers': 7.23.5 - '@babel/parser': 7.23.5 + '@babel/generator': 7.23.6 + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6) + '@babel/helpers': 7.23.6 + '@babel/parser': 7.23.6 '@babel/template': 7.22.15 - '@babel/traverse': 7.23.5 - '@babel/types': 7.23.5 + '@babel/traverse': 7.23.6 + '@babel/types': 7.23.6 convert-source-map: 2.0.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -483,23 +474,23 @@ packages: - supports-color dev: true - /@babel/generator@7.23.5: - resolution: {integrity: sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==} + /@babel/generator@7.23.6: + resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.5 + '@babel/types': 7.23.6 '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.20 jsesc: 2.5.2 dev: true - /@babel/helper-compilation-targets@7.22.15: - resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==} + /@babel/helper-compilation-targets@7.23.6: + resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/compat-data': 7.23.2 - '@babel/helper-validator-option': 7.22.15 - browserslist: 4.22.1 + '@babel/compat-data': 7.23.5 + '@babel/helper-validator-option': 7.23.5 + browserslist: 4.22.2 lru-cache: 5.1.1 semver: 6.3.1 dev: true @@ -514,30 +505,30 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.15 - '@babel/types': 7.23.5 + '@babel/types': 7.23.6 dev: true /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.5 + '@babel/types': 7.23.6 dev: true /@babel/helper-module-imports@7.22.15: resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.5 + '@babel/types': 7.23.6 dev: true - /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.5): + /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.5 + '@babel/core': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-module-imports': 7.22.15 '@babel/helper-simple-access': 7.22.5 @@ -549,14 +540,14 @@ packages: resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.5 + '@babel/types': 7.23.6 dev: true /@babel/helper-split-export-declaration@7.22.6: resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.5 + '@babel/types': 7.23.6 dev: true /@babel/helper-string-parser@7.23.4: @@ -568,32 +559,22 @@ packages: engines: {node: '>=6.9.0'} requiresBuild: true - /@babel/helper-validator-option@7.22.15: - resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==} + /@babel/helper-validator-option@7.23.5: + resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==} engines: {node: '>=6.9.0'} dev: true - /@babel/helpers@7.23.5: - resolution: {integrity: sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==} + /@babel/helpers@7.23.6: + resolution: {integrity: sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.15 - '@babel/traverse': 7.23.5 - '@babel/types': 7.23.5 + '@babel/traverse': 7.23.6 + '@babel/types': 7.23.6 transitivePeerDependencies: - supports-color dev: true - /@babel/highlight@7.22.20: - resolution: {integrity: sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==} - engines: {node: '>=6.9.0'} - requiresBuild: true - dependencies: - '@babel/helper-validator-identifier': 7.22.20 - chalk: 2.4.2 - js-tokens: 4.0.0 - dev: true - /@babel/highlight@7.23.4: resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==} engines: {node: '>=6.9.0'} @@ -603,42 +584,42 @@ packages: js-tokens: 4.0.0 dev: true - /@babel/parser@7.23.5: - resolution: {integrity: sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==} + /@babel/parser@7.23.6: + resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.23.5 + '@babel/types': 7.23.6 /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.23.5 - '@babel/parser': 7.23.5 - '@babel/types': 7.23.5 + '@babel/parser': 7.23.6 + '@babel/types': 7.23.6 dev: true - /@babel/traverse@7.23.5: - resolution: {integrity: sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==} + /@babel/traverse@7.23.6: + resolution: {integrity: sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.23.5 - '@babel/generator': 7.23.5 + '@babel/generator': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.23.5 - '@babel/types': 7.23.5 + '@babel/parser': 7.23.6 + '@babel/types': 7.23.6 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color dev: true - /@babel/types@7.23.5: - resolution: {integrity: sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==} + /@babel/types@7.23.6: + resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.23.4 @@ -2016,7 +1997,7 @@ packages: resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==} engines: {node: '>= 10.0.0'} dependencies: - '@babel/types': 7.23.5 + '@babel/types': 7.23.6 dev: true /balanced-match@1.0.2: @@ -2071,15 +2052,15 @@ packages: fill-range: 7.0.1 dev: true - /browserslist@4.22.1: - resolution: {integrity: sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==} + /browserslist@4.22.2: + resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001551 - electron-to-chromium: 1.4.561 - node-releases: 2.0.13 - update-browserslist-db: 1.0.13(browserslist@4.22.1) + caniuse-lite: 1.0.30001570 + electron-to-chromium: 1.4.614 + node-releases: 2.0.14 + update-browserslist-db: 1.0.13(browserslist@4.22.2) dev: true /buffer-crc32@0.2.13: @@ -2130,8 +2111,8 @@ packages: engines: {node: '>=14.16'} dev: true - /caniuse-lite@1.0.30001551: - resolution: {integrity: sha512-vtBAez47BoGMMzlbYhfXrMV1kvRF2WP/lqiMuDu1Sb4EE4LKEgjopFDSRtZfdVnslNRpOqV/woE+Xgrwj6VQlg==} + /caniuse-lite@1.0.30001570: + resolution: {integrity: sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==} dev: true /chai@4.3.10: @@ -2337,8 +2318,8 @@ packages: /constantinople@4.0.1: resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==} dependencies: - '@babel/parser': 7.23.5 - '@babel/types': 7.23.5 + '@babel/parser': 7.23.6 + '@babel/types': 7.23.6 dev: true /content-disposition@0.5.2: @@ -2680,8 +2661,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: true - /electron-to-chromium@1.4.561: - resolution: {integrity: sha512-eS5t4ulWOBfVHdq9SW2dxEaFarj1lPjvJ8PaYMOjY0DecBaj/t4ARziL2IPpDr4atyWwjLFGQ2vo/VCgQFezVQ==} + /electron-to-chromium@1.4.614: + resolution: {integrity: sha512-X4ze/9Sc3QWs6h92yerwqv7aB/uU8vCjZcrMjA8N9R1pjMFRe44dLsck5FzLilOYvcXuDn93B+bpGYyufc70gQ==} dev: true /emoji-regex@10.3.0: @@ -3844,8 +3825,8 @@ packages: resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==} engines: {node: '>=10'} dependencies: - '@babel/core': 7.23.5 - '@babel/parser': 7.23.5 + '@babel/core': 7.23.6 + '@babel/parser': 7.23.6 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 7.5.4 @@ -4181,8 +4162,8 @@ packages: /magicast@0.3.2: resolution: {integrity: sha512-Fjwkl6a0syt9TFN0JSYpOybxiMCkYNEeOTnOTNRbjphirLakznZXAqrXgj/7GG3D1dvETONNwrBfinvAbpunDg==} dependencies: - '@babel/parser': 7.23.5 - '@babel/types': 7.23.5 + '@babel/parser': 7.23.6 + '@babel/types': 7.23.6 source-map-js: 1.0.2 dev: true @@ -4372,8 +4353,8 @@ packages: hasBin: true dev: true - /node-releases@2.0.13: - resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} + /node-releases@2.0.14: + resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} dev: true /normalize-package-data@2.5.0: @@ -4588,7 +4569,7 @@ packages: resolution: {integrity: sha512-ihtdrgbqdONYD156Ap6qTcaGcGdkdAxodO1wLqQ/j7HP1u2sFYppINiq4jyC8F+Nm+4fVufylCV00QmkTHkSUg==} engines: {node: '>=16'} dependencies: - '@babel/code-frame': 7.22.13 + '@babel/code-frame': 7.23.5 error-ex: 1.3.2 json-parse-even-better-errors: 3.0.0 lines-and-columns: 2.0.3 @@ -5959,13 +5940,13 @@ packages: engines: {node: '>= 4.0.0'} dev: true - /update-browserslist-db@1.0.13(browserslist@4.22.1): + /update-browserslist-db@1.0.13(browserslist@4.22.2): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.22.1 + browserslist: 4.22.2 escalade: 3.1.1 picocolors: 1.0.0 dev: true @@ -6229,8 +6210,8 @@ packages: resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==} engines: {node: '>= 10.0.0'} dependencies: - '@babel/parser': 7.23.5 - '@babel/types': 7.23.5 + '@babel/parser': 7.23.6 + '@babel/types': 7.23.6 assert-never: 1.2.1 babel-walk: 3.0.0-canary-5 dev: true From e585b0db43150c8b8b3d78f71e12efccc018a38d Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 20 Dec 2023 10:48:01 +0800 Subject: [PATCH 13/35] fix(ssr): avoid hydration mismatch warning for classes with different order --- .../runtime-core/__tests__/hydration.spec.ts | 8 +++++++ packages/runtime-core/src/hydration.ts | 24 ++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/packages/runtime-core/__tests__/hydration.spec.ts b/packages/runtime-core/__tests__/hydration.spec.ts index fa069b925..6bbe41182 100644 --- a/packages/runtime-core/__tests__/hydration.spec.ts +++ b/packages/runtime-core/__tests__/hydration.spec.ts @@ -1406,6 +1406,14 @@ describe('SSR hydration', () => { mountWithHydration(`
`, () => h('div', { class: 'foo bar' }) ) + // SVG classes + mountWithHydration(``, () => + h('svg', { class: 'foo bar' }) + ) + // class with different order + mountWithHydration(`
`, () => + h('div', { class: 'bar foo' }) + ) expect(`Hydration class mismatch`).not.toHaveBeenWarned() mountWithHydration(`
`, () => h('div', { class: 'foo' }) diff --git a/packages/runtime-core/src/hydration.ts b/packages/runtime-core/src/hydration.ts index 57ced5118..d42a9952f 100644 --- a/packages/runtime-core/src/hydration.ts +++ b/packages/runtime-core/src/hydration.ts @@ -718,9 +718,11 @@ function propHasMismatch(el: Element, key: string, clientValue: any): boolean { let actual: any let expected: any if (key === 'class') { - actual = el.getAttribute('class') - expected = normalizeClass(clientValue) - if (actual !== expected) { + // classes might be in different order, but that doesn't affect cascade + // so we just need to check if the class lists contain the same classes. + actual = toClassSet(el.getAttribute('class') || '') + expected = toClassSet(normalizeClass(clientValue)) + if (!isSetEqual(actual, expected)) { mismatchType = mismatchKey = `class` } } else if (key === 'style') { @@ -765,3 +767,19 @@ function propHasMismatch(el: Element, key: string, clientValue: any): boolean { } return false } + +function toClassSet(str: string): Set { + return new Set(str.trim().split(/\s+/)) +} + +function isSetEqual(a: Set, b: Set): boolean { + if (a.size !== b.size) { + return false + } + for (const s of a) { + if (!b.has(s)) { + return false + } + } + return true +} From 9fa82414eba9748313d2ef28c939224b8929f046 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 10:52:16 +0800 Subject: [PATCH 14/35] chore(deps): update test (#9859) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 6 ++-- pnpm-lock.yaml | 95 ++++++++++++++++++++++++++++---------------------- 2 files changed, 57 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index e6b8d3866..aec8dde10 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@types/hash-sum": "^1.0.2", "@types/node": "^20.10.5", "@typescript-eslint/parser": "^6.13.2", - "@vitest/coverage-istanbul": "^1.0.4", + "@vitest/coverage-istanbul": "^1.1.0", "@vue/consolidate": "0.17.3", "conventional-changelog-cli": "^4.1.0", "enquirer": "^2.4.1", @@ -93,7 +93,7 @@ "prettier": "^3.1.1", "pretty-bytes": "^6.1.1", "pug": "^3.0.2", - "puppeteer": "~21.6.0", + "puppeteer": "~21.6.1", "rimraf": "^5.0.5", "rollup": "^4.1.4", "rollup-plugin-dts": "^6.1.0", @@ -108,6 +108,6 @@ "tsx": "^4.7.0", "typescript": "^5.2.2", "vite": "^5.0.5", - "vitest": "^1.0.4" + "vitest": "^1.1.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 17678e0c7..dd8b433b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: version: 7.23.6 '@codspeed/vitest-plugin': specifier: ^2.3.1 - version: 2.3.1(vite@5.0.6)(vitest@1.0.4) + version: 2.3.1(vite@5.0.6)(vitest@1.1.0) '@rollup/plugin-alias': specifier: ^5.0.1 version: 5.0.1(rollup@4.1.4) @@ -45,8 +45,8 @@ importers: specifier: ^6.13.2 version: 6.13.2(eslint@8.55.0)(typescript@5.2.2) '@vitest/coverage-istanbul': - specifier: ^1.0.4 - version: 1.0.4(vitest@1.0.4) + specifier: ^1.1.0 + version: 1.1.0(vitest@1.1.0) '@vue/consolidate': specifier: 0.17.3 version: 0.17.3 @@ -111,8 +111,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 puppeteer: - specifier: ~21.6.0 - version: 21.6.0(typescript@5.2.2) + specifier: ~21.6.1 + version: 21.6.1(typescript@5.2.2) rimraf: specifier: ^5.0.5 version: 5.0.5 @@ -156,8 +156,8 @@ importers: specifier: ^5.0.5 version: 5.0.6(@types/node@20.10.5)(terser@5.22.0) vitest: - specifier: ^1.0.4 - version: 1.0.4(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) + specifier: ^1.1.0 + version: 1.1.0(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) packages/compiler-core: dependencies: @@ -633,7 +633,7 @@ packages: node-gyp-build: 4.7.1 dev: true - /@codspeed/vitest-plugin@2.3.1(vite@5.0.6)(vitest@1.0.4): + /@codspeed/vitest-plugin@2.3.1(vite@5.0.6)(vitest@1.1.0): resolution: {integrity: sha512-/e4G2B/onX/hG/EjUU/NpDxnIryeTDamVRTBeWfgQDoex3g7GDzTwoQktaU5l/Asw3ZjEErQg+oQVToQ6jYZlA==} peerDependencies: vite: ^4.2.0 || ^5.0.0 @@ -641,7 +641,7 @@ packages: dependencies: '@codspeed/core': 2.3.1 vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0) - vitest: 1.0.4(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) + vitest: 1.1.0(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) dev: true /@esbuild/aix-ppc64@0.19.10: @@ -1718,8 +1718,8 @@ packages: vue: link:packages/vue dev: true - /@vitest/coverage-istanbul@1.0.4(vitest@1.0.4): - resolution: {integrity: sha512-6qoSzTR+sanwY/dREqu6OFJupo/mHzCcboh03rLwqH2V2B39505lDr9FpqaLwU1vQgeUKNA+CdHPkpNpusxkDw==} + /@vitest/coverage-istanbul@1.1.0(vitest@1.1.0): + resolution: {integrity: sha512-sjHGQQu7lkJUYSBMOR3f9AyOlK1LBVr0v7LMar/4i167ltabRWlQ2STBDM4P6Wl659NAcHlZ/RXxrAgJPavDMA==} peerDependencies: vitest: ^1.0.0 dependencies: @@ -1732,43 +1732,43 @@ packages: magicast: 0.3.2 picocolors: 1.0.0 test-exclude: 6.0.0 - vitest: 1.0.4(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) + vitest: 1.1.0(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0) transitivePeerDependencies: - supports-color dev: true - /@vitest/expect@1.0.4: - resolution: {integrity: sha512-/NRN9N88qjg3dkhmFcCBwhn/Ie4h064pY3iv7WLRsDJW7dXnEgeoa8W9zy7gIPluhz6CkgqiB3HmpIXgmEY5dQ==} + /@vitest/expect@1.1.0: + resolution: {integrity: sha512-9IE2WWkcJo2BR9eqtY5MIo3TPmS50Pnwpm66A6neb2hvk/QSLfPXBz2qdiwUOQkwyFuuXEUj5380CbwfzW4+/w==} dependencies: - '@vitest/spy': 1.0.4 - '@vitest/utils': 1.0.4 + '@vitest/spy': 1.1.0 + '@vitest/utils': 1.1.0 chai: 4.3.10 dev: true - /@vitest/runner@1.0.4: - resolution: {integrity: sha512-rhOQ9FZTEkV41JWXozFM8YgOqaG9zA7QXbhg5gy6mFOVqh4PcupirIJ+wN7QjeJt8S8nJRYuZH1OjJjsbxAXTQ==} + /@vitest/runner@1.1.0: + resolution: {integrity: sha512-zdNLJ00pm5z/uhbWF6aeIJCGMSyTyWImy3Fcp9piRGvueERFlQFbUwCpzVce79OLm2UHk9iwaMSOaU9jVHgNVw==} dependencies: - '@vitest/utils': 1.0.4 + '@vitest/utils': 1.1.0 p-limit: 5.0.0 pathe: 1.1.1 dev: true - /@vitest/snapshot@1.0.4: - resolution: {integrity: sha512-vkfXUrNyNRA/Gzsp2lpyJxh94vU2OHT1amoD6WuvUAA12n32xeVZQ0KjjQIf8F6u7bcq2A2k969fMVxEsxeKYA==} + /@vitest/snapshot@1.1.0: + resolution: {integrity: sha512-5O/wyZg09V5qmNmAlUgCBqflvn2ylgsWJRRuPrnHEfDNT6tQpQ8O1isNGgo+VxofISHqz961SG3iVvt3SPK/QQ==} dependencies: magic-string: 0.30.5 pathe: 1.1.1 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.0.4: - resolution: {integrity: sha512-9ojTFRL1AJVh0hvfzAQpm0QS6xIS+1HFIw94kl/1ucTfGCaj1LV/iuJU4Y6cdR03EzPDygxTHwE1JOm+5RCcvA==} + /@vitest/spy@1.1.0: + resolution: {integrity: sha512-sNOVSU/GE+7+P76qYo+VXdXhXffzWZcYIPQfmkiRxaNCSPiLANvQx5Mx6ZURJ/ndtEkUJEpvKLXqAYTKEY+lTg==} dependencies: tinyspy: 2.2.0 dev: true - /@vitest/utils@1.0.4: - resolution: {integrity: sha512-gsswWDXxtt0QvtK/y/LWukN7sGMYmnCcv1qv05CsY6cU/Y1zpGX1QuvLs+GO1inczpE6Owixeel3ShkjhYtGfA==} + /@vitest/utils@1.1.0: + resolution: {integrity: sha512-z+s510fKmYz4Y41XhNs3vcuFTFhcij2YF7F8VQfMEYAAUfqQh0Zfg7+w9xdgFGhPf3tX3TicAe+8BDITk6ampQ==} dependencies: diff-sequences: 29.6.3 loupe: 2.3.7 @@ -4937,8 +4937,8 @@ packages: engines: {node: '>=6'} dev: true - /puppeteer-core@21.6.0: - resolution: {integrity: sha512-1vrzbp2E1JpBwtIIrriWkN+A0afUxkqRuFTC3uASc5ql6iuK9ppOdIU/CPGKwOyB4YFIQ16mRbK0PK19mbXnaQ==} + /puppeteer-core@21.6.1: + resolution: {integrity: sha512-0chaaK/RL9S1U3bsyR4fUeUfoj51vNnjWvXgG6DcsyMjwYNpLcAThv187i1rZCo7QhJP0wZN8plQkjNyrq2h+A==} engines: {node: '>=16.13.2'} dependencies: '@puppeteer/browsers': 1.9.0 @@ -4946,7 +4946,7 @@ packages: cross-fetch: 4.0.0 debug: 4.3.4 devtools-protocol: 0.0.1203626 - ws: 8.14.2 + ws: 8.15.1 transitivePeerDependencies: - bufferutil - encoding @@ -4954,15 +4954,15 @@ packages: - utf-8-validate dev: true - /puppeteer@21.6.0(typescript@5.2.2): - resolution: {integrity: sha512-u6JhSF7xaPYZ2gd3tvhYI8MwVAjLc3Cazj7UWvMV95A07/y7cIjBwYUiMU9/jm4z0FSUORriLX/RZRaiASNWPw==} + /puppeteer@21.6.1(typescript@5.2.2): + resolution: {integrity: sha512-O+pbc61oj8ln6m8EJKncrsQFmytgRyFYERtk190PeLbJn5JKpmmynn2p1PiFrlhCitAQXLJ0MOy7F0TeyCRqBg==} engines: {node: '>=16.13.2'} hasBin: true requiresBuild: true dependencies: '@puppeteer/browsers': 1.9.0 cosmiconfig: 8.3.6(typescript@5.2.2) - puppeteer-core: 21.6.0 + puppeteer-core: 21.6.1 transitivePeerDependencies: - bufferutil - encoding @@ -5990,8 +5990,8 @@ packages: engines: {node: '>= 0.8'} dev: true - /vite-node@1.0.4(@types/node@20.10.5)(terser@5.22.0): - resolution: {integrity: sha512-9xQQtHdsz5Qn8hqbV7UKqkm8YkJhzT/zr41Dmt5N7AlD8hJXw/Z7y0QiD5I8lnTthV9Rvcvi0QW7PI0Fq83ZPg==} + /vite-node@1.1.0(@types/node@20.10.5)(terser@5.22.0): + resolution: {integrity: sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -6048,8 +6048,8 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.0.4(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0): - resolution: {integrity: sha512-s1GQHp/UOeWEo4+aXDOeFBJwFzL6mjycbQwwKWX2QcYfh/7tIerS59hWQ20mxzupTJluA2SdwiBuWwQHH67ckg==} + /vitest@1.1.0(@types/node@20.10.5)(jsdom@23.0.1)(terser@5.22.0): + resolution: {integrity: sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -6074,11 +6074,11 @@ packages: optional: true dependencies: '@types/node': 20.10.5 - '@vitest/expect': 1.0.4 - '@vitest/runner': 1.0.4 - '@vitest/snapshot': 1.0.4 - '@vitest/spy': 1.0.4 - '@vitest/utils': 1.0.4 + '@vitest/expect': 1.1.0 + '@vitest/runner': 1.1.0 + '@vitest/snapshot': 1.1.0 + '@vitest/spy': 1.1.0 + '@vitest/utils': 1.1.0 acorn-walk: 8.3.0 cac: 6.7.14 chai: 4.3.10 @@ -6094,7 +6094,7 @@ packages: tinybench: 2.5.1 tinypool: 0.8.1 vite: 5.0.6(@types/node@20.10.5)(terser@5.22.0) - vite-node: 1.0.4(@types/node@20.10.5)(terser@5.22.0) + vite-node: 1.1.0(@types/node@20.10.5)(terser@5.22.0) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -6264,6 +6264,19 @@ packages: optional: true dev: true + /ws@8.15.1: + resolution: {integrity: sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + dev: true + /xml-name-validator@5.0.0: resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==} engines: {node: '>=18'} From eb6f1e10d8e411ac20b83ff9edfe8a0d407846ed Mon Sep 17 00:00:00 2001 From: Dan Rose Date: Fri, 22 Dec 2023 07:51:32 -0600 Subject: [PATCH 15/35] chore: correct `@antfu/ni` package name in contributing guide (#9892) [ci skip] --- .github/contributing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/contributing.md b/.github/contributing.md index afdae6711..5e386fec2 100644 --- a/.github/contributing.md +++ b/.github/contributing.md @@ -63,7 +63,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before You will need [Node.js](https://nodejs.org) **version 18.12+**, and [PNPM](https://pnpm.io) **version 8+**. -We also recommend installing [ni](https://github.com/antfu/ni) to help switching between repos using different package managers. `ni` also provides the handy `nr` command which running npm scripts easier. +We also recommend installing [@antfu/ni](https://github.com/antfu/ni) to help switching between repos using different package managers. `ni` also provides the handy `nr` command which running npm scripts easier. After cloning the repo, run: @@ -90,7 +90,7 @@ The project uses [simple-git-hooks](https://github.com/toplenboren/simple-git-ho ## Scripts -**The examples below will be using the `nr` command from the [ni](https://github.com/antfu/ni) package.** You can also use plain `npm run`, but you will need to pass all additional arguments after the command after an extra `--`. For example, `nr build runtime --all` is equivalent to `npm run build -- runtime --all`. +**The examples below will be using the `nr` command from the [@antfu/ni](https://github.com/antfu/ni) package.** You can also use plain `npm run`, but you will need to pass all additional arguments after the command after an extra `--`. For example, `nr build runtime --all` is equivalent to `npm run build -- runtime --all`. The `run-s` and `run-p` commands found in some scripts are from [npm-run-all](https://github.com/mysticatea/npm-run-all) for orchestrating multiple scripts. `run-s` means "run in sequence" while `run-p` means "run in parallel". From a03514e994049714fcf9190763b54a47b83466a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:51:56 +0800 Subject: [PATCH 16/35] chore(deps): update lint (#9860) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +-- pnpm-lock.yaml | 78 +++++++++++++++++++++++++------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index aec8dde10..fa0b4dffd 100644 --- a/package.json +++ b/package.json @@ -70,14 +70,14 @@ "@rollup/plugin-terser": "^0.4.4", "@types/hash-sum": "^1.0.2", "@types/node": "^20.10.5", - "@typescript-eslint/parser": "^6.13.2", + "@typescript-eslint/parser": "^6.15.0", "@vitest/coverage-istanbul": "^1.1.0", "@vue/consolidate": "0.17.3", "conventional-changelog-cli": "^4.1.0", "enquirer": "^2.4.1", "esbuild": "^0.19.5", "esbuild-plugin-polyfill-node": "^0.3.0", - "eslint": "^8.55.0", + "eslint": "^8.56.0", "eslint-plugin-jest": "^27.6.0", "estree-walker": "^2.0.2", "execa": "^8.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd8b433b0..60a01d982 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,8 +42,8 @@ importers: specifier: ^20.10.5 version: 20.10.5 '@typescript-eslint/parser': - specifier: ^6.13.2 - version: 6.13.2(eslint@8.55.0)(typescript@5.2.2) + specifier: ^6.15.0 + version: 6.15.0(eslint@8.56.0)(typescript@5.2.2) '@vitest/coverage-istanbul': specifier: ^1.1.0 version: 1.1.0(vitest@1.1.0) @@ -63,11 +63,11 @@ importers: specifier: ^0.3.0 version: 0.3.0(esbuild@0.19.5) eslint: - specifier: ^8.55.0 - version: 8.55.0 + specifier: ^8.56.0 + version: 8.56.0 eslint-plugin-jest: specifier: ^27.6.0 - version: 27.6.0(eslint@8.55.0)(typescript@5.2.2) + version: 27.6.0(eslint@8.56.0)(typescript@5.2.2) estree-walker: specifier: ^2.0.2 version: 2.0.2 @@ -1049,13 +1049,13 @@ packages: dev: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.55.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.55.0 + eslint: 8.56.0 eslint-visitor-keys: 3.4.3 dev: true @@ -1081,8 +1081,8 @@ packages: - supports-color dev: true - /@eslint/js@8.55.0: - resolution: {integrity: sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==} + /@eslint/js@8.56.0: + resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -1578,8 +1578,8 @@ packages: dev: true optional: true - /@typescript-eslint/parser@6.13.2(eslint@8.55.0)(typescript@5.2.2): - resolution: {integrity: sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==} + /@typescript-eslint/parser@6.15.0(eslint@8.56.0)(typescript@5.2.2): + resolution: {integrity: sha512-MkgKNnsjC6QwcMdlNAel24jjkEO/0hQaMDLqP4S9zq5HBAUJNQB6y+3DwLjX7b3l2b37eNAxMPLwb3/kh8VKdA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -1588,12 +1588,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 6.13.2 - '@typescript-eslint/types': 6.13.2 - '@typescript-eslint/typescript-estree': 6.13.2(typescript@5.2.2) - '@typescript-eslint/visitor-keys': 6.13.2 + '@typescript-eslint/scope-manager': 6.15.0 + '@typescript-eslint/types': 6.15.0 + '@typescript-eslint/typescript-estree': 6.15.0(typescript@5.2.2) + '@typescript-eslint/visitor-keys': 6.15.0 debug: 4.3.4 - eslint: 8.55.0 + eslint: 8.56.0 typescript: 5.2.2 transitivePeerDependencies: - supports-color @@ -1607,12 +1607,12 @@ packages: '@typescript-eslint/visitor-keys': 5.62.0 dev: true - /@typescript-eslint/scope-manager@6.13.2: - resolution: {integrity: sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==} + /@typescript-eslint/scope-manager@6.15.0: + resolution: {integrity: sha512-+BdvxYBltqrmgCNu4Li+fGDIkW9n//NrruzG9X1vBzaNK+ExVXPoGB71kneaVw/Jp+4rH/vaMAGC6JfMbHstVg==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.13.2 - '@typescript-eslint/visitor-keys': 6.13.2 + '@typescript-eslint/types': 6.15.0 + '@typescript-eslint/visitor-keys': 6.15.0 dev: true /@typescript-eslint/types@5.62.0: @@ -1620,8 +1620,8 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/types@6.13.2: - resolution: {integrity: sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==} + /@typescript-eslint/types@6.15.0: + resolution: {integrity: sha512-yXjbt//E4T/ee8Ia1b5mGlbNj9fB9lJP4jqLbZualwpP2BCQ5is6BcWwxpIsY4XKAhmdv3hrW92GdtJbatC6dQ==} engines: {node: ^16.0.0 || >=18.0.0} dev: true @@ -1646,8 +1646,8 @@ packages: - supports-color dev: true - /@typescript-eslint/typescript-estree@6.13.2(typescript@5.2.2): - resolution: {integrity: sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==} + /@typescript-eslint/typescript-estree@6.15.0(typescript@5.2.2): + resolution: {integrity: sha512-7mVZJN7Hd15OmGuWrp2T9UvqR2Ecg+1j/Bp1jXUEY2GZKV6FXlOIoqVDmLpBiEiq3katvj/2n2mR0SDwtloCew==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: typescript: '*' @@ -1655,8 +1655,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 6.13.2 - '@typescript-eslint/visitor-keys': 6.13.2 + '@typescript-eslint/types': 6.15.0 + '@typescript-eslint/visitor-keys': 6.15.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -1667,19 +1667,19 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.55.0)(typescript@5.2.2): + /@typescript-eslint/utils@5.62.0(eslint@8.56.0)(typescript@5.2.2): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.55.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@types/json-schema': 7.0.14 '@types/semver': 7.5.5 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) - eslint: 8.55.0 + eslint: 8.56.0 eslint-scope: 5.1.1 semver: 7.5.4 transitivePeerDependencies: @@ -1695,11 +1695,11 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@typescript-eslint/visitor-keys@6.13.2: - resolution: {integrity: sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==} + /@typescript-eslint/visitor-keys@6.15.0: + resolution: {integrity: sha512-1zvtdC1a9h5Tb5jU9x3ADNXO9yjP8rXlaoChu0DQX40vf5ACVpYIVIZhIMZ6d5sDXH7vq4dsZBT1fEGj8D2n2w==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.13.2 + '@typescript-eslint/types': 6.15.0 eslint-visitor-keys: 3.4.3 dev: true @@ -2867,7 +2867,7 @@ packages: source-map: 0.6.1 dev: true - /eslint-plugin-jest@27.6.0(eslint@8.55.0)(typescript@5.2.2): + /eslint-plugin-jest@27.6.0(eslint@8.56.0)(typescript@5.2.2): resolution: {integrity: sha512-MTlusnnDMChbElsszJvrwD1dN3x6nZl//s4JD23BxB6MgR66TZlL064su24xEIS3VACfAoHV1vgyMgPw8nkdng==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -2880,8 +2880,8 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@5.2.2) - eslint: 8.55.0 + '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.2.2) + eslint: 8.56.0 transitivePeerDependencies: - supports-color - typescript @@ -2908,15 +2908,15 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.55.0: - resolution: {integrity: sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==} + /eslint@8.56.0: + resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.55.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@eslint-community/regexpp': 4.9.1 '@eslint/eslintrc': 2.1.4 - '@eslint/js': 8.55.0 + '@eslint/js': 8.56.0 '@humanwhocodes/config-array': 0.11.13 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 From e7135f7100fd3c1fa902f4bc5a48fd7da6654122 Mon Sep 17 00:00:00 2001 From: agoni1212 <22545824+agoni1212@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:55:11 +0800 Subject: [PATCH 17/35] chore: fix mismatching tag in hydration test (#9888) --- packages/runtime-core/__tests__/hydration.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/runtime-core/__tests__/hydration.spec.ts b/packages/runtime-core/__tests__/hydration.spec.ts index 6bbe41182..07f19527c 100644 --- a/packages/runtime-core/__tests__/hydration.spec.ts +++ b/packages/runtime-core/__tests__/hydration.spec.ts @@ -1411,7 +1411,7 @@ describe('SSR hydration', () => { h('svg', { class: 'foo bar' }) ) // class with different order - mountWithHydration(`
`, () => + mountWithHydration(`
`, () => h('div', { class: 'bar foo' }) ) expect(`Hydration class mismatch`).not.toHaveBeenWarned() From 1b522cae077265363a35d34fd0642678b7f57f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=B6=E8=BF=9C=E6=96=B9?= Date: Fri, 22 Dec 2023 21:55:43 +0800 Subject: [PATCH 18/35] chore(test): replace deprecated `SpyInstance` import with the latest `MockInstance` (#9889) --- packages/runtime-dom/__tests__/customizedBuiltIn.spec.ts | 4 ++-- scripts/setupVitest.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/runtime-dom/__tests__/customizedBuiltIn.spec.ts b/packages/runtime-dom/__tests__/customizedBuiltIn.spec.ts index 89ccf02bc..09542a355 100644 --- a/packages/runtime-dom/__tests__/customizedBuiltIn.spec.ts +++ b/packages/runtime-dom/__tests__/customizedBuiltIn.spec.ts @@ -1,8 +1,8 @@ -import { type SpyInstance } from 'vitest' +import { type MockInstance } from 'vitest' import { render, h } from '@vue/runtime-dom' describe('customized built-in elements support', () => { - let createElement: SpyInstance + let createElement: MockInstance afterEach(() => { createElement.mockRestore() }) diff --git a/scripts/setupVitest.ts b/scripts/setupVitest.ts index cd1e672fd..781e713e4 100644 --- a/scripts/setupVitest.ts +++ b/scripts/setupVitest.ts @@ -1,4 +1,4 @@ -import { type SpyInstance } from 'vitest' +import { type MockInstance } from 'vitest' expect.extend({ toHaveBeenWarned(received: string) { @@ -65,7 +65,7 @@ expect.extend({ } }) -let warn: SpyInstance +let warn: MockInstance const asserted: Set = new Set() beforeEach(() => { From 7aa3f250f26d58ee2db82af907de8b9105e6e418 Mon Sep 17 00:00:00 2001 From: Evan You Date: Fri, 22 Dec 2023 22:49:03 +0800 Subject: [PATCH 19/35] fix(compiler-core): fix parsing `