From: edison <daiwei521@126.com>
Date: Fri, 7 Nov 2025 00:46:41 +0000 (+0800)
Subject: Merge branch 'main' into edison/feat/ce_attachInternals
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fedison%2Ffeat%2Fce_attachInternals;p=thirdparty%2Fvuejs%2Fcore.git

Merge branch 'main' into edison/feat/ce_attachInternals
---

730f088d5e877df55bf9cbaa08ed10506d340f9f
diff --cc packages/runtime-dom/src/apiCustomElement.ts
index c6d000feec,85d37bc117..86ea365d2e
--- a/packages/runtime-dom/src/apiCustomElement.ts
+++ b/packages/runtime-dom/src/apiCustomElement.ts
@@@ -172,12 -173,10 +173,12 @@@ export function defineCustomElement
     */
    _createApp?: CreateAppFunction<Element>,
  ): VueElementConstructor {
-   const Comp = defineComponent(options, extraOptions) as any
-   if (isPlainObject(Comp)) extend(Comp, extraOptions)
+   let Comp = defineComponent(options, extraOptions) as any
+   if (isPlainObject(Comp)) Comp = extend({}, Comp, extraOptions)
    class VueCustomElement extends VueElement {
      static def = Comp
 +    static formAssociated = !!options.formAssociated
 +
      constructor(initialProps?: Record<string, any>) {
        super(Comp, initialProps, _createApp)
      }