Skip to content

Commit f3e5303

Browse files
committed
chore: merge branch 'minor' of https://github.com/vuejs/core into feat/onEffectCleanup-and-baseWatch
1 parent a8dc8e6 commit f3e5303

File tree

16 files changed

+646
-499
lines changed

16 files changed

+646
-499
lines changed

CHANGELOG.md

Lines changed: 17 additions & 478 deletions
Large diffs are not rendered by default.

changelogs/CHANGELOG-3.3.md

Lines changed: 598 additions & 0 deletions
Large diffs are not rendered by default.

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.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
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.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
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.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
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.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
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.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
44
"description": "@vue/compiler-ssr",
55
"main": "dist/compiler-ssr.cjs.js",
66
"types": "dist/compiler-ssr.d.ts",

packages/reactivity/package.json

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

packages/runtime-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/runtime-core",
3-
"version": "3.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
44
"description": "@vue/runtime-core",
55
"main": "index.js",
66
"module": "dist/runtime-core.esm-bundler.js",

packages/runtime-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/runtime-dom",
3-
"version": "3.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
44
"description": "@vue/runtime-dom",
55
"main": "index.js",
66
"module": "dist/runtime-dom.esm-bundler.js",

packages/server-renderer/package.json

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

packages/sfc-playground/src/Header.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ const { store } = props
2727
const currentCommit = __COMMIT__
2828
const vueVersion = ref(`@${currentCommit}`)
2929
30+
const vueURL = store.getImportMap().imports.vue
31+
if (vueURL && !vueURL.startsWith(location.origin)) {
32+
const versionMatch = vueURL.match(/runtime-dom@([^/]+)/)
33+
if (versionMatch) vueVersion.value = versionMatch[1]
34+
}
35+
3036
async function setVueVersion(v: string) {
3137
vueVersion.value = `loading...`
3238
await store.setVueVersion(v)

packages/shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/shared",
3-
"version": "3.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
44
"description": "internal utils shared across @vue packages",
55
"main": "index.js",
66
"module": "dist/shared.esm-bundler.js",

packages/vue-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compat",
3-
"version": "3.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
44
"description": "Vue 3 compatibility build for Vue 2",
55
"main": "index.js",
66
"module": "dist/vue.runtime.esm-bundler.js",

packages/vue/README.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,23 @@
3333

3434
#### Bundler Build Feature Flags
3535

36-
Starting with 3.0.0-rc.3, `esm-bundler` builds now exposes global feature flags that can be overwritten at compile time:
36+
[Detailed Reference on vuejs.org](https://vuejs.org/api/compile-time-flags.html)
3737

38-
- `__VUE_OPTIONS_API__` (enable/disable Options API support, default: `true`)
39-
- `__VUE_PROD_DEVTOOLS__` (enable/disable devtools support in production, default: `false`)
40-
- `__VUE_PROD_HYDRATION_MISMATCH_DETAILS__` (enable/disable detailed warnings for hydration mismatches in production, default: `false`)
38+
`esm-bundler` builds of Vue expose global feature flags that can be overwritten at compile time:
4139

42-
The build will work without configuring these flags, however it is **strongly recommended** to properly configure them in order to get proper tree-shaking in the final bundle. To configure these flags:
40+
- `__VUE_OPTIONS_API__`
41+
- Default: `true`
42+
- Enable / disable Options API support
4343

44-
- webpack: use [DefinePlugin](https://webpack.js.org/plugins/define-plugin/)
45-
- Rollup: use [@rollup/plugin-replace](https://github.com/rollup/plugins/tree/master/packages/replace)
46-
- Vite: configured by default, but can be overwritten using the [`define` option](https://github.com/vitejs/vite/blob/a4133c073e640b17276b2de6e91a6857bdf382e1/src/node/config.ts#L72-L76)
44+
- `__VUE_PROD_DEVTOOLS__`
45+
- Default: `false`
46+
- Enable / disable devtools support in production
4747

48-
Note: the replacement value **must be boolean literals** and cannot be strings, otherwise the bundler/minifier will not be able to properly evaluate the conditions.
48+
- `__VUE_PROD_HYDRATION_MISMATCH_DETAILS__`
49+
- Default: `false`
50+
- Enable / disable detailed warnings for hydration mismatches in production
51+
52+
The build will work without configuring these flags, however it is **strongly recommended** to properly configure them in order to get proper tree-shaking in the final bundle.
4953

5054
### For Server-Side Rendering
5155

packages/vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue",
3-
"version": "3.4.0-rc.2",
3+
"version": "3.4.0-rc.3",
44
"description": "The progressive JavaScript framework for building modern web UI.",
55
"main": "index.js",
66
"module": "dist/vue.runtime.esm-bundler.js",

0 commit comments

Comments
 (0)