Skip to content

Commit 61604f6

Browse files
edison1105edison1105
committed
Merge remote-tracking branch 'origin/main' into minor
2 parents edc79e7 + d6a6ec1 commit 61604f6

File tree

11 files changed

+635
-635
lines changed

11 files changed

+635
-635
lines changed

‎package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@
6969
"@rollup/plugin-json": "^6.1.0",
7070
"@rollup/plugin-node-resolve": "^16.0.0",
7171
"@rollup/plugin-replace": "5.0.4",
72-
"@swc/core": "^1.10.8",
72+
"@swc/core": "^1.10.15",
7373
"@types/hash-sum": "^1.0.2",
74-
"@types/node": "^22.10.7",
74+
"@types/node": "^22.12.0",
7575
"@types/semver": "^7.5.8",
7676
"@types/serve-handler": "^6.1.4",
77-
"@vitest/coverage-v8": "^3.0.2",
77+
"@vitest/coverage-v8": "^3.0.5",
7878
"@vue/consolidate": "1.0.0",
7979
"conventional-changelog-cli": "^5.0.0",
8080
"enquirer": "^2.4.1",
81-
"esbuild": "^0.24.2",
81+
"esbuild": "^0.25.0",
8282
"esbuild-plugin-polyfill-node": "^0.3.0",
8383
"eslint": "^9.18.0",
8484
"eslint-plugin-import-x": "^4.6.1",
85-
"@vitest/eslint-plugin": "^1.1.25",
85+
"@vitest/eslint-plugin": "^1.1.27",
8686
"estree-walker": "catalog:",
8787
"jsdom": "^26.0.0",
8888
"lint-staged": "^15.4.1",
@@ -95,11 +95,11 @@
9595
"prettier": "^3.4.2",
9696
"pretty-bytes": "^6.1.1",
9797
"pug": "^3.0.3",
98-
"puppeteer": "~24.1.0",
98+
"puppeteer": "~24.2.0",
9999
"rimraf": "^6.0.1",
100-
"rollup": "^4.31.0",
100+
"rollup": "^4.34.6",
101101
"rollup-plugin-dts": "^6.1.1",
102-
"rollup-plugin-esbuild": "^6.1.1",
102+
"rollup-plugin-esbuild": "^6.2.0",
103103
"rollup-plugin-polyfill-node": "^0.13.0",
104104
"semver": "^7.6.3",
105105
"serve": "^14.2.4",
@@ -110,7 +110,7 @@
110110
"typescript": "~5.6.2",
111111
"typescript-eslint": "^8.20.0",
112112
"vite": "catalog:",
113-
"vitest": "^3.0.2"
113+
"vitest": "^3.0.5"
114114
},
115115
"pnpm": {
116116
"peerDependencyRules": {

‎packages-private/sfc-playground/src/download/template/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
},
1313
"devDependencies": {
1414
"@vitejs/plugin-vue": "^5.2.1",
15-
"vite": "^6.0.7"
15+
"vite": "^6.1.0"
1616
}
1717
}

‎packages/compiler-sfc/src/rewriteDefault.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function rewriteDefaultAST(
3939
ast.forEach(node => {
4040
if (node.type === 'ExportDefaultDeclaration') {
4141
if (node.declaration.type === 'ClassDeclaration' && node.declaration.id) {
42-
let start: number =
42+
const start: number =
4343
node.declaration.decorators && node.declaration.decorators.length > 0
4444
? node.declaration.decorators[
4545
node.declaration.decorators.length - 1

‎packages/runtime-core/src/components/KeepAlive.ts

+5
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,11 @@ const KeepAliveImpl: ComponentOptions = {
187187
// Update components tree
188188
devtoolsComponentAdded(instance)
189189
}
190+
191+
// for e2e test
192+
if (__DEV__ && __BROWSER__) {
193+
;(instance as any).__keepAliveStorageContainer = storageContainer
194+
}
190195
}
191196

192197
function unmount(vnode: VNode) {

‎packages/runtime-core/src/renderer.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -2050,7 +2050,13 @@ function baseCreateRenderer(
20502050
queuePostRenderEffect(() => transition!.enter(el!), parentSuspense)
20512051
} else {
20522052
const { leave, delayLeave, afterLeave } = transition!
2053-
const remove = () => hostInsert(el!, container, anchor)
2053+
const remove = () => {
2054+
if (vnode.ctx!.isUnmounted) {
2055+
hostRemove(el!)
2056+
} else {
2057+
hostInsert(el!, container, anchor)
2058+
}
2059+
}
20542060
const performLeave = () => {
20552061
leave(el!, () => {
20562062
remove()

‎packages/vue/__tests__/e2e/Transition.spec.ts

+69
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { ElementHandle } from 'puppeteer'
12
import { E2E_TIMEOUT, setupPuppeteer } from './e2eUtils'
23
import path from 'node:path'
34
import { Transition, createApp, h, nextTick, ref } from 'vue'
@@ -1653,6 +1654,74 @@ describe('e2e: Transition', () => {
16531654
},
16541655
E2E_TIMEOUT,
16551656
)
1657+
1658+
// #12860
1659+
test(
1660+
'unmount children',
1661+
async () => {
1662+
const unmountSpy = vi.fn()
1663+
let storageContainer: ElementHandle<HTMLDivElement>
1664+
const setStorageContainer = (container: any) =>
1665+
(storageContainer = container)
1666+
await page().exposeFunction('unmountSpy', unmountSpy)
1667+
await page().exposeFunction('setStorageContainer', setStorageContainer)
1668+
await page().evaluate(() => {
1669+
const { unmountSpy, setStorageContainer } = window as any
1670+
const { createApp, ref, h, onUnmounted, getCurrentInstance } = (
1671+
window as any
1672+
).Vue
1673+
createApp({
1674+
template: `
1675+
<div id="container">
1676+
<transition>
1677+
<KeepAlive :include="includeRef">
1678+
<TrueBranch v-if="toggle"></TrueBranch>
1679+
</KeepAlive>
1680+
</transition>
1681+
</div>
1682+
<button id="toggleBtn" @click="click">button</button>
1683+
`,
1684+
components: {
1685+
TrueBranch: {
1686+
name: 'TrueBranch',
1687+
setup() {
1688+
const instance = getCurrentInstance()
1689+
onUnmounted(() => {
1690+
unmountSpy()
1691+
setStorageContainer(instance.__keepAliveStorageContainer)
1692+
})
1693+
const count = ref(0)
1694+
return () => h('div', count.value)
1695+
},
1696+
},
1697+
},
1698+
setup: () => {
1699+
const includeRef = ref(['TrueBranch'])
1700+
const toggle = ref(true)
1701+
const click = () => {
1702+
toggle.value = !toggle.value
1703+
if (toggle.value) {
1704+
includeRef.value = ['TrueBranch']
1705+
} else {
1706+
includeRef.value = []
1707+
}
1708+
}
1709+
return { toggle, click, unmountSpy, includeRef }
1710+
},
1711+
}).mount('#app')
1712+
})
1713+
1714+
await transitionFinish()
1715+
expect(await html('#container')).toBe('<div>0</div>')
1716+
1717+
await click('#toggleBtn')
1718+
await transitionFinish()
1719+
expect(await html('#container')).toBe('<!--v-if-->')
1720+
expect(unmountSpy).toBeCalledTimes(1)
1721+
expect(await storageContainer!.evaluate(x => x.innerHTML)).toBe(``)
1722+
},
1723+
E2E_TIMEOUT,
1724+
)
16561725
})
16571726

16581727
describe('transition with Suspense', () => {

‎packages/vue/__tests__/e2e/todomvc.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ describe('e2e: todomvc', () => {
139139
// editing triggered by blur
140140
await click('.filters li:nth-child(1) a')
141141
await timeout(1)
142-
await click('.todo:nth-child(1) label', { clickCount: 2 })
142+
await click('.todo:nth-child(1) label', { count: 2 })
143143
expect(await count('.todo.editing')).toBe(1)
144144
expect(await isFocused('.todo:nth-child(1) .edit')).toBe(true)
145145
await clearValue('.todo:nth-child(1) .edit')
@@ -149,21 +149,21 @@ describe('e2e: todomvc', () => {
149149
expect(await text('.todo:nth-child(1) label')).toBe('edited!')
150150

151151
// editing triggered by enter
152-
await click('.todo label', { clickCount: 2 })
152+
await click('.todo label', { count: 2 })
153153
await enterValue('.todo:nth-child(1) .edit', 'edited again!')
154154
expect(await count('.todo.editing')).toBe(0)
155155
expect(await text('.todo:nth-child(1) label')).toBe('edited again!')
156156

157157
// cancel
158-
await click('.todo label', { clickCount: 2 })
158+
await click('.todo label', { count: 2 })
159159
await clearValue('.todo:nth-child(1) .edit')
160160
await page().type('.todo:nth-child(1) .edit', 'edited!')
161161
await page().keyboard.press('Escape')
162162
expect(await count('.todo.editing')).toBe(0)
163163
expect(await text('.todo:nth-child(1) label')).toBe('edited again!')
164164

165165
// empty value should remove
166-
await click('.todo label', { clickCount: 2 })
166+
await click('.todo label', { count: 2 })
167167
await enterValue('.todo:nth-child(1) .edit', ' ')
168168
expect(await count('.todo')).toBe(3)
169169

‎packages/vue/__tests__/e2e/tree.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ describe('e2e: tree', () => {
8888
expect(await isVisible('#demo ul')).toBe(true)
8989
expect(await text('#demo li div span')).toContain('[-]')
9090

91-
await click('#demo ul > .item div', { clickCount: 2 })
91+
await click('#demo ul > .item div', { count: 2 })
9292
expect(await count('.item')).toBe(15)
9393
expect(await count('.item > ul')).toBe(5)
9494
expect(await text('#demo ul > .item:nth-child(1)')).toContain('[-]')

0 commit comments

Comments
 (0)