refactor: remove runtime-shared

Author: yyx990803

packages/compiler-vapor/src/ir/index.ts

@@ -43,7 +43,7 @@ export interface BaseIRNode {
   type: IRNodeTypes
 }
 
-export type VaporHelper = keyof typeof import('@vue/runtime-vapor')
+export type VaporHelper = keyof typeof import('packages/runtime-vapor/src')
 
 export interface BlockIRNode extends BaseIRNode {
   type: IRNodeTypes.BLOCK

packages/runtime-core/package.json

@@ -47,7 +47,6 @@
   "homepage": "https://github.com/vuejs/vue-vapor/tree/main/packages/runtime-core#readme",
   "dependencies": {
     "@vue/shared": "workspace:*",
-    "@vue/reactivity": "workspace:*",
-    "@vue/runtime-shared": "workspace:*"
+    "@vue/reactivity": "workspace:*"
   }
 }

packages/runtime-core/src/apiCreateApp.ts

@@ -1,6 +1,7 @@
 import {
   type Component,
   type ConcreteComponent,
+  type Data,
   type GenericComponent,
   type GenericComponentInstance,
   getComponentPublicInstance,
@@ -22,7 +23,6 @@ import { warn } from './warning'
 import type { VNode } from './vnode'
 import { devtoolsInitApp, devtoolsUnmountApp } from './devtools'
 import { NO, extend, isFunction, isObject } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import { version } from '.'
 import { installAppCompatProperties } from './compat/global'
 import type { NormalizedPropsOptions } from './componentProps'
@@ -256,8 +256,8 @@ export function createAppContext(): AppContext {
   }
 }
 
-export type CreateAppFunction<HostElement> = (
-  rootComponent: GenericComponent,
+export type CreateAppFunction<HostElement, Comp = Component> = (
+  rootComponent: Comp,
   rootProps?: Data | null,
 ) => App<HostElement>
 
@@ -275,13 +275,13 @@ export type AppUnmountFn = (app: App) => void
 /**
  * @internal
  */
-export function createAppAPI<HostElement>(
+export function createAppAPI<HostElement, Comp = Component>(
   // render: RootRenderFunction<HostElement>,
   // hydrate?: RootHydrateFunction,
   mount: AppMountFn<HostElement>,
   unmount: AppUnmountFn,
   render?: RootRenderFunction,
-): CreateAppFunction<HostElement> {
+): CreateAppFunction<HostElement, Comp> {
   return function createApp(rootComponent, rootProps = null) {
     if (!isFunction(rootComponent)) {
       rootComponent = extend({}, rootComponent)

packages/runtime-core/src/compat/global.ts

@@ -462,7 +462,7 @@ function installCompatMount(
    * function simulates that behavior.
    */
   app._createRoot = options => {
-    const component = app._component
+    const component = app._component as Component
     const vnode = createVNode(component, options.propsData || null)
     vnode.appContext = context
 

packages/runtime-core/src/compat/props.ts

@@ -1,7 +1,6 @@
 import { isArray } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import { inject } from '../apiInject'
-import type { ComponentInternalInstance } from '../component'
+import type { ComponentInternalInstance, Data } from '../component'
 import {
   type ComponentOptions,
   resolveMergedOptions,

packages/runtime-core/src/compat/renderFn.ts

@@ -10,11 +10,11 @@ import {
   normalizeStyle,
   toHandlerKey,
 } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import type {
   Component,
   ComponentInternalInstance,
   ComponentOptions,
+  Data,
   InternalRenderFunction,
 } from '../component'
 import { currentRenderingInstance } from '../componentRenderContext'

packages/runtime-core/src/compat/renderHelpers.ts

@@ -7,13 +7,12 @@ import {
   isReservedProp,
   normalizeClass,
 } from '@vue/shared'
-import type { ComponentInternalInstance } from '../component'
+import type { ComponentInternalInstance, Data } from '../component'
 import type { Slot } from '../componentSlots'
 import { createSlots } from '../helpers/createSlots'
 import { renderSlot } from '../helpers/renderSlot'
 import { toHandlers } from '../helpers/toHandlers'
 import { type VNode, mergeProps } from '../vnode'
-import type { Data } from '@vue/runtime-shared'
 
 function toObject(arr: Array<any>): Object {
   const res = {}

packages/runtime-core/src/component.ts

@@ -73,7 +73,6 @@ import {
   isObject,
   isPromise,
 } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import type { SuspenseBoundary } from './components/Suspense'
 import type { CompilerOptions } from '@vue/compiler-core'
 import { markAttrsAccessed } from './componentRenderUtils'
@@ -98,6 +97,8 @@ import { markAsyncBoundary } from './helpers/useId'
 import { isAsyncWrapper } from './apiAsyncComponent'
 import type { RendererElement } from './renderer'
 
+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
@@ -509,7 +510,7 @@ export interface ComponentInternalInstance extends GenericComponentInstance {
    * setup related
    * @internal
    */
-  setupState: Data | null
+  setupState: Data
   /**
    * devtools access to additional info
    * @internal

packages/runtime-core/src/componentOptions.ts

@@ -3,6 +3,7 @@ import {
   type ComponentInternalInstance,
   type ComponentInternalOptions,
   type ConcreteComponent,
+  type Data,
   type InternalRenderFunction,
   type SetupContext,
   currentInstance,
@@ -18,7 +19,6 @@ import {
   isPromise,
   isString,
 } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import { type Ref, getCurrentScope, isRef, traverse } from '@vue/reactivity'
 import { computed } from './apiComputed'
 import {

packages/runtime-core/src/componentProps.ts

@@ -24,12 +24,12 @@ import {
   makeMap,
   toRawType,
 } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import { warn } from './warning'
 import {
   type ComponentInternalInstance,
   type ComponentOptions,
   type ConcreteComponent,
+  type Data,
   type GenericComponentInstance,
   setCurrentInstance,
 } from './component'

packages/runtime-core/src/componentPublicInstance.ts

@@ -1,6 +1,7 @@
 import {
   type Component,
   type ComponentInternalInstance,
+  type Data,
   getComponentPublicInstance,
   isStatefulComponent,
 } from './component'
@@ -23,7 +24,6 @@ import {
   isGloballyAllowed,
   isString,
 } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import {
   ReactiveFlags,
   type ShallowUnwrapRef,

packages/runtime-core/src/componentRenderUtils.ts

@@ -1,5 +1,6 @@
 import {
   type ComponentInternalInstance,
+  type Data,
   type FunctionalComponent,
   getComponentName,
 } from './component'
@@ -15,7 +16,6 @@ import {
 } from './vnode'
 import { ErrorCodes, handleError } from './errorHandling'
 import { PatchFlags, ShapeFlags, isModelListener, isOn } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import { warn } from './warning'
 import { isHmrUpdating } from './hmr'
 import type { NormalizedProps } from './componentProps'

packages/runtime-core/src/directives.ts

@@ -13,10 +13,10 @@ return withDirectives(h(comp), [
 
 import type { VNode } from './vnode'
 import { EMPTY_OBJ, isBuiltInDirective, isFunction } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import { warn } from './warning'
 import {
   type ComponentInternalInstance,
+  type Data,
   getComponentPublicInstance,
 } from './component'
 import { currentRenderingInstance } from './componentRenderContext'

packages/runtime-core/src/helpers/renderSlot.ts

@@ -14,9 +14,9 @@ import {
   openBlock,
 } from '../vnode'
 import { PatchFlags, SlotFlags, isSymbol } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import { warn } from '../warning'
 import { isAsyncWrapper } from '../apiAsyncComponent'
+import type { Data } from '../component'
 
 /**
  * Compiler runtime helper for rendering `<slot/>`

packages/runtime-core/src/helpers/toHandlers.ts

@@ -1,8 +1,25 @@
-import { toHandlers as _toHandlers } from '@vue/runtime-shared'
+import { isObject, toHandlerKey } from '@vue/shared'
 import { warn } from '../warning'
-import { NOOP } from '@vue/shared'
 
-export const toHandlers: (
+/**
+ * For prefixing keys in v-on="obj" with "on"
+ * @private
+ */
+export function toHandlers(
   obj: Record<string, any>,
-  preserveCaseIfNecessary?: boolean | undefined,
-) => Record<string, any> = _toHandlers.bind(undefined, __DEV__ ? warn : NOOP)
+  preserveCaseIfNecessary?: boolean,
+): Record<string, any> {
+  const ret: Record<string, any> = {}
+  if (__DEV__ && !isObject(obj)) {
+    warn(`v-on with no argument expects an object value.`)
+    return ret
+  }
+  for (const key in obj) {
+    ret[
+      preserveCaseIfNecessary && /[A-Z]/.test(key)
+        ? `on:${key}`
+        : toHandlerKey(key)
+    ] = obj[key]
+  }
+  return ret
+}

packages/runtime-core/src/renderer.ts

@@ -17,6 +17,7 @@ import {
 import {
   type ComponentInternalInstance,
   type ComponentOptions,
+  type Data,
   type LifecycleHook,
   createComponentInstance,
   setupComponent,
@@ -39,7 +40,6 @@ import {
   isArray,
   isReservedProp,
 } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import {
   type SchedulerJob,
   SchedulerJobFlags,

packages/runtime-core/src/vnode.ts

@@ -12,12 +12,12 @@ import {
   normalizeClass,
   normalizeStyle,
 } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import {
   type ClassComponent,
   type Component,
   type ComponentInternalInstance,
   type ConcreteComponent,
+  type Data,
   isClassComponent,
 } from './component'
 import type { RawSlots } from './componentSlots'

packages/runtime-core/src/warning.ts

@@ -1,10 +1,10 @@
 import {
   type ComponentInternalInstance,
+  type Data,
   type GenericComponentInstance,
   formatComponentName,
 } from './component'
 import { isFunction, isString } from '@vue/shared'
-import type { Data } from '@vue/runtime-shared'
 import { isRef, pauseTracking, resetTracking, toRaw } from '@vue/reactivity'
 import { ErrorCodes, callWithErrorHandling } from './errorHandling'
 import { type VNode, isVNode } from './vnode'

packages/runtime-dom/src/index.ts

@@ -1,5 +1,6 @@
 import {
   type App,
+  type Component,
   type ConcreteComponent,
   type CreateAppFunction,
   type DefineComponent,
@@ -144,7 +145,7 @@ export const createApp = ((...args) => {
   }
 
   return app
-}) as CreateAppFunction<Element>
+}) as CreateAppFunction<Element, Component>
 
 export const createSSRApp = ((...args) => {
   const app = ensureHydrationRenderer().createApp(...args)