Skip to content

Commit 3f6d453

Browse files
Merge branch 'main' into feat/exposed-template-type
2 parents bd8c78d + a23fb59 commit 3f6d453

File tree

5 files changed

+530
-492
lines changed

5 files changed

+530
-492
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* **custom-element:** avoid triggering mutationObserver when relecting props ([352bc88](https://github.com/vuejs/core/commit/352bc88c1bd2fda09c61ab17ea1a5967ffcd7bc0)), closes [#12214](https://github.com/vuejs/core/issues/12214) [#12215](https://github.com/vuejs/core/issues/12215)
99
* **deps:** update dependency postcss to ^8.4.48 ([#12356](https://github.com/vuejs/core/issues/12356)) ([b5ff930](https://github.com/vuejs/core/commit/b5ff930089985a58c3553977ef999cec2a6708a4))
1010
* **hydration:** the component vnode's el should be updated when a mismatch occurs. ([#12255](https://github.com/vuejs/core/issues/12255)) ([a20a4cb](https://github.com/vuejs/core/commit/a20a4cb36a3e717d1f8f259d0d59f133f508ff0a)), closes [#12253](https://github.com/vuejs/core/issues/12253)
11-
* **reactiivty:** avoid unnecessary watcher effect removal from inactive scope ([2193284](https://github.com/vuejs/core/commit/21932840eae72ffcd357a62ec596aaecc7ec224a)), closes [#5783](https://github.com/vuejs/core/issues/5783) [#5806](https://github.com/vuejs/core/issues/5806)
11+
* **reactivty:** avoid unnecessary watcher effect removal from inactive scope ([2193284](https://github.com/vuejs/core/commit/21932840eae72ffcd357a62ec596aaecc7ec224a)), closes [#5783](https://github.com/vuejs/core/issues/5783) [#5806](https://github.com/vuejs/core/issues/5806)
1212
* **reactivity:** release nested effects/scopes on effect scope stop ([#12373](https://github.com/vuejs/core/issues/12373)) ([bee2f5e](https://github.com/vuejs/core/commit/bee2f5ee62dc0cd04123b737779550726374dd0a)), closes [#12370](https://github.com/vuejs/core/issues/12370)
1313
* **runtime-dom:** set css vars before user onMounted hooks ([2d5c5e2](https://github.com/vuejs/core/commit/2d5c5e25e9b7a56e883674fb434135ac514429b5)), closes [#11533](https://github.com/vuejs/core/issues/11533)
1414
* **runtime-dom:** set css vars on update to handle child forcing reflow in onMount ([#11561](https://github.com/vuejs/core/issues/11561)) ([c4312f9](https://github.com/vuejs/core/commit/c4312f9c715c131a09e552ba46e9beb4b36d55e6))

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"version": "3.5.13",
4-
"packageManager": "pnpm@10.8.0",
4+
"packageManager": "pnpm@10.9.0",
55
"type": "module",
66
"scripts": {
77
"dev": "node scripts/dev.js",

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.3",
15-
"vite": "^6.2.6"
15+
"vite": "^6.3.2"
1616
}
1717
}

packages/compiler-sfc/__tests__/compileStyle.spec.ts

+20-16
Original file line numberDiff line numberDiff line change
@@ -211,38 +211,42 @@ color: red
211211
expect(
212212
compileScoped(`.div { color: red; } .div:where(:hover) { color: blue; }`),
213213
).toMatchInlineSnapshot(`
214-
".div[data-v-test] { color: red;
215-
}
216-
.div[data-v-test]:where(:hover) { color: blue;
217-
}"`)
214+
".div[data-v-test] { color: red;
215+
}
216+
.div[data-v-test]:where(:hover) { color: blue;
217+
}"
218+
`)
218219

219220
expect(
220221
compileScoped(`.div { color: red; } .div:is(:hover) { color: blue; }`),
221222
).toMatchInlineSnapshot(`
222-
".div[data-v-test] { color: red;
223-
}
224-
.div[data-v-test]:is(:hover) { color: blue;
225-
}"`)
223+
".div[data-v-test] { color: red;
224+
}
225+
.div[data-v-test]:is(:hover) { color: blue;
226+
}"
227+
`)
226228

227229
expect(
228230
compileScoped(
229231
`.div { color: red; } .div:where(.foo:hover) { color: blue; }`,
230232
),
231233
).toMatchInlineSnapshot(`
232-
".div[data-v-test] { color: red;
233-
}
234-
.div[data-v-test]:where(.foo:hover) { color: blue;
235-
}"`)
234+
".div[data-v-test] { color: red;
235+
}
236+
.div[data-v-test]:where(.foo:hover) { color: blue;
237+
}"
238+
`)
236239

237240
expect(
238241
compileScoped(
239242
`.div { color: red; } .div:is(.foo:hover) { color: blue; }`,
240243
),
241244
).toMatchInlineSnapshot(`
242-
".div[data-v-test] { color: red;
243-
}
244-
.div[data-v-test]:is(.foo:hover) { color: blue;
245-
}"`)
245+
".div[data-v-test] { color: red;
246+
}
247+
.div[data-v-test]:is(.foo:hover) { color: blue;
248+
}"
249+
`)
246250
})
247251

248252
test('media query', () => {

0 commit comments

Comments
 (0)