Merge branch 'main' into feat/upgrade-volar2

package.json

@@ -5,7 +5,7 @@
   "private": true,
   "packageManager": "pnpm@9.2.0",
   "scripts": {
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc",
     "build": "pnpm -r run build",
     "test": "vitest",
     "lint": "eslint .",

packages/twoslash-vue/src/index.ts

@@ -207,7 +207,7 @@ export function createTwoslasher(createOptions: CreateTwoslashVueOptions = {}):
       ...sourceMeta.removals,
       ...result.meta.removals
         .map((r) => {
-          const start = [...map.getSourceOffsets(r[0])][0]?.[0]
+          const start = [...map.getSourceOffsets(r[0])][0]?.[0] ?? code.match(/(?<=<script[\s\S]*>\s)/)?.index
           const end = [...map.getSourceOffsets(r[1])][0]?.[0]
           if (start == null || end == null || start < 0 || end < 0 || start >= end)
             return undefined

packages/twoslash-vue/test/fixtures/cut-around-vue.vue

@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import { ref } from "vue"
+// ---cut-before---
+interface Foo {
+  bar: string
+}
+// ---cut---
+const { hi } = useFoo()
+function useFoo() {
+  const hi = ref<Foo>({ bar: "hello" })
+  return { hi }
+}
+// ---cut-after---
+declare const foo: {
+  hi: string
+}
+</script>
+
+<template>
+  <div>
+    {{ hi.bar }}
+  </div>
+</template>

tsconfig.json

@@ -8,7 +8,7 @@
     ],
     "moduleDetection": "force",
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "paths": {
       "twoslash": [
         "./packages/twoslash/src/index.ts"
@@ -30,6 +30,7 @@
     ],
     "allowJs": true,
     "strict": true,
+    "noEmit": true,
     "esModuleInterop": true,
     "isolatedModules": true,
     "skipDefaultLibCheck": true,