From: daiwei <daiwei521@126.com>
Date: Mon, 13 Oct 2025 06:10:10 +0000 (+0800)
Subject: chore: Merge branch 'minor' into edison/feat/svgAndMathML
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=277d57cd2eda543181638da54c283368bdd749ff;p=thirdparty%2Fvuejs%2Fcore.git

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

277d57cd2eda543181638da54c283368bdd749ff
diff --cc packages/compiler-vapor/__tests__/transforms/transformText.spec.ts
index 20fa6d1fd0,dbff56f2a4..499c5be974
--- a/packages/compiler-vapor/__tests__/transforms/transformText.spec.ts
+++ b/packages/compiler-vapor/__tests__/transforms/transformText.spec.ts
@@@ -48,4 -48,10 +48,10 @@@ describe('compiler: text transform', (
      expect(ir.block.operation).toMatchObject([])
      expect(ir.block.effect.length).toBe(1)
    })
+ 
+   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>')
+   })
  })
diff --cc packages/runtime-dom/src/index.ts
index 16f175b74a,64ba93e0e3..6f2492af27
--- a/packages/runtime-dom/src/index.ts
+++ b/packages/runtime-dom/src/index.ts
@@@ -348,11 -348,7 +348,15 @@@ export 
    vModelSelectInit,
    vModelSetSelected,
  } from './directives/vModel'
 +/**
 + * @internal
 + */
 +export { svgNS, mathmlNS } from './nodeOps'
 +/**
 + * @internal
 + */
 +export { xlinkNS } from './modules/attrs'
+ /**
+  * @internal
+  */
+ export { unsafeToTrustedHTML } from './nodeOps'
diff --cc packages/runtime-vapor/src/dom/prop.ts
index 47a2cd9695,346bea53eb..6e3de7fe59
--- a/packages/runtime-vapor/src/dom/prop.ts
+++ b/packages/runtime-vapor/src/dom/prop.ts
@@@ -14,8 -14,8 +14,9 @@@ import 
    mergeProps,
    patchStyle,
    shouldSetAsProp,
+   unsafeToTrustedHTML,
    warn,
 +  xlinkNS,
  } from '@vue/runtime-dom'
  import {
    type VaporComponentInstance,
diff --cc pnpm-lock.yaml
index 9352843692,40d3bbaff4..847ca344d4
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@@ -4544,128 -4433,71 +4438,74 @@@ snapshots
        estree-walker: 2.0.2
        picomatch: 4.0.3
      optionalDependencies:
-       rollup: 4.49.0
- 
-   '@rollup/rollup-android-arm-eabi@4.47.0':
-     optional: true
- 
-   '@rollup/rollup-android-arm-eabi@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-android-arm64@4.47.0':
-     optional: true
- 
-   '@rollup/rollup-android-arm64@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-darwin-arm64@4.47.0':
-     optional: true
- 
-   '@rollup/rollup-darwin-arm64@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-darwin-x64@4.47.0':
-     optional: true
+       rollup: 4.50.1
  
-   '@rollup/rollup-darwin-x64@4.49.0':
+   '@rollup/rollup-android-arm-eabi@4.50.1':
      optional: true
  
-   '@rollup/rollup-freebsd-arm64@4.47.0':
+   '@rollup/rollup-android-arm64@4.50.1':
      optional: true
  
-   '@rollup/rollup-freebsd-arm64@4.49.0':
+   '@rollup/rollup-darwin-arm64@4.50.1':
      optional: true
  
-   '@rollup/rollup-freebsd-x64@4.47.0':
+   '@rollup/rollup-darwin-x64@4.50.1':
      optional: true
  
-   '@rollup/rollup-freebsd-x64@4.49.0':
+   '@rollup/rollup-freebsd-arm64@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-arm-gnueabihf@4.47.0':
+   '@rollup/rollup-freebsd-x64@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-arm-gnueabihf@4.49.0':
+   '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-arm-musleabihf@4.47.0':
+   '@rollup/rollup-linux-arm-musleabihf@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-arm-musleabihf@4.49.0':
+   '@rollup/rollup-linux-arm64-gnu@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-arm64-gnu@4.47.0':
+   '@rollup/rollup-linux-arm64-musl@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-arm64-gnu@4.49.0':
+   '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-arm64-musl@4.47.0':
+   '@rollup/rollup-linux-ppc64-gnu@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-arm64-musl@4.49.0':
+   '@rollup/rollup-linux-riscv64-gnu@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-loongarch64-gnu@4.47.0':
+   '@rollup/rollup-linux-riscv64-musl@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-loongarch64-gnu@4.49.0':
+   '@rollup/rollup-linux-s390x-gnu@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-ppc64-gnu@4.47.0':
+   '@rollup/rollup-linux-x64-gnu@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-ppc64-gnu@4.49.0':
+   '@rollup/rollup-linux-x64-musl@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-riscv64-gnu@4.47.0':
+   '@rollup/rollup-openharmony-arm64@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-riscv64-gnu@4.49.0':
+   '@rollup/rollup-win32-arm64-msvc@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-riscv64-musl@4.47.0':
+   '@rollup/rollup-win32-ia32-msvc@4.50.1':
      optional: true
  
-   '@rollup/rollup-linux-riscv64-musl@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-linux-s390x-gnu@4.47.0':
-     optional: true
- 
-   '@rollup/rollup-linux-s390x-gnu@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-linux-x64-gnu@4.47.0':
-     optional: true
- 
-   '@rollup/rollup-linux-x64-gnu@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-linux-x64-musl@4.47.0':
-     optional: true
- 
-   '@rollup/rollup-linux-x64-musl@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-win32-arm64-msvc@4.47.0':
-     optional: true
- 
-   '@rollup/rollup-win32-arm64-msvc@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-win32-ia32-msvc@4.47.0':
-     optional: true
- 
-   '@rollup/rollup-win32-ia32-msvc@4.49.0':
-     optional: true
- 
-   '@rollup/rollup-win32-x64-msvc@4.47.0':
+   '@rollup/rollup-win32-x64-msvc@4.50.1':
      optional: true
  
 +  '@rollup/rollup-win32-x64-msvc@4.49.0':
 +    optional: true
 +
    '@swc/core-darwin-arm64@1.13.3':
      optional: true