From: Rizumu Ayaka <rizumu@ayaka.moe>
Date: Fri, 29 Dec 2023 13:03:21 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/minor'
X-Git-Tag: v3.6.0-alpha.1~16^2~697
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a82d070890991b6f02947ee721fbcd5757c8dd94;p=thirdparty%2Fvuejs%2Fcore.git

Merge remote-tracking branch 'upstream/minor'
---

a82d070890991b6f02947ee721fbcd5757c8dd94
diff --cc package.json
index 8f46270d0f,b50b1c58e2..62ddb7d7aa
--- a/package.json
+++ b/package.json
@@@ -9,13 -9,13 +9,13 @@@
      "build-dts": "tsc -p tsconfig.build.json && rollup -c rollup.dts.config.js",
      "clean": "rimraf packages/*/dist temp .eslintcache",
      "size": "run-s \"size-*\" && tsx scripts/usage-size.ts",
 -    "size-global": "node scripts/build.js vue runtime-dom -f global -p --size",
 -    "size-esm-runtime": "node scripts/build.js vue -f esm-bundler-runtime",
 -    "size-esm": "node scripts/build.js runtime-dom runtime-core reactivity shared -f esm-bundler",
 +    "size-global": "node scripts/build.js vue vue-vapor runtime-dom runtime-vapor -f global -p --size",
 +    "size-esm-runtime": "node scripts/build.js vue vue-vapor -f esm-bundler-runtime",
 +    "size-esm": "node scripts/build.js runtime-dom runtime-vapor runtime-core reactivity shared -f esm-bundler",
      "check": "tsc --incremental --noEmit",
-     "lint": "eslint --cache --ext .ts packages/*/{src,__tests__}/**.ts",
-     "format": "prettier --write --cache \"**/*.[tj]s?(x)\"",
-     "format-check": "prettier --check --cache \"**/*.[tj]s?(x)\"",
+     "lint": "eslint --cache --ext .js,.ts,.tsx . --ignore-path .gitignore",
+     "format": "prettier --write --cache .",
+     "format-check": "prettier --check --cache .",
      "test": "vitest",
      "test-unit": "vitest -c vitest.unit.config.ts",
      "test-e2e": "node scripts/build.js vue -f global -d && vitest -c vitest.e2e.config.ts",
diff --cc packages/compiler-core/src/codegen.ts
index 765b20b553,4447e67aaf..821c85d4cf
--- a/packages/compiler-core/src/codegen.ts
+++ b/packages/compiler-core/src/codegen.ts
@@@ -69,15 -69,11 +69,15 @@@ export interface CodegenResult 
    map?: RawSourceMap
  }
  
 -enum NewlineType {
 +export enum NewlineType {
 +  /** Start with `\n` */
    Start = 0,
 +  /** Ends with `\n` */
    End = -1,
 +  /** No `\n` included */
    None = -2,
 +  /** Don't know, calc it */
-   Unknown = -3
+   Unknown = -3,
  }
  
  export interface CodegenContext
diff --cc packages/compiler-core/src/index.ts
index d4f2f3d12b,ef4e54cf2d..4fdcd4052c
--- a/packages/compiler-core/src/index.ts
+++ b/packages/compiler-core/src/index.ts
@@@ -19,22 -19,15 +19,22 @@@ export 
    createStructuralDirectiveTransform,
    type NodeTransform,
    type StructuralDirectiveTransform,
-   type DirectiveTransform
+   type DirectiveTransform,
  } from './transform'
 -export { generate, type CodegenContext, type CodegenResult } from './codegen'
 +export {
 +  generate,
 +  NewlineType,
 +  type CodegenContext,
-   type CodegenResult
++  type CodegenResult,
 +} from './codegen'
  export {
    ErrorCodes,
    errorMessages,
    createCompilerError,
 +  defaultOnError,
 +  defaultOnWarn,
    type CoreCompilerError,
-   type CompilerError
+   type CompilerError,
  } from './errors'
  
  export * from './ast'
@@@ -76,5 -69,4 +76,5 @@@ export 
    checkCompatEnabled,
    warnDeprecation,
    CompilerDeprecationTypes,
-   type CompilerCompatOptions
++  type CompilerCompatOptions,
  } from './compat/compatConfig'
diff --cc packages/compiler-core/src/utils.ts
index cb4067c4d0,99a2c5b61a..77708a4105
--- a/packages/compiler-core/src/utils.ts
+++ b/packages/compiler-core/src/utils.ts
@@@ -153,17 -153,11 +153,17 @@@ export const isMemberExpressionBrowser 
  }
  
  export const isMemberExpressionNode = __BROWSER__
 -  ? (NOOP as any as (path: string, context: TransformContext) => boolean)
 -  : (path: string, context: TransformContext): boolean => {
 +  ? (NOOP as any as (
 +      path: string,
-       options: Pick<TransformContext, 'expressionPlugins'>
++      options: Pick<TransformContext, 'expressionPlugins'>,
 +    ) => boolean)
 +  : (
 +      path: string,
-       options: Pick<TransformContext, 'expressionPlugins'>
++      options: Pick<TransformContext, 'expressionPlugins'>,
 +    ): boolean => {
        try {
          let ret: Expression = parseExpression(path, {
-           plugins: options.expressionPlugins
 -          plugins: context.expressionPlugins,
++          plugins: options.expressionPlugins,
          })
          ret = unwrapTSNode(ret) as Expression
          return (
diff --cc packages/compiler-dom/src/errors.ts
index 8fb7e36ed6,b47624840a..15641e531a
--- a/packages/compiler-dom/src/errors.ts
+++ b/packages/compiler-dom/src/errors.ts
@@@ -60,7 -60,4 +60,7 @@@ export const DOMErrorMessages: Record<D
    [DOMErrorCodes.X_V_SHOW_NO_EXPRESSION]: `v-show is missing expression.`,
    [DOMErrorCodes.X_TRANSITION_INVALID_CHILDREN]: `<Transition> expects exactly one child element or component.`,
    [DOMErrorCodes.X_IGNORED_SIDE_EFFECT_TAG]: `Tags with side effect (<script> and <style>) are ignored in client component templates.`,
 +
 +  // just to fulfill types
-   [DOMErrorCodes.__EXTEND_POINT__]: ``
++  [DOMErrorCodes.__EXTEND_POINT__]: ``,
  }
diff --cc packages/compiler-dom/src/index.ts
index c2505ca5e1,a3a738a8fb..01d3eebe9d
--- a/packages/compiler-dom/src/index.ts
+++ b/packages/compiler-dom/src/index.ts
@@@ -71,7 -71,6 +71,7 @@@ export { transformStyle } from './trans
  export {
    createDOMCompilerError,
    DOMErrorCodes,
-   DOMErrorMessages
+   DOMErrorMessages,
  } from './errors'
 +export { resolveModifiers } from './transforms/vOn'
  export * from '@vue/compiler-core'
diff --cc packages/compiler-dom/src/transforms/vOn.ts
index 8fec0c91b1,88d2c5db74..8a77ee0d2f
--- a/packages/compiler-dom/src/transforms/vOn.ts
+++ b/packages/compiler-dom/src/transforms/vOn.ts
@@@ -1,20 -1,21 +1,20 @@@
  import {
+   CompilerDeprecationTypes,
+   type DirectiveTransform,
+   type ExpressionNode,
+   NodeTypes,
 -  type SimpleExpressionNode,
+   type SourceLocation,
+   type TransformContext,
    transformOn as baseTransform,
-   DirectiveTransform,
-   createObjectProperty,
+   checkCompatEnabled,
    createCallExpression,
-   createSimpleExpression,
-   NodeTypes,
    createCompoundExpression,
-   ExpressionNode,
+   createObjectProperty,
+   createSimpleExpression,
    isStaticExp,
-   CompilerDeprecationTypes,
-   TransformContext,
-   SourceLocation,
-   checkCompatEnabled
  } from '@vue/compiler-core'
- import { V_ON_WITH_MODIFIERS, V_ON_WITH_KEYS } from '../runtimeHelpers'
- import { makeMap, capitalize, isString } from '@vue/shared'
+ import { V_ON_WITH_KEYS, V_ON_WITH_MODIFIERS } from '../runtimeHelpers'
 -import { capitalize, makeMap } from '@vue/shared'
++import { capitalize, isString, makeMap } from '@vue/shared'
  
  const isEventOptionModifier = /*#__PURE__*/ makeMap(`passive,once,capture`)
  const isNonKeyModifier = /*#__PURE__*/ makeMap(
@@@ -29,14 -30,14 +29,14 @@@
  const maybeKeyModifier = /*#__PURE__*/ makeMap('left,right')
  const isKeyboardEvent = /*#__PURE__*/ makeMap(
    `onkeyup,onkeydown,onkeypress`,
-   true
+   true,
  )
  
 -const resolveModifiers = (
 -  key: ExpressionNode,
 +export const resolveModifiers = (
 +  key: ExpressionNode | string,
    modifiers: string[],
 -  context: TransformContext,
 +  context: TransformContext | null,
-   loc: SourceLocation
+   loc: SourceLocation,
  ) => {
    const keyModifiers = []
    const nonKeyModifiers = []
diff --cc packages/runtime-core/__tests__/vnode.spec.ts
index 78429b4040,653613ddb2..525a449d8a
--- a/packages/runtime-core/__tests__/vnode.spec.ts
+++ b/packages/runtime-core/__tests__/vnode.spec.ts
@@@ -6,13 -3,17 +3,16 @@@ import 
    Fragment,
    Text,
    cloneVNode,
+   createBlock,
+   createVNode,
+   isBlockTreeEnabled,
    mergeProps,
    normalizeVNode,
+   openBlock,
    transformVNodeArgs,
-   isBlockTreeEnabled
  } from '../src/vnode'
- import { ShapeFlags, PatchFlags, Data } from '@vue/shared'
- import { h, reactive, isReactive, setBlockTracking, ref, withCtx } from '../src'
 -import type { Data } from '../src/component'
 -import { PatchFlags, ShapeFlags } from '@vue/shared'
++import { type Data, PatchFlags, ShapeFlags } from '@vue/shared'
+ import { h, isReactive, reactive, ref, setBlockTracking, withCtx } from '../src'
  import { createApp, nodeOps, serializeInner } from '@vue/runtime-test'
  import { setCurrentRenderingInstance } from '../src/componentRenderContext'
  
diff --cc packages/runtime-core/src/apiCreateApp.ts
index d888e40ec3,b99d06e01f..7da2bfb132
--- a/packages/runtime-core/src/apiCreateApp.ts
+++ b/packages/runtime-core/src/apiCreateApp.ts
@@@ -1,32 -1,33 +1,32 @@@
  import {
-   ConcreteComponent,
+   type Component,
+   type ComponentInternalInstance,
+   type ConcreteComponent,
 -  type Data,
+   getExposeProxy,
    validateComponentName,
-   Component,
-   ComponentInternalInstance,
-   getExposeProxy
  } from './component'
- import {
+ import type {
    ComponentOptions,
    MergedComponentOptions,
-   RuntimeCompilerOptions
+   RuntimeCompilerOptions,
  } from './componentOptions'
- import {
+ import type {
    ComponentCustomProperties,
-   ComponentPublicInstance
+   ComponentPublicInstance,
  } from './componentPublicInstance'
- import { Directive, validateDirectiveName } from './directives'
- import { ElementNamespace, RootRenderFunction } from './renderer'
- import { InjectionKey } from './apiInject'
+ import { type Directive, validateDirectiveName } from './directives'
+ import type { ElementNamespace, RootRenderFunction } from './renderer'
+ import type { InjectionKey } from './apiInject'
  import { warn } from './warning'
- import { createVNode, cloneVNode, VNode } from './vnode'
- import { RootHydrateFunction } from './hydration'
+ import { type VNode, cloneVNode, createVNode } from './vnode'
+ import type { RootHydrateFunction } from './hydration'
  import { devtoolsInitApp, devtoolsUnmountApp } from './devtools'
- import { isFunction, NO, isObject, extend, Data } from '@vue/shared'
 -import { NO, extend, isFunction, isObject } from '@vue/shared'
++import { type Data, NO, extend, isFunction, isObject } from '@vue/shared'
  import { version } from '.'
  import { installAppCompatProperties } from './compat/global'
- import { NormalizedPropsOptions } from './componentProps'
- import { ObjectEmitsOptions } from './componentEmits'
- import { DefineComponent } from './apiDefineComponent'
+ import type { NormalizedPropsOptions } from './componentProps'
+ import type { ObjectEmitsOptions } from './componentEmits'
+ import type { DefineComponent } from './apiDefineComponent'
  
  export interface App<HostElement = any> {
    version: string
diff --cc packages/runtime-core/src/compat/props.ts
index b0167c2331,0330e33aa1..78dad9d32e
--- a/packages/runtime-core/src/compat/props.ts
+++ b/packages/runtime-core/src/compat/props.ts
@@@ -1,7 -1,10 +1,10 @@@
- import { isArray, Data } from '@vue/shared'
 -import { isArray } from '@vue/shared'
++import { type Data, isArray } from '@vue/shared'
  import { inject } from '../apiInject'
- import { ComponentInternalInstance } from '../component'
- import { ComponentOptions, resolveMergedOptions } from '../componentOptions'
 -import type { ComponentInternalInstance, Data } from '../component'
++import type { ComponentInternalInstance } from '../component'
+ import {
+   type ComponentOptions,
+   resolveMergedOptions,
+ } from '../componentOptions'
  import { DeprecationTypes, warnDeprecation } from './compatConfig'
  
  export function createPropsDefaultThis(
diff --cc packages/runtime-core/src/compat/renderFn.ts
index e1745cf294,52a19d08f8..3b98b69086
--- a/packages/runtime-core/src/compat/renderFn.ts
+++ b/packages/runtime-core/src/compat/renderFn.ts
@@@ -1,4 -1,5 +1,6 @@@
  import {
++  type Data,
+   ShapeFlags,
    extend,
    hyphenate,
    isArray,
@@@ -15,13 -14,14 +15,13 @@@ import type 
    Component,
    ComponentInternalInstance,
    ComponentOptions,
-   InternalRenderFunction
 -  Data,
+   InternalRenderFunction,
  } from '../component'
  import { currentRenderingInstance } from '../componentRenderContext'
- import { DirectiveArguments, withDirectives } from '../directives'
+ import { type DirectiveArguments, withDirectives } from '../directives'
  import {
    resolveDirective,
-   resolveDynamicComponent
+   resolveDynamicComponent,
  } from '../helpers/resolveAssets'
  import {
    Comment,
diff --cc packages/runtime-core/src/component.ts
index 7ceeaf3909,6595df8fd5..527965c080
--- a/packages/runtime-core/src/component.ts
+++ b/packages/runtime-core/src/component.ts
@@@ -32,57 -36,58 +36,57 @@@ import 
  } from './componentSlots'
  import { warn } from './warning'
  import { ErrorCodes, callWithErrorHandling, handleError } from './errorHandling'
- import { AppContext, createAppContext, AppConfig } from './apiCreateApp'
- import { Directive, validateDirectiveName } from './directives'
  import {
+   type AppConfig,
+   type AppContext,
+   createAppContext,
+ } from './apiCreateApp'
+ import { type Directive, validateDirectiveName } from './directives'
+ import {
+   type ComponentOptions,
+   type ComputedOptions,
+   type MethodOptions,
    applyOptions,
-   ComponentOptions,
-   ComputedOptions,
-   MethodOptions,
-   resolveMergedOptions
+   resolveMergedOptions,
  } from './componentOptions'
  import {
-   EmitsOptions,
-   ObjectEmitsOptions,
-   EmitFn,
+   type EmitFn,
+   type EmitsOptions,
+   type EmitsToProps,
+   type ObjectEmitsOptions,
+   type ShortEmitsToObject,
    emit,
    normalizeEmitsOptions,
-   EmitsToProps,
-   ShortEmitsToObject
  } from './componentEmits'
  import {
++  type Data,
    EMPTY_OBJ,
-   isArray,
-   isFunction,
-   NOOP,
-   isObject,
+   type IfAny,
    NO,
-   makeMap,
-   isPromise,
+   NOOP,
    ShapeFlags,
    extend,
    getGlobalThis,
-   IfAny,
-   Data
+   isArray,
+   isFunction,
+   isObject,
+   isPromise,
+   makeMap,
  } from '@vue/shared'
- import { SuspenseBoundary } from './components/Suspense'
- import { CompilerOptions } from '@vue/compiler-core'
+ import type { SuspenseBoundary } from './components/Suspense'
+ import type { CompilerOptions } from '@vue/compiler-core'
  import { markAttrsAccessed } from './componentRenderUtils'
  import { currentRenderingInstance } from './componentRenderContext'
- import { startMeasure, endMeasure } from './profiling'
+ import { endMeasure, startMeasure } from './profiling'
  import { convertLegacyRenderFn } from './compat/renderFn'
  import {
-   CompatConfig,
+   type CompatConfig,
    globalCompatConfig,
-   validateCompatConfig
+   validateCompatConfig,
  } from './compat/compatConfig'
- import { SchedulerJob } from './scheduler'
- import { LifecycleHooks } from './enums'
+ import type { SchedulerJob } from './scheduler'
+ import type { LifecycleHooks } from './enums'
  
 -export type Data = Record<string, unknown>
 -
  /**
   * Public utility type for extracting the instance type of a component.
   * Works with all valid component definition types. This is intended to replace
diff --cc packages/runtime-core/src/componentOptions.ts
index 4e98290914,65b952b0b5..0827c1cbb1
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@@ -1,70 -1,70 +1,70 @@@
- import {
+ import type {
+   Component,
    ComponentInternalInstance,
-   SetupContext,
    ComponentInternalOptions,
-   Component,
    ConcreteComponent,
-   InternalRenderFunction
 -  Data,
+   InternalRenderFunction,
+   SetupContext,
  } from './component'
  import {
-   isFunction,
++  type Data,
+   type LooseRequired,
+   NOOP,
+   type Prettify,
    extend,
-   isString,
-   isObject,
    isArray,
-   NOOP,
+   isFunction,
+   isObject,
    isPromise,
-   LooseRequired,
-   Prettify,
-   Data
+   isString,
  } from '@vue/shared'
- import { isRef, Ref } from '@vue/reactivity'
+ import { type Ref, isRef } from '@vue/reactivity'
  import { computed } from './apiComputed'
  import {
+   type WatchCallback,
+   type WatchOptions,
+   createPathGetter,
    watch,
-   WatchOptions,
-   WatchCallback,
-   createPathGetter
  } from './apiWatch'
- import { provide, inject } from './apiInject'
+ import { inject, provide } from './apiInject'
  import {
+   type DebuggerHook,
+   type ErrorCapturedHook,
+   onActivated,
    onBeforeMount,
-   onMounted,
+   onBeforeUnmount,
    onBeforeUpdate,
-   onUpdated,
+   onDeactivated,
    onErrorCaptured,
+   onMounted,
    onRenderTracked,
-   onBeforeUnmount,
-   onUnmounted,
-   onActivated,
-   onDeactivated,
    onRenderTriggered,
-   DebuggerHook,
-   ErrorCapturedHook,
-   onServerPrefetch
+   onServerPrefetch,
+   onUnmounted,
+   onUpdated,
  } from './apiLifecycle'
  import {
+   type ComputedGetter,
+   type WritableComputedOptions,
    reactive,
-   ComputedGetter,
-   WritableComputedOptions
  } from '@vue/reactivity'
- import {
+ import type {
    ComponentObjectPropsOptions,
-   ExtractPropTypes,
+   ComponentPropsOptions,
    ExtractDefaultPropTypes,
-   ComponentPropsOptions
+   ExtractPropTypes,
  } from './componentProps'
- import { EmitsOptions, EmitsToProps } from './componentEmits'
- import { Directive } from './directives'
+ import type { EmitsOptions, EmitsToProps } from './componentEmits'
+ import type { Directive } from './directives'
  import {
-   CreateComponentPublicInstance,
-   ComponentPublicInstance,
+   type ComponentPublicInstance,
+   type CreateComponentPublicInstance,
+   type IntersectionMixin,
+   type UnwrapMixinsType,
    isReservedPrefix,
-   IntersectionMixin,
-   UnwrapMixinsType
  } from './componentPublicInstance'
  import { warn } from './warning'
- import { VNodeChild } from './vnode'
+ import type { VNodeChild } from './vnode'
  import { callWithAsyncErrorHandling } from './errorHandling'
  import { deepMergeData } from './compat/data'
  import { DeprecationTypes } from './compat/compatConfig'
diff --cc packages/runtime-core/src/componentProps.ts
index c0dbc2d76a,2124853f12..e49bf0dcdb
--- a/packages/runtime-core/src/componentProps.ts
+++ b/packages/runtime-core/src/componentProps.ts
@@@ -1,38 -1,38 +1,38 @@@
  import {
-   toRaw,
+   TriggerOpTypes,
    shallowReactive,
+   shallowReadonly,
+   toRaw,
    trigger,
-   TriggerOpTypes,
-   shallowReadonly
  } from '@vue/reactivity'
  import {
++  type Data,
+   EMPTY_ARR,
    EMPTY_OBJ,
+   type IfAny,
+   PatchFlags,
    camelize,
-   hyphenate,
    capitalize,
-   isString,
-   isFunction,
-   isArray,
-   isObject,
-   hasOwn,
-   toRawType,
-   PatchFlags,
-   makeMap,
-   isReservedProp,
-   EMPTY_ARR,
    def,
    extend,
+   hasOwn,
+   hyphenate,
+   isArray,
+   isFunction,
+   isObject,
    isOn,
-   IfAny,
-   Data
+   isReservedProp,
+   isString,
+   makeMap,
+   toRawType,
  } from '@vue/shared'
  import { warn } from './warning'
  import {
-   ComponentInternalInstance,
-   ComponentOptions,
-   ConcreteComponent,
+   type ComponentInternalInstance,
+   type ComponentOptions,
+   type ConcreteComponent,
 -  type Data,
    setCurrentInstance,
-   unsetCurrentInstance
+   unsetCurrentInstance,
  } from './component'
  import { isEmitListener } from './componentEmits'
  import { InternalObjectKey } from './vnode'
diff --cc packages/runtime-core/src/componentPublicInstance.ts
index 77c42ff6ab,8cefecc7ae..c190810c69
--- a/packages/runtime-core/src/componentPublicInstance.ts
+++ b/packages/runtime-core/src/componentPublicInstance.ts
@@@ -1,47 -1,51 +1,51 @@@
  import {
-   ComponentInternalInstance,
+   type ComponentInternalInstance,
 -  type Data,
    getExposeProxy,
-   isStatefulComponent
+   isStatefulComponent,
  } from './component'
  import { nextTick, queueJob } from './scheduler'
- import { instanceWatch, WatchOptions, WatchStopHandle } from './apiWatch'
  import {
+   type WatchOptions,
+   type WatchStopHandle,
+   instanceWatch,
+ } from './apiWatch'
+ import {
++  type Data,
    EMPTY_OBJ,
-   hasOwn,
-   isGloballyAllowed,
+   type IfAny,
    NOOP,
+   type Prettify,
+   type UnionToIntersection,
    extend,
-   isString,
+   hasOwn,
    isFunction,
-   UnionToIntersection,
-   Prettify,
-   IfAny,
-   Data
+   isGloballyAllowed,
+   isString,
  } from '@vue/shared'
  import {
-   toRaw,
+   type ShallowUnwrapRef,
+   TrackOpTypes,
+   type UnwrapNestedRefs,
    shallowReadonly,
+   toRaw,
    track,
-   TrackOpTypes,
-   ShallowUnwrapRef,
-   UnwrapNestedRefs
  } from '@vue/reactivity'
  import {
-   ExtractComputedReturns,
-   ComponentOptionsBase,
-   ComputedOptions,
-   MethodOptions,
-   ComponentOptionsMixin,
-   OptionTypesType,
-   OptionTypesKeys,
+   type ComponentInjectOptions,
+   type ComponentOptionsBase,
+   type ComponentOptionsMixin,
+   type ComputedOptions,
+   type ExtractComputedReturns,
+   type InjectToObject,
+   type MergedComponentOptionsOverride,
+   type MethodOptions,
+   type OptionTypesKeys,
+   type OptionTypesType,
    resolveMergedOptions,
    shouldCacheAccess,
-   MergedComponentOptionsOverride,
-   InjectToObject,
-   ComponentInjectOptions
  } from './componentOptions'
- import { EmitsOptions, EmitFn } from './componentEmits'
- import { SlotsType, UnwrapSlotsType } from './componentSlots'
+ import type { EmitFn, EmitsOptions } from './componentEmits'
+ import type { SlotsType, UnwrapSlotsType } from './componentSlots'
  import { markAttrsAccessed } from './componentRenderUtils'
  import { currentRenderingInstance } from './componentRenderContext'
  import { warn } from './warning'
diff --cc packages/runtime-core/src/componentRenderUtils.ts
index 675f159065,e07a31ee20..90c95f6828
--- a/packages/runtime-core/src/componentRenderUtils.ts
+++ b/packages/runtime-core/src/componentRenderUtils.ts
@@@ -1,29 -1,24 +1,29 @@@
  import {
-   ComponentInternalInstance,
-   FunctionalComponent,
-   getComponentName
+   type ComponentInternalInstance,
 -  type Data,
+   type FunctionalComponent,
+   getComponentName,
  } from './component'
  import {
-   VNode,
-   normalizeVNode,
-   createVNode,
    Comment,
+   type VNode,
+   type VNodeArrayChildren,
+   blockStack,
    cloneVNode,
-   VNodeArrayChildren,
+   createVNode,
    isVNode,
-   blockStack
+   normalizeVNode,
  } from './vnode'
- import { handleError, ErrorCodes } from './errorHandling'
+ import { ErrorCodes, handleError } from './errorHandling'
 -import { PatchFlags, ShapeFlags, isModelListener, isOn } from '@vue/shared'
 +import {
++  type Data,
 +  PatchFlags,
 +  ShapeFlags,
-   isOn,
 +  isModelListener,
-   Data
++  isOn,
 +} from '@vue/shared'
  import { warn } from './warning'
  import { isHmrUpdating } from './hmr'
- import { NormalizedProps } from './componentProps'
+ import type { NormalizedProps } from './componentProps'
  import { isEmitListener } from './componentEmits'
  import { setCurrentRenderingInstance } from './componentRenderContext'
  import {
diff --cc packages/runtime-core/src/directives.ts
index 496b558503,a3b44d4c8f..2bd457aae5
--- a/packages/runtime-core/src/directives.ts
+++ b/packages/runtime-core/src/directives.ts
@@@ -11,13 -11,17 +11,18 @@@ return withDirectives(h(comp), 
  ])
  */
  
- import { VNode } from './vnode'
- import { isFunction, EMPTY_OBJ, isBuiltInDirective, Data } from '@vue/shared'
+ import type { VNode } from './vnode'
 -import { EMPTY_OBJ, isBuiltInDirective, isFunction } from '@vue/shared'
 -import { warn } from './warning'
+ import {
 -  type ComponentInternalInstance,
+   type Data,
 -  getExposeProxy,
 -} from './component'
++  EMPTY_OBJ,
++  isBuiltInDirective,
++  isFunction,
++} from '@vue/shared'
 +import { warn } from './warning'
- import { ComponentInternalInstance, getExposeProxy } from './component'
++import { type ComponentInternalInstance, getExposeProxy } from './component'
  import { currentRenderingInstance } from './componentRenderContext'
- import { callWithAsyncErrorHandling, ErrorCodes } from './errorHandling'
- import { ComponentPublicInstance } from './componentPublicInstance'
+ import { ErrorCodes, callWithAsyncErrorHandling } from './errorHandling'
+ import type { ComponentPublicInstance } from './componentPublicInstance'
  import { mapCompatDirectiveHook } from './compat/customDirective'
  import { pauseTracking, resetTracking } from '@vue/reactivity'
  import { traverse } from './apiWatch'
diff --cc packages/runtime-core/src/helpers/renderSlot.ts
index 1d8618800d,8a7608219d..49a92aa1b9
--- a/packages/runtime-core/src/helpers/renderSlot.ts
+++ b/packages/runtime-core/src/helpers/renderSlot.ts
@@@ -1,18 -1,19 +1,18 @@@
- import { Slots, RawSlots } from '../componentSlots'
 -import type { Data } from '../component'
+ import type { RawSlots, Slots } from '../componentSlots'
  import {
-   ContextualRenderFn,
-   currentRenderingInstance
+   type ContextualRenderFn,
+   currentRenderingInstance,
  } from '../componentRenderContext'
  import {
    Comment,
+   Fragment,
+   type VNode,
+   type VNodeArrayChildren,
+   createBlock,
    isVNode,
-   VNodeArrayChildren,
    openBlock,
-   createBlock,
-   Fragment,
-   VNode
  } from '../vnode'
- import { PatchFlags, SlotFlags, Data } from '@vue/shared'
 -import { PatchFlags, SlotFlags } from '@vue/shared'
++import { type Data, PatchFlags, SlotFlags } from '@vue/shared'
  import { warn } from '../warning'
  import { createVNode } from '@vue/runtime-core'
  import { isAsyncWrapper } from '../apiAsyncComponent'
diff --cc packages/runtime-core/src/index.ts
index 98d1fe849b,8e49771d3c..f67b557278
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@@ -297,7 -299,6 +299,7 @@@ export type 
    ObjectDirective,
    FunctionDirective,
    DirectiveArguments,
-   DirectiveModifiers
++  DirectiveModifiers,
  } from './directives'
  export type { SuspenseBoundary } from './components/Suspense'
  export type {
diff --cc packages/runtime-core/src/renderer.ts
index c2bf0dbac3,fa1f08c3c9..0d79e76454
--- a/packages/runtime-core/src/renderer.ts
+++ b/packages/runtime-core/src/renderer.ts
@@@ -1,67 -1,67 +1,67 @@@
  import {
-   Text,
-   Fragment,
    Comment,
+   Fragment,
+   Static,
+   Text,
+   type VNode,
+   type VNodeArrayChildren,
+   type VNodeHook,
+   type VNodeProps,
    cloneIfMounted,
-   normalizeVNode,
-   VNode,
-   VNodeArrayChildren,
    createVNode,
+   invokeVNodeHook,
    isSameVNodeType,
-   Static,
-   VNodeHook,
-   VNodeProps,
-   invokeVNodeHook
+   normalizeVNode,
  } from './vnode'
  import {
-   ComponentInternalInstance,
-   ComponentOptions,
+   type ComponentInternalInstance,
+   type ComponentOptions,
 -  type Data,
    createComponentInstance,
-   setupComponent
+   setupComponent,
  } from './component'
  import {
    filterSingleRoot,
    renderComponentRoot,
    shouldUpdateComponent,
-   updateHOCHostEl
+   updateHOCHostEl,
  } from './componentRenderUtils'
  import {
-   EMPTY_OBJ,
++  type Data,
    EMPTY_ARR,
-   isReservedProp,
+   EMPTY_OBJ,
+   NOOP,
    PatchFlags,
    ShapeFlags,
-   NOOP,
+   getGlobalThis,
    invokeArrayFns,
    isArray,
-   getGlobalThis,
-   Data
+   isReservedProp,
  } from '@vue/shared'
  import {
-   queueJob,
-   queuePostFlushCb,
+   type SchedulerJob,
    flushPostFlushCbs,
-   invalidateJob,
    flushPreFlushCbs,
-   SchedulerJob
+   invalidateJob,
+   queueJob,
+   queuePostFlushCb,
  } from './scheduler'
- import { pauseTracking, resetTracking, ReactiveEffect } from '@vue/reactivity'
+ import { ReactiveEffect, pauseTracking, resetTracking } from '@vue/reactivity'
  import { updateProps } from './componentProps'
  import { updateSlots } from './componentSlots'
- import { pushWarningContext, popWarningContext, warn } from './warning'
- import { createAppAPI, CreateAppFunction } from './apiCreateApp'
+ import { popWarningContext, pushWarningContext, warn } from './warning'
+ import { type CreateAppFunction, createAppAPI } from './apiCreateApp'
  import { setRef } from './rendererTemplateRef'
  import {
-   SuspenseBoundary,
+   type SuspenseBoundary,
+   type SuspenseImpl,
    queueEffectWithSuspense,
-   SuspenseImpl
  } from './components/Suspense'
- import { TeleportImpl, TeleportVNode } from './components/Teleport'
- import { isKeepAlive, KeepAliveContext } from './components/KeepAlive'
- import { registerHMR, unregisterHMR, isHmrUpdating } from './hmr'
- import { createHydrationFunctions, RootHydrateFunction } from './hydration'
+ import type { TeleportImpl, TeleportVNode } from './components/Teleport'
+ import { type KeepAliveContext, isKeepAlive } from './components/KeepAlive'
+ import { isHmrUpdating, registerHMR, unregisterHMR } from './hmr'
+ import { type RootHydrateFunction, createHydrationFunctions } from './hydration'
  import { invokeDirectiveHook } from './directives'
- import { startMeasure, endMeasure } from './profiling'
+ import { endMeasure, startMeasure } from './profiling'
  import {
    devtoolsComponentAdded,
    devtoolsComponentRemoved,
diff --cc packages/runtime-core/src/vnode.ts
index 533fb600b1,178ceec41b..a8aa50ced9
--- a/packages/runtime-core/src/vnode.ts
+++ b/packages/runtime-core/src/vnode.ts
@@@ -1,43 -1,53 +1,53 @@@
  import {
-   isArray,
-   isFunction,
-   isString,
-   isObject,
++  type Data,
    EMPTY_ARR,
-   extend,
-   normalizeClass,
-   normalizeStyle,
    PatchFlags,
    ShapeFlags,
    SlotFlags,
+   extend,
+   isArray,
+   isFunction,
+   isObject,
    isOn,
-   Data
+   isString,
+   normalizeClass,
+   normalizeStyle,
  } from '@vue/shared'
  import {
-   ComponentInternalInstance,
-   ConcreteComponent,
-   ClassComponent,
-   Component,
-   isClassComponent
+   type ClassComponent,
+   type Component,
+   type ComponentInternalInstance,
+   type ConcreteComponent,
 -  type Data,
+   isClassComponent,
  } from './component'
- import { RawSlots } from './componentSlots'
- import { isProxy, Ref, toRaw, ReactiveFlags, isRef } from '@vue/reactivity'
- import { AppContext } from './apiCreateApp'
+ import type { RawSlots } from './componentSlots'
  import {
-   Suspense,
-   SuspenseImpl,
+   type ReactiveFlags,
+   type Ref,
+   isProxy,
+   isRef,
+   toRaw,
+ } from '@vue/reactivity'
+ import type { AppContext } from './apiCreateApp'
+ import {
+   type Suspense,
+   type SuspenseBoundary,
+   type SuspenseImpl,
    isSuspense,
-   SuspenseBoundary
  } from './components/Suspense'
- import { DirectiveBinding } from './directives'
- import { TransitionHooks } from './components/BaseTransition'
+ import type { DirectiveBinding } from './directives'
+ import type { TransitionHooks } from './components/BaseTransition'
  import { warn } from './warning'
- import { Teleport, TeleportImpl, isTeleport } from './components/Teleport'
+ import {
+   type Teleport,
+   type TeleportImpl,
+   isTeleport,
+ } from './components/Teleport'
  import {
    currentRenderingInstance,
-   currentScopeId
+   currentScopeId,
  } from './componentRenderContext'
- import { RendererNode, RendererElement } from './renderer'
+ import type { RendererElement, RendererNode } from './renderer'
  import { NULL_DYNAMIC_COMPONENT } from './helpers/resolveAssets'
  import { hmrDirtyComponents } from './hmr'
  import { convertLegacyComponent } from './compat/component'
diff --cc packages/runtime-core/src/warning.ts
index 9007da2a78,16928387df..14f1b020a4
--- a/packages/runtime-core/src/warning.ts
+++ b/packages/runtime-core/src/warning.ts
@@@ -1,12 -1,13 +1,12 @@@
- import { VNode } from './vnode'
+ import type { VNode } from './vnode'
  import {
-   ComponentInternalInstance,
-   ConcreteComponent,
-   formatComponentName
+   type ComponentInternalInstance,
+   type ConcreteComponent,
 -  type Data,
+   formatComponentName,
  } from './component'
- import { isString, isFunction, Data } from '@vue/shared'
- import { toRaw, isRef, pauseTracking, resetTracking } from '@vue/reactivity'
- import { callWithErrorHandling, ErrorCodes } from './errorHandling'
 -import { isFunction, isString } from '@vue/shared'
++import { type Data, isFunction, isString } from '@vue/shared'
+ import { isRef, pauseTracking, resetTracking, toRaw } from '@vue/reactivity'
+ import { ErrorCodes, callWithErrorHandling } from './errorHandling'
  
  type ComponentVNode = VNode & {
    type: ConcreteComponent
diff --cc packages/template-explorer/src/index.ts
index 90c030bfd9,988712d623..fb16a9bf4f
--- a/packages/template-explorer/src/index.ts
+++ b/packages/template-explorer/src/index.ts
@@@ -1,12 -1,15 +1,13 @@@
- import * as m from 'monaco-editor'
- import { CompilerError } from '@vue/compiler-dom'
- import { compile, CompilerOptions } from '@vue/compiler-vapor'
+ import type * as m from 'monaco-editor'
 -import {
 -  type CompilerError,
 -  type CompilerOptions,
 -  compile,
 -} from '@vue/compiler-dom'
 -import { compile as ssrCompile } from '@vue/compiler-ssr'
++import type { CompilerError } from '@vue/compiler-dom'
++import { type CompilerOptions, compile } from '@vue/compiler-vapor'
 +// import { compile as ssrCompile } from '@vue/compiler-ssr'
++
  import {
-   defaultOptions,
    compilerOptions,
+   defaultOptions,
    initOptions,
-   ssrMode
+   ssrMode,
  } from './options'
  import { toRaw, watchEffect } from '@vue/runtime-dom'
  import { SourceMapConsumer } from 'source-map-js'
diff --cc packages/template-explorer/src/options.ts
index 46c0d9263d,e3cc6173a8..84fdce7cd6
--- a/packages/template-explorer/src/options.ts
+++ b/packages/template-explorer/src/options.ts
@@@ -1,5 -1,5 +1,5 @@@
- import { h, reactive, createApp, ref } from 'vue'
- import { CompilerOptions } from '@vue/compiler-vapor'
+ import { createApp, h, reactive, ref } from 'vue'
 -import type { CompilerOptions } from '@vue/compiler-dom'
++import type { CompilerOptions } from '@vue/compiler-vapor'
  import { BindingTypes } from '@vue/compiler-core'
  
  export const ssrMode = ref(false)
diff --cc pnpm-lock.yaml
index 9c84fbf77d,b74310a8e6..9acf0841f6
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@@ -46,10 -46,13 +46,13 @@@ importers
          version: 20.10.5
        '@types/semver':
          specifier: ^7.5.5
 -        version: 7.5.5
 +        version: 7.5.6
+       '@typescript-eslint/eslint-plugin':
+         specifier: ^6.16.0
 -        version: 6.16.0(@typescript-eslint/parser@6.15.0)(eslint@8.56.0)(typescript@5.2.2)
++        version: 6.16.0(@typescript-eslint/parser@6.16.0)(eslint@8.56.0)(typescript@5.2.2)
        '@typescript-eslint/parser':
          specifier: ^6.15.0
 -        version: 6.15.0(eslint@8.56.0)(typescript@5.2.2)
 +        version: 6.16.0(eslint@8.56.0)(typescript@5.2.2)
        '@vitest/coverage-istanbul':
          specifier: ^1.1.0
          version: 1.1.0(vitest@1.1.0)
@@@ -74,9 -77,12 +77,12 @@@
        eslint-define-config:
          specifier: ^1.24.1
          version: 1.24.1
+       eslint-plugin-import:
+         specifier: npm:eslint-plugin-i@^2.29.1
 -        version: /eslint-plugin-i@2.29.1(@typescript-eslint/parser@6.15.0)(eslint@8.56.0)
++        version: /eslint-plugin-i@2.29.1(@typescript-eslint/parser@6.16.0)(eslint@8.56.0)
        eslint-plugin-jest:
          specifier: ^27.6.0
-         version: 27.6.0(eslint@8.56.0)(typescript@5.2.2)
+         version: 27.6.0(@typescript-eslint/eslint-plugin@6.16.0)(eslint@8.56.0)(typescript@5.2.2)
        estree-walker:
          specifier: ^2.0.2
          version: 2.0.2
@@@ -1634,8 -1592,37 +1640,37 @@@ packages
      dev: true
      optional: true
  
 -  /@typescript-eslint/eslint-plugin@6.16.0(@typescript-eslint/parser@6.15.0)(eslint@8.56.0)(typescript@5.2.2):
++  /@typescript-eslint/eslint-plugin@6.16.0(@typescript-eslint/parser@6.16.0)(eslint@8.56.0)(typescript@5.2.2):
+     resolution: {integrity: sha512-O5f7Kv5o4dLWQtPX4ywPPa+v9G+1q1x8mz0Kr0pXUtKsevo+gIJHLkGc8RxaZWtP8RrhwhSNIWThnW42K9/0rQ==}
+     engines: {node: ^16.0.0 || >=18.0.0}
+     peerDependencies:
+       '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
+       eslint: ^7.0.0 || ^8.0.0
+       typescript: '*'
+     peerDependenciesMeta:
+       typescript:
+         optional: true
+     dependencies:
+       '@eslint-community/regexpp': 4.9.1
 -      '@typescript-eslint/parser': 6.15.0(eslint@8.56.0)(typescript@5.2.2)
++      '@typescript-eslint/parser': 6.16.0(eslint@8.56.0)(typescript@5.2.2)
+       '@typescript-eslint/scope-manager': 6.16.0
+       '@typescript-eslint/type-utils': 6.16.0(eslint@8.56.0)(typescript@5.2.2)
+       '@typescript-eslint/utils': 6.16.0(eslint@8.56.0)(typescript@5.2.2)
+       '@typescript-eslint/visitor-keys': 6.16.0
+       debug: 4.3.4
+       eslint: 8.56.0
+       graphemer: 1.4.0
+       ignore: 5.2.4
+       natural-compare: 1.4.0
+       semver: 7.5.4
+       ts-api-utils: 1.0.3(typescript@5.2.2)
+       typescript: 5.2.2
+     transitivePeerDependencies:
+       - supports-color
+     dev: true
+ 
 -  /@typescript-eslint/parser@6.15.0(eslint@8.56.0)(typescript@5.2.2):
 -    resolution: {integrity: sha512-MkgKNnsjC6QwcMdlNAel24jjkEO/0hQaMDLqP4S9zq5HBAUJNQB6y+3DwLjX7b3l2b37eNAxMPLwb3/kh8VKdA==}
 +  /@typescript-eslint/parser@6.16.0(eslint@8.56.0)(typescript@5.2.2):
 +    resolution: {integrity: sha512-H2GM3eUo12HpKZU9njig3DF5zJ58ja6ahj1GoHEHOgQvYxzoFJJEvC1MQ7T2l9Ha+69ZSOn7RTxOdpC/y3ikMw==}
      engines: {node: ^16.0.0 || >=18.0.0}
      peerDependencies:
        eslint: ^7.0.0 || ^8.0.0
@@@ -1744,6 -1785,25 +1799,25 @@@
        - typescript
      dev: true
  
+   /@typescript-eslint/utils@6.16.0(eslint@8.56.0)(typescript@5.2.2):
+     resolution: {integrity: sha512-T83QPKrBm6n//q9mv7oiSvy/Xq/7Hyw9SzSEhMHJwznEmQayfBM87+oAlkNAMEO7/MjIwKyOHgBJbxB0s7gx2A==}
+     engines: {node: ^16.0.0 || >=18.0.0}
+     peerDependencies:
+       eslint: ^7.0.0 || ^8.0.0
+     dependencies:
+       '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
+       '@types/json-schema': 7.0.14
 -      '@types/semver': 7.5.5
++      '@types/semver': 7.5.6
+       '@typescript-eslint/scope-manager': 6.16.0
+       '@typescript-eslint/types': 6.16.0
+       '@typescript-eslint/typescript-estree': 6.16.0(typescript@5.2.2)
+       eslint: 8.56.0
+       semver: 7.5.4
+     transitivePeerDependencies:
+       - supports-color
+       - typescript
+     dev: true
+ 
    /@typescript-eslint/visitor-keys@5.62.0:
      resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
      engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@@ -2985,7 -3007,68 +3070,68 @@@
      engines: {node: '>=18.0.0', npm: '>=9.0.0', pnpm: '>= 8.6.0'}
      dev: true
  
-   /eslint-plugin-jest@27.6.0(eslint@8.56.0)(typescript@5.2.2):
+   /eslint-import-resolver-node@0.3.9:
+     resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+     dependencies:
+       debug: 3.2.7
 -      is-core-module: 2.13.1
++      is-core-module: 2.13.0
+       resolve: 1.22.8
+     transitivePeerDependencies:
+       - supports-color
+     dev: true
+ 
 -  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0):
++  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.16.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0):
+     resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
+     engines: {node: '>=4'}
+     peerDependencies:
+       '@typescript-eslint/parser': '*'
+       eslint: '*'
+       eslint-import-resolver-node: '*'
+       eslint-import-resolver-typescript: '*'
+       eslint-import-resolver-webpack: '*'
+     peerDependenciesMeta:
+       '@typescript-eslint/parser':
+         optional: true
+       eslint:
+         optional: true
+       eslint-import-resolver-node:
+         optional: true
+       eslint-import-resolver-typescript:
+         optional: true
+       eslint-import-resolver-webpack:
+         optional: true
+     dependencies:
 -      '@typescript-eslint/parser': 6.15.0(eslint@8.56.0)(typescript@5.2.2)
++      '@typescript-eslint/parser': 6.16.0(eslint@8.56.0)(typescript@5.2.2)
+       debug: 3.2.7
+       eslint: 8.56.0
+       eslint-import-resolver-node: 0.3.9
+     transitivePeerDependencies:
+       - supports-color
+     dev: true
+ 
 -  /eslint-plugin-i@2.29.1(@typescript-eslint/parser@6.15.0)(eslint@8.56.0):
++  /eslint-plugin-i@2.29.1(@typescript-eslint/parser@6.16.0)(eslint@8.56.0):
+     resolution: {integrity: sha512-ORizX37MelIWLbMyqI7hi8VJMf7A0CskMmYkB+lkCX3aF4pkGV7kwx5bSEb4qx7Yce2rAf9s34HqDRPjGRZPNQ==}
+     engines: {node: '>=12'}
+     peerDependencies:
+       eslint: ^7.2.0 || ^8
+     dependencies:
+       debug: 4.3.4
+       doctrine: 3.0.0
+       eslint: 8.56.0
+       eslint-import-resolver-node: 0.3.9
 -      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0)
++      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.16.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0)
+       get-tsconfig: 4.7.2
+       is-glob: 4.0.3
+       minimatch: 3.1.2
+       semver: 7.5.4
+     transitivePeerDependencies:
+       - '@typescript-eslint/parser'
+       - eslint-import-resolver-typescript
+       - eslint-import-resolver-webpack
+       - supports-color
+     dev: true
+ 
+   /eslint-plugin-jest@27.6.0(@typescript-eslint/eslint-plugin@6.16.0)(eslint@8.56.0)(typescript@5.2.2):
      resolution: {integrity: sha512-MTlusnnDMChbElsszJvrwD1dN3x6nZl//s4JD23BxB6MgR66TZlL064su24xEIS3VACfAoHV1vgyMgPw8nkdng==}
      engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
      peerDependencies:
@@@ -2998,6 -3081,7 +3144,7 @@@
        jest:
          optional: true
      dependencies:
 -      '@typescript-eslint/eslint-plugin': 6.16.0(@typescript-eslint/parser@6.15.0)(eslint@8.56.0)(typescript@5.2.2)
++      '@typescript-eslint/eslint-plugin': 6.16.0(@typescript-eslint/parser@6.16.0)(eslint@8.56.0)(typescript@5.2.2)
        '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.2.2)
        eslint: 8.56.0
      transitivePeerDependencies:
diff --cc rollup.config.js
index a8fd417053,29fd844b96..5c898035e2
--- a/rollup.config.js
+++ b/rollup.config.js
@@@ -148,43 -148,9 +148,43 @@@ function createConfig(format, output, p
    // Rollup to complain for non-ESM targets, so we use separate entries for
    // esm vs. non-esm builds.
    if (isCompatPackage && (isBrowserESMBuild || isBundlerESMBuild)) {
 -    entryFile = /runtime$/.test(format)
 -      ? `src/esm-runtime.ts`
 -      : `src/esm-index.ts`
 +    entryFile = `esm-${entryFile}`
 +  }
 +  entryFile = 'src/' + entryFile
 +
 +  return {
 +    input: resolve(entryFile),
 +    // Global and Browser ESM builds inlines everything so that they can be
 +    // used alone.
 +    external: resolveExternal(),
 +    plugins: [
 +      json({
-         namedExports: false
++        namedExports: false,
 +      }),
 +      alias({
-         entries
++        entries,
 +      }),
 +      enumPlugin,
 +      ...resolveReplace(),
 +      esbuild({
 +        tsconfig: path.resolve(__dirname, 'tsconfig.json'),
 +        sourceMap: output.sourcemap,
 +        minify: false,
 +        target: isServerRenderer || isNodeBuild ? 'es2019' : 'es2015',
-         define: resolveDefine()
++        define: resolveDefine(),
 +      }),
 +      ...resolveNodePlugins(),
-       ...plugins
++      ...plugins,
 +    ],
 +    output,
 +    onwarn(msg, warn) {
 +      if (msg.code !== 'CIRCULAR_DEPENDENCY') {
 +        warn(msg)
 +      }
 +    },
 +    treeshake: {
-       moduleSideEffects: false
-     }
++      moduleSideEffects: false,
++    },
    }
  
    function resolveDefine() {
@@@ -342,8 -343,8 +342,8 @@@
  
  function createProductionConfig(/** @type {PackageFormat} */ format) {
    return createConfig(format, {
 +    ...outputConfigs[format],
-     file: resolve(`dist/${name}.${format}.prod.js`)
+     file: resolve(`dist/${name}.${format}.prod.js`),
 -    format: outputConfigs[format].format,
    })
  }
  
@@@ -351,8 -352,8 +351,8 @@@ function createMinifiedConfig(/** @typ
    return createConfig(
      format,
      {
 +      ...outputConfigs[format],
-       file: outputConfigs[format].file.replace(/\.js$/, '.prod.js')
+       file: outputConfigs[format].file.replace(/\.js$/, '.prod.js'),
 -      format: outputConfigs[format].format,
      },
      [
        terser({
diff --cc scripts/dev.js
index 4b4e73a1f3,2c3cdaf95e..abc7e048ed
--- a/scripts/dev.js
+++ b/scripts/dev.js
@@@ -30,104 -31,101 +30,104 @@@ const postfix = format.endsWith('-runti
    ? `runtime.${format.replace(/-runtime$/, '')}`
    : format
  
 -const outfile = resolve(
 -  __dirname,
 -  `../packages/${target}/dist/${
 -    target === 'vue-compat' ? `vue` : target
 -  }.${postfix}.${prod ? `prod.` : ``}js`,
 -)
 -const relativeOutfile = relative(process.cwd(), outfile)
 +for (const target of targets) {
 +  const pkg = require(`../packages/${target}/package.json`)
 +  const outfile = resolve(
 +    __dirname,
 +    `../packages/${target}/dist/${
 +      target === 'vue-compat' ? `vue` : target
-     }.${postfix}.${prod ? `prod.` : ``}js`
++    }.${postfix}.${prod ? `prod.` : ``}js`,
 +  )
 +  const relativeOutfile = relative(process.cwd(), outfile)
  
 -// resolve externals
 -// TODO this logic is largely duplicated from rollup.config.js
 -/** @type {string[]} */
 -let external = []
 -if (!inlineDeps) {
 -  // cjs & esm-bundler: external all deps
 -  if (format === 'cjs' || format.includes('esm-bundler')) {
 -    external = [
 -      ...external,
 -      ...Object.keys(pkg.dependencies || {}),
 -      ...Object.keys(pkg.peerDependencies || {}),
 -      // for @vue/compiler-sfc / server-renderer
 -      'path',
 -      'url',
 -      'stream',
 -    ]
 -  }
 +  // resolve externals
 +  // TODO this logic is largely duplicated from rollup.config.js
 +  /** @type {string[]} */
 +  let external = []
 +  if (!inlineDeps) {
 +    // cjs & esm-bundler: external all deps
 +    if (format === 'cjs' || format.includes('esm-bundler')) {
 +      external = [
 +        ...external,
 +        ...Object.keys(pkg.dependencies || {}),
 +        ...Object.keys(pkg.peerDependencies || {}),
 +        // for @vue/compiler-sfc / server-renderer
 +        'path',
 +        'url',
-         'stream'
++        'stream',
 +      ]
 +    }
  
 -  if (target === 'compiler-sfc') {
 -    const consolidatePkgPath = require.resolve(
 -      '@vue/consolidate/package.json',
 -      {
 -        paths: [resolve(__dirname, `../packages/${target}/`)],
 -      },
 -    )
 -    const consolidateDeps = Object.keys(
 -      require(consolidatePkgPath).devDependencies,
 -    )
 -    external = [
 -      ...external,
 -      ...consolidateDeps,
 -      'fs',
 -      'vm',
 -      'crypto',
 -      'react-dom/server',
 -      'teacup/lib/express',
 -      'arc-templates/dist/es5',
 -      'then-pug',
 -      'then-jade',
 -    ]
 +    if (target === 'compiler-sfc') {
 +      const consolidatePkgPath = require.resolve(
 +        '@vue/consolidate/package.json',
 +        {
-           paths: [resolve(__dirname, `../packages/${target}/`)]
-         }
++          paths: [resolve(__dirname, `../packages/${target}/`)],
++        },
 +      )
 +      const consolidateDeps = Object.keys(
-         require(consolidatePkgPath).devDependencies
++        require(consolidatePkgPath).devDependencies,
 +      )
 +      external = [
 +        ...external,
 +        ...consolidateDeps,
 +        'fs',
 +        'vm',
 +        'crypto',
 +        'react-dom/server',
 +        'teacup/lib/express',
 +        'arc-templates/dist/es5',
 +        'then-pug',
-         'then-jade'
++        'then-jade',
 +      ]
 +    }
    }
 -}
 -/** @type {Array<import('esbuild').Plugin>} */
 -const plugins = [
 -  {
 -    name: 'log-rebuild',
 -    setup(build) {
 -      build.onEnd(() => {
 -        console.log(`built: ${relativeOutfile}`)
 -      })
 +  /** @type {Array<import('esbuild').Plugin>} */
 +  const plugins = [
 +    {
 +      name: 'log-rebuild',
 +      setup(build) {
 +        build.onEnd(() => {
 +          console.log(`built: ${relativeOutfile}`)
 +        })
-       }
-     }
++      },
+     },
 -  },
 -]
 +  ]
  
 -if (format !== 'cjs' && pkg.buildOptions?.enableNonBrowserBranches) {
 -  plugins.push(polyfillNode())
 -}
 +  if (format !== 'cjs' && pkg.buildOptions?.enableNonBrowserBranches) {
 +    plugins.push(polyfillNode())
 +  }
  
 -esbuild
 -  .context({
 -    entryPoints: [resolve(__dirname, `../packages/${target}/src/index.ts`)],
 -    outfile,
 -    bundle: true,
 -    external,
 -    sourcemap: true,
 -    format: outputFormat,
 -    globalName: pkg.buildOptions?.name,
 -    platform: format === 'cjs' ? 'node' : 'browser',
 -    plugins,
 -    define: {
 -      __COMMIT__: `"dev"`,
 -      __VERSION__: `"${pkg.version}"`,
 -      __DEV__: prod ? `false` : `true`,
 -      __TEST__: `false`,
 -      __BROWSER__: String(
 -        format !== 'cjs' && !pkg.buildOptions?.enableNonBrowserBranches,
 -      ),
 -      __GLOBAL__: String(format === 'global'),
 -      __ESM_BUNDLER__: String(format.includes('esm-bundler')),
 -      __ESM_BROWSER__: String(format.includes('esm-browser')),
 -      __NODE_JS__: String(format === 'cjs'),
 -      __SSR__: String(format === 'cjs' || format.includes('esm-bundler')),
 -      __COMPAT__: String(target === 'vue-compat'),
 -      __FEATURE_SUSPENSE__: `true`,
 -      __FEATURE_OPTIONS_API__: `true`,
 -      __FEATURE_PROD_DEVTOOLS__: `false`,
 -      __FEATURE_PROD_HYDRATION_MISMATCH_DETAILS__: `false`,
 -    },
 -  })
 -  .then(ctx => ctx.watch())
 +  esbuild
 +    .context({
 +      entryPoints: [resolve(__dirname, `../packages/${target}/src/index.ts`)],
 +      outfile,
 +      bundle: true,
 +      external,
 +      sourcemap: true,
 +      format: outputFormat,
 +      globalName: pkg.buildOptions?.name,
 +      platform: format === 'cjs' ? 'node' : 'browser',
 +      plugins,
 +      define: {
 +        __COMMIT__: `"dev"`,
 +        __VERSION__: `"${pkg.version}"`,
 +        __DEV__: prod ? `false` : `true`,
 +        __TEST__: `false`,
 +        __BROWSER__: String(
-           format !== 'cjs' && !pkg.buildOptions?.enableNonBrowserBranches
++          format !== 'cjs' && !pkg.buildOptions?.enableNonBrowserBranches,
 +        ),
 +        __GLOBAL__: String(format === 'global'),
 +        __ESM_BUNDLER__: String(format.includes('esm-bundler')),
 +        __ESM_BROWSER__: String(format.includes('esm-browser')),
 +        __NODE_JS__: String(format === 'cjs'),
 +        __SSR__: String(format === 'cjs' || format.includes('esm-bundler')),
 +        __COMPAT__: String(target === 'vue-compat'),
 +        __FEATURE_SUSPENSE__: `true`,
 +        __FEATURE_OPTIONS_API__: `true`,
 +        __FEATURE_PROD_DEVTOOLS__: `false`,
-         __FEATURE_PROD_HYDRATION_MISMATCH_DETAILS__: `false`
-       }
++        __FEATURE_PROD_HYDRATION_MISMATCH_DETAILS__: `false`,
++      },
 +    })
 +    .then(ctx => ctx.watch())
 +}
diff --cc scripts/prepare-cjs.js
index 736bb8bed0,b28705f346..3e427e2b77
--- a/scripts/prepare-cjs.js
+++ b/scripts/prepare-cjs.js
@@@ -6,8 -6,7 +6,8 @@@ const packagesToCheck = 
    'compiler-core',
    'compiler-dom',
    'compiler-ssr',
 +  'compiler-vapor',
-   'shared'
+   'shared',
  ]
  
  let allFilesPresent = true
diff --cc scripts/usage-size.ts
index a25cfb4300,7eddbeb669..95c08175c9
--- a/scripts/usage-size.ts
+++ b/scripts/usage-size.ts
@@@ -7,10 -7,7 +7,10 @@@ import replace from '@rollup/plugin-rep
  import { brotliCompressSync, gzipSync } from 'node:zlib'
  
  const sizeDir = path.resolve('temp/size')
 -const entry = path.resolve('./packages/vue/dist/vue.runtime.esm-bundler.js')
 +const vue = path.resolve('./packages/vue/dist/vue.runtime.esm-bundler.js')
 +const vapor = path.resolve(
-   './packages/vue-vapor/dist/vue-vapor.runtime.esm-bundler.js'
++  './packages/vue-vapor/dist/vue-vapor.runtime.esm-bundler.js',
 +)
  
  interface Preset {
    name: string
@@@ -19,14 -15,9 +19,14 @@@
  }
  
  const presets: Preset[] = [
 -  { name: 'createApp', imports: ['createApp'] },
 -  { name: 'createSSRApp', imports: ['createSSRApp'] },
 -  { name: 'defineCustomElement', imports: ['defineCustomElement'] },
 +  { name: 'createApp', imports: ['createApp'], from: vue },
 +  { name: 'createSSRApp', imports: ['createSSRApp'], from: vue },
 +  {
 +    name: 'defineCustomElement',
 +    imports: ['defineCustomElement'],
-     from: vue
++    from: vue,
 +  },
 +  { name: 'vapor', imports: '*', from: vapor },
    {
      name: 'overall',
      imports: [
@@@ -35,10 -26,9 +35,10 @@@
        'watch',
        'Transition',
        'KeepAlive',
-       'Suspense'
+       'Suspense',
      ],
-     from: vue
-   }
++    from: vue,
+   },
  ]
  
  main()
diff --cc vitest.config.ts
index b15b2a9d8c,6b5b93a45f..d9c4aa0842
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@@ -27,10 -27,10 +27,10 @@@ export default defineConfig(
      globals: true,
      setupFiles: 'scripts/setup-vitest.ts',
      environmentMatchGlobs: [
-       ['packages/{vue,vue-compat,runtime-dom,runtime-vapor}/**', 'jsdom']
 -      ['packages/{vue,vue-compat,runtime-dom}/**', 'jsdom'],
++      ['packages/{vue,vue-compat,runtime-dom,runtime-vapor}/**', 'jsdom'],
      ],
      sequence: {
-       hooks: 'list'
+       hooks: 'list',
      },
      coverage: {
        provider: 'istanbul',