Skip to content

Commit 0c3a920

Browse files
yyx990803yyx990803
committed
chore: Merge branch 'main' into minor
2 parents 28841fe + 574c3e6 commit 0c3a920

File tree

19 files changed

+139
-52
lines changed

19 files changed

+139
-52
lines changed

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## [3.4.25](https://github.com/vuejs/core/compare/v3.4.24...v3.4.25) (2024-04-24)
2+
3+
4+
### Bug Fixes
5+
6+
* **defineModel:** align prod mode runtime type generation with defineProps ([4253a57](https://github.com/vuejs/core/commit/4253a57f1703a7f1ac701d77e0a235689203461d)), closes [#10769](https://github.com/vuejs/core/issues/10769)
7+
* **runtime-core:** properly get keepAlive child ([#10772](https://github.com/vuejs/core/issues/10772)) ([3724693](https://github.com/vuejs/core/commit/3724693a25c3f2dd13d70a8a1af760b03a4fb783)), closes [#10771](https://github.com/vuejs/core/issues/10771)
8+
* **runtime-core:** use normal object as internal prototype for attrs and slots ([064e82f](https://github.com/vuejs/core/commit/064e82f5855f30fe0b77fe9b5e4dd22700fd634d)), closes [/github.com/vuejs/core/commit/6df53d85a207986128159d88565e6e7045db2add#r141304923](https://github.com//github.com/vuejs/core/commit/6df53d85a207986128159d88565e6e7045db2add/issues/r141304923)
9+
10+
11+
112
## [3.4.24](https://github.com/vuejs/core/compare/v3.4.23...v3.4.24) (2024-04-22)
213

314

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"packageManager": "pnpm@9.0.5",
55
"type": "module",
66
"scripts": {

‎packages/compiler-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compiler-core",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "@vue/compiler-core",
55
"main": "index.js",
66
"module": "dist/compiler-core.esm-bundler.js",

‎packages/compiler-dom/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compiler-dom",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "@vue/compiler-dom",
55
"main": "index.js",
66
"module": "dist/compiler-dom.esm-bundler.js",

‎packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineModel.spec.ts.snap

+40
Original file line numberDiff line numberDiff line change
@@ -226,3 +226,43 @@ return { modelValue, fn, fnWithDefault, str, optional }
226226
227227
})"
228228
`;
229+
230+
exports[`defineModel() > w/ types, production mode, boolean + multiple types 1`] = `
231+
"import { useModel as _useModel, defineComponent as _defineComponent } from 'vue'
232+
233+
export default /*#__PURE__*/_defineComponent({
234+
props: {
235+
"modelValue": { type: [Boolean, String, Object] },
236+
"modelModifiers": {},
237+
},
238+
emits: ["update:modelValue"],
239+
setup(__props, { expose: __expose }) {
240+
__expose();
241+
242+
const modelValue = _useModel<boolean | string | {}>(__props, "modelValue")
243+
244+
return { modelValue }
245+
}
246+
247+
})"
248+
`;
249+
250+
exports[`defineModel() > w/ types, production mode, function + runtime opts + multiple types 1`] = `
251+
"import { useModel as _useModel, defineComponent as _defineComponent } from 'vue'
252+
253+
export default /*#__PURE__*/_defineComponent({
254+
props: {
255+
"modelValue": { type: [Number, Function], ...{ default: () => 1 } },
256+
"modelModifiers": {},
257+
},
258+
emits: ["update:modelValue"],
259+
setup(__props, { expose: __expose }) {
260+
__expose();
261+
262+
const modelValue = _useModel<number | (() => number)>(__props, "modelValue")
263+
264+
return { modelValue }
265+
}
266+
267+
})"
268+
`;

‎packages/compiler-sfc/__tests__/compileScript/defineModel.spec.ts

+28
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,34 @@ describe('defineModel()', () => {
161161
})
162162
})
163163

164+
test('w/ types, production mode, boolean + multiple types', () => {
165+
const { content } = compile(
166+
`
167+
<script setup lang="ts">
168+
const modelValue = defineModel<boolean | string | {}>()
169+
</script>
170+
`,
171+
{ isProd: true },
172+
)
173+
assertCode(content)
174+
expect(content).toMatch('"modelValue": { type: [Boolean, String, Object] }')
175+
})
176+
177+
test('w/ types, production mode, function + runtime opts + multiple types', () => {
178+
const { content } = compile(
179+
`
180+
<script setup lang="ts">
181+
const modelValue = defineModel<number | (() => number)>({ default: () => 1 })
182+
</script>
183+
`,
184+
{ isProd: true },
185+
)
186+
assertCode(content)
187+
expect(content).toMatch(
188+
'"modelValue": { type: [Number, Function], ...{ default: () => 1 } }',
189+
)
190+
})
191+
164192
test('get / set transformers', () => {
165193
const { content } = compile(
166194
`

‎packages/compiler-sfc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compiler-sfc",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "@vue/compiler-sfc",
55
"main": "dist/compiler-sfc.cjs.js",
66
"module": "dist/compiler-sfc.esm-browser.js",

‎packages/compiler-sfc/src/script/defineModel.ts

+32-31
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import type { LVal, Node, TSType } from '@babel/types'
22
import type { ScriptCompileContext } from './context'
33
import { inferRuntimeType } from './resolveType'
4-
import {
5-
UNKNOWN_TYPE,
6-
concatStrings,
7-
isCallOf,
8-
toRuntimeTypeString,
9-
} from './utils'
4+
import { UNKNOWN_TYPE, isCallOf, toRuntimeTypeString } from './utils'
105
import { BindingTypes, unwrapTSNode } from '@vue/compiler-dom'
116

127
export const DEFINE_MODEL = 'defineModel'
@@ -124,44 +119,50 @@ export function genModelProps(ctx: ScriptCompileContext) {
124119

125120
const isProd = !!ctx.options.isProd
126121
let modelPropsDecl = ''
127-
for (const [name, { type, options }] of Object.entries(ctx.modelDecls)) {
122+
for (const [name, { type, options: runtimeOptions }] of Object.entries(
123+
ctx.modelDecls,
124+
)) {
128125
let skipCheck = false
129-
126+
let codegenOptions = ``
130127
let runtimeTypes = type && inferRuntimeType(ctx, type)
131128
if (runtimeTypes) {
132129
const hasBoolean = runtimeTypes.includes('Boolean')
130+
const hasFunction = runtimeTypes.includes('Function')
133131
const hasUnknownType = runtimeTypes.includes(UNKNOWN_TYPE)
134132

135-
if (isProd || hasUnknownType) {
136-
runtimeTypes = runtimeTypes.filter(
137-
t =>
138-
t === 'Boolean' ||
139-
(hasBoolean && t === 'String') ||
140-
(t === 'Function' && options),
141-
)
133+
if (hasUnknownType) {
134+
if (hasBoolean || hasFunction) {
135+
runtimeTypes = runtimeTypes.filter(t => t !== UNKNOWN_TYPE)
136+
skipCheck = true
137+
} else {
138+
runtimeTypes = ['null']
139+
}
140+
}
142141

143-
skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0
142+
if (!isProd) {
143+
codegenOptions =
144+
`type: ${toRuntimeTypeString(runtimeTypes)}` +
145+
(skipCheck ? ', skipCheck: true' : '')
146+
} else if (hasBoolean || (runtimeOptions && hasFunction)) {
147+
// preserve types if contains boolean, or
148+
// function w/ runtime options that may contain default
149+
codegenOptions = `type: ${toRuntimeTypeString(runtimeTypes)}`
150+
} else {
151+
// able to drop types in production
144152
}
145153
}
146154

147-
let runtimeType =
148-
(runtimeTypes &&
149-
runtimeTypes.length > 0 &&
150-
toRuntimeTypeString(runtimeTypes)) ||
151-
undefined
152-
153-
const codegenOptions = concatStrings([
154-
runtimeType && `type: ${runtimeType}`,
155-
skipCheck && 'skipCheck: true',
156-
])
157-
158155
let decl: string
159-
if (runtimeType && options) {
156+
if (codegenOptions && runtimeOptions) {
160157
decl = ctx.isTS
161-
? `{ ${codegenOptions}, ...${options} }`
162-
: `Object.assign({ ${codegenOptions} }, ${options})`
158+
? `{ ${codegenOptions}, ...${runtimeOptions} }`
159+
: `Object.assign({ ${codegenOptions} }, ${runtimeOptions})`
160+
} else if (codegenOptions) {
161+
decl = `{ ${codegenOptions} }`
162+
} else if (runtimeOptions) {
163+
decl = runtimeOptions
163164
} else {
164-
decl = options || (runtimeType ? `{ ${codegenOptions} }` : '{}')
165+
decl = `{}`
165166
}
166167
modelPropsDecl += `\n ${JSON.stringify(name)}: ${decl},`
167168

‎packages/compiler-ssr/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/compiler-ssr",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "@vue/compiler-ssr",
55
"main": "dist/compiler-ssr.cjs.js",
66
"types": "dist/compiler-ssr.d.ts",

‎packages/reactivity/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/reactivity",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "@vue/reactivity",
55
"main": "index.js",
66
"module": "dist/reactivity.esm-bundler.js",

‎packages/runtime-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/runtime-core",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "@vue/runtime-core",
55
"main": "index.js",
66
"module": "dist/runtime-core.esm-bundler.js",

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

+10-8
Original file line numberDiff line numberDiff line change
@@ -470,15 +470,17 @@ function getKeepAliveChild(vnode: VNode): VNode | undefined {
470470

471471
const { shapeFlag, children } = vnode
472472

473-
if (shapeFlag & ShapeFlags.ARRAY_CHILDREN) {
474-
return (children as VNodeArrayChildren)[0] as VNode
475-
}
473+
if (children) {
474+
if (shapeFlag & ShapeFlags.ARRAY_CHILDREN) {
475+
return (children as VNodeArrayChildren)[0] as VNode
476+
}
476477

477-
if (
478-
shapeFlag & ShapeFlags.SLOTS_CHILDREN &&
479-
isFunction((children as any).default)
480-
) {
481-
return (children as any).default()
478+
if (
479+
shapeFlag & ShapeFlags.SLOTS_CHILDREN &&
480+
isFunction((children as any).default)
481+
) {
482+
return (children as any).default()
483+
}
482484
}
483485
}
484486

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* `Object.getPrototypeOf`. This is more performant than defining a
55
* non-enumerable property. (one of the optimizations done for ssr-benchmark)
66
*/
7-
const internalObjectProto = Object.create(null)
7+
const internalObjectProto = {}
88

99
export const createInternalObject = () => Object.create(internalObjectProto)
1010

‎packages/runtime-dom/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/runtime-dom",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "@vue/runtime-dom",
55
"main": "index.js",
66
"module": "dist/runtime-dom.esm-bundler.js",

‎packages/server-renderer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/server-renderer",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "@vue/server-renderer",
55
"main": "index.js",
66
"module": "dist/server-renderer.esm-bundler.js",

‎packages/shared/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/shared",
3-
"version": "3.4.24",
3+
"version": "3.4.25",
44
"description": "internal utils shared across @vue packages",
55
"main": "index.js",
66
"module": "dist/shared.esm-bundler.js",

‎packages/vue-compat/package.json

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

‎packages/vue/package.json

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

‎vitest.e2e.config.ts

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ import config from './vitest.config'
33

44
export default mergeConfig(config, {
55
test: {
6+
poolOptions: {
7+
threads: {
8+
singleThread: !!process.env.CI,
9+
},
10+
},
611
include: ['packages/vue/__tests__/e2e/*.spec.ts'],
712
},
813
})

0 commit comments

Comments
 (0)