From 3d3519f94e5a403f8ca8061a4eef3ac6c211ebdd Mon Sep 17 00:00:00 2001 From: Evan You Date: Mon, 15 Apr 2024 17:36:05 +0800 Subject: [PATCH] fix(compiler-core): fix v-bind shorthand for component :is close #10469 close #10471 --- .../transforms/transformElement.spec.ts | 18 +++++++++++++++++ .../src/transforms/transformElement.ts | 20 ++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/packages/compiler-core/__tests__/transforms/transformElement.spec.ts b/packages/compiler-core/__tests__/transforms/transformElement.spec.ts index 5d3f92ced18..c30840a21a6 100644 --- a/packages/compiler-core/__tests__/transforms/transformElement.spec.ts +++ b/packages/compiler-core/__tests__/transforms/transformElement.spec.ts @@ -1231,6 +1231,24 @@ describe('compiler: element transform', () => { }) }) + test('dynamic binding shorthand', () => { + const { node, root } = parseWithBind(``) + expect(root.helpers).toContain(RESOLVE_DYNAMIC_COMPONENT) + expect(node).toMatchObject({ + isBlock: true, + tag: { + callee: RESOLVE_DYNAMIC_COMPONENT, + arguments: [ + { + type: NodeTypes.SIMPLE_EXPRESSION, + content: 'is', + isStatic: false, + }, + ], + }, + }) + }) + test('is casting', () => { const { node, root } = parseWithBind(`
`) expect(root.helpers).toContain(RESOLVE_COMPONENT) diff --git a/packages/compiler-core/src/transforms/transformElement.ts b/packages/compiler-core/src/transforms/transformElement.ts index c50f7f5e969..ca6e59df32b 100644 --- a/packages/compiler-core/src/transforms/transformElement.ts +++ b/packages/compiler-core/src/transforms/transformElement.ts @@ -64,6 +64,7 @@ import { checkCompatEnabled, isCompatEnabled, } from '../compat/compatConfig' +import { processExpression } from './transformExpression' // some directive transforms (e.g. v-model) may return a symbol for runtime // import, which should be used instead of a resolveDirective call. @@ -253,7 +254,7 @@ export function resolveComponentType( // 1. dynamic component const isExplicitDynamic = isComponentTag(tag) - const isProp = findProp(node, 'is') + const isProp = findProp(node, 'is', false, true /* allow empty */) if (isProp) { if ( isExplicitDynamic || @@ -263,10 +264,19 @@ export function resolveComponentType( context, )) ) { - const exp = - isProp.type === NodeTypes.ATTRIBUTE - ? isProp.value && createSimpleExpression(isProp.value.content, true) - : isProp.exp + let exp: ExpressionNode | undefined + if (isProp.type === NodeTypes.ATTRIBUTE) { + exp = isProp.value && createSimpleExpression(isProp.value.content, true) + } else { + exp = isProp.exp + if (!exp) { + // #10469 handle :is shorthand + exp = createSimpleExpression(`is`, false, isProp.loc) + if (!__BROWSER__) { + exp = isProp.exp = processExpression(exp, context) + } + } + } if (exp) { return createCallExpression(context.helper(RESOLVE_DYNAMIC_COMPONENT), [ exp,