Merge remote-tracking branch 'upstream/main'

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "version": "0.0.0-vapor",
-  "packageManager": "pnpm@8.15.0",
+  "packageManager": "pnpm@8.15.1",
   "type": "module",
   "scripts": {
     "dev": "node scripts/dev.js vue vue-vapor",
@@ -59,18 +59,18 @@
     "node": ">=18.12.0"
   },
   "devDependencies": {
-    "@babel/parser": "^7.23.6",
-    "@babel/types": "^7.23.6",
+    "@babel/parser": "^7.23.9",
+    "@babel/types": "^7.23.9",
     "@codspeed/vitest-plugin": "^2.3.1",
-    "@rollup/plugin-alias": "^5.0.1",
+    "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.4",
+    "@rollup/plugin-replace": "5.0.4",
     "@rollup/plugin-terser": "^0.4.4",
     "@types/hash-sum": "^1.0.2",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.11.10",
+    "@types/node": "^20.11.16",
     "@types/semver": "^7.5.6",
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
@@ -78,7 +78,7 @@
     "@vue/consolidate": "0.17.3",
     "conventional-changelog-cli": "^4.1.0",
     "enquirer": "^2.4.1",
-    "esbuild": "^0.19.5",
+    "esbuild": "^0.20.0",
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "eslint": "^8.56.0",
     "eslint-define-config": "^1.24.1",
@@ -89,7 +89,7 @@
     "jsdom": "^23.2.0",
     "lint-staged": "^15.2.0",
     "lodash": "^4.17.21",
-    "magic-string": "^0.30.5",
+    "magic-string": "^0.30.6",
     "markdown-table": "^3.0.3",
     "marked": "^11.2.0",
     "minimist": "^1.2.8",
@@ -98,16 +98,16 @@
     "prettier": "^3.2.2",
     "pretty-bytes": "^6.1.1",
     "pug": "^3.0.2",
-    "puppeteer": "~21.9.0",
+    "puppeteer": "~21.11.0",
     "rimraf": "^5.0.5",
-    "rollup": "^4.1.4",
+    "rollup": "4.9.2",
     "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-esbuild": "^6.1.0",
-    "rollup-plugin-polyfill-node": "^0.12.0",
+    "rollup-plugin-esbuild": "^6.1.1",
+    "rollup-plugin-polyfill-node": "^0.13.0",
     "semver": "^7.5.4",
     "serve": "^14.2.1",
     "simple-git-hooks": "^2.9.0",
-    "terser": "^5.22.0",
+    "terser": "^5.27.0",
     "todomvc-app-css": "^2.4.3",
     "tslib": "^2.6.2",
     "tsx": "^4.7.0",

packages/compiler-core/package.json

@@ -46,13 +46,13 @@
   },
   "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/compiler-core#readme",
   "dependencies": {
-    "@babel/parser": "^7.23.6",
+    "@babel/parser": "^7.23.9",
     "@vue/shared": "workspace:*",
     "entities": "^4.5.0",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.0.2"
   },
   "devDependencies": {
-    "@babel/types": "^7.23.6"
+    "@babel/types": "^7.23.9"
   }
 }

packages/compiler-sfc/package.json

@@ -42,19 +42,19 @@
   },
   "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/compiler-sfc#readme",
   "dependencies": {
-    "@babel/parser": "^7.23.6",
+    "@babel/parser": "^7.23.9",
     "@vue/compiler-core": "workspace:*",
     "@vue/compiler-dom": "workspace:*",
     "@vue/compiler-ssr": "workspace:*",
     "@vue/compiler-vapor": "workspace:*",
     "@vue/shared": "workspace:*",
     "estree-walker": "^2.0.2",
-    "magic-string": "^0.30.5",
+    "magic-string": "^0.30.6",
     "postcss": "^8.4.33",
     "source-map-js": "^1.0.2"
   },
   "devDependencies": {
-    "@babel/types": "^7.23.6",
+    "@babel/types": "^7.23.9",
     "@vue/consolidate": "^0.17.3",
     "hash-sum": "^2.0.0",
     "lru-cache": "^10.2.0",

packages/runtime-core/src/customFormatter.ts

@@ -1,6 +1,12 @@
-import { type Ref, isReactive, isReadonly, isRef, toRaw } from '@vue/reactivity'
+import {
+  type Ref,
+  isReactive,
+  isReadonly,
+  isRef,
+  isShallow,
+  toRaw,
+} from '@vue/reactivity'
 import { EMPTY_OBJ, extend, isArray, isFunction, isObject } from '@vue/shared'
-import { isShallow } from '../../reactivity/src/reactive'
 import type { ComponentInternalInstance, ComponentOptions } from './component'
 import type { ComponentPublicInstance } from './componentPublicInstance'
 

packages/sfc-playground/package.json

@@ -9,7 +9,7 @@
     "serve": "vite preview"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^4.4.0",
+    "@vitejs/plugin-vue": "^5.0.3",
     "vite": "^5.0.12"
   },
   "dependencies": {

packages/sfc-playground/src/download/template/package.json

@@ -8,10 +8,10 @@
     "serve": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.3.0"
+    "vue": "^3.4.0"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^4.4.0",
-    "vite": "^5.0.0"
+    "@vitejs/plugin-vue": "^5.0.3",
+    "vite": "^5.0.12"
   }
 }

packages/vue-compat/package.json

@@ -52,7 +52,7 @@
   },
   "homepage": "https://github.com/vuejs/core-vapor/tree/main/packages/vue-compat#readme",
   "dependencies": {
-    "@babel/parser": "^7.23.6",
+    "@babel/parser": "^7.23.9",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.0.2"
   },

packages/vue/macros.d.ts

@@ -1,112 +0,0 @@
-import type {
-  ComputedRef,
-  CustomRefFactory,
-  DebuggerOptions,
-  Ref,
-  UnwrapRef,
-  WritableComputedOptions,
-  WritableComputedRef,
-} from '@vue/runtime-dom'
-
-export declare const RefType: unique symbol
-
-export declare enum RefTypes {
-  Ref = 1,
-  ComputedRef = 2,
-  WritableComputedRef = 3,
-}
-
-type RefValue<T> = T extends null | undefined ? T : ReactiveVariable<T>
-
-type ReactiveVariable<T> = T & { [RefType]?: RefTypes.Ref }
-
-type ComputedRefValue<T> = T extends null | undefined ? T : ComputedVariable<T>
-
-type ComputedVariable<T> = T & { [RefType]?: RefTypes.ComputedRef }
-
-type WritableComputedRefValue<T> = T extends null | undefined
-  ? T
-  : WritableComputedVariable<T>
-
-type WritableComputedVariable<T> = T & {
-  [RefType]?: RefTypes.WritableComputedRef
-}
-
-type NormalObject<T extends object> = T & { [RefType]?: never }
-
-/**
- * Vue ref transform macro for binding refs as reactive variables.
- */
-export declare function $<T>(arg: ComputedRef<T>): ComputedRefValue<T>
-export declare function $<T>(
-  arg: WritableComputedRef<T>,
-): WritableComputedRefValue<T>
-export declare function $<T>(arg: Ref<T>): RefValue<T>
-export declare function $<T extends object>(arg?: T): DestructureRefs<T>
-
-type DestructureRefs<T extends object> = {
-  [K in keyof T]: T[K] extends ComputedRef<infer V>
-    ? ComputedRefValue<V>
-    : T[K] extends WritableComputedRef<infer V>
-      ? WritableComputedRefValue<V>
-      : T[K] extends Ref<infer V>
-        ? RefValue<V>
-        : T[K]
-}
-
-/**
- * Vue ref transform macro for accessing underlying refs of reactive variables.
- */
-export declare function $$<T extends object>(arg: NormalObject<T>): ToRawRefs<T>
-export declare function $$<T>(value: RefValue<T>): Ref<T>
-export declare function $$<T>(value: ComputedRefValue<T>): ComputedRef<T>
-export declare function $$<T>(
-  value: WritableComputedRefValue<T>,
-): WritableComputedRef<T>
-
-type ToRawRefs<T extends object> = {
-  [K in keyof T]: T[K] extends RefValue<infer V>
-    ? Ref<V>
-    : T[K] extends ComputedRefValue<infer V>
-      ? ComputedRef<V>
-      : T[K] extends WritableComputedRefValue<infer V>
-        ? WritableComputedRef<V>
-        : T[K] extends object
-          ? T[K] extends
-              | Function
-              | Map<any, any>
-              | Set<any>
-              | WeakMap<any, any>
-              | WeakSet<any>
-            ? T[K]
-            : ToRawRefs<T[K]>
-          : T[K]
-}
-
-export declare function $ref<T>(): RefValue<T | undefined>
-export declare function $ref<T>(arg: T | Ref<T>): RefValue<UnwrapRef<T>>
-
-export declare function $shallowRef<T>(): RefValue<T | undefined>
-export declare function $shallowRef<T>(arg: T): RefValue<T>
-
-export declare function $toRef<T extends object, K extends keyof T>(
-  object: T,
-  key: K,
-): RefValue<T[K]>
-
-export declare function $toRef<T extends object, K extends keyof T>(
-  object: T,
-  key: K,
-  defaultValue: T[K],
-): RefValue<Exclude<T[K], undefined>>
-
-export declare function $customRef<T>(factory: CustomRefFactory<T>): RefValue<T>
-
-export declare function $computed<T>(
-  getter: () => T,
-  debuggerOptions?: DebuggerOptions,
-): ComputedRefValue<T>
-export declare function $computed<T>(
-  options: WritableComputedOptions<T>,
-  debuggerOptions?: DebuggerOptions,
-): WritableComputedRefValue<T>