diff --git a/package.json b/package.json
index 3b2db0fa15f..4f1d0f2a10b 100644
--- a/package.json
+++ b/package.json
@@ -63,9 +63,9 @@
     "@ember/string": "4.0.1",
     "@ember/test-helpers": "4.0.5",
     "@ember/test-waiters": "3.1.0",
-    "@embroider/compat": "3.8.1",
-    "@embroider/core": "3.5.0",
-    "@embroider/webpack": "4.0.9",
+    "@embroider/compat": "3.8.2",
+    "@embroider/core": "3.5.1",
+    "@embroider/webpack": "4.0.10",
     "@eslint/js": "9.20.0",
     "@eslint/eslintrc": "3.2.0",
     "@glimmer/component": "2.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 95514886200..44a04ace659 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -77,14 +77,14 @@ importers:
         specifier: 3.1.0
         version: 3.1.0
       '@embroider/compat':
-        specifier: 3.8.1
-        version: 3.8.1(@embroider/core@3.5.0)
+        specifier: 3.8.2
+        version: 3.8.2(@embroider/core@3.5.1)
       '@embroider/core':
-        specifier: 3.5.0
-        version: 3.5.0
+        specifier: 3.5.1
+        version: 3.5.1
       '@embroider/webpack':
-        specifier: 4.0.9
-        version: 4.0.9(@embroider/core@3.5.0)(webpack@5.98.0)
+        specifier: 4.0.10
+        version: 4.0.10(@embroider/core@3.5.1)(webpack@5.98.0)
       '@eslint/eslintrc':
         specifier: 3.2.0
         version: 3.2.0
@@ -150,7 +150,7 @@ importers:
         version: 1.0.0
       ember-cli-code-coverage:
         specifier: 3.1.0
-        version: 3.1.0(@embroider/compat@3.8.1(@embroider/core@3.5.0))(@embroider/core@3.5.0)
+        version: 3.1.0(@embroider/compat@3.8.2(@embroider/core@3.5.1))(@embroider/core@3.5.1)
       ember-cli-dependency-checker:
         specifier: 3.3.3
         version: 3.3.3(ember-cli@6.2.2(ejs@3.1.10)(handlebars@4.7.8)(underscore@1.13.7))
@@ -1375,15 +1375,15 @@ packages:
     peerDependencies:
       '@embroider/core': ^3.4.0
 
-  '@embroider/compat@3.8.1':
-    resolution: {integrity: sha512-MzZYQsF59V2Gr0nvPWOglAmYli0OCjwSbGx/LW0VFYXtlveKUqvMozy/jfYlcFMN+9zFBrSzKdvKGsITcZSLug==}
+  '@embroider/compat@3.8.2':
+    resolution: {integrity: sha512-mbCFAEn26rcVXudIBJ1JafXghseQ1iZ54Hd/V32PhLQobPyNO4lWFgdMfeCC9Qbz67Krw6OfIPkft0vWlGibIQ==}
     engines: {node: 12.* || 14.* || >= 16}
     hasBin: true
     peerDependencies:
-      '@embroider/core': ^3.5.0
+      '@embroider/core': ^3.5.1
 
-  '@embroider/core@3.5.0':
-    resolution: {integrity: sha512-5vt2lX0jss/8Qk5ls9NrIpXx5dYMb1uuiMC2yTEj8vaBo+5Im/YJoJ0HR3VS4EGy1OB69yAASu+noyPajU7fvg==}
+  '@embroider/core@3.5.1':
+    resolution: {integrity: sha512-fqTFSfR57ZaKbc/002q4wlhU+HWJNgHB4VNX8fLJzsbr8Y9svllQbYSnz/UAtOiNkLwnj+exC2UKMy6qg/SkyA==}
     engines: {node: 12.* || 14.* || >= 16}
 
   '@embroider/hbs-loader@3.0.3':
@@ -1402,15 +1402,28 @@ packages:
       '@glint/template':
         optional: true
 
+  '@embroider/macros@1.16.11':
+    resolution: {integrity: sha512-TUm/74oBr+tWto0IPAht1g6zjpP7UK0aQdnFHHqGvDPc+tAROQb9jKI/ePEuKAdBCV3L7XvvC4Rlf0DNvT4qmw==}
+    engines: {node: 12.* || 14.* || >= 16}
+    peerDependencies:
+      '@glint/template': ^1.0.0
+    peerDependenciesMeta:
+      '@glint/template':
+        optional: true
+
   '@embroider/shared-internals@2.8.1':
     resolution: {integrity: sha512-zi0CENFD1e0DH7c9M/rNKJnFnt2c3+736J3lguBddZdmaIV6Cb8l3HQSkskSW5O4ady+SavemLKO3hCjQQJBIw==}
     engines: {node: 12.* || 14.* || >= 16}
 
-  '@embroider/webpack@4.0.9':
-    resolution: {integrity: sha512-4pRnY6fC8sdGrhD+Tk8ilblmHbwzlsy1BrA0r1dYGd23TpmGOgrit/CIv3C2ffRQ4EaiZh1XYO0KDVNTMYUFAw==}
+  '@embroider/shared-internals@2.9.0':
+    resolution: {integrity: sha512-8untWEvGy6av/oYibqZWMz/yB+LHsKxEOoUZiLvcpFwWj2Sipc0DcXeTJQZQZ++otNkLCWyDrDhOLrOkgjOPSg==}
+    engines: {node: 12.* || 14.* || >= 16}
+
+  '@embroider/webpack@4.0.10':
+    resolution: {integrity: sha512-OHpJ5JIT+NaT3ORKaXjSFBPTo3t71LvfkdFd1J0er2zGRGyc39V9E73wolc7Av9yhwlRNN+W0oFj2rFeXUVuQw==}
     engines: {node: 12.* || 14.* || >= 16}
     peerDependencies:
-      '@embroider/core': ^3.4.20
+      '@embroider/core': ^3.5.1
       webpack: ^5.0.0
 
   '@esbuild/aix-ppc64@0.24.2':
@@ -10060,23 +10073,23 @@ snapshots:
 
   '@embroider/addon-shim@1.9.0':
     dependencies:
-      '@embroider/shared-internals': 2.8.1(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.8.1
       broccoli-funnel: 3.0.8
       common-ancestor-path: 1.0.1
       semver: 7.7.1
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/babel-loader-9@3.1.1(@embroider/core@3.5.0)(supports-color@8.1.1)(webpack@5.98.0)':
+  '@embroider/babel-loader-9@3.1.1(@embroider/core@3.5.1)(supports-color@8.1.1)(webpack@5.98.0)':
     dependencies:
       '@babel/core': 7.26.9(supports-color@8.1.1)
-      '@embroider/core': 3.5.0
+      '@embroider/core': 3.5.1
       babel-loader: 9.2.1(@babel/core@7.26.9)(webpack@5.98.0)
     transitivePeerDependencies:
       - supports-color
       - webpack
 
-  '@embroider/compat@3.8.1(@embroider/core@3.5.0)':
+  '@embroider/compat@3.8.2(@embroider/core@3.5.1)':
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/core': 7.26.9(supports-color@8.1.1)
@@ -10087,8 +10100,8 @@ snapshots:
       '@babel/preset-env': 7.26.9(@babel/core@7.26.9)(supports-color@8.1.1)
       '@babel/runtime': 7.26.9
       '@babel/traverse': 7.26.9(supports-color@8.1.1)
-      '@embroider/core': 3.5.0
-      '@embroider/macros': 1.16.10
+      '@embroider/core': 3.5.1
+      '@embroider/macros': 1.16.11
       '@types/babel__code-frame': 7.0.6
       '@types/yargs': 17.0.33
       assert-never: 1.4.0
@@ -10129,13 +10142,13 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@embroider/core@3.5.0':
+  '@embroider/core@3.5.1':
     dependencies:
       '@babel/core': 7.26.9(supports-color@8.1.1)
       '@babel/parser': 7.26.9
       '@babel/traverse': 7.26.9(supports-color@8.1.1)
-      '@embroider/macros': 1.16.10
-      '@embroider/shared-internals': 2.8.1(supports-color@8.1.1)
+      '@embroider/macros': 1.16.11
+      '@embroider/shared-internals': 2.9.0(supports-color@8.1.1)
       assert-never: 1.4.0
       babel-plugin-ember-template-compilation: 2.3.0
       broccoli-node-api: 1.7.0
@@ -10163,14 +10176,14 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@embroider/hbs-loader@3.0.3(@embroider/core@3.5.0)(webpack@5.98.0)':
+  '@embroider/hbs-loader@3.0.3(@embroider/core@3.5.1)(webpack@5.98.0)':
     dependencies:
-      '@embroider/core': 3.5.0
+      '@embroider/core': 3.5.1
       webpack: 5.98.0
 
   '@embroider/macros@1.16.10':
     dependencies:
-      '@embroider/shared-internals': 2.8.1(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.8.1
       assert-never: 1.4.0
       babel-import-util: 2.1.1
       ember-cli-babel: 7.26.11
@@ -10181,7 +10194,37 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/shared-internals@2.8.1(supports-color@8.1.1)':
+  '@embroider/macros@1.16.11':
+    dependencies:
+      '@embroider/shared-internals': 2.9.0(supports-color@8.1.1)
+      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.7.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@embroider/shared-internals@2.8.1':
+    dependencies:
+      babel-import-util: 2.1.1
+      debug: 4.4.0(supports-color@8.1.1)
+      ember-rfc176-data: 0.3.18
+      fs-extra: 9.1.0
+      is-subdir: 1.2.0
+      js-string-escape: 1.0.1
+      lodash: 4.17.21
+      minimatch: 3.1.2
+      pkg-entry-points: 1.1.1
+      resolve-package-path: 4.0.3
+      semver: 7.7.1
+      typescript-memoize: 1.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@embroider/shared-internals@2.9.0(supports-color@8.1.1)':
     dependencies:
       babel-import-util: 2.1.1
       debug: 4.4.0(supports-color@8.1.1)
@@ -10198,14 +10241,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/webpack@4.0.9(@embroider/core@3.5.0)(webpack@5.98.0)':
+  '@embroider/webpack@4.0.10(@embroider/core@3.5.1)(webpack@5.98.0)':
     dependencies:
       '@babel/core': 7.26.9(supports-color@8.1.1)
       '@babel/preset-env': 7.26.9(@babel/core@7.26.9)(supports-color@8.1.1)
-      '@embroider/babel-loader-9': 3.1.1(@embroider/core@3.5.0)(supports-color@8.1.1)(webpack@5.98.0)
-      '@embroider/core': 3.5.0
-      '@embroider/hbs-loader': 3.0.3(@embroider/core@3.5.0)(webpack@5.98.0)
-      '@embroider/shared-internals': 2.8.1(supports-color@8.1.1)
+      '@embroider/babel-loader-9': 3.1.1(@embroider/core@3.5.1)(supports-color@8.1.1)(webpack@5.98.0)
+      '@embroider/core': 3.5.1
+      '@embroider/hbs-loader': 3.0.3(@embroider/core@3.5.1)(webpack@5.98.0)
+      '@embroider/shared-internals': 2.9.0(supports-color@8.1.1)
       '@types/supports-color': 8.1.3
       assert-never: 1.4.0
       babel-loader: 8.4.1(@babel/core@7.26.9)(webpack@5.98.0)
@@ -13616,7 +13659,7 @@ snapshots:
       '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.26.9)(supports-color@8.1.1)
       '@babel/preset-env': 7.26.9(@babel/core@7.26.9)(supports-color@8.1.1)
       '@embroider/macros': 1.16.10
-      '@embroider/shared-internals': 2.8.1(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.8.1
       babel-loader: 8.4.1(@babel/core@7.26.9)(webpack@5.98.0)
       babel-plugin-ember-modules-api-polyfill: 3.5.0
       babel-plugin-ember-template-compilation: 2.3.0
@@ -13730,7 +13773,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ember-cli-code-coverage@3.1.0(@embroider/compat@3.8.1(@embroider/core@3.5.0))(@embroider/core@3.5.0):
+  ember-cli-code-coverage@3.1.0(@embroider/compat@3.8.2(@embroider/core@3.5.1))(@embroider/core@3.5.1):
     dependencies:
       babel-plugin-istanbul: 6.1.1
       body-parser: 1.20.3
@@ -13744,8 +13787,8 @@ snapshots:
       node-dir: 0.1.17
       walk-sync: 2.2.0
     optionalDependencies:
-      '@embroider/compat': 3.8.1(@embroider/core@3.5.0)
-      '@embroider/core': 3.5.0
+      '@embroider/compat': 3.8.2(@embroider/core@3.5.1)
+      '@embroider/core': 3.5.1
     transitivePeerDependencies:
       - supports-color