From: daiwei Date: Thu, 12 Jun 2025 13:45:38 +0000 (+0800) Subject: chore: Merge branch 'edison/fix/dynamicComponentAttrsFallthrough' into edison/testVapor X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e033870da5e5e5f8612d7c6cacf29a0f039a33ee;p=thirdparty%2Fvuejs%2Fcore.git chore: Merge branch 'edison/fix/dynamicComponentAttrsFallthrough' into edison/testVapor --- e033870da5e5e5f8612d7c6cacf29a0f039a33ee diff --cc packages/runtime-vapor/src/component.ts index 46322ac0e2,55edf38c6b..00b9f26c1b --- a/packages/runtime-vapor/src/component.ts +++ b/packages/runtime-vapor/src/component.ts @@@ -25,14 -25,7 +25,15 @@@ import unregisterHMR, warn, } from '@vue/runtime-dom' -import { type Block, DynamicFragment, insert, isBlock, remove } from './block' +import { + type Block, ++ DynamicFragment, + insert, + isBlock, + remove, + setComponentScopeId, + setScopeId, +} from './block' import { type ShallowRef, markRaw,