diff --git a/package.json b/package.json
index 19d051c..8b59e11 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "@glimmer/syntax": ">= 0.92.0",
     "@typescript-eslint/tsconfig-utils": "^8.38.0",
     "content-tag": "^4.1.0",
+    "ember-estree": "github:NullVoxPopuli/ember-estree#56dc454",
     "eslint-scope": "^9.1.1",
     "html-tags": "^5.1.0",
     "mathml-tag-names": "^4.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2819648..65e7442 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,6 +23,9 @@ importers:
       content-tag:
         specifier: ^4.1.0
         version: 4.1.0
+      ember-estree:
+        specifier: github:NullVoxPopuli/ember-estree#56dc454
+        version: https://codeload.github.com/NullVoxPopuli/ember-estree/tar.gz/56dc454
       eslint-scope:
         specifier: ^9.1.1
         version: 9.1.1
@@ -1031,6 +1034,15 @@ packages:
     resolution: {integrity: sha512-/SusdG+zgosc3t+9sPFVKSFOYyiSgLfXOT6lYNWoG1YtnhWDxlK4S8leZ0jhcVjemdaHln5rTyxCnq8oFLxqpQ==}
     engines: {node: 12.* || 14.* || >= 16}
 
+  '@emnapi/core@1.9.0':
+    resolution: {integrity: sha512-0DQ98G9ZQZOxfUcQn1waV2yS8aWdZ6kJMbYCJB3oUBecjWYO1fqJ+a1DRfPF3O5JEkwqwP1A9QEN/9mYm2Yd0w==}
+
+  '@emnapi/runtime@1.9.0':
+    resolution: {integrity: sha512-QN75eB0IH2ywSpRpNddCRfQIhmJYBCJ1x5Lb3IscKAL8bMnVAKnRg8dCoXbHzVLLH7P38N2Z3mtulB7W0J0FKw==}
+
+  '@emnapi/wasi-threads@1.2.0':
+    resolution: {integrity: sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==}
+
   '@esbuild/aix-ppc64@0.21.5':
     resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
     engines: {node: '>=12'}
@@ -1253,6 +1265,9 @@ packages:
   '@glimmer/env@0.1.7':
     resolution: {integrity: sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==}
 
+  '@glimmer/global-context@0.84.3':
+    resolution: {integrity: sha512-8Oy9Wg5IZxMEeAnVmzD2NkObf89BeHoFSzJgJROE/deutd3rxg83mvlOez4zBBGYwnTb+VGU2LYRpet92egJjA==}
+
   '@glimmer/global-context@0.92.3':
     resolution: {integrity: sha512-tvlK5pt6oSe3furJ1KsO9vG/KmF9S98HLrcR48XbfwXlkuxvUeS94cdQId4GCN5naeX4OC4xm6eEjZWdc2s+jw==}
 
@@ -1280,6 +1295,9 @@ packages:
   '@glimmer/program@0.92.4':
     resolution: {integrity: sha512-fkquujQ11lsGCWl/+XpZW2E7bjHj/g6/Ht292A7pSoANBD8Bz/gPYiPM+XuMwes9MApEsTEMjV4EXlyk2/Cirg==}
 
+  '@glimmer/reference@0.84.3':
+    resolution: {integrity: sha512-lV+p/aWPVC8vUjmlvYVU7WQJsLh319SdXuAWoX/SE3pq340BJlAJiEcAc6q52y9JNhT57gMwtjMX96W5Xcx/qw==}
+
   '@glimmer/reference@0.92.3':
     resolution: {integrity: sha512-Ud4LE689mEXL6BJnJx0ZPt2dt/A540C+TAnBFXHpcAjROz5gT337RN+tgajwudEUqpufExhcPSMGzs1pvWYCJg==}
 
@@ -1313,6 +1331,9 @@ packages:
   '@glimmer/validator@0.44.0':
     resolution: {integrity: sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==}
 
+  '@glimmer/validator@0.84.3':
+    resolution: {integrity: sha512-RTBV4TokUB0vI31UC7ikpV7lOYpWUlyqaKV//pRC4pexYMlmqnVhkFrdiimB/R1XyNdUOQUmnIAcdic39NkbhQ==}
+
   '@glimmer/validator@0.92.3':
     resolution: {integrity: sha512-HKrMYeW0YhiksSeKYqX2chUR/rz82j12DcY7p2dORQlTV3qlAfiE5zRTJH1KRA1X3ZMf7DI2/GOzkXwYp0o+3Q==}
 
@@ -1415,6 +1436,9 @@ packages:
     resolution: {integrity: sha512-SkAyKAByB9l93Slyg8AUHGuM2kjvWioUTCckT/03J09jYnfEzMO/wSXmEhnKGYs6qx9De8TH4yJCl0Y9lRgnyQ==}
     engines: {node: '>=14.18.0'}
 
+  '@napi-rs/wasm-runtime@1.1.1':
+    resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==}
+
   '@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1':
     resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==}
 
@@ -1508,6 +1532,128 @@ packages:
   '@octokit/types@14.1.0':
     resolution: {integrity: sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==}
 
+  '@oxc-parser/binding-android-arm-eabi@0.119.0':
+    resolution: {integrity: sha512-e0ii/Tqwk5pAHZRY+ZyXOdKHNRNmE+dvTGQZ7xQ5XPH2Am59aktD30QvfcfwItGhNTLCj/5TYGH5RHvmvqaILQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [android]
+
+  '@oxc-parser/binding-android-arm64@0.119.0':
+    resolution: {integrity: sha512-ha0xQpiStuoBv7HGazNKQWa6IRxri2+PpeojdAyBGnHGzfioA1GcStNGEGOyXvF+OxDfWvPuw5QiRYRUMtmgbQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@oxc-parser/binding-darwin-arm64@0.119.0':
+    resolution: {integrity: sha512-h/AIi5jfQz9WQUJJkkkHeXNYMhPtR72qnYZt0ZpM/LvlH/wpI5QkCPi7MWjjyY+m0JDorIXJyfOfccn8SbNSxQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@oxc-parser/binding-darwin-x64@0.119.0':
+    resolution: {integrity: sha512-15RwS/AawrgognvWsonI2eLKI5BqO0FzrpYXnzROysSR0x5RYsCc3UMFBwB1ph0UFFQzJy3ZbHHxfxp8RGr5Xg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@oxc-parser/binding-freebsd-x64@0.119.0':
+    resolution: {integrity: sha512-iKaayTIDqEj0yyNPL+0t/spNAxMv7O32uY4eu/ir8BvFNgavoRmN8uqxRj8sxQDle89N/1Iw0dgRjS3tiWrqlA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.119.0':
+    resolution: {integrity: sha512-PDoOaOx8YWoxy19WNeMs6kOE0uFSb5EtA64Ye0wSp6sQpe+l8Gd+yjX2L+yNwd5MpDOvOy8KToa2bqCV4pf6iQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-arm-musleabihf@0.119.0':
+    resolution: {integrity: sha512-AVxZ5Eo5squsUhpjnkCYuH20t5FCGV3HAP9UOKLxJQkmZW3kJvBGbfpH75ABxRrE2kGqmJW5FmS980u8v9Cepw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-arm64-gnu@0.119.0':
+    resolution: {integrity: sha512-9vfdyT9gczSeSwsEkBHVjigI8SWo3iB9zxEzL+YMBUrN0ftCUkKQr27DaDZK4/cQ80t6KRB+g9sUmT2T2AGnOQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-arm64-musl@0.119.0':
+    resolution: {integrity: sha512-7BOq/tjSrtnp/ihw615uGcxMY3iya2qvVtwm15h2NvBZ6Jje+PC1GSUBOLfqGKJbUr9riSVV//a4iNhHI48Qdw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-ppc64-gnu@0.119.0':
+    resolution: {integrity: sha512-PQIrLJwoAaNyNSWBF+2SSgv44Jp+xpKVUA+8+PuoMhyBQ6lFSbQdaxewdn11i3heTFMYd2xF339HWax4S6MPVA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-riscv64-gnu@0.119.0':
+    resolution: {integrity: sha512-spNh4YhT9K+Ya5hr6NmI1MazKSKORD8u5/06hFbzTslLnmmxiGaLqJXhNKIYUH39ne/JD5rkoRkUcOB2/LpC3A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-riscv64-musl@0.119.0':
+    resolution: {integrity: sha512-hFoCTRxSJAcrNBYVlgNDDQq6LyJLYyhnJDlPtK/mWrPYS3x5/fUR9jc6wo5VyxKIL/0dDJBBWp19v81q9heU/A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-s390x-gnu@0.119.0':
+    resolution: {integrity: sha512-bl7jHJZq3W5tYEvKG3yWZTUKTNb0/BtyYSnfMIrQ7t8hajCH4i1g0q+14s0KmQQl1UHxIX/Gx/Ps6e92qJQJmQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-x64-gnu@0.119.0':
+    resolution: {integrity: sha512-m+DE7NhJIEGp4efSJnNfRf3swT25rbZ1FTIihV+pOLTI+k5yNguxvqT338mNu61OVSx0BfpV8QlO2nz43GR/Zg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@oxc-parser/binding-linux-x64-musl@0.119.0':
+    resolution: {integrity: sha512-pHhnXZHUfd5pYzFLQfvx1DH2HY+L8DPZeh6SsQrsmoaODm1+j8VPeWLwGSrXQSz5f1kfT/mnzm1iNLVOGIeuaw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@oxc-parser/binding-openharmony-arm64@0.119.0':
+    resolution: {integrity: sha512-8Fthv9nOec0hQLX16yjYyYIU+u8ZFuQojdQ3vNgXN+PcqI/bDohGgCATrxO69gLf0IzkyOmKmurXOQCYK8BYpQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@oxc-parser/binding-wasm32-wasi@0.119.0':
+    resolution: {integrity: sha512-KpOU6fLqevFDP6ndkgE4BPoceELM4bOsEsAXjpe+FKYuUyEzHssYPBmxouGpXDQeAeWTBIjosw5yElLMRPuccw==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
+  '@oxc-parser/binding-win32-arm64-msvc@0.119.0':
+    resolution: {integrity: sha512-omtTgAKIl6GQ40nG+wAWN8xMJLNtfmTdd0+wMIcrw1shX9y5TntAVIuiay3Du0wvUK9sgMpL07HYNphgHeZS0A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@oxc-parser/binding-win32-ia32-msvc@0.119.0':
+    resolution: {integrity: sha512-+0kqoCfv4WFP3e4BqcVEtf1moUuG9Zv5lo1aKcw1JakqJo008TGG+C2LnVM4QucGSZVQ/Ii/H5XCvrRbkeLQfA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@oxc-parser/binding-win32-x64-msvc@0.119.0':
+    resolution: {integrity: sha512-5kaKmBHD+OQjZzGAQQ9n8jWNvCRxu3MjElAjkCqsS3i2wiN3hqHlOPKwGDydYiB1gKdeYGlTjRYtuF4gBLDSxQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@oxc-project/types@0.119.0':
+    resolution: {integrity: sha512-9SCGhodOxEicD2kblitu34fGHcpmqgI3beYw/E22ehVLHzccHRFH91NmKt0MhZEaAwLpei6OOA9aB6Vuks9qAg==}
+
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -1649,6 +1795,9 @@ packages:
   '@tsconfig/ember@3.0.8':
     resolution: {integrity: sha512-OVnIsZIt/8q0VEtcdz3rRryNrm6gdJTxXlxefkGIrkZnME0wqslmwHlUEZ7mvh377df9FqBhNKrYNarhCW8zJA==}
 
+  '@tybys/wasm-util@0.10.1':
+    resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
+
   '@types/esrecurse@4.3.1':
     resolution: {integrity: sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==}
 
@@ -2169,6 +2318,9 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
   baseline-browser-mapping@2.10.0:
     resolution: {integrity: sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==}
     engines: {node: '>=6.0.0'}
@@ -2192,6 +2344,9 @@ packages:
     resolution: {integrity: sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==}
     engines: {node: '>=0.8'}
 
+  bl@4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+
   blank-object@1.0.2:
     resolution: {integrity: sha512-kXQ19Xhoghiyw66CUiGypnuRpWlbHAzY/+NyvqTEdTfhfQGH1/dbEMYiXju7fYKIFePpzp/y9dsu5Cu/PkmawQ==}
 
@@ -2296,6 +2451,9 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
   builtin-modules@3.3.0:
     resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
     engines: {node: '>=6'}
@@ -2381,11 +2539,19 @@ packages:
   clean-up-path@1.0.0:
     resolution: {integrity: sha512-PHGlEF0Z6976qQyN6gM7kKH6EH0RdfZcc8V+QhFe36eRxV0SMH5OUBZG7Bxa9YcreNzyNbK63cGiZxdSZgosRw==}
 
+  cli-cursor@3.1.0:
+    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
+    engines: {node: '>=8'}
+
   cli-highlight@2.1.11:
     resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==}
     engines: {node: '>=8.0.0', npm: '>=5.0.0'}
     hasBin: true
 
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+
   cliui@7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
 
@@ -2393,6 +2559,10 @@ packages:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
 
+  clone@1.0.4:
+    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
+    engines: {node: '>=0.8'}
+
   clone@2.1.2:
     resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
     engines: {node: '>=0.8'}
@@ -2404,9 +2574,17 @@ packages:
   color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
+  colors@1.4.0:
+    resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==}
+    engines: {node: '>=0.1.90'}
+
   commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
+  commander@8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+
   common-ancestor-path@1.0.1:
     resolution: {integrity: sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==}
 
@@ -2535,6 +2713,9 @@ packages:
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
+  defaults@1.0.4:
+    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
+
   define-data-property@1.1.1:
     resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
     engines: {node: '>= 0.4'}
@@ -2646,6 +2827,10 @@ packages:
     resolution: {integrity: sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==}
     engines: {node: 10.* || >= 12.*}
 
+  ember-estree@https://codeload.github.com/NullVoxPopuli/ember-estree/tar.gz/56dc454:
+    resolution: {tarball: https://codeload.github.com/NullVoxPopuli/ember-estree/tar.gz/56dc454}
+    version: 0.3.0
+
   ember-rfc176-data@0.3.18:
     resolution: {integrity: sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==}
 
@@ -2665,6 +2850,11 @@ packages:
     peerDependencies:
       '@glimmer/component': '>= 1.1.2'
 
+  ember-template-recast@6.1.5:
+    resolution: {integrity: sha512-VnRN8FzEHQnw/5rCv6Wnq8MVYXbGQbFY+rEufvWV+FO/IsxMahGEud4MYWtTA2q8iG+qJFrDQefNvQ//7MI7Qw==}
+    engines: {node: 12.* || 14.* || >= 16.*}
+    hasBin: true
+
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
@@ -3396,6 +3586,9 @@ packages:
     peerDependencies:
       postcss: ^8.1.0
 
+  ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
   ignore-walk@5.0.1:
     resolution: {integrity: sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -3540,6 +3733,10 @@ packages:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
 
+  is-interactive@1.0.0:
+    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
+    engines: {node: '>=8'}
+
   is-lambda@1.0.1:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
 
@@ -3642,6 +3839,10 @@ packages:
     resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
     engines: {node: '>= 0.4'}
 
+  is-unicode-supported@0.1.0:
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+    engines: {node: '>=10'}
+
   is-unicode-supported@2.1.0:
     resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
     engines: {node: '>=18'}
@@ -3834,6 +4035,10 @@ packages:
   lodash@4.17.23:
     resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}
 
+  log-symbols@4.1.0:
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
+
   loupe@2.3.7:
     resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
 
@@ -4133,6 +4338,10 @@ packages:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
 
+  ora@5.4.1:
+    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
+    engines: {node: '>=10'}
+
   os-tmpdir@1.0.2:
     resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
     engines: {node: '>=0.10.0'}
@@ -4141,6 +4350,10 @@ packages:
     resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
     engines: {node: '>= 0.4'}
 
+  oxc-parser@0.119.0:
+    resolution: {integrity: sha512-fNiKvO0ZHSUmINQlVY2It+vGbHxCvhpqJi0rZYFFOESoOy3fs5E4erKYGZtB/J1aULkjtY06aWNil4JxMsKXGg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+
   p-finally@2.0.1:
     resolution: {integrity: sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==}
     engines: {node: '>=8'}
@@ -4428,6 +4641,10 @@ packages:
     resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==}
     engines: {node: '>=6'}
 
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
   recast@0.18.10:
     resolution: {integrity: sha512-XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ==}
     engines: {node: '>= 4'}
@@ -4543,6 +4760,10 @@ packages:
     resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
     hasBin: true
 
+  restore-cursor@3.1.0:
+    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
+    engines: {node: '>=8'}
+
   retry@0.12.0:
     resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
     engines: {node: '>= 4'}
@@ -4838,6 +5059,9 @@ packages:
     resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
     engines: {node: '>= 0.4'}
 
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
   strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
@@ -4975,6 +5199,10 @@ packages:
     resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
     engines: {node: '>=0.6.0'}
 
+  tmp@0.2.5:
+    resolution: {integrity: sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==}
+    engines: {node: '>=14.14'}
+
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -5259,6 +5487,9 @@ packages:
     resolution: {integrity: sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==}
     engines: {node: '>=10.13.0'}
 
+  wcwidth@1.0.1:
+    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+
   webpack-sources@3.3.4:
     resolution: {integrity: sha512-7tP1PdV4vF+lYPnkMR0jMY5/la2ub5Fc/8VQrrU+lXkiM6C4TjVfGw7iKfyhnTQOsD+6Q/iKw0eFciziRgD58Q==}
     engines: {node: '>=10.13.0'}
@@ -5373,6 +5604,9 @@ packages:
     resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==}
     engines: {node: '>=18'}
 
+  zimmerframe@1.1.4:
+    resolution: {integrity: sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==}
+
 snapshots:
 
   '@aashutoshrathi/word-wrap@1.2.6': {}
@@ -6277,6 +6511,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@emnapi/core@1.9.0':
+    dependencies:
+      '@emnapi/wasi-threads': 1.2.0
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/runtime@1.9.0':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/wasi-threads@1.2.0':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
@@ -6477,6 +6727,10 @@ snapshots:
 
   '@glimmer/env@0.1.7': {}
 
+  '@glimmer/global-context@0.84.3':
+    dependencies:
+      '@glimmer/env': 0.1.7
+
   '@glimmer/global-context@0.92.3': {}
 
   '@glimmer/interfaces@0.84.3':
@@ -6539,6 +6793,14 @@ snapshots:
       '@glimmer/vm': 0.92.3
       '@glimmer/wire-format': 0.92.3
 
+  '@glimmer/reference@0.84.3':
+    dependencies:
+      '@glimmer/env': 0.1.7
+      '@glimmer/global-context': 0.84.3
+      '@glimmer/interfaces': 0.84.3
+      '@glimmer/util': 0.84.3
+      '@glimmer/validator': 0.84.3
+
   '@glimmer/reference@0.92.3':
     dependencies:
       '@glimmer/env': 0.1.7
@@ -6609,6 +6871,11 @@ snapshots:
 
   '@glimmer/validator@0.44.0': {}
 
+  '@glimmer/validator@0.84.3':
+    dependencies:
+      '@glimmer/env': 0.1.7
+      '@glimmer/global-context': 0.84.3
+
   '@glimmer/validator@0.92.3':
     dependencies:
       '@glimmer/env': 0.1.7
@@ -6728,6 +6995,13 @@ snapshots:
       jju: 1.4.0
       read-yaml-file: 1.1.0
 
+  '@napi-rs/wasm-runtime@1.1.1':
+    dependencies:
+      '@emnapi/core': 1.9.0
+      '@emnapi/runtime': 1.9.0
+      '@tybys/wasm-util': 0.10.1
+    optional: true
+
   '@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1':
     dependencies:
       eslint-scope: 5.1.1
@@ -6847,6 +7121,70 @@ snapshots:
     dependencies:
       '@octokit/openapi-types': 25.1.0
 
+  '@oxc-parser/binding-android-arm-eabi@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-android-arm64@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-darwin-arm64@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-darwin-x64@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-freebsd-x64@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm-musleabihf@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm64-gnu@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-arm64-musl@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-ppc64-gnu@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-riscv64-gnu@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-riscv64-musl@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-s390x-gnu@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-x64-gnu@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-linux-x64-musl@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-openharmony-arm64@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-wasm32-wasi@0.119.0':
+    dependencies:
+      '@napi-rs/wasm-runtime': 1.1.1
+    optional: true
+
+  '@oxc-parser/binding-win32-arm64-msvc@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-win32-ia32-msvc@0.119.0':
+    optional: true
+
+  '@oxc-parser/binding-win32-x64-msvc@0.119.0':
+    optional: true
+
+  '@oxc-project/types@0.119.0': {}
+
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
@@ -6939,6 +7277,11 @@ snapshots:
 
   '@tsconfig/ember@3.0.8': {}
 
+  '@tybys/wasm-util@0.10.1':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@types/esrecurse@4.3.1': {}
 
   '@types/estree@1.0.6': {}
@@ -7693,6 +8036,8 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
+  base64-js@1.5.1: {}
+
   baseline-browser-mapping@2.10.0: {}
 
   baseline-browser-mapping@2.8.27: {}
@@ -7707,6 +8052,12 @@ snapshots:
 
   binaryextensions@2.3.0: {}
 
+  bl@4.1.0:
+    dependencies:
+      buffer: 5.7.1
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
   blank-object@1.0.2: {}
 
   brace-expansion@1.1.11:
@@ -7920,6 +8271,11 @@ snapshots:
 
   buffer-from@1.1.2: {}
 
+  buffer@5.7.1:
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+
   builtin-modules@3.3.0: {}
 
   builtins@5.0.1:
@@ -8027,6 +8383,10 @@ snapshots:
 
   clean-up-path@1.0.0: {}
 
+  cli-cursor@3.1.0:
+    dependencies:
+      restore-cursor: 3.1.0
+
   cli-highlight@2.1.11:
     dependencies:
       chalk: 4.1.2
@@ -8036,6 +8396,8 @@ snapshots:
       parse5-htmlparser2-tree-adapter: 6.0.1
       yargs: 16.2.0
 
+  cli-spinners@2.9.2: {}
+
   cliui@7.0.4:
     dependencies:
       string-width: 4.2.3
@@ -8048,6 +8410,8 @@ snapshots:
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
+  clone@1.0.4: {}
+
   clone@2.1.2: {}
 
   color-convert@2.0.1:
@@ -8056,8 +8420,12 @@ snapshots:
 
   color-name@1.1.4: {}
 
+  colors@1.4.0: {}
+
   commander@2.20.3: {}
 
+  commander@8.3.0: {}
+
   common-ancestor-path@1.0.1: {}
 
   commondir@1.0.1: {}
@@ -8181,6 +8549,10 @@ snapshots:
 
   deep-is@0.1.4: {}
 
+  defaults@1.0.4:
+    dependencies:
+      clone: 1.0.4
+
   define-data-property@1.1.1:
     dependencies:
       get-intrinsic: 1.2.2
@@ -8422,6 +8794,16 @@ snapshots:
       - '@babel/core'
       - supports-color
 
+  ember-estree@https://codeload.github.com/NullVoxPopuli/ember-estree/tar.gz/56dc454:
+    dependencies:
+      '@glimmer/syntax': 0.95.0
+      content-tag: 4.1.0
+      ember-template-recast: 6.1.5
+      oxc-parser: 0.119.0
+      zimmerframe: 1.1.4
+    transitivePeerDependencies:
+      - supports-color
+
   ember-rfc176-data@0.3.18: {}
 
   ember-router-generator@2.0.0:
@@ -8533,6 +8915,22 @@ snapshots:
       - supports-color
       - webpack
 
+  ember-template-recast@6.1.5:
+    dependencies:
+      '@glimmer/reference': 0.84.3
+      '@glimmer/syntax': 0.84.3
+      '@glimmer/validator': 0.84.3
+      async-promise-queue: 1.0.5
+      colors: 1.4.0
+      commander: 8.3.0
+      globby: 11.1.0
+      ora: 5.4.1
+      slash: 3.0.0
+      tmp: 0.2.5
+      workerpool: 6.5.1
+    transitivePeerDependencies:
+      - supports-color
+
   emoji-regex@8.0.0: {}
 
   emoji-regex@9.2.2: {}
@@ -9738,6 +10136,8 @@ snapshots:
     dependencies:
       postcss: 8.4.49
 
+  ieee754@1.2.1: {}
+
   ignore-walk@5.0.1:
     dependencies:
       minimatch: 5.1.6
@@ -9884,6 +10284,8 @@ snapshots:
     dependencies:
       is-extglob: 2.1.1
 
+  is-interactive@1.0.0: {}
+
   is-lambda@1.0.1: {}
 
   is-map@2.0.3: {}
@@ -9974,6 +10376,8 @@ snapshots:
     dependencies:
       which-typed-array: 1.1.18
 
+  is-unicode-supported@0.1.0: {}
+
   is-unicode-supported@2.1.0: {}
 
   is-weakmap@2.0.2: {}
@@ -10151,6 +10555,11 @@ snapshots:
 
   lodash@4.17.23: {}
 
+  log-symbols@4.1.0:
+    dependencies:
+      chalk: 4.1.2
+      is-unicode-supported: 0.1.0
+
   loupe@2.3.7:
     dependencies:
       get-func-name: 2.0.2
@@ -10474,6 +10883,18 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
+  ora@5.4.1:
+    dependencies:
+      bl: 4.1.0
+      chalk: 4.1.2
+      cli-cursor: 3.1.0
+      cli-spinners: 2.9.2
+      is-interactive: 1.0.0
+      is-unicode-supported: 0.1.0
+      log-symbols: 4.1.0
+      strip-ansi: 6.0.1
+      wcwidth: 1.0.1
+
   os-tmpdir@1.0.2: {}
 
   own-keys@1.0.1:
@@ -10482,6 +10903,31 @@ snapshots:
       object-keys: 1.1.1
       safe-push-apply: 1.0.0
 
+  oxc-parser@0.119.0:
+    dependencies:
+      '@oxc-project/types': 0.119.0
+    optionalDependencies:
+      '@oxc-parser/binding-android-arm-eabi': 0.119.0
+      '@oxc-parser/binding-android-arm64': 0.119.0
+      '@oxc-parser/binding-darwin-arm64': 0.119.0
+      '@oxc-parser/binding-darwin-x64': 0.119.0
+      '@oxc-parser/binding-freebsd-x64': 0.119.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.119.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.119.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.119.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.119.0
+      '@oxc-parser/binding-linux-ppc64-gnu': 0.119.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.119.0
+      '@oxc-parser/binding-linux-riscv64-musl': 0.119.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.119.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.119.0
+      '@oxc-parser/binding-linux-x64-musl': 0.119.0
+      '@oxc-parser/binding-openharmony-arm64': 0.119.0
+      '@oxc-parser/binding-wasm32-wasi': 0.119.0
+      '@oxc-parser/binding-win32-arm64-msvc': 0.119.0
+      '@oxc-parser/binding-win32-ia32-msvc': 0.119.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.119.0
+
   p-finally@2.0.1: {}
 
   p-limit@1.3.0:
@@ -10728,6 +11174,12 @@ snapshots:
       pify: 4.0.1
       strip-bom: 3.0.0
 
+  readable-stream@3.6.2:
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.3.0
+      util-deprecate: 1.0.2
+
   recast@0.18.10:
     dependencies:
       ast-types: 0.13.3
@@ -10881,6 +11333,11 @@ snapshots:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  restore-cursor@3.1.0:
+    dependencies:
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+
   retry@0.12.0: {}
 
   reusify@1.0.4: {}
@@ -11257,6 +11714,10 @@ snapshots:
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
 
+  string_decoder@1.3.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
   strip-ansi@6.0.1:
     dependencies:
       ansi-regex: 5.0.1
@@ -11381,6 +11842,8 @@ snapshots:
     dependencies:
       os-tmpdir: 1.0.2
 
+  tmp@0.2.5: {}
+
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
@@ -11722,6 +12185,10 @@ snapshots:
       glob-to-regexp: 0.4.1
       graceful-fs: 4.2.11
 
+  wcwidth@1.0.1:
+    dependencies:
+      defaults: 1.0.4
+
   webpack-sources@3.3.4: {}
 
   webpack@5.94.0:
@@ -11892,3 +12359,5 @@ snapshots:
   yocto-queue@1.1.1: {}
 
   yoctocolors@2.1.1: {}
+
+  zimmerframe@1.1.4: {}
diff --git a/src/parser/gjs-gts-parser.js b/src/parser/gjs-gts-parser.js
index 8c753f5..2561c54 100644
--- a/src/parser/gjs-gts-parser.js
+++ b/src/parser/gjs-gts-parser.js
@@ -3,16 +3,19 @@ import tsconfigUtils from '@typescript-eslint/tsconfig-utils';
 import babelParser from '@babel/eslint-parser/experimental-worker';
 import { registerParsedFile } from '../preprocessor/noop.js';
 import { patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser } from './ts-patch.js';
-import { transformForLint, preprocessGlimmerTemplates, convertAst } from './transforms.js';
+import { toTree, buildGlimmerVisitorKeys } from 'ember-estree';
+import { registerGlimmerScopes } from './transforms.js';
 
 const require = createRequire(import.meta.url);
 
 /**
  * implements https://eslint.org/docs/latest/extend/custom-parsers
- * 1. transforms gts/gjs files into parseable ts/js without changing the offsets and locations around it
- * 2. parses the transformed code and generates the AST for TS ot JS
- * 3. preprocesses the templates info and prepares the Glimmer AST
- * 4. converts the js/ts AST so that it includes the Glimmer AST at the right locations, replacing the original
+ *
+ * Uses ember-estree's toTree with a pluggable jsParser to:
+ * 1. Extract <template> regions via content-tag
+ * 2. Parse JS/TS with TypeScript-ESLint or Babel
+ * 3. Process Glimmer templates and splice them into the AST
+ * 4. Register Glimmer scopes for ESLint rules (no-undef, no-unused-vars)
  */
 
 /**
@@ -77,12 +80,10 @@ function getAllowJsFromPrograms(programs) {
 function getProjectServiceTsconfigPath(projectService) {
   if (!projectService) return null;
 
-  // If projectService is true, use default behavior (nearest tsconfig.json, allowJs from config)
   if (projectService === true) {
     return 'tsconfig.json';
   }
 
-  // If projectService is an object, handle ProjectServiceOptions
   if (typeof projectService === 'object') {
     if (typeof projectService.allowDefaultProject !== 'undefined') {
       // eslint-disable-next-line no-console
@@ -138,14 +139,10 @@ export function parseForESLint(code, options) {
   const allowGjsWasSet = options.allowGjs !== undefined;
   const allowGjs = allowGjsWasSet ? options.allowGjs : getAllowJs(options);
   let actualAllowGjs;
-  // Only patch TypeScript if we actually need it.
   if (options.programs || options.projectService || options.project) {
     ({ allowGjs: actualAllowGjs } = patchTs({ allowGjs }));
   }
   registerParsedFile(options.filePath);
-  let jsCode = code;
-  const info = transformForLint(code, options.filePath);
-  jsCode = info.output;
 
   const isTypescript = options.filePath.endsWith('.gts') || options.filePath.endsWith('.ts');
   let useTypescript = true;
@@ -154,42 +151,51 @@ export function parseForESLint(code, options) {
     useTypescript = false;
   }
 
-  let result = null;
-  const filePath = options.filePath;
-  if (options.project || options.projectService) {
-    jsCode = replaceExtensions(jsCode);
-  }
-
   if (isTypescript && !typescriptParser) {
     throw new Error('Please install typescript to process gts');
   }
 
+  const filePath = options.filePath;
+
+  // scopeManager is captured from jsParser result for use in the visitor
+  let scopeManager = null;
+  let jsParserResult = null;
+
   try {
-    result =
-      isTypescript || useTypescript
-        ? typescriptParser.parseForESLint(jsCode, {
-            ...options,
-            ranges: true,
-            extraFileExtensions: ['.gts', '.gjs'],
-            filePath,
-          })
-        : babelParser.parseForESLint(jsCode, {
-            ...options,
-            requireConfigFile: false,
-            ranges: true,
-          });
-    if (!info.templateInfos?.length) {
-      return result;
-    }
-    const preprocessedResult = preprocessGlimmerTemplates(info, code);
-    preprocessedResult.code = code;
-    const { templateVisitorKeys } = preprocessedResult;
-    const visitorKeys = { ...result.visitorKeys, ...templateVisitorKeys };
-    result.isTypescript = isTypescript || useTypescript;
-    convertAst(result, preprocessedResult, visitorKeys);
-    if (result.services?.program) {
-      // Compare allowJs with the actual program's compiler options
-      const programAllowJs = result.services.program.getCompilerOptions?.()?.allowJs;
+    const result = toTree(code, {
+      filePath,
+      jsParser(placeholderJS, filename) {
+        let jsCode = placeholderJS;
+        if (options.project || options.projectService) {
+          jsCode = replaceExtensions(jsCode);
+        }
+
+        jsParserResult =
+          isTypescript || useTypescript
+            ? typescriptParser.parseForESLint(jsCode, {
+                ...options,
+                ranges: true,
+                extraFileExtensions: ['.gts', '.gjs'],
+                filePath: filename,
+              })
+            : babelParser.parseForESLint(jsCode, {
+                ...options,
+                requireConfigFile: false,
+                ranges: true,
+              });
+
+        scopeManager = jsParserResult.scopeManager;
+        return jsParserResult;
+      },
+      visitor(path) {
+        if (scopeManager) {
+          registerGlimmerScopes(path, scopeManager, isTypescript || useTypescript);
+        }
+      },
+    });
+
+    if (jsParserResult?.services?.program) {
+      const programAllowJs = jsParserResult.services.program.getCompilerOptions?.()?.allowJs;
       if (
         !allowGjsWasSet &&
         programAllowJs !== undefined &&
@@ -202,10 +208,30 @@ export function parseForESLint(code, options) {
             `    Current: ${allowGjs}, Program: ${programAllowJs}`
         );
       }
-      syncMtsGtsSourceFiles(result.services.program);
+      syncMtsGtsSourceFiles(jsParserResult.services.program);
     }
-    return { ...result, visitorKeys };
+
+    const visitorKeys = {
+      ...(jsParserResult?.visitorKeys || {}),
+      ...buildGlimmerVisitorKeys(),
+    };
+
+    return {
+      ast: result.program,
+      visitorKeys,
+      scopeManager,
+      services: jsParserResult?.services || {},
+    };
   } catch (e) {
+    // Wrap content-tag parse errors with ESLint-friendly properties
+    if (e.message?.includes('Parse Error at')) {
+      const [line, column] = e.message.split(':').slice(-2).map((x) => parseInt(x));
+      const err = new Error(e.source_code || e.message);
+      err.lineNumber = line;
+      err.column = column;
+      err.fileName = filePath;
+      throw err;
+    }
     console.error(e);
     throw e;
   }
diff --git a/src/parser/hbs-parser.js b/src/parser/hbs-parser.js
index 9722a74..b71bc1f 100644
--- a/src/parser/hbs-parser.js
+++ b/src/parser/hbs-parser.js
@@ -1,6 +1,5 @@
 import * as eslintScope from 'eslint-scope';
-import DocumentLines from '../utils/document.js';
-import { processGlimmerTemplate, buildGlimmerVisitorKeys } from './transforms.js';
+import { parseTemplate, DocumentLines, buildGlimmerVisitorKeys } from 'ember-estree';
 
 // Constant: Program + all Glimmer node types. Computed once at module load.
 const hbsVisitorKeys = { Program: ['body'], ...buildGlimmerVisitorKeys() };
@@ -26,15 +25,10 @@ export function parseForESLint(code, options) {
   const filePath = (options && options.filePath) || '<hbs>';
   const codeLines = new DocumentLines(code);
 
-  let result;
+  let templateNode;
   try {
-    result = processGlimmerTemplate({
-      templateContent: code,
-      codeLines,
-      templateRange: [0, code.length],
-    });
+    templateNode = parseTemplate(code);
   } catch (e) {
-    // Transform glimmer parse error to ESLint-compatible error
     const loc = e.location || (e.hash && e.hash.loc);
     if (loc && loc.start) {
       const err = Object.assign(new SyntaxError(e.message), {
@@ -48,14 +42,11 @@ export function parseForESLint(code, options) {
     throw e;
   }
 
-  const { ast: templateNode, comments } = result;
-
-  // Wrap in a synthetic Program node (required by ESLint)
   const program = {
     type: 'Program',
     body: [templateNode],
     tokens: templateNode.tokens,
-    comments,
+    comments: templateNode.comments || [],
     range: [0, code.length],
     start: 0,
     end: code.length,
@@ -65,28 +56,14 @@ export function parseForESLint(code, options) {
     },
   };
 
-  // Build visitor keys: Program + all Glimmer node types
   const visitorKeys = hbsVisitorKeys;
 
-  // Create an empty scope manager.
-  // For HBS, all locals are assumed to be defined at runtime,
-  // so we don't track variable references (no no-undef errors).
   const scopeManager = eslintScope.analyze(
-    {
-      type: 'Program',
-      body: [],
-      range: [0, code.length],
-      loc: program.loc,
-    },
+    { type: 'Program', body: [], range: [0, code.length], loc: program.loc },
     { range: true }
   );
 
-  return {
-    ast: program,
-    scopeManager,
-    visitorKeys,
-    services: {},
-  };
+  return { ast: program, scopeManager, visitorKeys, services: {} };
 }
 
 export default { meta, parseForESLint };
diff --git a/src/parser/transforms.js b/src/parser/transforms.js
index b2b3509..83918a1 100644
--- a/src/parser/transforms.js
+++ b/src/parser/transforms.js
@@ -1,12 +1,7 @@
 import { createRequire } from 'node:module';
 import ContentTag from 'content-tag';
-import {
-  visitorKeys as glimmerVisitorKeys,
-  traverse as glimmerTraverse,
-  preprocess as glimmerPreprocess,
-  isKeyword as glimmerIsKeyword,
-} from '@glimmer/syntax';
-import DocumentLines from '../utils/document.js';
+import { isKeyword as glimmerIsKeyword } from '@glimmer/syntax';
+import { buildGlimmerVisitorKeys } from 'ember-estree';
 import { Reference, Scope, Variable, Definition } from 'eslint-scope';
 import htmlTags from 'html-tags';
 import svgTags from 'svg-tags';
@@ -30,37 +25,18 @@ try {
   // not available
 }
 
-/**
- * finds the nearest node scope
- * @param scopeManager
- * @param nodePath
- * @return {*|null}
- */
+// ── Scope helpers ──
+
 function findParentScope(scopeManager, nodePath) {
-  let scope = null;
   let path = nodePath;
   while (path) {
-    scope = scopeManager.acquire(path.node, true);
-    if (scope) {
-      return scope;
-    }
+    const scope = scopeManager.acquire(path.node, true);
+    if (scope) return scope;
     path = path.parentPath;
   }
   return null;
 }
 
-/**
- * tries to find the variable names {name} in any parent scope
- * if the variable is not found it just returns the nearest scope,
- * so that it's usage can be registered.
- *
- * Also returns the nearest scope (equivalent to findParentScope) in one pass,
- * avoiding the redundant second traversal that findParentScope would perform.
- * @param scopeManager
- * @param nodePath
- * @param name
- * @return {{scope: null, variable: *}|{scope: (*|null)}}
- */
 function findVarInParentScopes(scopeManager, nodePath, name) {
   let defScope = null;
   let currentScope = null;
@@ -76,712 +52,191 @@ function findVarInParentScopes(scopeManager, nodePath, name) {
     }
     path = path.parentPath;
   }
-  if (!defScope) {
-    return { scope: currentScope };
-  }
+  if (!defScope) return { scope: currentScope };
   return { scope: currentScope, variable: defScope.set.get(name) };
 }
 
-/**
- * registers a node variable usage in the scope.
- * @param node
- * @param scope
- * @param variable
- */
 function registerNodeInScope(node, scope, variable) {
   const ref = new Reference(node, scope, Reference.READ);
   if (variable) {
     variable.references.push(ref);
     ref.resolved = variable;
   } else {
-    // register missing variable in most upper scope.
     let s = scope;
-    while (s.upper) {
-      s = s.upper;
-    }
+    while (s.upper) s = s.upper;
     s.through.push(ref);
   }
   scope.references.push(ref);
 }
 
-/**
- * Builds the complete Glimmer visitor keys map with "Glimmer" prefix and
- * additional keys needed for traversal (blockParamNodes, parts, etc).
- * Result is cached since glimmerVisitorKeys is a constant.
- * @return {object}
- */
-let _cachedGlimmerVisitorKeys = null;
-function buildGlimmerVisitorKeys() {
-  if (_cachedGlimmerVisitorKeys) return _cachedGlimmerVisitorKeys;
-  const keys = {};
-  for (const [k, v] of Object.entries(glimmerVisitorKeys)) {
-    keys[`Glimmer${k}`] = [...v];
-  }
-  if (!keys.GlimmerElementNode.includes('blockParamNodes')) {
-    keys.GlimmerElementNode.push('blockParamNodes', 'parts');
-  }
-  keys.GlimmerProgram = ['body', 'blockParamNodes'];
-  keys.GlimmerTemplate = ['body'];
-  _cachedGlimmerVisitorKeys = keys;
-  return keys;
-}
-
-/**
- * traverses all nodes using the {visitorKeys} calling the callback function, visitor
- * @param visitorKeys
- * @param node
- * @param visitor
- */
-function traverse(visitorKeys, node, visitor) {
-  const allVisitorKeys = { ...visitorKeys, ...buildGlimmerVisitorKeys() };
-  const queue = [];
-
-  queue.push({
-    node,
-    parent: null,
-    parentKey: null,
-    parentPath: null,
-    context: {},
-  });
-
-  while (queue.length > 0) {
-    const currentPath = queue.pop();
-
-    visitor(currentPath);
-
-    if (!currentPath.node) continue;
-
-    const visitorKeys = allVisitorKeys[currentPath.node.type];
-    if (!visitorKeys) {
-      continue;
-    }
-
-    for (const visitorKey of visitorKeys) {
-      const child = currentPath.node[visitorKey];
-
-      if (!child) {
-        continue;
-      } else if (Array.isArray(child)) {
-        for (const item of child) {
-          queue.push({
-            node: item,
-            parent: currentPath.node,
-            context: currentPath.context,
-            parentKey: visitorKey,
-            parentPath: currentPath,
-          });
-        }
-      } else {
-        queue.push({
-          node: child,
-          parent: currentPath.node,
-          context: currentPath.context,
-          parentKey: visitorKey,
-          parentPath: currentPath,
-        });
-      }
-    }
-  }
-}
-
 function isUpperCase(char) {
   return char.toUpperCase() === char;
 }
 
-function isAlphaNumeric(code) {
-  return !(
-    !(code > 47 && code < 58) && // numeric (0-9)
-    !(code > 64 && code < 91) && // upper alpha (A-Z)
-    !(code > 96 && code < 123)
-  );
-}
-
-function isWhiteSpaceCode(code) {
-  return (
-    code === 32 /* space */ ||
-    code === 9 /* tab */ ||
-    code === 13 /* carriageReturn */ ||
-    code === 10 /* lineFeed */ ||
-    code === 11 /* verticalTab */
-  );
-}
+// ── Glimmer scope registration (called by visitor during toTree walk) ──
 
 /**
- * simple tokenizer for templates, just splits it up into words and punctuators
- * @param template {string}
- * @param startOffset {number}
- * @param doc {DocumentLines}
- * @return {Token[]}
+ * Registers Glimmer template variable references and block param scopes
+ * in the ESLint scope manager.
  */
-function tokenize(template, doc, startOffset) {
-  const tokens = [];
-  let wordStart = -1;
-  function pushToken(value, type, range) {
-    const t = {
-      type,
-      value,
-      range,
-      start: range[0],
-      end: range[1],
-      loc: {
-        start: { ...doc.offsetToPosition(range[0]), index: range[0] },
-        end: { ...doc.offsetToPosition(range[1]), index: range[1] },
-      },
+export function registerGlimmerScopes(path, scopeManager, isTypescript) {
+  const node = path.node;
+  if (!node) return;
+
+  if (node.type === 'GlimmerPathExpression' && node.head?.type === 'VarHead') {
+    const name = node.head.name;
+    if (glimmerIsKeyword(name)) return;
+    const { scope, variable } = findVarInParentScopes(scopeManager, path, name) || {};
+    if (scope) {
+      node.head.parent = node;
+      registerNodeInScope(node.head, scope, variable);
+    }
+  }
+
+  if (node.type === 'GlimmerElementNode') {
+    const n = node.parts[0];
+    const { scope, variable } = findVarInParentScopes(scopeManager, path, n.name) || {};
+    const ignore =
+      n.name === 'this' ||
+      n.name.startsWith(':') ||
+      n.name.startsWith('@') ||
+      !scope ||
+      n.name.includes('-');
+    const registerUndef =
+      isUpperCase(n.name[0]) ||
+      node.name.includes('.') ||
+      (!htmlTagsSet.has(node.name) && !svgTagsSet.has(node.name) && !mathMLTagsSet.has(node.name));
+    if (!ignore && (variable || registerUndef)) {
+      registerNodeInScope(n, scope, variable);
+    }
+  }
+
+  if ('blockParams' in node) {
+    const upperScope = findParentScope(scopeManager, path);
+    const scope = isTypescript
+      ? new TypescriptScope.BlockScope(scopeManager, upperScope, node)
+      : new Scope(scopeManager, 'block', upperScope, node);
+    const declaredVariables = scopeManager.declaredVariables || scopeManager.__declaredVariables;
+    const vars = [];
+    declaredVariables.set(node, vars);
+    const blockParamNodes = node.blockParamNodes || [];
+    const virtualJSParentNode = {
+      type: 'FunctionDeclaration',
+      params: blockParamNodes,
+      range: node.range,
+      loc: node.loc,
+      parent: path.parent,
     };
-    tokens.push(t);
-  }
-  for (let i = 0; i < template.length; i++) {
-    const code = template.charCodeAt(i);
-    if (isAlphaNumeric(code)) {
-      if (wordStart < 0) {
-        wordStart = i;
-      }
-    } else {
-      if (wordStart >= 0) {
-        pushToken(template.slice(wordStart, i), 'word', [startOffset + wordStart, startOffset + i]);
-        wordStart = -1;
-      }
-      if (!isWhiteSpaceCode(code)) {
-        pushToken(template[i], 'Punctuator', [startOffset + i, startOffset + i + 1]);
-      }
-    }
-  }
-  if (wordStart >= 0) {
-    pushToken(template.slice(wordStart), 'word', [
-      startOffset + wordStart,
-      startOffset + template.length,
-    ]);
-  }
-  return tokens;
-}
-
-/**
- * Traverses a Glimmer AST, sets parent references, and categorizes nodes.
- * @param {object} ast
- * @return {{ allNodes: object[], comments: object[], textNodes: object[], emptyTextNodes: object[] }}
- */
-function collectNodes(ast) {
-  const allNodes = [];
-  const comments = [];
-  const textNodes = [];
-  const emptyTextNodes = [];
-
-  glimmerTraverse(ast, {
-    All(node, path) {
-      node.parent = path.parentNode;
-      allNodes.push(node);
-      if (node.type === 'CommentStatement' || node.type === 'MustacheCommentStatement') {
-        comments.push(node);
-      }
-      if (node.type === 'TextNode') {
-        node.value = node.chars;
-        if (node.value.trim().length !== 0 || (node.parent && node.parent.type === 'AttrNode')) {
-          textNodes.push(node);
-        } else {
-          emptyTextNodes.push(node);
-        }
-      }
-    },
-  });
-
-  return { allNodes, comments, textNodes, emptyTextNodes };
-}
-
-/**
- * Removes nodes from their parent's children/body/parts arrays.
- * @param {object[]} nodes
- */
-function removeFromParent(nodes) {
-  for (const node of nodes) {
-    const children =
-      (node.parent && (node.parent.children || node.parent.body || node.parent.parts)) || [];
-    const idx = children.indexOf(node);
-    if (idx >= 0) {
-      children.splice(idx, 1);
-    }
-  }
-}
-
-/**
- * Builds the final token stream by filtering out tokens covered by comments
- * or text nodes, then merging text nodes back in sorted order.
- * @param {object[]} rawTokens
- * @param {object[]} comments
- * @param {object[]} textNodes
- * @return {object[]}
- */
-function buildTokenStream(rawTokens, comments, textNodes) {
-  // Build sorted interval arrays for O(log n) exclusion checks
-  const commentIntervals = comments.map((c) => c.range).sort((a, b) => a[0] - b[0]);
-  const textNodeIntervals = textNodes.map((t) => t.range).sort((a, b) => a[0] - b[0]);
-
-  /**
-   * Binary-search: is the token's range fully covered by any interval in `intervals`?
-   * Intervals must be sorted by start offset.
-   * @param {number[]} tokenRange
-   * @param {number[][]} intervals
-   */
-  function isCovered(tokenRange, intervals) {
-    let lo = 0;
-    let hi = intervals.length - 1;
-    while (lo <= hi) {
-      const mid = (lo + hi) >> 1;
-      const iv = intervals[mid];
-      if (iv[0] <= tokenRange[0] && iv[1] >= tokenRange[1]) {
-        return true;
-      }
-      if (iv[0] > tokenRange[0]) {
-        hi = mid - 1;
-      } else {
-        lo = mid + 1;
-      }
-    }
-    return false;
-  }
-
-  // Single-pass filter: drop tokens covered by a comment or text node
-  const filteredTokens = rawTokens.filter(
-    (t) => !isCovered(t.range, commentIntervals) && !isCovered(t.range, textNodeIntervals)
-  );
-
-  // Merge text nodes (already sorted by position from the AST) into filteredTokens
-  // using a single linear merge pass instead of repeated splice calls.
-  const sortedTextNodes = [...textNodes].sort((a, b) => a.range[0] - b.range[0]);
-  const result = [];
-  let ti = 0;
-  for (const token of filteredTokens) {
-    while (ti < sortedTextNodes.length && sortedTextNodes[ti].range[0] < token.range[0]) {
-      result.push(sortedTextNodes[ti++]);
-    }
-    result.push(token);
-  }
-  while (ti < sortedTextNodes.length) {
-    result.push(sortedTextNodes[ti++]);
-  }
-
-  return result;
-}
-
-/**
- * Parses a Glimmer template and produces a processed AST ready for ESLint.
- * Shared between hbs-parser (standalone .hbs files) and gjs/gts parser (embedded templates).
- *
- * @param {object} options
- * @param {string} options.templateContent - The template string to parse with glimmer
- * @param {DocumentLines} options.codeLines - DocumentLines for the full source file
- * @param {[number, number]} options.templateRange - Range [start, end] for the Template root node
- * @param {string} [options.tokenSource] - String to tokenize (defaults to templateContent)
- * @return {{ ast: object, comments: object[] }}
- */
-function processGlimmerTemplate({ templateContent, codeLines, templateRange, tokenSource }) {
-  const offset = templateRange[0];
-  const docLines = new DocumentLines(templateContent);
-
-  /** Convert a Glimmer loc to a file-level [start, end] range */
-  const toFileRange = (loc) => [
-    offset + docLines.positionToOffset(loc.start),
-    offset + docLines.positionToOffset(loc.end),
-  ];
-  /** Convert a file-level range to a file-level loc */
-  const toFileLoc = (range) => ({
-    start: codeLines.offsetToPosition(range[0]),
-    end: codeLines.offsetToPosition(range[1]),
-  });
-
-  const ast = glimmerPreprocess(templateContent, { mode: 'codemod' });
-  const { allNodes, comments, textNodes, emptyTextNodes } = collectNodes(ast);
-
-  // Fix ranges, locs, and prefix types with "Glimmer"
-  for (const n of allNodes) {
-    if (n.type === 'PathExpression') {
-      n.head.range = toFileRange(n.head.loc);
-      n.head.loc = toFileLoc(n.head.range);
-    }
-
-    n.range = n.type === 'Template' ? [...templateRange] : toFileRange(n.loc);
-    n.start = n.range[0];
-    n.end = n.range[1];
-    n.loc = toFileLoc(n.range);
-
-    if (n.type === 'ElementNode') {
-      n.name = n.tag;
-      n.parts = [n.path.head].map((p) => {
-        const range = toFileRange(p.loc);
-        return {
-          ...p,
-          name: p.original,
-          parent: n,
-          type: 'GlimmerElementNodePart',
-          range,
-          loc: toFileLoc(range),
-        };
-      });
-    }
-
-    if ('blockParams' in n) {
-      n.params = (n.params || []).map((p) => {
-        const range = toFileRange(p.loc);
-        return {
-          ...p,
-          type: 'BlockParam',
-          name: p.original,
-          parent: n,
-          range,
-          loc: toFileLoc(range),
-        };
-      });
-    }
-
-    // Nullify empty hashes before the type is renamed
-    if (
-      (n.type === 'MustacheStatement' ||
-        n.type === 'BlockStatement' ||
-        n.type === 'SubExpression') &&
-      n.hash &&
-      n.hash.pairs &&
-      n.hash.pairs.length === 0
-    ) {
-      n.hash = null;
-    }
-
-    n.type = `Glimmer${n.type}`;
-  }
-
-  // Clean up AST structure
-  removeFromParent(emptyTextNodes);
-  removeFromParent(comments);
-  for (const comment of comments) {
-    comment.type = 'Block';
-  }
-
-  // Build final token stream
-  ast.tokens = buildTokenStream(
-    tokenize(tokenSource || templateContent, codeLines, offset),
-    comments,
-    textNodes
-  );
-  ast.contents = templateContent;
-
-  return { ast, comments };
-}
-
-/**
- * Preprocesses the template info, parsing the template content to Glimmer AST,
- * fixing the offsets and locations of all nodes
- * also calculates the block params locations & ranges
- * and adding it to the info
- * @param info
- * @param code
- * @return {{templateVisitorKeys: {}, comments: *[], templateInfos: {templateRange: *, range: *, replacedRange: *}[]}}
- */
-export function preprocessGlimmerTemplates(info, code) {
-  const templateInfos = info.templateInfos.map((r) => ({
-    utf16Range: [r.range.startUtf16Codepoint, r.range.endUtf16Codepoint],
-  }));
-  const codeLines = new DocumentLines(code);
-  const allComments = [];
-
-  for (const tpl of templateInfos) {
-    const template = code.slice(...tpl.utf16Range);
-
-    const { ast, comments } = processGlimmerTemplate({
-      templateContent: template,
-      codeLines,
-      templateRange: [...tpl.utf16Range],
-    });
-
-    ast.content = template;
-    allComments.push(...comments);
-    tpl.ast = ast;
-  }
-
-  return {
-    templateVisitorKeys: buildGlimmerVisitorKeys(),
-    templateInfos,
-    comments: allComments,
-  };
-}
-
-/**
- * traverses the AST and replaces the transformed template parts with the Glimmer
- * AST.
- * This also creates the scopes for the Glimmer Blocks and registers the block params
- * in the scope, and also any usages of variables in path expressions
- * this allows the basic eslint rules no-undef and no-unsused to work also for the
- * templates without needing any custom rules
- * @param result
- * @param preprocessedResult
- * @param visitorKeys
- */
-export function convertAst(result, preprocessedResult, visitorKeys) {
-  const templateInfos = preprocessedResult.templateInfos;
-  let counter = 0;
-  result.ast.comments.push(...preprocessedResult.comments);
-
-  for (const ti of templateInfos) {
-    const firstIdx = result.ast.tokens.findIndex((t) => t.range[0] === ti.utf16Range[0]);
-    const lastIdx = result.ast.tokens.findIndex((t) => t.range[1] === ti.utf16Range[1]);
-    result.ast.tokens.splice(firstIdx, lastIdx - firstIdx + 1, ...ti.ast.tokens);
-  }
-
-  // Build a Map keyed by range start for O(1) lookup during traversal
-  const templateInfoByStart = new Map(templateInfos.map((t) => [t.utf16Range[0], t]));
-
-  // eslint-disable-next-line complexity
-  traverse(visitorKeys, result.ast, (path) => {
-    const node = path.node;
-    if (!node) return null;
-
-    if (
-      node.type === 'ExpressionStatement' ||
-      node.type === 'StaticBlock' ||
-      node.type === 'TemplateLiteral' ||
-      node.type === 'ExportDefaultDeclaration'
-    ) {
-      let range = node.range;
-      if (node.type === 'ExportDefaultDeclaration') {
-        range = [node.declaration.range[0], node.declaration.range[1]];
-      }
-
-      const template = templateInfoByStart.get(range[0]);
-      if (
-        !template ||
-        (template.utf16Range[1] !== range[1] && template.utf16Range[1] !== range[1] + 1)
-      ) {
-        return null;
-      }
-      counter++;
-      const ast = template.ast;
-      Object.assign(node, ast);
-    }
-
-    if (node.type === 'GlimmerPathExpression' && node.head.type === 'VarHead') {
-      const name = node.head.name;
-      if (glimmerIsKeyword(name)) {
-        return null;
-      }
-      const { scope, variable } = findVarInParentScopes(result.scopeManager, path, name) || {};
-      if (scope) {
-        node.head.parent = node;
-        registerNodeInScope(node.head, scope, variable);
-      }
-    }
-    if (node.type === 'GlimmerElementNode') {
-      // always reference first part of tag name, this also has the advantage
-      // that errors regarding this tag will only mark the tag name instead of
-      // the whole tag + children
-      const n = node.parts[0];
-      const { scope, variable } = findVarInParentScopes(result.scopeManager, path, n.name) || {};
-      /*
-      register a node in scope if we found a variable
-      we ignore named-blocks and args as we know that it doesn't reference anything in current scope
-      we also ignore `this`
-      if we do not find a variable we register it with a missing variable if
-        * it starts with upper case, it should be a component with a reference
-        * it includes a dot, it's a path which should have a reference
-        * it's NOT a standard html, svg or mathml tag, it should have a referenced variable
-      */
-      const ignore =
-        // Local instance access
-        n.name === 'this' ||
-        // named block
-        n.name.startsWith(':') ||
-        // argument
-        n.name.startsWith('@') ||
-        // defined locally
-        !scope ||
-        // custom-elements are allowed to be used even if they don't exist
-        // and are undefined
-        n.name.includes('-');
-
-      const registerUndef =
-        isUpperCase(n.name[0]) ||
-        node.name.includes('.') ||
-        (!htmlTagsSet.has(node.name) &&
-          !svgTagsSet.has(node.name) &&
-          !mathMLTagsSet.has(node.name));
-
-      if (!ignore && (variable || registerUndef)) {
-        registerNodeInScope(n, scope, variable);
-      }
-    }
-
-    if ('blockParams' in node) {
-      const upperScope = findParentScope(result.scopeManager, path);
-      const scope = result.isTypescript
-        ? new TypescriptScope.BlockScope(result.scopeManager, upperScope, node)
-        : new Scope(result.scopeManager, 'block', upperScope, node);
-      const declaredVariables =
-        result.scopeManager.declaredVariables || result.scopeManager.__declaredVariables;
-      const vars = [];
-      declaredVariables.set(node, vars);
-      const virtualJSParentNode = {
-        type: 'FunctionDeclaration',
-        params: node.params,
-        range: node.range,
-        loc: node.loc,
-        parent: path.parent,
+    for (const [i, b] of blockParamNodes.entries()) {
+      const v = new Variable(b.name, scope);
+      v.identifiers.push(b);
+      scope.variables.push(v);
+      scope.set.set(b.name, v);
+      vars.push(v);
+      const virtualJSNode = {
+        type: 'Identifier',
+        name: b.name,
+        range: b.range,
+        loc: b.loc,
+        parent: virtualJSParentNode,
       };
-      for (const [i, b] of node.params.entries()) {
-        const v = new Variable(b.name, scope);
-        v.identifiers.push(b);
-        scope.variables.push(v);
-        scope.set.set(b.name, v);
-        vars.push(v);
-
-        const virtualJSNode = {
-          type: 'Identifier',
-          name: b.name,
-          range: b.range,
-          loc: b.loc,
-          parent: virtualJSParentNode,
-        };
-        v.defs.push(new Definition('Parameter', virtualJSNode, node, node, i, 'Block Param'));
-        v.defs.push(new Definition('Parameter', b, node, node, i, 'Block Param'));
-      }
+      v.defs.push(new Definition('Parameter', virtualJSNode, node, node, i, 'Block Param'));
+      v.defs.push(new Definition('Parameter', b, node, node, i, 'Block Param'));
     }
-    return null;
-  });
-
-  if (counter !== templateInfos.length) {
-    throw new Error('failed to process all templates');
   }
 }
 
+// ── Utilities for ts-patch.js and tests ──
+
 export const replaceRange = function replaceRange(s, start, end, substitute) {
   return s.slice(0, start) + substitute + s.slice(end);
 };
 
-const processor = new ContentTag.Preprocessor();
-
-class EmberParserError extends Error {
-  constructor(message, fileName, location) {
-    super(message);
-    this.location = location;
-    this.fileName = fileName;
-    Object.defineProperty(this, 'name', {
-      configurable: true,
-      enumerable: false,
-      value: new.target.name,
-    });
-  }
-
-  // For old version of ESLint https://github.com/typescript-eslint/typescript-eslint/pull/6556#discussion_r1123237311
-  get index() {
-    return this.location.start.offset;
-  }
-
-  // https://github.com/eslint/eslint/blob/b09a512107249a4eb19ef5a37b0bd672266eafdb/lib/linter/linter.js#L853
-  get lineNumber() {
-    return this.location.start.line;
-  }
-
-  // https://github.com/eslint/eslint/blob/b09a512107249a4eb19ef5a37b0bd672266eafdb/lib/linter/linter.js#L854
-  get column() {
-    return this.location.start.column;
-  }
-}
-
-function createError(code, message, fileName, start, end = start) {
-  return new EmberParserError(message, fileName, { end, start });
-}
+const _processor = new ContentTag.Preprocessor();
 
+/**
+ * Creates placeholder JS for TypeScript project services (ts-patch.js).
+ * Uses content-tag to extract templates and replace with backtick placeholders.
+ */
 export function transformForLint(code, fileName) {
   let jsCode = code;
-  /**
-   *
-   * @type {{
-   *   type: 'expression' | 'class-member';
-   *   tagName: 'template';
-   *   contents: string;
-   *   range: {
-   *     startByte: number;
-   *     endByte: number;
-   *     startChar: number;
-   *     endChar: number;
-   *     startUtf16Codepoint: number;
-   *     endUtf16Codepoint: number;
-   *   };
-   *   contentRange: {
-   *     startByte: number;
-   *     endByte: number;
-   *     startChar: number;
-   *     endChar: number;
-   *     startUtf16Codepoint: number;
-   *     endUtf16Codepoint: number;
-   *   };
-   *   startRange: {
-   *     startByte: number;
-   *     endByte: number;
-   *     startChar: number;
-   *     endChar: number;
-   *     startUtf16Codepoint: number;
-   *     endUtf16Codepoint: number;
-   *   };
-   *   endRange: {
-   *     startByte: number;
-   *     endByte: number;
-   *     startChar: number;
-   *     endChar: number;
-   *     startUtf16Codepoint: number;
-   *     endUtf16Codepoint: number;
-   *   };
-   * }[]}
-   */
   let result = null;
   try {
-    result = processor.parse(code);
+    result = _processor.parse(code);
   } catch (e) {
-    // Parse Error at <anon>:1:19: 1:19
     if (e.message.includes('Parse Error at')) {
-      const [line, column] = e.message
-        .split(':')
-        .slice(-2)
-        .map((x) => parseInt(x));
-      // e.source_code has actually usable info, e.g × Expected ',', got 'string literal (, '')'
-      //     ╭─[9:1]
-      //   9 │
-      //  10 │ console.log(test'');
-      //     ·                 ──
-      //     ╰────
-      throw createError(code, e.source_code, fileName, { line, column });
+      const [line, column] = e.message.split(':').slice(-2).map((x) => parseInt(x));
+      const err = new Error(e.source_code || e.message);
+      err.lineNumber = line;
+      err.column = column;
+      err.fileName = fileName;
+      throw err;
     }
     throw e;
   }
   for (const tplInfo of result.reverse()) {
     const content = tplInfo.contents.replace(/`/g, '\\`').replace(/\$/g, '\\$');
+    const tplLength = tplInfo.range.endUtf16Codepoint - tplInfo.range.startUtf16Codepoint;
     if (tplInfo.type === 'class-member') {
-      const tplLength = tplInfo.range.endUtf16Codepoint - tplInfo.range.startUtf16Codepoint;
       const spaces = tplLength - content.length - 'static{`'.length - '`}'.length;
-      const total = content + ' '.repeat(spaces);
-      const replacementCode = `static{\`${total}\`}`;
       jsCode = replaceRange(
         jsCode,
         tplInfo.range.startUtf16Codepoint,
         tplInfo.range.endUtf16Codepoint,
-        replacementCode
+        `static{\`${content + ' '.repeat(spaces)}\`}`
       );
     } else {
-      const tplLength = tplInfo.range.endUtf16Codepoint - tplInfo.range.startUtf16Codepoint;
       const spaces = tplLength - content.length - '`'.length - '`'.length;
-      const total = content + ' '.repeat(spaces);
-      const replacementCode = `\`${total}\``;
       jsCode = replaceRange(
         jsCode,
         tplInfo.range.startUtf16Codepoint,
         tplInfo.range.endUtf16Codepoint,
-        replacementCode
+        `\`${content + ' '.repeat(spaces)}\``
       );
     }
   }
-  /* istanbul ignore next */
   if (jsCode.length !== code.length) {
     throw new Error('bad transform');
   }
-  return {
-    templateInfos: result,
-    output: jsCode,
-  };
+  return { templateInfos: result, output: jsCode };
 }
 
-export { traverse, tokenize, processGlimmerTemplate, buildGlimmerVisitorKeys };
+/**
+ * Traverses all nodes using visitorKeys, calling visitor for each.
+ * Used by tests for AST inspection.
+ */
+export function traverse(visitorKeys, node, visitor) {
+  const allVisitorKeys = { ...visitorKeys, ...buildGlimmerVisitorKeys() };
+  const queue = [{ node, parent: null, parentKey: null, parentPath: null, context: {} }];
+
+  while (queue.length > 0) {
+    const currentPath = queue.pop();
+    visitor(currentPath);
+    if (!currentPath.node) continue;
+    const keys = allVisitorKeys[currentPath.node.type];
+    if (!keys) continue;
+    for (const key of keys) {
+      const child = currentPath.node[key];
+      if (!child) continue;
+      if (Array.isArray(child)) {
+        for (const item of child) {
+          queue.push({
+            node: item,
+            parent: currentPath.node,
+            context: currentPath.context,
+            parentKey: key,
+            parentPath: currentPath,
+          });
+        }
+      } else {
+        queue.push({
+          node: child,
+          parent: currentPath.node,
+          context: currentPath.context,
+          parentKey: key,
+          parentPath: currentPath,
+        });
+      }
+    }
+  }
+}
diff --git a/src/utils/document.js b/src/utils/document.js
deleted file mode 100644
index 3b2f1d3..0000000
--- a/src/utils/document.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * @typedef {{ line: number; column: number }} Position
- */
-
-// Helper class to convert line/column from and to offset
-// taken and adapt from https://github.com/typed-ember/glint/blob/main/packages/core/src/language-server/util/position.ts
-class DocumentLines {
-  /**
-   * @param {string} contents
-   */
-  constructor(contents) {
-    this.lineStarts = computeLineStarts(contents);
-  }
-
-  /**
-   * @param {Position} position
-   * @return {number}
-   */
-  positionToOffset(position) {
-    const { line, column } = position;
-    return this.lineStarts[line - 1] + column;
-  }
-
-  /**
-   *
-   * @param {number} position
-   * @return {Position}
-   */
-  offsetToPosition(position) {
-    const lineStarts = this.lineStarts;
-    let lo = 0;
-    let hi = lineStarts.length - 1;
-    // Upper-biased midpoint is required here: we want the *rightmost* line whose
-    // start is ≤ position. With a lower-biased mid, when lo + 1 === hi and the
-    // condition is true, mid === lo and lo never advances, causing an infinite loop.
-    while (lo < hi) {
-      const mid = (lo + hi + 1) >> 1;
-      if (lineStarts[mid] <= position) {
-        lo = mid;
-      } else {
-        hi = mid - 1;
-      }
-    }
-    return { line: lo + 1, column: position - lineStarts[lo] };
-  }
-}
-
-/**
- * @returns {number[]}
- * @param {string} text
- */
-function computeLineStarts(text) {
-  const result = [];
-  let pos = 0;
-  let lineStart = 0;
-  while (pos < text.length) {
-    const ch = text.charCodeAt(pos++);
-    if (ch === 13 /* carriageReturn */) {
-      if (text.charCodeAt(pos) === 10 /* lineFeed */) {
-        pos++;
-      }
-      result.push(lineStart);
-      lineStart = pos;
-    } else if (
-      ch === 10 /* lineFeed */ ||
-      ch === 8232 /* lineSeparator */ ||
-      ch === 8233 /* paragraphSeparator */
-    ) {
-      result.push(lineStart);
-      lineStart = pos;
-    }
-  }
-  result.push(lineStart);
-  return result;
-}
-
-/* istanbul ignore next */
-/**
- * @param {number} ch
- * @return {boolean}
- */
-function isLineBreak(ch) {
-  // ES5 7.3:
-  // The ECMAScript line terminator characters are listed in Table 3.
-  //     Table 3: Line Terminator Characters
-  //     Code Unit Value     Name                    Formal Name
-  //     \u000A              Line Feed               <LF>
-  //     \u000D              Carriage Return         <CR>
-  //     \u2028              Line separator          <LS>
-  //     \u2029              Paragraph separator     <PS>
-  // Only the characters in Table 3 are treated as line terminators. Other new line or line
-  // breaking characters are treated as white space but not as line terminators.
-  return (
-    ch === 10 /* lineFeed */ ||
-    ch === 13 /* carriageReturn */ ||
-    ch === 8232 /* lineSeparator */ ||
-    ch === 8233 /* paragraphSeparator */
-  );
-}
-
-export default DocumentLines;
-export { isLineBreak };
diff --git a/tests/parser.test.js b/tests/parser.test.js
index d7ef54d..fe72e5b 100644
--- a/tests/parser.test.js
+++ b/tests/parser.test.js
@@ -72,10 +72,7 @@ export const NotFound = <template>
 
   it('all tokens are correct', () => {
     for (const token of result.ast.tokens) {
-      let range = token.range;
-      if (token.type === 'GlimmerTextNode' && token.parent.type === 'GlimmerAttrNode') {
-        range = [range[0] + 1, range[1] - 1];
-      }
+      const range = token.range;
       expect(token.raw || token.value).toStrictEqual(text.slice(...range));
     }
   });
@@ -209,31 +206,6 @@ export const NotFound = <template>
         "type": "GlimmerTemplate",
       }
     `);
-    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
-      {
-        "slice": "<template>
-        Prose for the current tutorial, <CurrentPath />, could not be found.
-
-        Please check the URL and try again,
-        or navigate to a different tutorial chapter.
-
-        <br /><br />
-        <ReportIssue />
-
-        <br /><br /><br>
-        <BackToStart test="  {{foo}} {{bar}}" />
-        \${{this.price}}
-        \`
-      </template>",
-        "type": "GlimmerElementNode",
-      }
-    `);
-    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
-      {
-        "slice": "template",
-        "type": "GlimmerElementNodePart",
-      }
-    `);
     expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
       {
         "slice": "
@@ -444,21 +416,6 @@ export const NotFound = <template>
         "type": "GlimmerTemplate",
       }
     `);
-    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
-      {
-        "slice": "<template>
-        You may also try going
-        <Link href="/" style="width: max-content; display: inline-block;">back to the beginning</Link>
-      </template>",
-        "type": "GlimmerElementNode",
-      }
-    `);
-    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
-      {
-        "slice": "template",
-        "type": "GlimmerElementNodePart",
-      }
-    `);
     expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
       {
         "slice": "<Link href="/" style="width: max-content; display: inline-block;">back to the beginning</Link>",
@@ -485,7 +442,7 @@ export const NotFound = <template>
     `);
     expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
       {
-        "slice": ""width: max-content; display: inline-block;"",
+        "slice": "width: max-content; display: inline-block;",
         "type": "GlimmerTextNode",
       }
     `);
@@ -497,7 +454,7 @@ export const NotFound = <template>
     `);
     expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
       {
-        "slice": ""/"",
+        "slice": "/",
         "type": "GlimmerTextNode",
       }
     `);
@@ -545,22 +502,6 @@ export const NotFound = <template>
         "type": "GlimmerTemplate",
       }
     `);
-    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
-      {
-        "slice": "<template>
-        {{#let (service "docs") as |docs|}}
-          <code>{{docs.currentPath}}</code>
-        {{/let}}
-      </template>",
-        "type": "GlimmerElementNode",
-      }
-    `);
-    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
-      {
-        "slice": "template",
-        "type": "GlimmerElementNodePart",
-      }
-    `);
     expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
       {
         "slice": "{{#let (service "docs") as |docs|}}
@@ -661,22 +602,6 @@ export const NotFound = <template>
         "type": "GlimmerTemplate",
       }
     `);
-    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
-      {
-        "slice": "<template>
-        If the tutorial navigated you here,
-        <ExternalLink href="https://github.com/NullVoxPopuli/limber/issues">please report the issue</ExternalLink>.
-        ❤️
-      </template>",
-        "type": "GlimmerElementNode",
-      }
-    `);
-    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
-      {
-        "slice": "template",
-        "type": "GlimmerElementNodePart",
-      }
-    `);
     expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
       {
         "slice": ".
@@ -711,7 +636,7 @@ export const NotFound = <template>
     `);
     expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
       {
-        "slice": ""https://github.com/NullVoxPopuli/limber/issues"",
+        "slice": "https://github.com/NullVoxPopuli/limber/issues",
         "type": "GlimmerTextNode",
       }
     `);
@@ -771,6 +696,30 @@ export const NotFound = <template>
         "type": "Identifier",
       }
     `);
+    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
+      {
+        "slice": "Link",
+        "type": "Identifier",
+      }
+    `);
+    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
+      {
+        "slice": "ExternalLink",
+        "type": "ImportSpecifier",
+      }
+    `);
+    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
+      {
+        "slice": "ExternalLink",
+        "type": "Identifier",
+      }
+    `);
+    expect({ type: nodes[i].type, slice: text.slice(...nodes[i++].range) }).toMatchInlineSnapshot(`
+      {
+        "slice": "ExternalLink",
+        "type": "Identifier",
+      }
+    `);
   });
 
   it('node tokens are correct', () => {
@@ -810,7 +759,9 @@ export const NotFound = <template>
             "ExternalLink",
             "href",
             "=",
+            """,
             "https://github.com/NullVoxPopuli/limber/issues",
+            """,
             ">",
             "please report the issue",
             "<",
@@ -885,10 +836,14 @@ export const NotFound = <template>
             "Link",
             "href",
             "=",
+            """,
             "/",
+            """,
             "style",
             "=",
+            """,
             "width: max-content; display: inline-block;",
+            """,
             ">",
             "back to the beginning",
             "<",
@@ -1309,95 +1264,6 @@ export const NotFound = <template>
           "type": "GlimmerTemplate",
         }
       `);
-    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
-      .toMatchInlineSnapshot(`
-        {
-          "tokens": [
-            "<",
-            "template",
-            ">",
-            "
-          Prose for the current tutorial, ",
-            "<",
-            "CurrentPath",
-            "/",
-            ">",
-            ", could not be found.
-
-          Please check the URL and try again,
-          or navigate to a different tutorial chapter.
-
-          ",
-            "<",
-            "br",
-            "/",
-            ">",
-            "<",
-            "br",
-            "/",
-            ">",
-            "<",
-            "ReportIssue",
-            "/",
-            ">",
-            "<",
-            "br",
-            "/",
-            ">",
-            "<",
-            "br",
-            "/",
-            ">",
-            "<",
-            "br",
-            ">",
-            "<",
-            "BackToStart",
-            "test",
-            "=",
-            """,
-            "{",
-            "{",
-            "foo",
-            "}",
-            "}",
-            "{",
-            "{",
-            "bar",
-            "}",
-            "}",
-            """,
-            "/",
-            ">",
-            "
-          $",
-            "{",
-            "{",
-            "this",
-            ".",
-            "price",
-            "}",
-            "}",
-            "
-          \`
-        ",
-            "<",
-            "/",
-            "template",
-            ">",
-          ],
-          "type": "GlimmerElementNode",
-        }
-      `);
-    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
-      .toMatchInlineSnapshot(`
-      {
-        "tokens": [
-          "template",
-        ],
-        "type": "GlimmerElementNodePart",
-      }
-    `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
         {
@@ -1473,13 +1339,13 @@ export const NotFound = <template>
       `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
-      {
-        "tokens": [
-          "BackToStart",
-        ],
-        "type": "GlimmerElementNodePart",
-      }
-    `);
+        {
+          "tokens": [
+            "BackToStart",
+          ],
+          "type": "GlimmerElementNodePart",
+        }
+      `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
         {
@@ -1588,25 +1454,25 @@ export const NotFound = <template>
       `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
-      {
-        "tokens": [
-          "<",
-          "br",
-          "/",
-          ">",
-        ],
-        "type": "GlimmerElementNode",
-      }
-    `);
+        {
+          "tokens": [
+            "<",
+            "br",
+            "/",
+            ">",
+          ],
+          "type": "GlimmerElementNode",
+        }
+      `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
-      {
-        "tokens": [
-          "br",
-        ],
-        "type": "GlimmerElementNodePart",
-      }
-    `);
+        {
+          "tokens": [
+            "br",
+          ],
+          "type": "GlimmerElementNodePart",
+        }
+      `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
       {
@@ -1762,10 +1628,14 @@ export const NotFound = <template>
             "Link",
             "href",
             "=",
+            """,
             "/",
+            """,
             "style",
             "=",
+            """,
             "width: max-content; display: inline-block;",
+            """,
             ">",
             "back to the beginning",
             "<",
@@ -1797,10 +1667,14 @@ export const NotFound = <template>
             "Link",
             "href",
             "=",
+            """,
             "/",
+            """,
             "style",
             "=",
+            """,
             "width: max-content; display: inline-block;",
+            """,
             ">",
             "back to the beginning",
             "<",
@@ -1829,10 +1703,14 @@ export const NotFound = <template>
             "Link",
             "href",
             "=",
+            """,
             "/",
+            """,
             "style",
             "=",
+            """,
             "width: max-content; display: inline-block;",
+            """,
             ">",
             "back to the beginning",
             "<",
@@ -1847,47 +1725,6 @@ export const NotFound = <template>
           "type": "GlimmerTemplate",
         }
       `);
-    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
-      .toMatchInlineSnapshot(`
-        {
-          "tokens": [
-            "<",
-            "template",
-            ">",
-            "
-          You may also try going
-          ",
-            "<",
-            "Link",
-            "href",
-            "=",
-            "/",
-            "style",
-            "=",
-            "width: max-content; display: inline-block;",
-            ">",
-            "back to the beginning",
-            "<",
-            "/",
-            "Link",
-            ">",
-            "<",
-            "/",
-            "template",
-            ">",
-          ],
-          "type": "GlimmerElementNode",
-        }
-      `);
-    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
-      .toMatchInlineSnapshot(`
-        {
-          "tokens": [
-            "template",
-          ],
-          "type": "GlimmerElementNodePart",
-        }
-      `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
         {
@@ -1896,10 +1733,14 @@ export const NotFound = <template>
             "Link",
             "href",
             "=",
+            """,
             "/",
+            """,
             "style",
             "=",
+            """,
             "width: max-content; display: inline-block;",
+            """,
             ">",
             "back to the beginning",
             "<",
@@ -1934,7 +1775,9 @@ export const NotFound = <template>
           "tokens": [
             "style",
             "=",
+            """,
             "width: max-content; display: inline-block;",
+            """,
           ],
           "type": "GlimmerAttrNode",
         }
@@ -1954,7 +1797,9 @@ export const NotFound = <template>
           "tokens": [
             "href",
             "=",
+            """,
             "/",
+            """,
           ],
           "type": "GlimmerAttrNode",
         }
@@ -2147,66 +1992,6 @@ export const NotFound = <template>
           "type": "GlimmerTemplate",
         }
       `);
-    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
-      .toMatchInlineSnapshot(`
-        {
-          "tokens": [
-            "<",
-            "template",
-            ">",
-            "{",
-            "{",
-            "#",
-            "let",
-            "(",
-            "service",
-            """,
-            "docs",
-            """,
-            ")",
-            "as",
-            "|",
-            "docs",
-            "|",
-            "}",
-            "}",
-            "<",
-            "code",
-            ">",
-            "{",
-            "{",
-            "docs",
-            ".",
-            "currentPath",
-            "}",
-            "}",
-            "<",
-            "/",
-            "code",
-            ">",
-            "{",
-            "{",
-            "/",
-            "let",
-            "}",
-            "}",
-            "<",
-            "/",
-            "template",
-            ">",
-          ],
-          "type": "GlimmerElementNode",
-        }
-      `);
-    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
-      .toMatchInlineSnapshot(`
-        {
-          "tokens": [
-            "template",
-          ],
-          "type": "GlimmerElementNodePart",
-        }
-      `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
         {
@@ -2399,7 +2184,9 @@ export const NotFound = <template>
             "ExternalLink",
             "href",
             "=",
+            """,
             "https://github.com/NullVoxPopuli/limber/issues",
+            """,
             ">",
             "please report the issue",
             "<",
@@ -2434,7 +2221,9 @@ export const NotFound = <template>
             "ExternalLink",
             "href",
             "=",
+            """,
             "https://github.com/NullVoxPopuli/limber/issues",
+            """,
             ">",
             "please report the issue",
             "<",
@@ -2466,7 +2255,9 @@ export const NotFound = <template>
             "ExternalLink",
             "href",
             "=",
+            """,
             "https://github.com/NullVoxPopuli/limber/issues",
+            """,
             ">",
             "please report the issue",
             "<",
@@ -2484,47 +2275,6 @@ export const NotFound = <template>
           "type": "GlimmerTemplate",
         }
       `);
-    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
-      .toMatchInlineSnapshot(`
-        {
-          "tokens": [
-            "<",
-            "template",
-            ">",
-            "
-          If the tutorial navigated you here,
-          ",
-            "<",
-            "ExternalLink",
-            "href",
-            "=",
-            "https://github.com/NullVoxPopuli/limber/issues",
-            ">",
-            "please report the issue",
-            "<",
-            "/",
-            "ExternalLink",
-            ">",
-            ".
-          ❤️
-        ",
-            "<",
-            "/",
-            "template",
-            ">",
-          ],
-          "type": "GlimmerElementNode",
-        }
-      `);
-    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
-      .toMatchInlineSnapshot(`
-        {
-          "tokens": [
-            "template",
-          ],
-          "type": "GlimmerElementNodePart",
-        }
-      `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
         {
@@ -2544,7 +2294,9 @@ export const NotFound = <template>
             "ExternalLink",
             "href",
             "=",
+            """,
             "https://github.com/NullVoxPopuli/limber/issues",
+            """,
             ">",
             "please report the issue",
             "<",
@@ -2579,7 +2331,9 @@ export const NotFound = <template>
           "tokens": [
             "href",
             "=",
+            """,
             "https://github.com/NullVoxPopuli/limber/issues",
+            """,
           ],
           "type": "GlimmerAttrNode",
         }
@@ -2670,22 +2424,58 @@ export const NotFound = <template>
       `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
-      {
-        "tokens": [
-          "Link",
-        ],
-        "type": "ImportSpecifier",
-      }
-    `);
+        {
+          "tokens": [
+            "Link",
+          ],
+          "type": "ImportSpecifier",
+        }
+      `);
     expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
       .toMatchInlineSnapshot(`
-      {
-        "tokens": [
-          "Link",
-        ],
-        "type": "Identifier",
-      }
-    `);
+        {
+          "tokens": [
+            "Link",
+          ],
+          "type": "Identifier",
+        }
+      `);
+    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
+      .toMatchInlineSnapshot(`
+        {
+          "tokens": [
+            "Link",
+          ],
+          "type": "Identifier",
+        }
+      `);
+    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
+      .toMatchInlineSnapshot(`
+        {
+          "tokens": [
+            "ExternalLink",
+          ],
+          "type": "ImportSpecifier",
+        }
+      `);
+    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
+      .toMatchInlineSnapshot(`
+        {
+          "tokens": [
+            "ExternalLink",
+          ],
+          "type": "Identifier",
+        }
+      `);
+    expect({ type: nodes[i].type, tokens: source.getTokens(nodes[i++]).map((t) => t.value) })
+      .toMatchInlineSnapshot(`
+        {
+          "tokens": [
+            "ExternalLink",
+          ],
+          "type": "Identifier",
+        }
+      `);
   });
 
   it('throws eslint syntax error', () => {