refactor: remove @vue/vapor package

Author: yyx990803

benchmark/client/App.vue

@@ -4,7 +4,7 @@ import {
   triggerRef,
   type ShallowRef,
   createSelector,
-} from '@vue/vapor'
+} from 'vue/vapor'
 import { buildData } from './data'
 import { defer, wrap } from './profiling'
 

benchmark/client/data.ts

@@ -1,4 +1,4 @@
-import { shallowRef } from '@vue/vapor'
+import { shallowRef } from 'vue/vapor'
 
 let ID = 1
 

benchmark/client/profiling.ts

@@ -2,7 +2,7 @@
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable no-restricted-globals */
 
-import { nextTick } from '@vue/vapor'
+import { nextTick } from 'vue/vapor'
 
 declare namespace globalThis {
   let doProfile: boolean

benchmark/client/vapor.ts

@@ -1,4 +1,4 @@
-import { createVaporApp } from '@vue/vapor'
+import { createVaporApp } from 'vue/vapor'
 import App from './App.vue'
 
 createVaporApp(App as any).mount('#app')

benchmark/index.js

@@ -179,7 +179,6 @@ async function buildApp(isVapor) {
     },
     resolve: {
       alias: {
-        '@vue/vapor': runtimePath,
         'vue/vapor': runtimePath,
         vue: runtimePath,
       },

benchmark/tsconfig.json

@@ -18,8 +18,6 @@
     "noEmit": true,
     "paths": {
       "vue": ["../packages/vue/src"],
-      "@vue/vapor": ["../packages/vue-vapor/src"],
-      "vue/vapor": ["../packages/vue-vapor/src"],
       "@vue/*": ["../packages/*/src"]
     }
   },

packages/runtime-dom/src/index.ts

@@ -230,17 +230,17 @@ function injectCompilerOptionsCheck(app: App) {
 /**
  * @internal
  */
-export function normalizeContainer(
-  container: Element | ShadowRoot | string,
-): Element | ShadowRoot | null {
+export function normalizeContainer<T extends ParentNode>(
+  container: T | string,
+): T | null {
   if (isString(container)) {
     const res = document.querySelector(container)
     if (__DEV__ && !res) {
       warn(
         `Failed to mount app: mount target selector "${container}" returned null.`,
       )
     }
-    return res
+    return res as any
   }
   if (
     __DEV__ &&

packages/runtime-vapor/src/apiCreateApp.ts

@@ -1,12 +1,12 @@
-import { normalizeContainer } from './_old/apiRender'
 import { insert } from './dom/element'
 import { type VaporComponent, createComponent } from './component'
 import {
   type AppMountFn,
   type AppUnmountFn,
   type CreateAppFunction,
   createAppAPI,
-} from '@vue/runtime-core'
+  normalizeContainer,
+} from '@vue/runtime-dom'
 
 let _createApp: CreateAppFunction<ParentNode, VaporComponent>
 
@@ -32,7 +32,7 @@ export const createVaporApp: CreateAppFunction<
   const app = _createApp(comp)
   const mount = app.mount
   app.mount = (container, ...args: any[]) => {
-    container = normalizeContainer(container) // TODO reuse from runtime-dom
+    container = normalizeContainer(container) as ParentNode
     return mount(container, ...args)
   }
   return app

packages/runtime-vapor/src/component.ts

@@ -11,7 +11,7 @@ import {
   nextUid,
   popWarningContext,
   pushWarningContext,
-} from '@vue/runtime-core'
+} from '@vue/runtime-dom'
 import type { Block } from './block'
 import { pauseTracking, resetTracking } from '@vue/reactivity'
 import { EMPTY_OBJ, isFunction } from '@vue/shared'

packages/runtime-vapor/src/componentEmits.ts

@@ -2,7 +2,7 @@ import {
   type EmitFn,
   type ObjectEmitsOptions,
   baseEmit,
-} from '@vue/runtime-core'
+} from '@vue/runtime-dom'
 import {
   type VaporComponent,
   type VaporComponentInstance,

packages/runtime-vapor/src/componentProps.ts

@@ -5,7 +5,7 @@ import {
   baseNormalizePropsOptions,
   isEmitListener,
   resolvePropValue,
-} from '@vue/runtime-core'
+} from '@vue/runtime-dom'
 import { normalizeEmitsOptions } from './componentEmits'
 
 export interface RawProps {

packages/runtime-vapor/src/dom/prop.ts

@@ -12,15 +12,15 @@ import {
   shouldSetAsAttr,
   toDisplayString,
 } from '@vue/shared'
-import { warn } from '../_old/warning'
 import { setStyle } from './style'
 import {
   MetadataKind,
   getMetadata,
   recordPropMetadata,
 } from '../componentMetadata'
 import { on } from './event'
-import { currentInstance } from '../_old/component'
+import { currentInstance } from '../component'
+import { warn } from '@vue/runtime-dom'
 
 export function mergeInheritAttr(key: string, value: any): unknown {
   const instance = currentInstance!

packages/runtime-vapor/src/dom/style.ts

@@ -6,7 +6,7 @@ import {
   isString,
   normalizeStyle,
 } from '@vue/shared'
-import { warn } from '../_old/warning'
+import { warn } from '@vue/runtime-dom'
 import { recordPropMetadata } from '../componentMetadata'
 import { mergeInheritAttr } from './prop'
 

packages/runtime-vapor/src/dom/templateRef.ts

@@ -1,10 +1,15 @@
 import { type Ref, isRef, onScopeDispose } from '@vue/reactivity'
 import {
-  type ComponentInternalInstance,
+  type VaporComponentInstance,
   currentInstance,
   isVaporComponent,
-} from '../_old/component'
-import { VaporErrorCodes, callWithErrorHandling } from '../_old/errorHandling'
+} from '../component'
+import {
+  type SchedulerJob,
+  callWithErrorHandling,
+  queuePostFlushCb,
+  warn,
+} from '@vue/runtime-dom'
 import {
   EMPTY_OBJ,
   hasOwn,
@@ -13,11 +18,9 @@ import {
   isString,
   remove,
 } from '@vue/shared'
-import { warn } from '../_old/warning'
-import { type SchedulerJob, queuePostFlushCb } from '../_old/scheduler'
 
 export type NodeRef = string | Ref | ((ref: Element) => void)
-export type RefEl = Element | ComponentInternalInstance
+export type RefEl = Element | VaporComponentInstance
 
 /**
  * Function for handling a template ref
@@ -29,6 +32,7 @@ export function setRef(
   refFor = false,
 ): NodeRef | undefined {
   if (!currentInstance) return
+  // @ts-expect-error TODO
   const { setupState, isUnmounted } = currentInstance
 
   if (isUnmounted) {
@@ -46,7 +50,7 @@ export function setRef(
   if (oldRef != null && oldRef !== ref) {
     if (isString(oldRef)) {
       refs[oldRef] = null
-      if (hasOwn(setupState, oldRef)) {
+      if (setupState && hasOwn(setupState, oldRef)) {
         setupState[oldRef] = null
       }
     } else if (isRef(oldRef)) {
@@ -59,7 +63,8 @@ export function setRef(
       callWithErrorHandling(
         ref,
         currentInstance,
-        VaporErrorCodes.FUNCTION_REF,
+        // @ts-expect-error
+        null,
         [value, refs],
       )
     }
@@ -126,7 +131,7 @@ export function setRef(
         })
       })
     } else if (__DEV__) {
-      warn('Invalid template ref type:', ref, `(${typeof ref})`)
+      // warn('Invalid template ref type:', ref, `(${typeof ref})`)
     }
   }
   return ref

packages/runtime-vapor/src/renderEffect.ts

@@ -1,5 +1,5 @@
 import { ReactiveEffect } from '@vue/reactivity'
-import { type SchedulerJob, queueJob } from '@vue/runtime-core'
+import { type SchedulerJob, queueJob } from '@vue/runtime-dom'
 import { currentInstance } from './component'
 
 export function renderEffect(fn: () => void): void {