Skip to content

Commit f5a8fc5

Browse files
authored
Merge branch 'minor' into edison/feat/fowardedSlots
2 parents d85ff5e + 56a7f9d commit f5a8fc5

34 files changed

+283
-144
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# [3.6.0-alpha.2](https://github.com/vuejs/core/compare/v3.6.0-alpha.1...v3.6.0-alpha.2) (2025-07-18)
2+
3+
4+
### Bug Fixes
5+
6+
* **compiler-vapor:** handle empty interpolation ([#13592](https://github.com/vuejs/core/issues/13592)) ([d1f2915](https://github.com/vuejs/core/commit/d1f2915cfe7915fa73624485ff3dd443176a31a9))
7+
* **compiler-vapor:** handle special characters in cached variable names ([#13626](https://github.com/vuejs/core/issues/13626)) ([a5e106d](https://github.com/vuejs/core/commit/a5e106d96eb17d73c8673e826393c910d5594a2f))
8+
* **compiler-vapor:** selectors was not initialized in time when the initial value of createFor source was not empty ([#13642](https://github.com/vuejs/core/issues/13642)) ([f04c9c3](https://github.com/vuejs/core/commit/f04c9c342d398c11111c873143dc437f588578ee))
9+
* **reactivity:** allow collect effects in EffectScope ([#13657](https://github.com/vuejs/core/issues/13657)) ([b9fb79a](https://github.com/vuejs/core/commit/b9fb79a1fd099b67e01c5fe5941551c0da3a0cae)), closes [#13656](https://github.com/vuejs/core/issues/13656)
10+
* **reactivity:** remove link check to align with 3.5 ([#13654](https://github.com/vuejs/core/issues/13654)) ([3cb27d1](https://github.com/vuejs/core/commit/3cb27d156f6a30e8f950616a53a3726519eaf216)), closes [#13620](https://github.com/vuejs/core/issues/13620)
11+
* **runtime-core:** use __vapor instead of vapor to identify Vapor components ([#13652](https://github.com/vuejs/core/issues/13652)) ([ad21b1b](https://github.com/vuejs/core/commit/ad21b1b7e96bc894f5df0d95fbd77c9ba6b15c2e))
12+
* **runtime-vapor:** component emits vdom interop ([#13498](https://github.com/vuejs/core/issues/13498)) ([d95fc18](https://github.com/vuejs/core/commit/d95fc186c26e81345cd75037c3c1304b0eae13b4))
13+
* **runtime-vapor:** handle v-model vdom interop error ([#13643](https://github.com/vuejs/core/issues/13643)) ([2be828a](https://github.com/vuejs/core/commit/2be828a0c165c7f1533ace0bd81fba43a2af16d6))
14+
* **runtime-vapor:** remove access globalProperties warning ([#13609](https://github.com/vuejs/core/issues/13609)) ([fca74b0](https://github.com/vuejs/core/commit/fca74b00a86c6039aa05591618539a77aaa72daf))
15+
16+
17+
118
# [3.6.0-alpha.1](https://github.com/vuejs/core/compare/v3.5.17...v3.6.0-alpha.1) (2025-07-12)
219

320
### Features

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"version": "3.6.0-alpha.1",
3+
"version": "3.6.0-alpha.2",
44
"packageManager": "[email protected]",
55
"type": "module",
66
"scripts": {

packages/compiler-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compiler-core",
3-
"version": "3.6.0-alpha.1",
3+
"version": "3.6.0-alpha.2",
44
"description": "@vue/compiler-core",
55
"main": "index.js",
66
"module": "dist/compiler-core.esm-bundler.js",

packages/compiler-dom/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compiler-dom",
3-
"version": "3.6.0-alpha.1",
3+
"version": "3.6.0-alpha.2",
44
"description": "@vue/compiler-dom",
55
"main": "index.js",
66
"module": "dist/compiler-dom.esm-bundler.js",

packages/compiler-sfc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compiler-sfc",
3-
"version": "3.6.0-alpha.1",
3+
"version": "3.6.0-alpha.2",
44
"description": "@vue/compiler-sfc",
55
"main": "dist/compiler-sfc.cjs.js",
66
"module": "dist/compiler-sfc.esm-browser.js",

packages/compiler-ssr/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compiler-ssr",
3-
"version": "3.6.0-alpha.1",
3+
"version": "3.6.0-alpha.2",
44
"description": "@vue/compiler-ssr",
55
"main": "dist/compiler-ssr.cjs.js",
66
"types": "dist/compiler-ssr.d.ts",

packages/compiler-vapor/__tests__/transforms/__snapshots__/expression.spec.ts.snap

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,53 @@ export function render(_ctx) {
1111
}"
1212
`;
1313

14+
exports[`compiler: expression > empty interpolation 1`] = `
15+
"import { template as _template } from 'vue';
16+
const t0 = _template(" ")
17+
18+
export function render(_ctx) {
19+
const n0 = t0()
20+
return n0
21+
}"
22+
`;
23+
24+
exports[`compiler: expression > empty interpolation 2`] = `
25+
"import { template as _template } from 'vue';
26+
const t0 = _template(" ")
27+
28+
export function render(_ctx) {
29+
const n0 = t0()
30+
return n0
31+
}"
32+
`;
33+
34+
exports[`compiler: expression > empty interpolation 3`] = `
35+
"import { template as _template } from 'vue';
36+
const t0 = _template("<div></div>", true)
37+
38+
export function render(_ctx) {
39+
const n0 = t0()
40+
return n0
41+
}"
42+
`;
43+
44+
exports[`compiler: expression > empty interpolation 4`] = `
45+
"import { child as _child, toDisplayString as _toDisplayString, setText as _setText, renderEffect as _renderEffect, template as _template } from 'vue';
46+
const t0 = _template("<div> </div>", true)
47+
48+
export function render(_ctx) {
49+
const n1 = t0()
50+
const n0 = _child(n1)
51+
const x1 = _child(n1)
52+
_renderEffect(() => {
53+
const _foo = _ctx.foo
54+
_setText(n0, _toDisplayString(_foo))
55+
_setText(x1, _toDisplayString(_foo))
56+
})
57+
return n1
58+
}"
59+
`;
60+
1461
exports[`compiler: expression > props 1`] = `
1562
"import { toDisplayString as _toDisplayString, setText as _setText, renderEffect as _renderEffect, template as _template } from 'vue';
1663
const t0 = _template(" ")

packages/compiler-vapor/__tests__/transforms/__snapshots__/transformTemplateRef.spec.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function render(_ctx) {
4343
const n2 = t0()
4444
_setTemplateRef(n2, "foo", void 0, true)
4545
return n2
46-
}, null, 4)
46+
}, undefined, 4)
4747
return n0
4848
}"
4949
`;

packages/compiler-vapor/__tests__/transforms/__snapshots__/vFor.spec.ts.snap

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export function render(_ctx) {
9393
const x4 = _child(n4)
9494
_renderEffect(() => _setText(x4, _toDisplayString(_for_item1.value+_for_item0.value)))
9595
return n4
96-
}, null, 1)
96+
}, undefined, 1)
9797
return n5
9898
})
9999
return n0
@@ -150,15 +150,17 @@ exports[`compiler: v-for > selector pattern 1`] = `
150150
const t0 = _template("<tr> </tr>", true)
151151
152152
export function render(_ctx) {
153+
let _selector0_0
153154
const n0 = _createFor(() => (_ctx.rows), (_for_item0) => {
154155
const n2 = t0()
155156
const x2 = _child(n2)
156157
_selector0_0(() => {
157158
_setText(x2, _toDisplayString(_ctx.selected === _for_item0.value.id ? 'danger' : ''))
158159
})
159160
return n2
160-
}, (row) => (row.id))
161-
const _selector0_0 = n0.useSelector(() => _ctx.selected)
161+
}, (row) => (row.id), undefined, ({ createSelector }) => {
162+
_selector0_0 = createSelector(() => _ctx.selected)
163+
})
162164
return n0
163165
}"
164166
`;
@@ -168,14 +170,16 @@ exports[`compiler: v-for > selector pattern 2`] = `
168170
const t0 = _template("<tr></tr>", true)
169171
170172
export function render(_ctx) {
173+
let _selector0_0
171174
const n0 = _createFor(() => (_ctx.rows), (_for_item0) => {
172175
const n2 = t0()
173176
_selector0_0(() => {
174177
_setClass(n2, _ctx.selected === _for_item0.value.id ? 'danger' : '')
175178
})
176179
return n2
177-
}, (row) => (row.id))
178-
const _selector0_0 = n0.useSelector(() => _ctx.selected)
180+
}, (row) => (row.id), undefined, ({ createSelector }) => {
181+
_selector0_0 = createSelector(() => _ctx.selected)
182+
})
179183
return n0
180184
}"
181185
`;
@@ -202,14 +206,16 @@ exports[`compiler: v-for > selector pattern 4`] = `
202206
const t0 = _template("<tr></tr>", true)
203207
204208
export function render(_ctx) {
209+
let _selector0_0
205210
const n0 = _createFor(() => (_ctx.rows), (_for_item0) => {
206211
const n2 = t0()
207212
_selector0_0(() => {
208213
_setClass(n2, { danger: _for_item0.value.id === _ctx.selected })
209214
})
210215
return n2
211-
}, (row) => (row.id))
212-
const _selector0_0 = n0.useSelector(() => _ctx.selected)
216+
}, (row) => (row.id), undefined, ({ createSelector }) => {
217+
_selector0_0 = createSelector(() => _ctx.selected)
218+
})
213219
return n0
214220
}"
215221
`;

packages/compiler-vapor/__tests__/transforms/__snapshots__/vOn.spec.ts.snap

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@ export function render(_ctx) {
1212
}"
1313
`;
1414

15+
exports[`v-on > component event with special characters 1`] = `
16+
"import { resolveComponent as _resolveComponent, createComponentWithFallback as _createComponentWithFallback } from 'vue';
17+
18+
export function render(_ctx) {
19+
const _component_Foo = _resolveComponent("Foo")
20+
const _on_update_model = () => {}
21+
const _on_update_model1 = () => {}
22+
const n0 = _createComponentWithFallback(_component_Foo, {
23+
"onUpdate:model": () => _on_update_model,
24+
"onUpdate-model": () => _on_update_model1
25+
}, null, true)
26+
return n0
27+
}"
28+
`;
29+
1530
exports[`v-on > dynamic arg 1`] = `
1631
"import { on as _on, renderEffect as _renderEffect, template as _template } from 'vue';
1732
const t0 = _template("<div></div>", true)

0 commit comments

Comments
 (0)