diff --git a/packages/define-prop/macros-global.d.ts b/packages/define-prop/macros-global.d.ts
deleted file mode 100644
index 51f8421a4..000000000
--- a/packages/define-prop/macros-global.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare const defineProp: typeof import('./macros').defineProp
diff --git a/packages/define-prop/macros-johnson.d.ts b/packages/define-prop/macros-johnson.d.ts
deleted file mode 100644
index e7a029fec..000000000
--- a/packages/define-prop/macros-johnson.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ComputedRef } from 'vue'
-
-export function defineProp<T>(
-  value: T | (() => T),
-  required?: boolean,
-  rest?: any,
-): ComputedRef<T>
-export function defineProp<T>(
-  value: T | (() => T) | undefined,
-  required: true,
-  rest?: any,
-): ComputedRef<T>
-export function defineProp<T>(
-  value?: T | (() => T),
-  required?: boolean,
-  rest?: any,
-): ComputedRef<T | undefined>
diff --git a/packages/define-prop/macros.d.ts b/packages/define-prop/macros.d.ts
deleted file mode 100644
index 3e7dba6cb..000000000
--- a/packages/define-prop/macros.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { ComputedRef } from 'vue'
-
-export function defineProp<T>(
-  name: string,
-  options:
-    | ({ required: true } & Record<string, unknown>)
-    | ({ default: any } & Record<string, unknown>),
-): ComputedRef<T>
-export function defineProp<T>(
-  name?: string,
-  options?: any,
-): ComputedRef<T | undefined>
diff --git a/packages/define-prop/package.json b/packages/define-prop/package.json
index 6c1749362..204b1c303 100644
--- a/packages/define-prop/package.json
+++ b/packages/define-prop/package.json
@@ -65,10 +65,7 @@
       "dev": "./src/webpack.ts",
       "default": "./dist/webpack.js"
     },
-    "./*": [
-      "./*",
-      "./*.d.ts"
-    ]
+    "./*": "./*"
   },
   "typesVersions": {
     "*": {
@@ -89,10 +86,7 @@
       "./rspack": "./dist/rspack.js",
       "./vite": "./dist/vite.js",
       "./webpack": "./dist/webpack.js",
-      "./*": [
-        "./*",
-        "./*.d.ts"
-      ]
+      "./*": "./*"
     },
     "tag": "next"
   },
diff --git a/packages/define-prop/tests/__snapshots__/fixtures.test.ts.snap b/packages/define-prop/tests/__snapshots__/fixtures.test.ts.snap
index 7325674dc..7ff8e76dd 100644
--- a/packages/define-prop/tests/__snapshots__/fixtures.test.ts.snap
+++ b/packages/define-prop/tests/__snapshots__/fixtures.test.ts.snap
@@ -2,7 +2,9 @@
 
 exports[`fixtures > tests/fixtures/johnson-edition/basic.vue 1`] = `
 "// basic.js
-var basic = \`<script setup lang="ts">
+var basic = \`<!-- @experimentalDefinePropProposal "johnsonEdition" -->
+
+<script setup lang="ts">
 const __MACROS_props = defineProps({
   qux: { type: String },
   foo: { type: String, default: 'foo' },
@@ -15,8 +17,7 @@ const __MACROS_props = defineProps({
 
 import { toRef as __MACROS_toRef } from "vue";
 import { expectTypeOf } from 'expect-type'
-import type { ComputedRef } from 'vue'
-import { defineProp } from '../../../macros-johnson'
+import { type ComputedRef } from 'vue'
 
 // defineProp()
 const qux = __MACROS_toRef(__props, "qux")
@@ -72,7 +73,6 @@ import { toRef as __MACROS_toRef } from "vue";
 import { expectTypeOf } from 'expect-type'
 import type { ComputedRef } from 'vue'
 import type { Qux } from '../types'
-import { defineProp } from '../../../macros'
 
 // defineProp(prop_name)
 const foo = __MACROS_toRef(__props, "foo")
diff --git a/packages/define-prop/tests/fixtures/johnson-edition/basic.vue b/packages/define-prop/tests/fixtures/johnson-edition/basic.vue
index 1e1e8493e..5be8c815e 100644
--- a/packages/define-prop/tests/fixtures/johnson-edition/basic.vue
+++ b/packages/define-prop/tests/fixtures/johnson-edition/basic.vue
@@ -1,7 +1,8 @@
+<!-- @experimentalDefinePropProposal "johnsonEdition" -->
+
 <script setup lang="ts">
 import { expectTypeOf } from 'expect-type'
-import type { ComputedRef } from 'vue'
-import { defineProp } from '../../../macros-johnson'
+import { type ComputedRef } from 'vue'
 
 // defineProp()
 const qux = defineProp<string>()
diff --git a/packages/define-prop/tests/fixtures/kevin-edition/basic.vue b/packages/define-prop/tests/fixtures/kevin-edition/basic.vue
index d5b3fa592..9db5210fc 100644
--- a/packages/define-prop/tests/fixtures/kevin-edition/basic.vue
+++ b/packages/define-prop/tests/fixtures/kevin-edition/basic.vue
@@ -2,7 +2,6 @@
 import { expectTypeOf } from 'expect-type'
 import type { ComputedRef } from 'vue'
 import type { Qux } from '../types'
-import { defineProp } from '../../../macros'
 
 // defineProp(prop_name)
 const foo = defineProp<string>('foo')
diff --git a/packages/macros/macros-global.d.ts b/packages/macros/macros-global.d.ts
index 39fd2e57f..d7ed59432 100644
--- a/packages/macros/macros-global.d.ts
+++ b/packages/macros/macros-global.d.ts
@@ -1,4 +1,3 @@
-/// <reference types="@vue-macros/define-prop/macros-global" />
 /// <reference types="@vue-macros/define-emit/macros-global" />
 /// <reference types="@vue-macros/define-models/macros-global" />
 /// <reference types="unplugin-vue-define-options/macros-global" />
diff --git a/packages/macros/macros.d.ts b/packages/macros/macros.d.ts
index 06795b0c3..12ae3279d 100644
--- a/packages/macros/macros.d.ts
+++ b/packages/macros/macros.d.ts
@@ -8,7 +8,6 @@ import type { RecordToUnion, UnionToIntersection } from '@vue-macros/common'
 export * from '@vue-macros/define-emit/macros'
 export * from '@vue-macros/define-models/macros'
 export * from 'unplugin-vue-define-options/macros'
-export * from '@vue-macros/define-prop/macros'
 export * from '@vue-macros/define-props/macros'
 export * from '@vue-macros/define-render/macros'
 export * from '@vue-macros/define-slots/macros'
diff --git a/packages/macros/tests/fixtures/mixed-define-props.vue b/packages/macros/tests/fixtures/mixed-define-props.vue
index b6dc9d4d1..4ea00f037 100644
--- a/packages/macros/tests/fixtures/mixed-define-props.vue
+++ b/packages/macros/tests/fixtures/mixed-define-props.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { defineProp } from 'vue-macros/macros' with { type: 'macro' }
 const { foo } = definePropsRefs<{ foo?: string }>()
 const bar = defineProp('bar')
 const { baz } = defineModels<{ baz: string }>()
diff --git a/packages/volar/src/define-prop.ts b/packages/volar/src/define-prop.ts
index a101614b2..c976e71e0 100644
--- a/packages/volar/src/define-prop.ts
+++ b/packages/volar/src/define-prop.ts
@@ -24,7 +24,7 @@ function transformDefineProp({
   codes: Code[]
   defineProps: DefineProp[]
   version: number
-  edition: 'kevinEdition' | 'johnsonEdition'
+  edition: string
 }) {
   addProps(
     codes,
@@ -50,6 +50,17 @@ function transformDefineProp({
 
   if (edition === 'kevinEdition') {
     codes.push(`
+type __VLS_PropOptions<T> = Exclude<import('vue').Prop<T>, import('vue').PropType<T>>;
+declare function defineProp<T>(
+  name: string,
+  options: 
+    | ({ default: T } & __VLS_PropOptions<T>)
+    | ({ required: true } & __VLS_PropOptions<T>)
+): import('vue').ComputedRef<T>;
+declare function defineProp<T>(
+  name?: string,
+  options?: __VLS_PropOptions<T>
+): import('vue').ComputedRef<T | undefined>;
 declare function $defineProp<T>(
   name: string,
   options: 
@@ -73,6 +84,21 @@ type __VLS_PropOptions<T> = Omit<
   >,
   'required'
 >;
+declare function defineProp<T>(
+  value: T | (() => T) | undefined,
+  required: true,
+  options?: __VLS_PropOptions<T>
+): import('vue').ComputedRef<T>;
+declare function defineProp<T>(
+  value: T | (() => T),
+  required?: boolean,
+  options?: __VLS_PropOptions<T>
+): import('vue').ComputedRef<T>;
+declare function defineProp<T>(
+  value?: T | (() => T),
+  required?: boolean,
+  options?: __VLS_PropOptions<T>
+): | import('vue').ComputedRef<T | undefined>;
 declare function $defineProp<T>(
   value: T | (() => T) | undefined,
   required: true,
@@ -96,7 +122,7 @@ declare function $defineProp<T>(
 function getDefineProp(
   ts: typeof import('typescript'),
   sfc: Sfc,
-  edition: 'kevinEdition' | 'johnsonEdition',
+  edition: string,
 ) {
   const defineProps: DefineProp[] = []
   function visitNode(
@@ -222,7 +248,7 @@ const plugin: VueMacrosPlugin<'defineProp'> = (ctx, options = {}) => {
   const filter = createFilter(options)
   const {
     modules: { typescript: ts },
-    vueCompilerOptions: { experimentalDefinePropProposal, target },
+    vueCompilerOptions: { target },
   } = ctx
 
   return {
@@ -236,8 +262,11 @@ const plugin: VueMacrosPlugin<'defineProp'> = (ctx, options = {}) => {
       )
         return
 
+      const experimentalDefinePropProposal = sfc.content.match(
+        /<!-- @experimentalDefinePropProposal "(kevinEdition|johnsonEdition)" -->/,
+      )
       const edition =
-        options.edition || experimentalDefinePropProposal || 'kevinEdition'
+        experimentalDefinePropProposal?.[1] || options.edition || 'kevinEdition'
       const defineProps = getDefineProp(ts, sfc, edition)
       if (defineProps.length === 0) return
 
diff --git a/playground/astro/tsconfig.json b/playground/astro/tsconfig.json
index c3445c58a..eac419779 100644
--- a/playground/astro/tsconfig.json
+++ b/playground/astro/tsconfig.json
@@ -4,7 +4,6 @@
     "jsx": "preserve"
   },
   "vueCompilerOptions": {
-    "plugins": ["vue-macros/volar"],
-    "experimentalDefinePropProposal": "kevinEdition"
+    "plugins": ["vue-macros/volar"]
   }
 }
diff --git a/playground/vue3/tsconfig.json b/playground/vue3/tsconfig.json
index 7641dfc70..0123ffc5e 100644
--- a/playground/vue3/tsconfig.json
+++ b/playground/vue3/tsconfig.json
@@ -24,8 +24,7 @@
     "skipLibCheck": true
   },
   "vueCompilerOptions": {
-    "plugins": ["vue-macros/volar"],
-    "experimentalDefinePropProposal": "kevinEdition"
+    "plugins": ["vue-macros/volar"]
   },
   "include": ["src", "*", "../../packages/shim.d.ts"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4e53591f1..22fc675a5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -283,8 +283,8 @@ catalogs:
       specifier: ^3.5.16
       version: 3.5.16
     vue-tsc:
-      specifier: 2.2.10
-      version: 2.2.10
+      specifier: 3.0.0-beta.1
+      version: 3.0.0-beta.1
     webpack:
       specifier: ^5.99.9
       version: 5.99.9
@@ -296,7 +296,7 @@ overrides:
   '@shikijs/transformers': ^3.4.2
   '@shikijs/types': ^3.4.2
   '@vitejs/plugin-vue': ^5.2.4
-  '@vue/language-core': 2.2.10
+  '@vue/language-core': 3.0.0-beta.1
   is-core-module: npm:@no-shims/is-core-module
   oxc-parser: ^0.72.2
   shiki: ^3.4.2
@@ -392,7 +392,7 @@ importers:
         version: 19.1.0
       tsdown:
         specifier: 'catalog:'
-        version: 0.12.5(oxc-resolver@11.0.0)(publint@0.3.12)(typescript@5.8.3)(unplugin-unused@0.5.0)(vue-tsc@2.2.10(typescript@5.8.3))
+        version: 0.12.5(oxc-resolver@11.0.0)(publint@0.3.12)(typescript@5.8.3)(unplugin-unused@0.5.0)(vue-tsc@3.0.0-beta.1(typescript@5.8.3))
       tsx:
         specifier: 'catalog:'
         version: 4.19.4
@@ -431,7 +431,7 @@ importers:
         version: link:packages/macros
       vue-tsc:
         specifier: 'catalog:'
-        version: 2.2.10(typescript@5.8.3)
+        version: 3.0.0-beta.1(typescript@5.8.3)
       webpack:
         specifier: 'catalog:'
         version: 5.99.9(esbuild@0.25.5)
@@ -1045,8 +1045,8 @@ importers:
         specifier: 'catalog:'
         version: 3.17.4
       '@vue/language-core':
-        specifier: 2.2.10
-        version: 2.2.10(typescript@5.8.3)
+        specifier: 3.0.0-beta.1
+        version: 3.0.0-beta.1(typescript@5.8.3)
 
   packages/reactivity-transform:
     dependencies:
@@ -1204,8 +1204,8 @@ importers:
         specifier: workspace:*
         version: link:../short-vmodel
       '@vue/language-core':
-        specifier: 2.2.10
-        version: 2.2.10(typescript@5.8.3)
+        specifier: 3.0.0-beta.1
+        version: 3.0.0-beta.1(typescript@5.8.3)
       '@vue/shared':
         specifier: 'catalog:'
         version: 3.5.16
@@ -1224,7 +1224,7 @@ importers:
         version: 5.8.3
       vue-tsc:
         specifier: 'catalog:'
-        version: 2.2.10(typescript@5.8.3)
+        version: 3.0.0-beta.1(typescript@5.8.3)
 
   playground/astro:
     dependencies:
@@ -1261,7 +1261,7 @@ importers:
         version: 66.1.3(magicast@0.3.5)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue@3.5.16(typescript@5.8.3))(webpack@5.99.9(esbuild@0.25.5))
       nuxt:
         specifier: 'catalog:'
-        version: 3.17.4(@parcel/watcher@2.5.1)(@types/node@22.15.29)(db0@0.3.2)(eslint@9.28.0(jiti@2.4.2))(ioredis@5.6.1)(less@4.3.0)(magicast@0.3.5)(optionator@0.9.4)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.41.1)(terser@5.40.0)(tsx@4.19.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue-tsc@2.2.10(typescript@5.8.3))(yaml@2.8.0)
+        version: 3.17.4(@parcel/watcher@2.5.1)(@types/node@22.15.29)(db0@0.3.2)(eslint@9.28.0(jiti@2.4.2))(ioredis@5.6.1)(less@4.3.0)(magicast@0.3.5)(optionator@0.9.4)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.41.1)(terser@5.40.0)(tsx@4.19.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue-tsc@3.0.0-beta.1(typescript@5.8.3))(yaml@2.8.0)
       quasar:
         specifier: 'catalog:'
         version: 2.18.1
@@ -1331,7 +1331,7 @@ importers:
         version: link:../../packages/macros
       vue-tsc:
         specifier: 'catalog:'
-        version: 2.2.10(typescript@5.8.3)
+        version: 3.0.0-beta.1(typescript@5.8.3)
 
 packages:
 
@@ -3671,9 +3671,6 @@ packages:
   '@vue/compiler-ssr@3.5.16':
     resolution: {integrity: sha512-d2V7kfxbdsjrDSGlJE7my1ZzCXViEcqN6w14DOsDrUCHEA6vbnVCpRFfrc4ryCP/lCKzX2eS1YtnLE/BuC9f/A==}
 
-  '@vue/compiler-vue2@2.7.16':
-    resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
-
   '@vue/devtools-api@6.6.4':
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
@@ -3691,8 +3688,8 @@ packages:
   '@vue/devtools-shared@7.7.6':
     resolution: {integrity: sha512-yFEgJZ/WblEsojQQceuyK6FzpFDx4kqrz2ohInxNj5/DnhoX023upTv4OD6lNPLAA5LLkbwPVb10o/7b+Y4FVA==}
 
-  '@vue/language-core@2.2.10':
-    resolution: {integrity: sha512-+yNoYx6XIKuAO8Mqh1vGytu8jkFEOH5C8iOv3i8Z/65A7x9iAOXA97Q+PqZ3nlm2lxf5rOJuIGI/wDtx/riNYw==}
+  '@vue/language-core@3.0.0-beta.1':
+    resolution: {integrity: sha512-3S4e+zZ7vpAp4d4csOVlsetx1TydGTOvkjX6B5Rj+/ZaGSebT3bzWUa+5oQrS0BfPPzB6cH8cGdMySTi2LSbNQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -3888,8 +3885,8 @@ packages:
     resolution: {integrity: sha512-n73BVorL4HIwKlfJKb4SEzAYkR3Buwfwbh+MYxg2mloFph2fFGV58E90QTzdbfzWrLn4HE5Czx/WTjI8fcHaMg==}
     engines: {node: '>= 14.0.0'}
 
-  alien-signals@1.0.13:
-    resolution: {integrity: sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg==}
+  alien-signals@2.0.5:
+    resolution: {integrity: sha512-PdJB6+06nUNAClInE3Dweq7/2xVAYM64vvvS1IHVHSJmgeOtEdrAGyp7Z2oJtYm0B342/Exd2NT0uMJaThcjLQ==}
 
   ansi-align@3.0.1:
     resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==}
@@ -4446,9 +4443,6 @@ packages:
       sqlite3:
         optional: true
 
-  de-indent@1.0.2:
-    resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
-
   debug@4.4.1:
     resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
     engines: {node: '>=6.0'}
@@ -5224,10 +5218,6 @@ packages:
   hastscript@9.0.1:
     resolution: {integrity: sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==}
 
-  he@1.2.0:
-    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
-    hasBin: true
-
   hookable@5.5.3:
     resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==}
 
@@ -7655,8 +7645,8 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
-  vue-tsc@2.2.10:
-    resolution: {integrity: sha512-jWZ1xSaNbabEV3whpIDMbjVSVawjAyW+x1n3JeGQo7S0uv2n9F/JMgWW90tGWNFRKya4YwKMZgCtr0vRAM7DeQ==}
+  vue-tsc@3.0.0-beta.1:
+    resolution: {integrity: sha512-bEIVhnlRkjN/WNYtd2T8P896es3822V640fhvXUs7IPhkf9ivfGqzT/FA7BJfuFnEOr99jhYYCxNIS0j7kxz5w==}
     hasBin: true
     peerDependencies:
       typescript: '>=5.0.0'
@@ -9110,7 +9100,7 @@ snapshots:
     transitivePeerDependencies:
       - magicast
 
-  '@nuxt/vite-builder@3.17.4(@types/node@22.15.29)(eslint@9.28.0(jiti@2.4.2))(less@4.3.0)(magicast@0.3.5)(optionator@0.9.4)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.41.1)(terser@5.40.0)(tsx@4.19.4)(typescript@5.8.3)(vue-tsc@2.2.10(typescript@5.8.3))(vue@3.5.16(typescript@5.8.3))(yaml@2.8.0)':
+  '@nuxt/vite-builder@3.17.4(@types/node@22.15.29)(eslint@9.28.0(jiti@2.4.2))(less@4.3.0)(magicast@0.3.5)(optionator@0.9.4)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.41.1)(terser@5.40.0)(tsx@4.19.4)(typescript@5.8.3)(vue-tsc@3.0.0-beta.1(typescript@5.8.3))(vue@3.5.16(typescript@5.8.3))(yaml@2.8.0)':
     dependencies:
       '@nuxt/kit': 3.17.4(magicast@0.3.5)
       '@rollup/plugin-replace': 6.0.2(rollup@4.41.1)
@@ -9143,7 +9133,7 @@ snapshots:
       unplugin: 2.3.5
       vite: 6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0)
       vite-node: 3.1.4(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0)
-      vite-plugin-checker: 0.9.3(eslint@9.28.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue-tsc@2.2.10(typescript@5.8.3))
+      vite-plugin-checker: 0.9.3(eslint@9.28.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue-tsc@3.0.0-beta.1(typescript@5.8.3))
       vue: 3.5.16(typescript@5.8.3)
       vue-bundle-renderer: 2.1.1
     transitivePeerDependencies:
@@ -10437,11 +10427,6 @@ snapshots:
       '@vue/compiler-dom': 3.5.16
       '@vue/shared': 3.5.16
 
-  '@vue/compiler-vue2@2.7.16':
-    dependencies:
-      de-indent: 1.0.2
-      he: 1.2.0
-
   '@vue/devtools-api@6.6.4': {}
 
   '@vue/devtools-api@7.7.6':
@@ -10474,14 +10459,13 @@ snapshots:
     dependencies:
       rfdc: 1.4.1
 
-  '@vue/language-core@2.2.10(typescript@5.8.3)':
+  '@vue/language-core@3.0.0-beta.1(typescript@5.8.3)':
     dependencies:
       '@volar/language-core': 2.4.14
       '@vue/compiler-dom': 3.5.16
-      '@vue/compiler-vue2': 2.7.16
       '@vue/shared': 3.5.16
-      alien-signals: 1.0.13
-      minimatch: 9.0.5
+      alien-signals: 2.0.5
+      minimatch: 10.0.1
       muggle-string: 0.4.1
       path-browserify: 1.0.1
     optionalDependencies:
@@ -10713,7 +10697,7 @@ snapshots:
       '@algolia/requester-fetch': 5.25.0
       '@algolia/requester-node-http': 5.25.0
 
-  alien-signals@1.0.13: {}
+  alien-signals@2.0.5: {}
 
   ansi-align@3.0.1:
     dependencies:
@@ -11412,8 +11396,6 @@ snapshots:
 
   db0@0.3.2: {}
 
-  de-indent@1.0.2: {}
-
   debug@4.4.1:
     dependencies:
       ms: 2.1.3
@@ -12282,8 +12264,6 @@ snapshots:
       property-information: 7.1.0
       space-separated-tokens: 2.0.2
 
-  he@1.2.0: {}
-
   hookable@5.5.3: {}
 
   html-escaper@2.0.2: {}
@@ -13275,7 +13255,7 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuxt@3.17.4(@parcel/watcher@2.5.1)(@types/node@22.15.29)(db0@0.3.2)(eslint@9.28.0(jiti@2.4.2))(ioredis@5.6.1)(less@4.3.0)(magicast@0.3.5)(optionator@0.9.4)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.41.1)(terser@5.40.0)(tsx@4.19.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue-tsc@2.2.10(typescript@5.8.3))(yaml@2.8.0):
+  nuxt@3.17.4(@parcel/watcher@2.5.1)(@types/node@22.15.29)(db0@0.3.2)(eslint@9.28.0(jiti@2.4.2))(ioredis@5.6.1)(less@4.3.0)(magicast@0.3.5)(optionator@0.9.4)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.41.1)(terser@5.40.0)(tsx@4.19.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue-tsc@3.0.0-beta.1(typescript@5.8.3))(yaml@2.8.0):
     dependencies:
       '@nuxt/cli': 3.25.1(magicast@0.3.5)
       '@nuxt/devalue': 2.0.2
@@ -13283,7 +13263,7 @@ snapshots:
       '@nuxt/kit': 3.17.4(magicast@0.3.5)
       '@nuxt/schema': 3.17.4
       '@nuxt/telemetry': 2.6.6(magicast@0.3.5)
-      '@nuxt/vite-builder': 3.17.4(@types/node@22.15.29)(eslint@9.28.0(jiti@2.4.2))(less@4.3.0)(magicast@0.3.5)(optionator@0.9.4)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.41.1)(terser@5.40.0)(tsx@4.19.4)(typescript@5.8.3)(vue-tsc@2.2.10(typescript@5.8.3))(vue@3.5.16(typescript@5.8.3))(yaml@2.8.0)
+      '@nuxt/vite-builder': 3.17.4(@types/node@22.15.29)(eslint@9.28.0(jiti@2.4.2))(less@4.3.0)(magicast@0.3.5)(optionator@0.9.4)(rolldown@1.0.0-beta.10-commit.87188ed)(rollup@4.41.1)(terser@5.40.0)(tsx@4.19.4)(typescript@5.8.3)(vue-tsc@3.0.0-beta.1(typescript@5.8.3))(vue@3.5.16(typescript@5.8.3))(yaml@2.8.0)
       '@unhead/vue': 2.0.10(vue@3.5.16(typescript@5.8.3))
       '@vue/shared': 3.5.16
       c12: 3.0.4(magicast@0.3.5)
@@ -14105,7 +14085,7 @@ snapshots:
       glob: 11.0.2
       package-json-from-dist: 1.0.1
 
-  rolldown-plugin-dts@0.13.6(oxc-resolver@11.0.0)(rolldown@1.0.0-beta.10-commit.87188ed)(typescript@5.8.3)(vue-tsc@2.2.10(typescript@5.8.3)):
+  rolldown-plugin-dts@0.13.6(oxc-resolver@11.0.0)(rolldown@1.0.0-beta.10-commit.87188ed)(typescript@5.8.3)(vue-tsc@3.0.0-beta.1(typescript@5.8.3)):
     dependencies:
       '@babel/generator': 7.27.3
       '@babel/parser': 7.27.4
@@ -14118,7 +14098,7 @@ snapshots:
       rolldown: 1.0.0-beta.10-commit.87188ed
     optionalDependencies:
       typescript: 5.8.3
-      vue-tsc: 2.2.10(typescript@5.8.3)
+      vue-tsc: 3.0.0-beta.1(typescript@5.8.3)
     transitivePeerDependencies:
       - oxc-resolver
       - supports-color
@@ -14609,7 +14589,7 @@ snapshots:
     optionalDependencies:
       typescript: 5.8.3
 
-  tsdown@0.12.5(oxc-resolver@11.0.0)(publint@0.3.12)(typescript@5.8.3)(unplugin-unused@0.5.0)(vue-tsc@2.2.10(typescript@5.8.3)):
+  tsdown@0.12.5(oxc-resolver@11.0.0)(publint@0.3.12)(typescript@5.8.3)(unplugin-unused@0.5.0)(vue-tsc@3.0.0-beta.1(typescript@5.8.3)):
     dependencies:
       ansis: 4.1.0
       cac: 6.7.14
@@ -14619,7 +14599,7 @@ snapshots:
       empathic: 1.1.0
       hookable: 5.5.3
       rolldown: 1.0.0-beta.10-commit.87188ed
-      rolldown-plugin-dts: 0.13.6(oxc-resolver@11.0.0)(rolldown@1.0.0-beta.10-commit.87188ed)(typescript@5.8.3)(vue-tsc@2.2.10(typescript@5.8.3))
+      rolldown-plugin-dts: 0.13.6(oxc-resolver@11.0.0)(rolldown@1.0.0-beta.10-commit.87188ed)(typescript@5.8.3)(vue-tsc@3.0.0-beta.1(typescript@5.8.3))
       semver: 7.7.2
       tinyexec: 1.0.1
       tinyglobby: 0.2.14
@@ -14646,7 +14626,7 @@ snapshots:
 
   twoslash-vue@0.3.1(typescript@5.8.3):
     dependencies:
-      '@vue/language-core': 2.2.10(typescript@5.8.3)
+      '@vue/language-core': 3.0.0-beta.1(typescript@5.8.3)
       twoslash: 0.3.1(typescript@5.8.3)
       twoslash-protocol: 0.3.1
       typescript: 5.8.3
@@ -15092,7 +15072,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-checker@0.9.3(eslint@9.28.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue-tsc@2.2.10(typescript@5.8.3)):
+  vite-plugin-checker@0.9.3(eslint@9.28.0(jiti@2.4.2))(optionator@0.9.4)(typescript@5.8.3)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0))(vue-tsc@3.0.0-beta.1(typescript@5.8.3)):
     dependencies:
       '@babel/code-frame': 7.27.1
       chokidar: 4.0.3
@@ -15108,7 +15088,7 @@ snapshots:
       eslint: 9.28.0(jiti@2.4.2)
       optionator: 0.9.4
       typescript: 5.8.3
-      vue-tsc: 2.2.10(typescript@5.8.3)
+      vue-tsc: 3.0.0-beta.1(typescript@5.8.3)
 
   vite-plugin-inspect@0.8.9(@nuxt/kit@3.17.4(magicast@0.3.5))(rollup@4.41.1)(vite@6.3.5(@types/node@22.15.29)(jiti@2.4.2)(less@4.3.0)(terser@5.40.0)(tsx@4.19.4)(yaml@2.8.0)):
     dependencies:
@@ -15379,10 +15359,10 @@ snapshots:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.16(typescript@5.8.3)
 
-  vue-tsc@2.2.10(typescript@5.8.3):
+  vue-tsc@3.0.0-beta.1(typescript@5.8.3):
     dependencies:
       '@volar/typescript': 2.4.14
-      '@vue/language-core': 2.2.10(typescript@5.8.3)
+      '@vue/language-core': 3.0.0-beta.1(typescript@5.8.3)
       typescript: 5.8.3
 
   vue@3.5.16(typescript@5.8.3):
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 27aa3c759..e44a7fa1f 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -9,7 +9,7 @@ defines:
   - &shiki ^3.4.2
   - &unocss ^66.1.3
   - &vitest ^3.1.4
-  - &volar 2.2.10
+  - &volar 3.0.0-beta.1
   - &vue ^3.5.16
   - &rolldown 1.0.0-beta.10-commit.87188ed