diff --git a/package.json b/package.json
index 55e9d25..894ba13 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,10 @@
     "@nuxt/devtools-kit": "^3.0.0",
     "@nuxt/kit": "^4.1.2",
     "h3": "^1.15.4",
+    "knitwork": "^1.3.0",
     "magic-string": "^0.30.19",
     "nitropack": "^2.12.6",
+    "oxc-parser": "^0.99.0",
     "shiki": "^3.13.0",
     "sirv": "^3.0.2",
     "unplugin": "^2.3.10",
@@ -50,6 +52,7 @@
     "@nuxt/devtools": "^3.0.0",
     "@nuxt/devtools-ui-kit": "^3.0.0",
     "@nuxt/eslint": "^1.9.0",
+    "@nuxt/hints": "workspace:^",
     "@nuxt/icon": "^2.0.0",
     "@nuxt/module-builder": "^1.0.0",
     "@nuxt/schema": "^4.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4a14cda..89259db 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -17,12 +17,18 @@ importers:
       h3:
         specifier: ^1.15.4
         version: 1.15.4
+      knitwork:
+        specifier: ^1.3.0
+        version: 1.3.0
       magic-string:
         specifier: ^0.30.19
         version: 0.30.21
       nitropack:
         specifier: ^2.12.6
         version: 2.12.9
+      oxc-parser:
+        specifier: ^0.99.0
+        version: 0.99.0
       shiki:
         specifier: ^3.13.0
         version: 3.17.0
@@ -48,6 +54,9 @@ importers:
       '@nuxt/eslint':
         specifier: ^1.9.0
         version: 1.11.0(@typescript-eslint/utils@8.48.0(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3))(@vue/compiler-sfc@3.5.25)(eslint@9.39.1(jiti@2.6.1))(magicast@0.5.1)(typescript@5.9.3)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(sass-embedded@1.93.3)(sass@1.93.3)(terser@5.44.1)(yaml@2.8.1))
+      '@nuxt/hints':
+        specifier: workspace:^
+        version: 'link:'
       '@nuxt/icon':
         specifier: ^2.0.0
         version: 2.1.0(magicast@0.5.1)(vite@7.2.4(@types/node@24.10.1)(jiti@2.6.1)(sass-embedded@1.93.3)(sass@1.93.3)(terser@5.44.1)(yaml@2.8.1))(vue@3.5.25(typescript@5.9.3))
@@ -1053,92 +1062,184 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@oxc-parser/binding-android-arm64@0.99.0':
+    resolution: {integrity: sha512-V4jhmKXgQQdRnm73F+r3ZY4pUEsijQeSraFeaCGng7abSNJGs76X6l82wHnmjLGFAeY00LWtjcELs7ZmbJ9+lA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
   '@oxc-parser/binding-darwin-arm64@0.96.0':
     resolution: {integrity: sha512-+HZ2L1a/1BsUXYik8XqQwT2Tl5Z3jRQ/RRQiPV9UsB2skKyd91NLDlQlMpdhjLGs9Qe7Y42unFjRg2iHjIiwnw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
+  '@oxc-parser/binding-darwin-arm64@0.99.0':
+    resolution: {integrity: sha512-Rp41nf9zD5FyLZciS9l1GfK8PhYqrD5kEGxyTOA2esTLeAy37rZxetG2E3xteEolAkeb2WDkVrlxPtibeAncMg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
   '@oxc-parser/binding-darwin-x64@0.96.0':
     resolution: {integrity: sha512-GC8wH1W0XaCLyTeGsmyaMdnItiYQkqfTcn9Ygc55AWI+m11lCjQeoKDIsDCm/QwrKLCN07u3WWWsuPs5ubfXpA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
+  '@oxc-parser/binding-darwin-x64@0.99.0':
+    resolution: {integrity: sha512-WVonp40fPPxo5Gs0POTI57iEFv485TvNKOHMwZRhigwZRhZY2accEAkYIhei9eswF4HN5B44Wybkz7Gd1Qr/5Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
   '@oxc-parser/binding-freebsd-x64@0.96.0':
     resolution: {integrity: sha512-8SeXi2FmlN15uPY5oM03cua5RXBDYmY34Uewongv6RUiAaU/kWxLvzuijpyNC+yQ1r4fC2LbWJhAsKpX5qkA6g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
+  '@oxc-parser/binding-freebsd-x64@0.99.0':
+    resolution: {integrity: sha512-H30bjOOttPmG54gAqu6+HzbLEzuNOYO2jZYrIq4At+NtLJwvNhXz28Hf5iEAFZIH/4hMpLkM4VN7uc+5UlNW3Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
   '@oxc-parser/binding-linux-arm-gnueabihf@0.96.0':
     resolution: {integrity: sha512-UEs+Zf6T2/FwQlLgv7gfZsKmY19sl3hK57r2BQVc2eCmCmF/deeqDcWyFjzkNLgdDDucY60PoNhNGClDm605uQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.99.0':
+    resolution: {integrity: sha512-0Z/Th0SYqzSRDPs6tk5lQdW0i73UCupnim3dgq2oW0//UdLonV/5wIZCArfKGC7w9y4h8TxgXpgtIyD1kKzzlQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
   '@oxc-parser/binding-linux-arm-musleabihf@0.96.0':
     resolution: {integrity: sha512-1kuWvjR2+ORJMoyxt9LSbLcDhXZnL25XOuv9VmH6NmSPvLgewzuubSlm++W03x+U7SzWFilBsdwIHtD/0mjERw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
+  '@oxc-parser/binding-linux-arm-musleabihf@0.99.0':
+    resolution: {integrity: sha512-xo0wqNd5bpbzQVNpAIFbHk1xa+SaS/FGBABCd942SRTnrpxl6GeDj/s1BFaGcTl8MlwlKVMwOcyKrw/2Kdfquw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
   '@oxc-parser/binding-linux-arm64-gnu@0.96.0':
     resolution: {integrity: sha512-PHH4ETR1t0fymxuhpQNj3Z9t/78/zZa2Lj3Z3I0ZOd+/Ex+gtdhGoB5xYyy7lcYGAPMfZ+Gmr+dTCr1GYNZ3BA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
+  '@oxc-parser/binding-linux-arm64-gnu@0.99.0':
+    resolution: {integrity: sha512-u26I6LKoLTPTd4Fcpr0aoAtjnGf5/ulMllo+QUiBhupgbVCAlaj4RyXH/mvcjcsl2bVBv9E/gYJZz2JjxQWXBA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
   '@oxc-parser/binding-linux-arm64-musl@0.96.0':
     resolution: {integrity: sha512-fjDPbZjkqaDSTBe0FM8nZ9zBw4B/NF/I0gH7CfvNDwIj9smISaNFypYeomkvubORpnbX9ORhvhYwg3TxQ60OGA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
+  '@oxc-parser/binding-linux-arm64-musl@0.99.0':
+    resolution: {integrity: sha512-qhftDo2D37SqCEl3ZTa367NqWSZNb1Ddp34CTmShLKFrnKdNiUn55RdokLnHtf1AL5ssaQlYDwBECX7XiBWOhw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
   '@oxc-parser/binding-linux-riscv64-gnu@0.96.0':
     resolution: {integrity: sha512-59KAHd/6/LmjkdSAuJn0piKmwSavMasWNUKuYLX/UnqI5KkGIp14+LBwwaBG6KzOtIq1NrRCnmlL4XSEaNkzTg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
 
+  '@oxc-parser/binding-linux-riscv64-gnu@0.99.0':
+    resolution: {integrity: sha512-zxn/xkf519f12FKkpL5XwJipsylfSSnm36h6c1zBDTz4fbIDMGyIhHfWfwM7uUmHo9Aqw1pLxFpY39Etv398+Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
   '@oxc-parser/binding-linux-s390x-gnu@0.96.0':
     resolution: {integrity: sha512-VtupojtgahY8XmLwpVpM3C1WQEgMD1JxpB8lzUtdSLwosWaaz1EAl+VXWNuxTTZusNuLBtmR+F0qql22ISi/9g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
 
+  '@oxc-parser/binding-linux-s390x-gnu@0.99.0':
+    resolution: {integrity: sha512-Y1eSDKDS5E4IVC7Oxw+NbYAKRmJPMJTIjW+9xOWwteDHkFqpocKe0USxog+Q1uhzalD9M0p9eXWEWdGQCMDBMQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+
   '@oxc-parser/binding-linux-x64-gnu@0.96.0':
     resolution: {integrity: sha512-8XSY9aUYY+5I4I1mhSEWmYqdUrJi3J5cCAInvEVHyTnDAPkhb+tnLGVZD696TpW+lFOLrTFF2V5GMWJVafqIUA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
+  '@oxc-parser/binding-linux-x64-gnu@0.99.0':
+    resolution: {integrity: sha512-YVJMfk5cFWB8i2/nIrbk6n15bFkMHqWnMIWkVx7r2KwpTxHyFMfu2IpeVKo1ITDSmt5nBrGdLHD36QRlu2nDLg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
   '@oxc-parser/binding-linux-x64-musl@0.96.0':
     resolution: {integrity: sha512-IIVNtqhA0uxKkD8Y6aZinKO/sOD5O62VlduE54FnUU2rzZEszrZQLL8nMGVZhTdPaKW5M1aeLmjcdnOs6er1Jg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
+  '@oxc-parser/binding-linux-x64-musl@0.99.0':
+    resolution: {integrity: sha512-2+SDPrie5f90A1b9EirtVggOgsqtsYU5raZwkDYKyS1uvJzjqHCDhG/f4TwQxHmIc5YkczdQfwvN91lwmjsKYQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
   '@oxc-parser/binding-wasm32-wasi@0.96.0':
     resolution: {integrity: sha512-TJ/sNPbVD4u6kUwm7sDKa5iRDEB8vd7ZIMjYqFrrAo9US1RGYOSvt6Ie9sDRekUL9fZhNsykvSrpmIj6dg/C2w==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
+  '@oxc-parser/binding-wasm32-wasi@0.99.0':
+    resolution: {integrity: sha512-DKA4j0QerUWSMADziLM5sAyM7V53Fj95CV9SjP77bPfEfT7MnvFKnneaRMqPK1cpzjAGiQF52OBUIKyk0dwOQA==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
   '@oxc-parser/binding-win32-arm64-msvc@0.96.0':
     resolution: {integrity: sha512-zCOhRB7MYVIHLj+2QYoTuLyaipiD8JG/ggUjfsMUaupRPpvwQNhsxINLIcTcb0AS+OsT7/OREhydjO74STqQzQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
+  '@oxc-parser/binding-win32-arm64-msvc@0.99.0':
+    resolution: {integrity: sha512-EaB3AvsxqdNUhh9FOoAxRZ2L4PCRwDlDb//QXItwyOJrX7XS+uGK9B1KEUV4FZ/7rDhHsWieLt5e07wl2Ti5AQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
   '@oxc-parser/binding-win32-x64-msvc@0.96.0':
     resolution: {integrity: sha512-J6zfx9TE0oS+TrqBUjMVMOi/d/j3HMj69Pip263pETOEPm788N0HXKPsc2X2jUfSTHzD9vmdjq0QFymbf2LhWg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
+  '@oxc-parser/binding-win32-x64-msvc@0.99.0':
+    resolution: {integrity: sha512-sJN1Q8h7ggFOyDn0zsHaXbP/MklAVUvhrbq0LA46Qum686P3SZQHjbATqJn9yaVEvaSKXCshgl0vQ1gWkGgpcQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
   '@oxc-project/types@0.96.0':
     resolution: {integrity: sha512-r/xkmoXA0xEpU6UGtn18CNVjXH6erU3KCpCDbpLmbVxBFor1U9MqN5Z2uMmCHJuXjJzlnDR+hWY+yPoLo8oHDw==}
 
+  '@oxc-project/types@0.99.0':
+    resolution: {integrity: sha512-LLDEhXB7g1m5J+woRSgfKsFPS3LhR9xRhTeIoEBm5WrkwMxn6eZ0Ld0c0K5eHB57ChZX6I3uSmmLjZ8pcjlRcw==}
+
   '@oxc-transform/binding-android-arm64@0.96.0':
     resolution: {integrity: sha512-wOm+ZsqFvyZ7B9RefUMsj0zcXw77Z2pXA51nbSQyPXqr+g0/pDGxriZWP8Sdpz/e4AEaKPA9DvrwyOZxu7GRDQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -3752,6 +3853,10 @@ packages:
     resolution: {integrity: sha512-ucs6niJ5mZlYP3oTl4AK2eD2m7WLoSaljswnSFVYWrXzme5PtM97S7Ve1Tjx+/TKjanmEZuSt1f1qYi6SZvntw==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
+  oxc-parser@0.99.0:
+    resolution: {integrity: sha512-MpS1lbd2vR0NZn1v0drpgu7RUFu3x9Rd0kxExObZc2+F+DIrV0BOMval/RO3BYGwssIOerII6iS8EbbpCCZQpQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+
   oxc-transform@0.96.0:
     resolution: {integrity: sha512-dQPNIF+gHpSkmC0+Vg9IktNyhcn28Y8R3eTLyzn52UNymkasLicl3sFAtz7oEVuFmCpgGjaUTKkwk+jW2cHpDQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
@@ -6512,52 +6617,101 @@ snapshots:
   '@oxc-parser/binding-android-arm64@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-android-arm64@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-darwin-arm64@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-darwin-arm64@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-darwin-x64@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-darwin-x64@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-freebsd-x64@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-freebsd-x64@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-linux-arm-gnueabihf@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-linux-arm-musleabihf@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-linux-arm-musleabihf@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-linux-arm64-gnu@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-linux-arm64-gnu@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-linux-arm64-musl@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-linux-arm64-musl@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-linux-riscv64-gnu@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-linux-riscv64-gnu@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-linux-s390x-gnu@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-linux-s390x-gnu@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-linux-x64-gnu@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-linux-x64-gnu@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-linux-x64-musl@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-linux-x64-musl@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-wasm32-wasi@0.96.0':
     dependencies:
       '@napi-rs/wasm-runtime': 1.0.7
     optional: true
 
+  '@oxc-parser/binding-wasm32-wasi@0.99.0':
+    dependencies:
+      '@napi-rs/wasm-runtime': 1.0.7
+    optional: true
+
   '@oxc-parser/binding-win32-arm64-msvc@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-win32-arm64-msvc@0.99.0':
+    optional: true
+
   '@oxc-parser/binding-win32-x64-msvc@0.96.0':
     optional: true
 
+  '@oxc-parser/binding-win32-x64-msvc@0.99.0':
+    optional: true
+
   '@oxc-project/types@0.96.0': {}
 
+  '@oxc-project/types@0.99.0': {}
+
   '@oxc-transform/binding-android-arm64@0.96.0':
     optional: true
 
@@ -9480,6 +9634,26 @@ snapshots:
       '@oxc-parser/binding-win32-arm64-msvc': 0.96.0
       '@oxc-parser/binding-win32-x64-msvc': 0.96.0
 
+  oxc-parser@0.99.0:
+    dependencies:
+      '@oxc-project/types': 0.99.0
+    optionalDependencies:
+      '@oxc-parser/binding-android-arm64': 0.99.0
+      '@oxc-parser/binding-darwin-arm64': 0.99.0
+      '@oxc-parser/binding-darwin-x64': 0.99.0
+      '@oxc-parser/binding-freebsd-x64': 0.99.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.99.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.99.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.99.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.99.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.99.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.99.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.99.0
+      '@oxc-parser/binding-linux-x64-musl': 0.99.0
+      '@oxc-parser/binding-wasm32-wasi': 0.99.0
+      '@oxc-parser/binding-win32-arm64-msvc': 0.99.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.99.0
+
   oxc-transform@0.96.0:
     optionalDependencies:
       '@oxc-transform/binding-android-arm64': 0.96.0
diff --git a/src/module.ts b/src/module.ts
index d54e1ee..ff81f3d 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -24,17 +24,19 @@ export default defineNuxtModule<ModuleOptions>({
 
     const resolver = createResolver(import.meta.url)
 
+    // core
+    addComponent({
+      name: 'NuxtIsland',
+      filePath: resolver.resolve('./runtime/core/components/nuxt-island'),
+      priority: 1000,
+    })
+
     // performances
     addPlugin(resolver.resolve('./runtime/web-vitals/plugin.client'))
 
     // hydration
     addPlugin(resolver.resolve('./runtime/hydration/plugin.client'))
     addBuildPlugin(InjectHydrationPlugin)
-    addComponent({
-      name: 'NuxtIsland',
-      filePath: resolver.resolve('./runtime/core/components/nuxt-island'),
-      priority: 1000,
-    })
 
     // third-party scripts
     addPlugin(resolver.resolve('./runtime/third-party-scripts/plugin.client'))
diff --git a/src/plugins/hydration.ts b/src/plugins/hydration.ts
index 4055c52..a544b07 100644
--- a/src/plugins/hydration.ts
+++ b/src/plugins/hydration.ts
@@ -1,42 +1,121 @@
+import { genImport } from 'knitwork'
 import MagicString from 'magic-string'
+import { parseSync, type ImportDeclaration } from 'oxc-parser'
 import { createUnplugin } from 'unplugin'
 
-const ID_INCLUDE = /\.vue$/
-const ID_EXCLUDE = /node_modules/
+const INCLUDE_VUE_RE = /\.vue$/
+const EXCLUDE_NODE_MODULES = /node_modules/
+const DEFINE_COMPONENT_RE = /defineComponent/
+const DEFINE_NUXT_COMPONENT_RE = /defineNuxtComponent/
 export const InjectHydrationPlugin = createUnplugin(() => {
-  return {
-    name: '@nuxt/hints:inject-hydration-check',
-    enforce: 'pre',
-    transformInclude(id) {
-      return id.endsWith('.vue') && !id.includes('node_modules')
-    },
-    transform: {
-      filter: {
-        id: {
-          include: ID_INCLUDE,
-          exclude: ID_EXCLUDE,
+  return [
+    {
+      name: '@nuxt/hints:modify-hydration-composable-import',
+      enforce: 'post',
+      transform: {
+        filter: {
+          id: {
+            include: /.(vue|ts|js|tsx|jsx)$/,
+            exclude: EXCLUDE_NODE_MODULES,
+          },
+          code: /defineNuxtComponent|defineComponent/,
         },
-      },
+        handler(code, id) {
+          const m = new MagicString(code)
+          const { program } = parseSync(id, code)
+          const imports = program.body.filter(node => node.type === 'ImportDeclaration')
+          const hasDefineComponent = DEFINE_COMPONENT_RE.test(code)
+          const hasDefineNuxtComponent = DEFINE_NUXT_COMPONENT_RE.test(code)
+          const importsToAdd = new Set([
+            hasDefineComponent
+            && genImport(
+              '@nuxt/hints/runtime/hydration/component',
+              ['defineComponent'],
+            ),
+            hasDefineNuxtComponent
+            && genImport(
+              '@nuxt/hints/runtime/hydration/component',
+              ['defineNuxtComponent'],
+            ),
+          ].filter(Boolean))
+
+          const defineComponentImport = findImportSpecifier(imports as ImportDeclaration[], 'defineComponent', ['vue', '#imports'])
+          if (defineComponentImport) {
+            m.remove(
+              defineComponentImport.start,
+              defineComponentImport.end,
+            )
+          }
+          const defineNuxtComponentImport = findImportSpecifier(imports as ImportDeclaration[], 'defineNuxtComponent', ['#app/composables/component', '#imports', '#app', 'nuxt/app'])
+          if (defineNuxtComponentImport) {
+            m.remove(
+              defineNuxtComponentImport.start,
+              defineNuxtComponentImport.end,
+            )
+          }
+
+          m.prepend([...importsToAdd].join('\n') + '\n')
 
-      handler(code) {
-        const m = new MagicString(code)
-        const re = /<script\s+setup[^>]*>/g
-        const match = re.exec(code)
-        if (!match) {
-          return code
-        }
-
-        // Add useHydrationCheck after the <script setup> tag
-        m.appendRight(
-          match.index + match[0].length,
-          `\nimport { useHydrationCheck } from '@nuxt/hints/runtime/hydration/composables'\nuseHydrationCheck();`,
-        )
-
-        return {
-          code: m.toString(),
-          map: m.generateMap({ hires: true }),
-        }
+          if (m.hasChanged()) {
+            return {
+              code: m.toString(),
+              map: m.generateMap({ hires: true }),
+            }
+          }
+        },
       },
     },
-  }
+
+    {
+      name: '@nuxt/hints:inject-hydration-composable',
+      enforce: 'post',
+      transform: {
+        filter: {
+          id: {
+            include: INCLUDE_VUE_RE,
+            exclude: EXCLUDE_NODE_MODULES,
+          },
+          code: /(?!defineComponent|defineNuxtComponent)/,
+        },
+
+        handler(code, id) {
+          const m = new MagicString(code)
+          const { program } = parseSync(id, code)
+
+          const exportDeclaration = program.body.find(node =>
+            node.type === 'ExportDefaultDeclaration',
+          )?.declaration
+
+          if (exportDeclaration) {
+            m.prepend(genImport(
+              '@nuxt/hints/runtime/hydration/component',
+              ['defineComponent'],
+            ))
+
+            m.overwrite(
+              exportDeclaration.start,
+              exportDeclaration.end,
+              `defineComponent(${code.slice(exportDeclaration.start, exportDeclaration.end)})`,
+            )
+          }
+
+          if (m.hasChanged()) {
+            return {
+              code: m.toString(),
+              map: m.generateMap({ hires: true }),
+            }
+          }
+        },
+      },
+    }]
 })
+
+/**
+ * Finds an import specifier for a given imported name from specified package names.
+ */
+function findImportSpecifier(importDecl: ImportDeclaration[], importedName: string, pkgNames: string | string[]) {
+  const names = Array.isArray(pkgNames) ? pkgNames : [pkgNames]
+  return importDecl.find(imp => names.includes(imp.source.value))?.specifiers.find((specifier) => {
+    return specifier.type === 'ImportSpecifier' && specifier.imported.type === 'Identifier' && specifier.imported.name === importedName
+  })
+}
diff --git a/src/runtime/hydration/component.ts b/src/runtime/hydration/component.ts
new file mode 100644
index 0000000..a3fb912
--- /dev/null
+++ b/src/runtime/hydration/component.ts
@@ -0,0 +1,29 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { defineComponent as _defineComponent, type DefineComponent } from 'vue'
+import { defineNuxtComponent as _defineNuxtComponent } from 'nuxt/app'
+import { useHydrationCheck } from './composables'
+
+export const defineNuxtComponent: typeof _defineComponent
+  = function defineNuxtComponent(...args: any[]): any {
+    const [options, key] = args
+    const { setup } = options as DefineComponent
+
+    options.setup = function (props: any, ctx: any) {
+      useHydrationCheck()
+      return setup ? setup(props, ctx) : undefined
+    }
+
+    return _defineNuxtComponent(options as any, key)
+  }
+
+export const defineComponent: typeof _defineComponent = function defineComponent(...args: any[]): any {
+  const [options] = args
+  if (typeof options === 'object' && options !== null) {
+    const { setup } = options as DefineComponent
+    options.setup = function (props: any, ctx: any) {
+      useHydrationCheck()
+      return setup ? setup(props, ctx) : undefined
+    }
+  }
+  return _defineComponent(options as any)
+}
diff --git a/test/unit/hydration/vite-plugin.test.ts b/test/unit/hydration/vite-plugin.test.ts
new file mode 100644
index 0000000..4b9fdd7
--- /dev/null
+++ b/test/unit/hydration/vite-plugin.test.ts
@@ -0,0 +1,115 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect } from 'vitest'
+import { InjectHydrationPlugin } from '../../../src/plugins/hydration'
+import { genImport } from 'knitwork'
+import type { Plugin } from 'vite'
+import type { ObjectHook } from 'unplugin'
+
+const plugins = InjectHydrationPlugin.vite() as Plugin[]
+
+const modifyImportPluginTransform = (plugins.find(p => p.name === '@nuxt/hints:modify-hydration-composable-import')!.transform as ObjectHook<any, any>)!.handler
+const injectComposablePluginTransform = (plugins.find(p => p.name === '@nuxt/hints:inject-hydration-composable')!.transform as ObjectHook<any, any>)!.handler
+
+const importDefineComponent = genImport(
+  '@nuxt/hints/runtime/hydration/component',
+  ['defineComponent'],
+)
+
+const importDefineNuxtComponent = genImport(
+  '@nuxt/hints/runtime/hydration/component',
+  ['defineNuxtComponent'],
+)
+
+const exportDefineComponent = `
+export default defineComponent({
+  name: 'MyComponent'
+})
+`
+
+const exportDefineNuxtComponent = `
+export default defineNuxtComponent({
+  name: 'MyNuxtComponent'
+})
+`
+
+const vueCompiledFile = `
+/* Analyzed bindings: {
+  "ref": "setup-const",
+  "msg": "setup-ref"
+} */
+import { ref } from 'vue'
+
+
+const __sfc__ = {
+  __name: 'App',
+  setup(__props, { expose: __expose }) {
+  __expose();
+
+const msg = ref('Hello World!')
+
+const __returned__ = { msg, ref }
+Object.defineProperty(__returned__, '__isScriptSetup', { enumerable: false, value: true })
+return __returned__
+}
+
+};
+import { toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, vModelText as _vModelText, withDirectives as _withDirectives, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue"
+function render(_ctx, _cache, $props, $setup, $data, $options) {
+  return (_openBlock(), _createElementBlock(_Fragment, null, [
+    _createElementVNode("h1", null, _toDisplayString($setup.msg), 1 /* TEXT */),
+    _withDirectives(_createElementVNode("input", {
+      "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (($setup.msg) = $event))
+    }, null, 512 /* NEED_PATCH */), [
+      [_vModelText, $setup.msg]
+    ])
+  ], 64 /* STABLE_FRAGMENT */))
+}
+__sfc__.render = render
+__sfc__.__file = "src/App.vue"
+export default __sfc__
+`
+
+describe('InjectHydrationPlugin', () => {
+  describe('modify-hydration-composable-import', () => {
+    it('should replace defineComponent import from vue', async () => {
+      const code = `import { defineComponent } from 'vue'\n${exportDefineComponent}`
+      const result = await modifyImportPluginTransform(code, 'test.ts')
+      expect(result.code).toContain(importDefineComponent.trim())
+      expect(result.code).not.toContain('import { defineComponent } from \'vue\'')
+    })
+
+    it('should replace defineNuxtComponent import from #app', async () => {
+      const code = `import { defineNuxtComponent } from '#app'\n${exportDefineNuxtComponent}`
+      const result = await modifyImportPluginTransform(code, 'test.ts')
+      expect(result.code).toContain(importDefineNuxtComponent.trim())
+      expect(result.code).not.toContain('import { defineNuxtComponent } from \'#app\'')
+    })
+
+    it('should replace defineNuxtComponent import from #imports', async () => {
+      const code = `import { defineNuxtComponent } from '#imports'\n${exportDefineNuxtComponent}`
+      const result = await modifyImportPluginTransform(code, 'test.ts')
+      expect(result.code).toContain(importDefineNuxtComponent.trim())
+      expect(result.code).not.toContain('import { defineNuxtComponent } from \'#imports\'')
+    })
+
+    it('should inject import if defineComponent is used but not imported', async () => {
+      const code = `${exportDefineComponent}`
+      const result = await modifyImportPluginTransform(code, 'test.ts')
+      expect(result.code).toContain(importDefineComponent.trim())
+    })
+
+    it('should not replace other imports', async () => {
+      const code = `import { ref } from 'vue'\nexport default {}`
+      const result = await modifyImportPluginTransform(code, 'test.ts')
+      expect(result).toBe(undefined)
+    })
+  })
+
+  describe('inject-hydration-composable', () => {
+    it('should wrap default export with defineComponent in vue files', async () => {
+      const result = await injectComposablePluginTransform(vueCompiledFile, 'App.vue')
+      expect(result.code).toContain(importDefineComponent.trim())
+      expect(result.code).toContain('export default defineComponent(__sfc__)')
+    })
+  })
+})
diff --git a/vitest.config.ts b/vitest.config.ts
index 314a997..a2f3d3b 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -4,6 +4,7 @@ export default defineConfig({
   test: {
     projects: [
       './vitest.runtime.config.ts',
+      './vitest.unit.config.ts',
     ],
   },
 })
diff --git a/vitest.unit.config.ts b/vitest.unit.config.ts
new file mode 100644
index 0000000..c9e34bd
--- /dev/null
+++ b/vitest.unit.config.ts
@@ -0,0 +1,8 @@
+import { defineProject } from 'vitest/config'
+
+export default defineProject({
+  test: {
+    name: 'unit',
+    include: ['test/unit/**/*.test.ts'],
+  },
+})