From: daiwei <daiwei521@126.com>
Date: Thu, 6 Nov 2025 07:41:17 +0000 (+0800)
Subject: chore: Merge branch 'minor' into edison/feat/svgAndMathML
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13703%2Fhead;p=thirdparty%2Fvuejs%2Fcore.git

chore: Merge branch 'minor' into edison/feat/svgAndMathML
---

785fdf2e574ebcce38705cee14f4bc14fa43ab74
diff --cc packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap
index 71eaea876b,8d9df60dfa..517c282a2c
--- a/packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap
+++ b/packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap
@@@ -1,15 -1,16 +1,26 @@@
  // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
  
 +exports[`compiler: element transform > MathML 1`] = `
 +"import { template as _template } from 'vue';
 +const t0 = _template("<math><mrow><mi>x</mi></mrow></math>", true, 2)
 +
 +export function render(_ctx) {
 +  const n0 = t0()
 +  return n0
 +}"
 +`;
 +
+ exports[`compiler: element transform > checkbox with static indeterminate 1`] = `
+ "import { setProp as _setProp, template as _template } from 'vue';
+ const t0 = _template("<input type=\\"checkbox\\">", true)
+ 
+ export function render(_ctx) {
+   const n0 = t0()
+   _setProp(n0, "indeterminate", "")
+   return n0
+ }"
+ `;
+ 
  exports[`compiler: element transform > component > cache v-on expression with unique handler name 1`] = `
  "import { resolveComponent as _resolveComponent, createComponentWithFallback as _createComponentWithFallback } from 'vue';
  
diff --cc packages/compiler-vapor/__tests__/transforms/__snapshots__/vBind.spec.ts.snap
index 429bc440f1,4bbf1884d9..6fecc45962
--- a/packages/compiler-vapor/__tests__/transforms/__snapshots__/vBind.spec.ts.snap
+++ b/packages/compiler-vapor/__tests__/transforms/__snapshots__/vBind.spec.ts.snap
@@@ -642,20 -631,9 +642,20 @@@ export function render(_ctx) 
  }"
  `;
  
 +exports[`compiler v-bind > v-bind w/ svg elements 1`] = `
 +"import { setDynamicProps as _setDynamicProps, renderEffect as _renderEffect, template as _template } from 'vue';
 +const t0 = _template("<svg></svg>", true, 1)
 +
 +export function render(_ctx) {
 +  const n0 = t0()
 +  _renderEffect(() => _setDynamicProps(n0, [_ctx.obj], true, true))
 +  return n0
 +}"
 +`;
 +
  exports[`compiler v-bind > with constant value 1`] = `
  "import { setProp as _setProp, template as _template } from 'vue';
- const t0 = _template("<div f=\\"foo1\\" h=\\"1\\"></div>", true)
+ const t0 = _template("<div e=\\"2\\" f=\\"foo1\\" g=\\"1\\" h=\\"1\\"></div>", true)
  
  export function render(_ctx, $props, $emit, $attrs, $slots) {
    const n0 = t0()
diff --cc packages/compiler-vapor/__tests__/transforms/transformText.spec.ts
index 499c5be974,1c929f0f20..fa51d085eb
--- a/packages/compiler-vapor/__tests__/transforms/transformText.spec.ts
+++ b/packages/compiler-vapor/__tests__/transforms/transformText.spec.ts
@@@ -51,7 -51,22 +51,22 @@@ describe('compiler: text transform', (
  
    it('escapes raw static text when generating the template string', () => {
      const { ir } = compileWithTextTransform('<code>&lt;script&gt;</code>')
 -    expect(ir.template).toContain('<code>&lt;script&gt;</code>')
 -    expect(ir.template).not.toContain('<code><script></code>')
 +    expect([...ir.template.keys()]).toContain('<code>&lt;script&gt;</code>')
 +    expect([...ir.template.keys()]).not.toContain('<code><script></code>')
    })
+ 
+   test('constant text', () => {
+     const { code } = compileWithTextTransform(
+       `
+         <div>
+           {{ (2) }}
+           {{ \`foo\${1}\` }}
+           {{ 1 }}
+           {{ 1n }}
+           {{ '1' }}
+         </div>`,
+     )
+     expect(code).includes(`_template("<div>2 foo1 1 1 1</div>", true)`)
+     expect(code).toMatchSnapshot()
+   })
  })
diff --cc packages/compiler-vapor/__tests__/transforms/vIf.spec.ts
index 76a1bde612,6a8148b7c1..cfac122885
--- a/packages/compiler-vapor/__tests__/transforms/vIf.spec.ts
+++ b/packages/compiler-vapor/__tests__/transforms/vIf.spec.ts
@@@ -186,10 -182,10 +186,10 @@@ describe('compiler: v-if', () => 
  
    test('v-if + v-else-if + v-else', () => {
      const { code, ir } = compileWithVIf(
-       `<div v-if="ok"/><p v-else-if="orNot"/><template v-else>fine</template>`,
+       `<div v-if="ok"/><p v-else-if="orNot"/><p v-else-if="false"/><template v-else>fine</template>`,
      )
      expect(code).matchSnapshot()
 -    expect(ir.template).toEqual(['<div></div>', '<p></p>', 'fine'])
 +    expect([...ir.template.keys()]).toEqual(['<div></div>', '<p></p>', 'fine'])
  
      expect(ir.block.returns).toEqual([0])
      expect(ir.block.dynamic.children[0].operation).toMatchObject({
diff --cc packages/compiler-vapor/src/generators/template.ts
index 350e493002,1bf99ec383..adb7cef1b6
--- a/packages/compiler-vapor/src/generators/template.ts
+++ b/packages/compiler-vapor/src/generators/template.ts
@@@ -5,21 -9,18 +9,21 @@@ import { genOperationWithInsertionStat
  import { type CodeFragment, NEWLINE, buildCodeFragment, genCall } from './utils'
  
  export function genTemplates(
 -  templates: string[],
 +  templates: Map<string, number>,
    rootIndex: number | undefined,
-   { helper }: CodegenContext,
+   context: CodegenContext,
  ): string {
 -  return templates
 -    .map(
 -      (template, i) =>
 -        `const ${context.tName(i)} = ${context.helper('template')}(${JSON.stringify(
 -          template,
 -        )}${i === rootIndex ? ', true' : ''})\n`,
 +  const result: string[] = []
 +  let i = 0
 +  templates.forEach((ns, template) => {
 +    result.push(
-       `const t${i} = ${helper('template')}(${JSON.stringify(
++      `const ${context.tName(i)} = ${context.helper('template')}(${JSON.stringify(
 +        template,
 +      )}${i === rootIndex ? ', true' : ns ? ', false' : ''}${ns ? `, ${ns}` : ''})\n`,
      )
 -    .join('')
 +    i++
 +  })
 +  return result.join('')
  }
  
  export function genSelf(
diff --cc packages/runtime-dom/src/components/TransitionGroup.ts
index 72af535d38,b7ba56f99f..7556c54049
--- a/packages/runtime-dom/src/components/TransitionGroup.ts
+++ b/packages/runtime-dom/src/components/TransitionGroup.ts
@@@ -30,9 -30,14 +30,14 @@@ import 
  } from '@vue/runtime-core'
  import { extend } from '@vue/shared'
  
- const positionMap = new WeakMap<VNode, DOMRect>()
- const newPositionMap = new WeakMap<VNode, DOMRect>()
- const moveCbKey = Symbol('_moveCb')
+ interface Position {
+   top: number
+   left: number
+ }
+ 
+ const positionMap = new WeakMap<VNode, Position>()
+ const newPositionMap = new WeakMap<VNode, Position>()
 -export const moveCbKey: unique symbol = Symbol('_moveCb')
++const moveCbKey: unique symbol = Symbol('_moveCb')
  const enterCbKey = Symbol('_enterCb')
  
  export type TransitionGroupProps = Omit<TransitionProps, 'mode'> & {
diff --cc packages/runtime-dom/src/index.ts
index 6f2492af27,c4518b0029..f275d65a82
--- a/packages/runtime-dom/src/index.ts
+++ b/packages/runtime-dom/src/index.ts
@@@ -348,14 -347,27 +347,32 @@@ export 
    vModelSelectInit,
    vModelSetSelected,
  } from './directives/vModel'
 +/**
 + * @internal
 + */
- export { svgNS, mathmlNS } from './nodeOps'
++export { svgNS } from './nodeOps'
 +/**
 + * @internal
 + */
 +export { xlinkNS } from './modules/attrs'
+ /**
+  * @internal
+  */
+ export {
+   resolveTransitionProps,
+   TransitionPropsValidators,
+   forceReflow,
 -  addTransitionClass,
 -  removeTransitionClass,
+   type ElementWithTransition,
+ } from './components/Transition'
+ /**
+  * @internal
+  */
+ export {
+   hasCSSTransform,
+   callPendingCbs,
 -  moveCbKey,
+   handleMovedChildren,
+   baseApplyTranslation,
+ } from './components/TransitionGroup'
  /**
   * @internal
   */
diff --cc packages/runtime-vapor/__tests__/dom/prop.spec.ts
index 066634e029,f185e0e067..dd29281bac
--- a/packages/runtime-vapor/__tests__/dom/prop.spec.ts
+++ b/packages/runtime-vapor/__tests__/dom/prop.spec.ts
@@@ -11,8 -13,15 +13,15 @@@ import 
    setValue,
  } from '../../src/dom/prop'
  import { setStyle } from '../../src/dom/prop'
- import { VaporComponentInstance } from '../../src/component'
+ import { VaporComponentInstance, createComponent } from '../../src/component'
 -import { ref, setCurrentInstance } from '@vue/runtime-dom'
 +import { ref, setCurrentInstance, svgNS, xlinkNS } from '@vue/runtime-dom'
+ import { makeRender } from '../_utils'
+ import {
+   createDynamicComponent,
+   defineVaporComponent,
+   renderEffect,
+   template,
+ } from '../../src'
  
  let removeComponentInstance = NOOP
  beforeEach(() => {
diff --cc packages/runtime-vapor/src/dom/prop.ts
index 6e3de7fe59,b104b20900..6d41a7c1bc
--- a/packages/runtime-vapor/src/dom/prop.ts
+++ b/packages/runtime-vapor/src/dom/prop.ts
@@@ -14,9 -23,12 +23,13 @@@ import 
    mergeProps,
    patchStyle,
    shouldSetAsProp,
+   toClassSet,
+   toStyleMap,
    unsafeToTrustedHTML,
+   vShowHidden,
    warn,
+   warnPropMismatch,
 +  xlinkNS,
  } from '@vue/runtime-dom'
  import {
    type VaporComponentInstance,
@@@ -73,12 -74,21 +80,29 @@@ export function setAttr
      ;(el as any)._falseValue = value
    }
  
+   if (
+     (__DEV__ || __FEATURE_PROD_HYDRATION_MISMATCH_DETAILS__) &&
+     isHydrating &&
+     !attributeHasMismatch(el, key, value)
+   ) {
+     el[`$${key}`] = value
+     return
+   }
+ 
    if (value !== el[`$${key}`]) {
      el[`$${key}`] = value
--    if (value != null) {
--      el.setAttribute(key, value)
++    if (isSVG && key.startsWith('xlink:')) {
++      if (value != null) {
++        el.setAttributeNS(xlinkNS, key, value)
++      } else {
++        el.removeAttributeNS(xlinkNS, key.slice(6, key.length))
++      }
      } else {
--      el.removeAttribute(key)
++      if (value != null) {
++        el.setAttribute(key, value)
++      } else {
++        el.removeAttribute(key)
++      }
      }
    }
  }
@@@ -125,18 -152,22 +166,30 @@@ export function setDOMProp
    needRemove && el.removeAttribute(key)
  }
  
 -export function setClass(el: TargetElement, value: any): void {
 +export function setClass(
 +  el: TargetElement,
 +  value: any,
 +  isSVG: boolean = false,
 +): void {
    if (el.$root) {
      setClassIncremental(el, value)
-   } else if ((value = normalizeClass(value)) !== el.$cls) {
-     if (isSVG) {
-       el.setAttribute('class', (el.$cls = value))
-     } else {
-       el.className = el.$cls = value
+   } else {
+     value = normalizeClass(value)
+     if (
+       (__DEV__ || __FEATURE_PROD_HYDRATION_MISMATCH_DETAILS__) &&
+       isHydrating &&
+       !classHasMismatch(el, value, false)
+     ) {
+       el.$cls = value
+       return
+     }
+ 
+     if (value !== el.$cls) {
 -      el.className = el.$cls = value
++      if (isSVG) {
++        el.setAttribute('class', (el.$cls = value))
++      } else {
++        el.className = el.$cls = value
++      }
      }
    }
  }
@@@ -227,12 -377,35 +399,40 @@@ export function setHtml(el: TargetEleme
    }
  }
  
+ export function setBlockHtml(
+   block: Block & { $html?: string },
+   value: any,
+ ): void {
+   value = value == null ? '' : unsafeToTrustedHTML(value)
+   if (block.$html !== value) {
+     setHtmlToBlock(block, (block.$html = value))
+   }
+ }
+ 
+ function setHtmlToBlock(block: Block, value: any): void {
+   if (block instanceof Node) {
+     if (block instanceof Element) {
+       block.innerHTML = value
+     } else if (__DEV__) {
+       warnCannotSetProp('innerHTML')
+     }
+   } else if (isVaporComponent(block)) {
+     setHtmlToBlock(block.block, value)
+   } else if (isArray(block)) {
+     if (__DEV__) {
+       warnCannotSetProp('innerHTML')
+     }
+   } else {
+     setHtmlToBlock(block.nodes, value)
+   }
+ }
+ 
 -export function setDynamicProps(el: any, args: any[]): void {
 +export function setDynamicProps(
 +  el: any,
 +  args: any[],
 +  root?: boolean,
 +  isSVG?: boolean,
 +): void {
    const props = args.length > 1 ? mergeProps(...args) : args[0]
    const cacheKey = `$dprops${isApplyingFallthroughProps ? '$' : ''}`
    const prevKeys = el[cacheKey] as string[]
@@@ -258,10 -430,12 +458,11 @@@ export function setDynamicProp
    el: TargetElement,
    key: string,
    value: any,
 +  isSVG: boolean = false,
  ): void {
 -  // TODO
 -  const isSVG = false
+   let forceHydrate = false
    if (key === 'class') {
 -    setClass(el, value)
 +    setClass(el, value, isSVG)
    } else if (key === 'style') {
      setStyle(el, value)
    } else if (isOn(key)) {
@@@ -278,12 -453,12 +480,12 @@@
      } else if (key === 'textContent') {
        setElementText(el, value)
      } else if (key === 'value' && canSetValueDirectly(el.tagName)) {
-       setValue(el, value)
+       setValue(el, value, forceHydrate)
      } else {
-       setDOMProp(el, key, value)
+       setDOMProp(el, key, value, forceHydrate)
      }
    } else {
 -    setAttr(el, key, value)
 +    setAttr(el, key, value, isSVG)
    }
    return value
  }
diff --cc packages/runtime-vapor/src/dom/template.ts
index d4659abea2,5db46476f7..23c56e0ca1
--- a/packages/runtime-vapor/src/dom/template.ts
+++ b/packages/runtime-vapor/src/dom/template.ts
@@@ -1,6 -1,5 +1,6 @@@
  import { adoptTemplate, currentHydrationNode, isHydrating } from './hydration'
- import { child, createTextNode } from './node'
 -import { _child, createElement, createTextNode } from './node'
 +import { type Namespace, Namespaces } from '@vue/shared'
++import { _child, createTextNode } from './node'
  
  let t: HTMLTemplateElement
  
@@@ -20,15 -20,9 +21,15 @@@ export function template(html: string, 
        return createTextNode(html)
      }
      if (!node) {
 -      t = t || createElement('template')
 -      t.innerHTML = html
 -      node = _child(t.content)
 +      t = t || document.createElement('template')
 +      if (ns) {
 +        const tag = ns === Namespaces.SVG ? 'svg' : 'math'
 +        t.innerHTML = `<${tag}>${html}</${tag}>`
-         node = child(child(t.content) as ParentNode)
++        node = _child(_child(t.content) as ParentNode)
 +      } else {
 +        t.innerHTML = html
-         node = child(t.content)
++        node = _child(t.content)
 +      }
      }
      const ret = node.cloneNode(true)
      if (root) (ret as any).$root = true