diff --git a/apps/ember-vite/package.json b/apps/ember-vite/package.json
index c64171e03..92e616488 100644
--- a/apps/ember-vite/package.json
+++ b/apps/ember-vite/package.json
@@ -32,9 +32,9 @@
     "@ember/optional-features": "2.2.0",
     "@ember/string": "4.0.0",
     "@ember/test-helpers": "5.1.0",
-    "@embroider/compat": "3.6.2-unstable.f33728f",
+    "@embroider/compat": "3.8.1",
     "@embroider/config-meta-loader": "0.0.1-unstable.f33728f",
-    "@embroider/core": "3.4.16-unstable.f33728f",
+    "@embroider/core": "3.5.0",
     "@embroider/test-setup": "4.0.1-unstable.f33728f",
     "@embroider/vite": "0.2.1-unstable.f33728f",
     "@eslint/js": "9.20.0",
diff --git a/apps/ember-webpack/package.json b/apps/ember-webpack/package.json
index 3804a2633..4937b70a8 100644
--- a/apps/ember-webpack/package.json
+++ b/apps/ember-webpack/package.json
@@ -29,8 +29,8 @@
     "@ember/optional-features": "2.2.0",
     "@ember/string": "4.0.0",
     "@ember/test-helpers": "5.1.0",
-    "@embroider/compat": "3.6.0",
-    "@embroider/core": "3.4.15",
+    "@embroider/compat": "3.8.1",
+    "@embroider/core": "3.5.0",
     "@embroider/macros": "1.16.5",
     "@embroider/webpack": "4.0.5",
     "@eslint/js": "9.20.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 368b82057..1fceb7390 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -55,7 +55,7 @@ importers:
         version: 1.16.5(@glint/template@1.5.2)
       '@embroider/test-setup':
         specifier: 4.0.0
-        version: 4.0.0(@embroider/compat@3.6.2-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2))(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@embroider/webpack@4.0.5(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1))
+        version: 4.0.0(@embroider/compat@3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2))(@embroider/core@3.5.0(@glint/template@1.5.2))(@embroider/webpack@4.0.5(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1))
       '@eslint/js':
         specifier: 9.20.0
         version: 9.20.0
@@ -300,20 +300,20 @@ importers:
         specifier: 5.1.0
         version: 5.1.0(@babel/core@7.25.9)(@glint/template@1.5.2)(ember-source@6.0.1(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.97.1))
       '@embroider/compat':
-        specifier: 3.6.2-unstable.f33728f
-        version: 3.6.2-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2)
+        specifier: 3.8.1
+        version: 3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2)
       '@embroider/config-meta-loader':
         specifier: 0.0.1-unstable.f33728f
         version: 0.0.1-unstable.f33728f
       '@embroider/core':
-        specifier: 3.4.16-unstable.f33728f
-        version: 3.4.16-unstable.f33728f(@glint/template@1.5.2)
+        specifier: 3.5.0
+        version: 3.5.0(@glint/template@1.5.2)
       '@embroider/test-setup':
         specifier: 4.0.1-unstable.f33728f
-        version: 4.0.1-unstable.f33728f(@embroider/compat@3.6.2-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2))(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@embroider/webpack@4.0.5(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1))
+        version: 4.0.1-unstable.f33728f(@embroider/compat@3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2))(@embroider/core@3.5.0(@glint/template@1.5.2))(@embroider/webpack@4.0.5(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1))
       '@embroider/vite':
         specifier: 0.2.1-unstable.f33728f
-        version: 0.2.1-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2)(rollup@4.34.7)(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))
+        version: 0.2.1-unstable.f33728f(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2)(rollup@4.34.7)(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))
       '@eslint/js':
         specifier: 9.20.0
         version: 9.20.0
@@ -453,17 +453,17 @@ importers:
         specifier: 5.1.0
         version: 5.1.0(@babel/core@7.25.9)(@glint/template@1.5.2)(ember-source@6.0.1(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.97.1))
       '@embroider/compat':
-        specifier: 3.6.0
-        version: 3.6.0(@embroider/core@3.4.15(@glint/template@1.5.2))(@glint/template@1.5.2)
+        specifier: 3.8.1
+        version: 3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2)
       '@embroider/core':
-        specifier: 3.4.15
-        version: 3.4.15(@glint/template@1.5.2)
+        specifier: 3.5.0
+        version: 3.5.0(@glint/template@1.5.2)
       '@embroider/macros':
         specifier: 1.16.5
         version: 1.16.5(@glint/template@1.5.2)
       '@embroider/webpack':
         specifier: 4.0.5
-        version: 4.0.5(@embroider/core@3.4.15(@glint/template@1.5.2))(webpack@5.97.1)
+        version: 4.0.5(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1)
       '@eslint/js':
         specifier: 9.20.0
         version: 9.20.0
@@ -1135,7 +1135,7 @@ importers:
         version: 9.20.1(jiti@2.4.2)
       eslint-plugin-ember:
         specifier: 12.5.0
-        version: 12.5.0(@babel/core@7.25.9)(@typescript-eslint/parser@8.23.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3))(eslint@9.20.1(jiti@2.4.2))
+        version: 12.5.0(@babel/core@7.25.9)(@typescript-eslint/parser@8.24.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3))(eslint@9.20.1(jiti@2.4.2))
       globals:
         specifier: 15.15.0
         version: 15.15.0
@@ -2363,32 +2363,17 @@ packages:
     peerDependencies:
       '@embroider/core': ^3.4.0
 
-  '@embroider/compat@3.6.0':
-    resolution: {integrity: sha512-pL3BdYVKu5UQNfsBQ6PGUFkLp20INxbTltcss3bCV12/dNqqCYbCEewQsjiDHnZ+WgweZli3cuCcmug2BgyVcg==}
-    engines: {node: 12.* || 14.* || >= 16}
-    hasBin: true
-    peerDependencies:
-      '@embroider/core': ^3.4.14
-
-  '@embroider/compat@3.6.2-unstable.f33728f':
-    resolution: {integrity: sha512-BMILR/neHRB6s6OLIr2ZisAsyVsA+Gz9MtMowq2aUhwp6aZRask+5HcSs8UjqDn6uyj5CIINpkN16Wvpap7rRg==}
+  '@embroider/compat@3.8.1':
+    resolution: {integrity: sha512-MzZYQsF59V2Gr0nvPWOglAmYli0OCjwSbGx/LW0VFYXtlveKUqvMozy/jfYlcFMN+9zFBrSzKdvKGsITcZSLug==}
     engines: {node: 12.* || 14.* || >= 16}
     hasBin: true
     peerDependencies:
-      '@embroider/core': ^3.4.16-unstable.f33728f
+      '@embroider/core': ^3.5.0
 
   '@embroider/config-meta-loader@0.0.1-unstable.f33728f':
     resolution: {integrity: sha512-vwcLWgm9Jx+MPpkN+GYy0oNH8JCqxOgSjLSbUEDBpvCW2P0YElOkEWl02U30BEijXBHFvGndf75JzumPuo9WBQ==}
     engines: {node: 12.* || 14.* || >= 16}
 
-  '@embroider/core@3.4.15':
-    resolution: {integrity: sha512-aVG+3eU5IWJYw8yP+o6vinG9vvzEzB/YpoVm1fr5T5E30BtbF0cU5jYYn3ItSLNiE1Q1mnG9ebjIhy5VVFiu1Q==}
-    engines: {node: 12.* || 14.* || >= 16}
-
-  '@embroider/core@3.4.16-unstable.f33728f':
-    resolution: {integrity: sha512-fD1r3v8cyXlAygbRWyQO6dOE2stapW3GQT5B5jt39WJc/eQz2GdNJTwgUeWFD6Peh05O+QCpNNddixwLTPjpng==}
-    engines: {node: 12.* || 14.* || >= 16}
-
   '@embroider/core@3.5.0':
     resolution: {integrity: sha512-5vt2lX0jss/8Qk5ls9NrIpXx5dYMb1uuiMC2yTEj8vaBo+5Im/YJoJ0HR3VS4EGy1OB69yAASu+noyPajU7fvg==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -2418,15 +2403,6 @@ packages:
       '@glint/template':
         optional: true
 
-  '@embroider/macros@1.16.6':
-    resolution: {integrity: sha512-aSdRetg0vY3c70G/3K85fOSlGtDzSV4ozwF9qD8ToQB+4RLZusxwItnctWEa+MKkhAYB6rbFiQ+bhFwEnaEazg==}
-    engines: {node: 12.* || 14.* || >= 16}
-    peerDependencies:
-      '@glint/template': ^1.0.0
-    peerDependenciesMeta:
-      '@glint/template':
-        optional: true
-
   '@embroider/macros@1.16.7-unstable.f33728f':
     resolution: {integrity: sha512-qLgrRNlOgHFvRBShAQ1FKV3LYTt+mL8+sgU2BdMrRlwgag9RW3Fty8+8QIAp25lyOJxJxvB9/SgP/IBkT+hDpw==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -4408,13 +4384,6 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.8.0'
 
-  '@typescript-eslint/parser@8.23.0':
-    resolution: {integrity: sha512-h2lUByouOXFAlMec2mILeELUbME5SZRN/7R9Cw2RD2lRQQY08MWMM+PmVVKKJNK1aIwqTo9t/0CvOxwPbRIE2Q==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <5.8.0'
-
   '@typescript-eslint/parser@8.24.0':
     resolution: {integrity: sha512-MFDaO9CYiard9j9VepMNa9MTcqVvSny2N4hkY6roquzj8pdCBRENhErrteaQuu7Yjn1ppk0v1/ZF9CG3KIlrTA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4422,10 +4391,6 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.8.0'
 
-  '@typescript-eslint/scope-manager@8.23.0':
-    resolution: {integrity: sha512-OGqo7+dXHqI7Hfm+WqkZjKjsiRtFUQHPdGMXzk5mYXhJUedO7e/Y7i8AK3MyLMgZR93TX4bIzYrfyVjLC+0VSw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@typescript-eslint/scope-manager@8.24.0':
     resolution: {integrity: sha512-HZIX0UByphEtdVBKaQBgTDdn9z16l4aTUz8e8zPQnyxwHBtf5vtl1L+OhH+m1FGV9DrRmoDuYKqzVrvWDcDozw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4437,20 +4402,10 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.8.0'
 
-  '@typescript-eslint/types@8.23.0':
-    resolution: {integrity: sha512-1sK4ILJbCmZOTt9k4vkoulT6/y5CHJ1qUYxqpF1K/DBAd8+ZUL4LlSCxOssuH5m4rUaaN0uS0HlVPvd45zjduQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@typescript-eslint/types@8.24.0':
     resolution: {integrity: sha512-VacJCBTyje7HGAw7xp11q439A+zeGG0p0/p2zsZwpnMzjPB5WteaWqt4g2iysgGFafrqvyLWqq6ZPZAOCoefCw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.23.0':
-    resolution: {integrity: sha512-LcqzfipsB8RTvH8FX24W4UUFk1bl+0yTOf9ZA08XngFwMg4Kj8A+9hwz8Cr/ZS4KwHrmo9PJiLZkOt49vPnuvQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <5.8.0'
-
   '@typescript-eslint/typescript-estree@8.24.0':
     resolution: {integrity: sha512-ITjYcP0+8kbsvT9bysygfIfb+hBj6koDsu37JZG7xrCiy3fPJyNmfVtaGsgTUSEuTzcvME5YI5uyL5LD1EV5ZQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4464,10 +4419,6 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.8.0'
 
-  '@typescript-eslint/visitor-keys@8.23.0':
-    resolution: {integrity: sha512-oWWhcWDLwDfu++BGTZcmXWqpwtkwb5o7fxUIGksMQQDSdPW9prsSnfIOZMlsj4vBOSrcnjIUZMiIjODgGosFhQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@typescript-eslint/visitor-keys@8.24.0':
     resolution: {integrity: sha512-kArLq83QxGLbuHrTMoOEWO+l2MwsNS2TGISEdx8xgqpkbytB07XmlQyQdNDrCc1ecSqx0cnmhGvpX+VBwqqSkg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -5130,12 +5081,6 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  babel-plugin-debug-macros@1.0.2:
-    resolution: {integrity: sha512-ADkMh1LL45678c+4iGn3Fp8hdI9qvxGBkH5x9HNiIlgYJGdQWmYNcA2cS3XAr76N85kDCg4VpqsTN1hFX2jbEA==}
-    engines: {node: '>=16'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
   babel-plugin-ember-data-packages-polyfill@0.1.2:
     resolution: {integrity: sha512-kTHnOwoOXfPXi00Z8yAgyD64+jdSXk3pknnS7NlqnCKAU6YDkXZ4Y7irl66kaZjZn0FBBt0P4YOZFZk85jYOww==}
     engines: {node: 6.* || 8.* || 10.* || >= 12.*}
@@ -13654,37 +13599,28 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/babel-loader-9@3.1.1(@embroider/core@3.4.15(@glint/template@1.5.2))(supports-color@8.1.1)(webpack@5.97.1)':
-    dependencies:
-      '@babel/core': 7.25.9(supports-color@8.1.1)
-      '@embroider/core': 3.4.15(@glint/template@1.5.2)
-      babel-loader: 9.2.1(@babel/core@7.25.9(supports-color@8.1.1))(webpack@5.97.1)
-    transitivePeerDependencies:
-      - supports-color
-      - webpack
-
-  '@embroider/babel-loader-9@3.1.1(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(supports-color@8.1.1)(webpack@5.97.1)':
+  '@embroider/babel-loader-9@3.1.1(@embroider/core@3.5.0(@glint/template@1.5.2))(supports-color@8.1.1)(webpack@5.97.1)':
     dependencies:
       '@babel/core': 7.25.9(supports-color@8.1.1)
-      '@embroider/core': 3.4.16-unstable.f33728f(@glint/template@1.5.2)
+      '@embroider/core': 3.5.0(@glint/template@1.5.2)
       babel-loader: 9.2.1(@babel/core@7.25.9(supports-color@8.1.1))(webpack@5.97.1)
     transitivePeerDependencies:
       - supports-color
       - webpack
-    optional: true
 
-  '@embroider/compat@3.6.0(@embroider/core@3.4.15(@glint/template@1.5.2))(@glint/template@1.5.2)':
+  '@embroider/compat@3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2)':
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/core': 7.25.9
       '@babel/plugin-syntax-decorators': 7.25.9(@babel/core@7.25.9)
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.9)
+      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.25.9)
       '@babel/plugin-transform-runtime': 7.25.9(@babel/core@7.25.9)
       '@babel/preset-env': 7.26.7(@babel/core@7.25.9)
       '@babel/runtime': 7.25.9
       '@babel/traverse': 7.26.7
-      '@embroider/core': 3.4.15(@glint/template@1.5.2)
-      '@embroider/macros': 1.16.5(@glint/template@1.5.2)
+      '@embroider/core': 3.5.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.16.10(@glint/template@1.5.2)
       '@types/babel__code-frame': 7.0.6
       '@types/yargs': 17.0.33
       assert-never: 1.4.0
@@ -13707,64 +13643,11 @@ snapshots:
       fast-sourcemap-concat: 2.1.1
       fs-extra: 9.1.0
       fs-tree-diff: 2.0.1
-      jsdom: 16.7.0
-      lodash: 4.17.21
-      pkg-up: 3.1.0
-      resolve: 1.22.10
-      resolve-package-path: 4.0.3
-      semver: 7.6.3
-      symlink-or-copy: 1.3.1
-      tree-sync: 2.1.0
-      typescript-memoize: 1.1.1
-      walk-sync: 3.0.0
-      yargs: 17.7.2
-    transitivePeerDependencies:
-      - '@glint/template'
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-
-  '@embroider/compat@3.6.2-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2)':
-    dependencies:
-      '@babel/code-frame': 7.26.2
-      '@babel/core': 7.25.9
-      '@babel/plugin-syntax-decorators': 7.25.9(@babel/core@7.25.9)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.9)
-      '@babel/plugin-transform-runtime': 7.25.9(@babel/core@7.25.9)
-      '@babel/preset-env': 7.26.7(@babel/core@7.25.9)
-      '@babel/runtime': 7.25.9
-      '@babel/traverse': 7.26.7
-      '@embroider/core': 3.4.16-unstable.f33728f(@glint/template@1.5.2)
-      '@embroider/macros': 1.16.7-unstable.f33728f(@glint/template@1.5.2)
-      '@types/babel__code-frame': 7.0.6
-      '@types/yargs': 17.0.33
-      assert-never: 1.4.0
-      babel-import-util: 2.1.1
-      babel-plugin-debug-macros: 1.0.2(@babel/core@7.25.9)
-      babel-plugin-ember-template-compilation: 2.3.0
-      babel-plugin-syntax-dynamic-import: 6.18.0
-      babylon: 6.18.0
-      bind-decorator: 1.0.11
-      broccoli: 3.5.2
-      broccoli-concat: 4.2.5
-      broccoli-file-creator: 2.1.1
-      broccoli-funnel: 3.0.8
-      broccoli-merge-trees: 4.2.0
-      broccoli-persistent-filter: 3.1.3
-      broccoli-plugin: 4.0.7
-      broccoli-source: 3.0.1
-      chalk: 4.1.2
-      debug: 4.4.0(supports-color@9.4.0)
-      fast-sourcemap-concat: 2.1.1
-      fs-extra: 9.1.0
-      fs-tree-diff: 2.0.1
-      jsdom: 16.7.0
+      jsdom: 25.0.1
       lodash: 4.17.21
       pkg-up: 3.1.0
       resolve: 1.22.10
       resolve-package-path: 4.0.3
-      resolve.exports: 2.0.3
       semver: 7.6.3
       symlink-or-copy: 1.3.1
       tree-sync: 2.1.0
@@ -13780,74 +13663,6 @@ snapshots:
 
   '@embroider/config-meta-loader@0.0.1-unstable.f33728f': {}
 
-  '@embroider/core@3.4.15(@glint/template@1.5.2)':
-    dependencies:
-      '@babel/core': 7.25.9
-      '@babel/parser': 7.26.7
-      '@babel/traverse': 7.26.7
-      '@embroider/macros': 1.16.6(@glint/template@1.5.2)
-      '@embroider/shared-internals': 2.6.3
-      assert-never: 1.4.0
-      babel-plugin-ember-template-compilation: 2.3.0
-      broccoli-node-api: 1.7.0
-      broccoli-persistent-filter: 3.1.3
-      broccoli-plugin: 4.0.7
-      broccoli-source: 3.0.1
-      debug: 4.4.0(supports-color@9.4.0)
-      fast-sourcemap-concat: 2.1.1
-      filesize: 10.1.6
-      fs-extra: 9.1.0
-      fs-tree-diff: 2.0.1
-      handlebars: 4.7.8
-      js-string-escape: 1.0.1
-      jsdom: 16.7.0
-      lodash: 4.17.21
-      resolve: 1.22.10
-      resolve-package-path: 4.0.3
-      typescript-memoize: 1.1.1
-      walk-sync: 3.0.0
-    transitivePeerDependencies:
-      - '@glint/template'
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-
-  '@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2)':
-    dependencies:
-      '@babel/core': 7.25.9
-      '@babel/parser': 7.26.7
-      '@babel/traverse': 7.26.7
-      '@embroider/macros': 1.16.7-unstable.f33728f(@glint/template@1.5.2)
-      '@embroider/reverse-exports': 0.1.1-unstable.f33728f
-      '@embroider/shared-internals': 2.6.4-unstable.f33728f
-      assert-never: 1.4.0
-      babel-plugin-ember-template-compilation: 2.3.0
-      broccoli-node-api: 1.7.0
-      broccoli-persistent-filter: 3.1.3
-      broccoli-plugin: 4.0.7
-      broccoli-source: 3.0.1
-      debug: 4.4.0(supports-color@9.4.0)
-      escape-string-regexp: 4.0.0
-      fast-sourcemap-concat: 2.1.1
-      fs-extra: 9.1.0
-      fs-tree-diff: 2.0.1
-      handlebars: 4.7.8
-      js-string-escape: 1.0.1
-      jsdom: 16.7.0
-      lodash: 4.17.21
-      resolve: 1.22.10
-      resolve-package-path: 4.0.3
-      resolve.exports: 2.0.3
-      typescript-memoize: 1.1.1
-      walk-sync: 3.0.0
-    transitivePeerDependencies:
-      - '@glint/template'
-      - bufferutil
-      - canvas
-      - supports-color
-      - utf-8-validate
-
   '@embroider/core@3.5.0(@glint/template@1.5.2)':
     dependencies:
       '@babel/core': 7.25.9
@@ -13882,17 +13697,11 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@embroider/hbs-loader@3.0.3(@embroider/core@3.4.15(@glint/template@1.5.2))(webpack@5.97.1)':
+  '@embroider/hbs-loader@3.0.3(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1)':
     dependencies:
-      '@embroider/core': 3.4.15(@glint/template@1.5.2)
+      '@embroider/core': 3.5.0(@glint/template@1.5.2)
       webpack: 5.97.1
 
-  '@embroider/hbs-loader@3.0.3(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1)':
-    dependencies:
-      '@embroider/core': 3.4.16-unstable.f33728f(@glint/template@1.5.2)
-      webpack: 5.97.1
-    optional: true
-
   '@embroider/macros@1.16.10(@glint/template@1.5.2)':
     dependencies:
       '@embroider/shared-internals': 2.8.1
@@ -13923,21 +13732,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/macros@1.16.6(@glint/template@1.5.2)':
-    dependencies:
-      '@embroider/shared-internals': 2.6.3
-      assert-never: 1.4.0
-      babel-import-util: 2.1.1
-      ember-cli-babel: 7.26.11
-      find-up: 5.0.0
-      lodash: 4.17.21
-      resolve: 1.22.10
-      semver: 7.6.3
-    optionalDependencies:
-      '@glint/template': 1.5.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@embroider/macros@1.16.7-unstable.f33728f(@glint/template@1.5.2)':
     dependencies:
       '@embroider/shared-internals': 2.6.4-unstable.f33728f
@@ -13972,21 +13766,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/shared-internals@2.6.3':
-    dependencies:
-      babel-import-util: 2.1.1
-      debug: 4.4.0(supports-color@9.4.0)
-      ember-rfc176-data: 0.3.18
-      fs-extra: 9.1.0
-      js-string-escape: 1.0.1
-      lodash: 4.17.21
-      minimatch: 3.1.2
-      resolve-package-path: 4.0.3
-      semver: 7.6.3
-      typescript-memoize: 1.1.1
-    transitivePeerDependencies:
-      - supports-color
-
   '@embroider/shared-internals@2.6.3(supports-color@8.1.1)':
     dependencies:
       babel-import-util: 2.1.1
@@ -14035,31 +13814,31 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/test-setup@4.0.0(@embroider/compat@3.6.2-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2))(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@embroider/webpack@4.0.5(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1))':
+  '@embroider/test-setup@4.0.0(@embroider/compat@3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2))(@embroider/core@3.5.0(@glint/template@1.5.2))(@embroider/webpack@4.0.5(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1))':
     dependencies:
       lodash: 4.17.21
       resolve: 1.22.10
     optionalDependencies:
-      '@embroider/compat': 3.6.2-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2)
-      '@embroider/core': 3.4.16-unstable.f33728f(@glint/template@1.5.2)
-      '@embroider/webpack': 4.0.5(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1)
+      '@embroider/compat': 3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2)
+      '@embroider/core': 3.5.0(@glint/template@1.5.2)
+      '@embroider/webpack': 4.0.5(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1)
 
-  '@embroider/test-setup@4.0.1-unstable.f33728f(@embroider/compat@3.6.2-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2))(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@embroider/webpack@4.0.5(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1))':
+  '@embroider/test-setup@4.0.1-unstable.f33728f(@embroider/compat@3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2))(@embroider/core@3.5.0(@glint/template@1.5.2))(@embroider/webpack@4.0.5(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1))':
     dependencies:
       broccoli-plugin: 4.0.7
       lodash: 4.17.21
       resolve: 1.22.10
     optionalDependencies:
-      '@embroider/compat': 3.6.2-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2)
-      '@embroider/core': 3.4.16-unstable.f33728f(@glint/template@1.5.2)
-      '@embroider/webpack': 4.0.5(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1)
+      '@embroider/compat': 3.8.1(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2)
+      '@embroider/core': 3.5.0(@glint/template@1.5.2)
+      '@embroider/webpack': 4.0.5(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/vite@0.2.1-unstable.f33728f(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(@glint/template@1.5.2)(rollup@4.34.7)(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))':
+  '@embroider/vite@0.2.1-unstable.f33728f(@embroider/core@3.5.0(@glint/template@1.5.2))(@glint/template@1.5.2)(rollup@4.34.7)(vite@6.1.0(@types/node@22.13.4)(jiti@2.4.2)(terser@5.37.0)(yaml@1.10.2))':
     dependencies:
       '@babel/core': 7.25.9
-      '@embroider/core': 3.4.16-unstable.f33728f(@glint/template@1.5.2)
+      '@embroider/core': 3.5.0(@glint/template@1.5.2)
       '@embroider/macros': 1.16.7-unstable.f33728f(@glint/template@1.5.2)
       '@embroider/reverse-exports': 0.1.1-unstable.f33728f
       '@rollup/pluginutils': 5.1.4(rollup@4.34.7)
@@ -14082,44 +13861,13 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.5.2))(webpack@5.97.1)':
+  '@embroider/webpack@4.0.5(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1)':
     dependencies:
       '@babel/core': 7.25.9(supports-color@8.1.1)
       '@babel/preset-env': 7.26.7(@babel/core@7.25.9(supports-color@8.1.1))(supports-color@8.1.1)
-      '@embroider/babel-loader-9': 3.1.1(@embroider/core@3.4.15(@glint/template@1.5.2))(supports-color@8.1.1)(webpack@5.97.1)
-      '@embroider/core': 3.4.15(@glint/template@1.5.2)
-      '@embroider/hbs-loader': 3.0.3(@embroider/core@3.4.15(@glint/template@1.5.2))(webpack@5.97.1)
-      '@embroider/shared-internals': 2.6.3(supports-color@8.1.1)
-      '@types/supports-color': 8.1.3
-      assert-never: 1.4.0
-      babel-loader: 8.4.1(@babel/core@7.25.9(supports-color@8.1.1))(webpack@5.97.1)
-      css-loader: 5.2.7(webpack@5.97.1)
-      csso: 4.2.0
-      debug: 4.4.0(supports-color@8.1.1)
-      escape-string-regexp: 4.0.0
-      fs-extra: 9.1.0
-      jsdom: 16.7.0(supports-color@8.1.1)
-      lodash: 4.17.21
-      mini-css-extract-plugin: 2.9.2(webpack@5.97.1)
-      semver: 7.6.3
-      source-map-url: 0.4.1
-      style-loader: 2.0.0(webpack@5.97.1)
-      supports-color: 8.1.1
-      terser: 5.37.0
-      thread-loader: 3.0.4(webpack@5.97.1)
-      webpack: 5.97.1
-    transitivePeerDependencies:
-      - bufferutil
-      - canvas
-      - utf-8-validate
-
-  '@embroider/webpack@4.0.5(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1)':
-    dependencies:
-      '@babel/core': 7.25.9(supports-color@8.1.1)
-      '@babel/preset-env': 7.26.7(@babel/core@7.25.9(supports-color@8.1.1))(supports-color@8.1.1)
-      '@embroider/babel-loader-9': 3.1.1(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(supports-color@8.1.1)(webpack@5.97.1)
-      '@embroider/core': 3.4.16-unstable.f33728f(@glint/template@1.5.2)
-      '@embroider/hbs-loader': 3.0.3(@embroider/core@3.4.16-unstable.f33728f(@glint/template@1.5.2))(webpack@5.97.1)
+      '@embroider/babel-loader-9': 3.1.1(@embroider/core@3.5.0(@glint/template@1.5.2))(supports-color@8.1.1)(webpack@5.97.1)
+      '@embroider/core': 3.5.0(@glint/template@1.5.2)
+      '@embroider/hbs-loader': 3.0.3(@embroider/core@3.5.0(@glint/template@1.5.2))(webpack@5.97.1)
       '@embroider/shared-internals': 2.6.3(supports-color@8.1.1)
       '@types/supports-color': 8.1.3
       assert-never: 1.4.0
@@ -14143,7 +13891,6 @@ snapshots:
       - bufferutil
       - canvas
       - utf-8-validate
-    optional: true
 
   '@emnapi/runtime@1.3.1':
     dependencies:
@@ -16020,19 +15767,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.23.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 8.23.0
-      '@typescript-eslint/types': 8.23.0
-      '@typescript-eslint/typescript-estree': 8.23.0(typescript@5.7.3)
-      '@typescript-eslint/visitor-keys': 8.23.0
-      debug: 4.4.0(supports-color@9.4.0)
-      eslint: 9.20.1(jiti@2.4.2)
-      typescript: 5.7.3
-    transitivePeerDependencies:
-      - supports-color
-    optional: true
-
   '@typescript-eslint/parser@8.24.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.24.0
@@ -16045,12 +15779,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@8.23.0':
-    dependencies:
-      '@typescript-eslint/types': 8.23.0
-      '@typescript-eslint/visitor-keys': 8.23.0
-    optional: true
-
   '@typescript-eslint/scope-manager@8.24.0':
     dependencies:
       '@typescript-eslint/types': 8.24.0
@@ -16067,26 +15795,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.23.0':
-    optional: true
-
   '@typescript-eslint/types@8.24.0': {}
 
-  '@typescript-eslint/typescript-estree@8.23.0(typescript@5.7.3)':
-    dependencies:
-      '@typescript-eslint/types': 8.23.0
-      '@typescript-eslint/visitor-keys': 8.23.0
-      debug: 4.4.0(supports-color@9.4.0)
-      fast-glob: 3.3.3
-      is-glob: 4.0.3
-      minimatch: 9.0.5
-      semver: 7.6.3
-      ts-api-utils: 2.0.1(typescript@5.7.3)
-      typescript: 5.7.3
-    transitivePeerDependencies:
-      - supports-color
-    optional: true
-
   '@typescript-eslint/typescript-estree@8.24.0(typescript@5.7.3)':
     dependencies:
       '@typescript-eslint/types': 8.24.0
@@ -16112,12 +15822,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.23.0':
-    dependencies:
-      '@typescript-eslint/types': 8.23.0
-      eslint-visitor-keys: 4.2.0
-    optional: true
-
   '@typescript-eslint/visitor-keys@8.24.0':
     dependencies:
       '@typescript-eslint/types': 8.24.0
@@ -16967,12 +16671,6 @@ snapshots:
       '@babel/core': 7.25.9
       semver: 5.7.2
 
-  babel-plugin-debug-macros@1.0.2(@babel/core@7.25.9):
-    dependencies:
-      '@babel/core': 7.25.9
-      babel-import-util: 2.1.1
-      semver: 7.6.3
-
   babel-plugin-ember-data-packages-polyfill@0.1.2:
     dependencies:
       '@ember-data/rfc395-data': 0.0.4
@@ -18974,21 +18672,6 @@ snapshots:
 
   ember-disable-prototype-extensions@1.1.3: {}
 
-  ember-eslint-parser@0.5.9(@babel/core@7.25.9)(@typescript-eslint/parser@8.23.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3))(eslint@9.20.1(jiti@2.4.2)):
-    dependencies:
-      '@babel/core': 7.25.9
-      '@babel/eslint-parser': 7.25.9(@babel/core@7.25.9)(eslint@9.20.1(jiti@2.4.2))
-      '@glimmer/syntax': 0.92.3
-      content-tag: 2.0.3
-      eslint-scope: 7.2.2
-      html-tags: 3.3.1
-      mathml-tag-names: 2.1.3
-      svg-tags: 1.0.0
-    optionalDependencies:
-      '@typescript-eslint/parser': 8.23.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3)
-    transitivePeerDependencies:
-      - eslint
-
   ember-eslint-parser@0.5.9(@babel/core@7.25.9)(@typescript-eslint/parser@8.24.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3))(eslint@9.20.1(jiti@2.4.2)):
     dependencies:
       '@babel/core': 7.25.9
@@ -19527,24 +19210,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-ember@12.5.0(@babel/core@7.25.9)(@typescript-eslint/parser@8.23.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3))(eslint@9.20.1(jiti@2.4.2)):
-    dependencies:
-      '@ember-data/rfc395-data': 0.0.4
-      css-tree: 3.1.0
-      ember-eslint-parser: 0.5.9(@babel/core@7.25.9)(@typescript-eslint/parser@8.23.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3))(eslint@9.20.1(jiti@2.4.2))
-      ember-rfc176-data: 0.3.18
-      eslint: 9.20.1(jiti@2.4.2)
-      eslint-utils: 3.0.0(eslint@9.20.1(jiti@2.4.2))
-      estraverse: 5.3.0
-      lodash.camelcase: 4.3.0
-      lodash.kebabcase: 4.1.1
-      requireindex: 1.2.0
-      snake-case: 3.0.4
-    optionalDependencies:
-      '@typescript-eslint/parser': 8.23.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3)
-    transitivePeerDependencies:
-      - '@babel/core'
-
   eslint-plugin-ember@12.5.0(@babel/core@7.25.9)(@typescript-eslint/parser@8.24.0(eslint@9.20.1(jiti@2.4.2))(typescript@5.7.3))(eslint@9.20.1(jiti@2.4.2)):
     dependencies:
       '@ember-data/rfc395-data': 0.0.4