diff --git a/package.json b/package.json
index a971977b..b959809c 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@ember/legacy-built-in-components": "^0.5.0",
     "@ember/optional-features": "^2.1.0",
     "@ember/render-modifiers": "^2.1.0",
-    "@embroider/macros": "^1.14.0",
+    "@embroider/macros": "^1.15.0",
     "@fortawesome/ember-fontawesome": "^2.0.0",
     "@fortawesome/free-regular-svg-icons": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c8334faf..b88f6031 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,8 +21,8 @@ dependencies:
     specifier: ^2.1.0
     version: 2.1.0(@babel/core@7.24.0)(@glint/template@1.2.2)(ember-source@5.6.0)
   '@embroider/macros':
-    specifier: ^1.14.0
-    version: 1.14.0(@glint/template@1.2.2)
+    specifier: ^1.15.0
+    version: 1.15.0(@glint/template@1.2.2)
   '@fortawesome/ember-fontawesome':
     specifier: ^2.0.0
     version: 2.0.0(@glint/template@1.2.2)(ember-source@5.6.0)(webpack@5.90.3)
@@ -1893,7 +1893,7 @@ packages:
       '@ember-data/private-build-infra': 4.12.5(@glint/template@1.2.2)
       '@ember-data/store': 4.12.5(@babel/core@7.24.0)(@ember-data/graph@4.12.5)(@ember-data/json-api@4.12.5)(@ember-data/legacy-compat@4.12.5)(@ember-data/model@4.12.5)(@ember-data/tracking@4.12.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(@glint/template@1.2.2)(ember-source@5.6.0)
       '@ember/string': 3.1.1
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
       ember-cli-test-info: 1.0.0
       ember-inflector: 4.0.2
@@ -1912,7 +1912,7 @@ packages:
       '@ember-data/store': 4.12.5(@babel/core@7.24.0)(@ember-data/graph@4.12.5)(@ember-data/json-api@4.12.5)(@ember-data/legacy-compat@4.12.5)(@ember-data/model@4.12.5)(@ember-data/tracking@4.12.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(@glint/template@1.2.2)(ember-source@5.6.0)
       '@ember/edition-utils': 1.2.0
       '@ember/string': 3.1.1
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-auto-import: 2.7.2(@glint/template@1.2.2)(webpack@5.90.3)
       ember-cli-babel: 7.26.11
     transitivePeerDependencies:
@@ -1929,7 +1929,7 @@ packages:
       '@ember-data/private-build-infra': 4.12.5(@glint/template@1.2.2)
       '@ember-data/store': 4.12.5(@babel/core@7.24.0)(@ember-data/graph@4.12.5)(@ember-data/json-api@4.12.5)(@ember-data/legacy-compat@4.12.5)(@ember-data/model@4.12.5)(@ember-data/tracking@4.12.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(@glint/template@1.2.2)(ember-source@5.6.0)
       '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
     transitivePeerDependencies:
       - '@glint/template'
@@ -1946,7 +1946,7 @@ packages:
       '@ember-data/private-build-infra': 4.12.5(@glint/template@1.2.2)
       '@ember-data/store': 4.12.5(@babel/core@7.24.0)(@ember-data/graph@4.12.5)(@ember-data/json-api@4.12.5)(@ember-data/legacy-compat@4.12.5)(@ember-data/model@4.12.5)(@ember-data/tracking@4.12.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(@glint/template@1.2.2)(ember-source@5.6.0)
       '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
     transitivePeerDependencies:
       - '@glint/template'
@@ -1967,7 +1967,7 @@ packages:
       '@ember-data/graph': 4.12.5(@ember-data/store@4.12.5)(@glint/template@1.2.2)
       '@ember-data/json-api': 4.12.5(@ember-data/graph@4.12.5)(@ember-data/store@4.12.5)(@glint/template@1.2.2)
       '@ember-data/private-build-infra': 4.12.5(@glint/template@1.2.2)
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
     transitivePeerDependencies:
       - '@glint/template'
@@ -2002,7 +2002,7 @@ packages:
       '@ember-data/tracking': 4.12.5(@glint/template@1.2.2)
       '@ember/edition-utils': 1.2.0
       '@ember/string': 3.1.1
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.0)(@glint/template@1.2.2)(ember-source@5.6.0)
       ember-cli-babel: 7.26.11
       ember-cli-string-utils: 1.1.0
@@ -2023,7 +2023,7 @@ packages:
       '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.24.0)
       '@babel/runtime': 7.23.6
       '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       babel-import-util: 1.4.1
       babel-plugin-debug-macros: 0.3.4(@babel/core@7.24.0)
       babel-plugin-filter-imports: 4.0.0
@@ -2054,7 +2054,7 @@ packages:
     dependencies:
       '@ember-data/private-build-infra': 4.12.5(@glint/template@1.2.2)
       '@ember/test-waiters': 3.1.0
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
     transitivePeerDependencies:
       - '@glint/template'
@@ -2074,7 +2074,7 @@ packages:
       '@ember-data/private-build-infra': 4.12.5(@glint/template@1.2.2)
       '@ember-data/store': 4.12.5(@babel/core@7.24.0)(@ember-data/graph@4.12.5)(@ember-data/json-api@4.12.5)(@ember-data/legacy-compat@4.12.5)(@ember-data/model@4.12.5)(@ember-data/tracking@4.12.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(@glint/template@1.2.2)(ember-source@5.6.0)
       '@ember/string': 3.1.1
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
       ember-cli-test-info: 1.0.0
       ember-inflector: 4.0.2
@@ -2110,7 +2110,7 @@ packages:
       '@ember-data/private-build-infra': 4.12.5(@glint/template@1.2.2)
       '@ember-data/tracking': 4.12.5(@glint/template@1.2.2)
       '@ember/string': 3.1.1
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@glimmer/tracking': 1.1.2
       ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.0)(@glint/template@1.2.2)(ember-source@5.6.0)
       ember-cli-babel: 7.26.11
@@ -2125,7 +2125,7 @@ packages:
     engines: {node: 16.* || >= 18}
     dependencies:
       '@ember-data/private-build-infra': 4.12.5(@glint/template@1.2.2)
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
     transitivePeerDependencies:
       - '@glint/template'
@@ -2140,7 +2140,7 @@ packages:
     peerDependencies:
       ember-source: '>= 4.8'
     dependencies:
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
       ember-cli-htmlbars: 5.7.2
       ember-cli-typescript: 4.2.1
@@ -2173,7 +2173,7 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@glint/template': 1.2.2
       ember-cli-babel: 7.26.11
       ember-modifier-manager-polyfill: 1.2.0(@babel/core@7.24.0)
@@ -2198,7 +2198,7 @@ packages:
       ember-source: ^4.0.0 || ^5.0.0
     dependencies:
       '@ember/test-waiters': 3.1.0
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@simple-dom/interface': 1.4.0
       broccoli-debug: 0.6.5
       broccoli-funnel: 3.0.8
@@ -2233,8 +2233,8 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@embroider/macros@1.14.0(@glint/template@1.2.2):
-    resolution: {integrity: sha512-V+jkc8mU6mJ4McW6qdEhCiD74CzMDd1T4CeJ9IkidC3pPwTMRIKJMkbiSnjmGDy7NCxT66XtFwJH7HGM2B/fXA==}
+  /@embroider/macros@1.15.0(@glint/template@1.2.2):
+    resolution: {integrity: sha512-gXh46ZafqYb6AJVoCCaQwYRsqFIwAat/PVCaJgEDKnOgOP/BTyIXwAld0gLZlIgSKkqOccBih83bXMShflKkLg==}
     engines: {node: 12.* || 14.* || >= 16}
     peerDependencies:
       '@glint/template': ^1.0.0
@@ -2242,11 +2242,12 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
+      '@babel/core': 7.24.0
       '@embroider/shared-internals': 2.5.2
       '@glint/template': 1.2.2
       assert-never: 1.2.1
       babel-import-util: 2.0.1
-      ember-cli-babel: 7.26.11
+      ember-cli-babel: 8.2.0(@babel/core@7.24.0)
       find-up: 5.0.0
       lodash: 4.17.21
       resolve: 1.22.8
@@ -2318,7 +2319,7 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@glint/template': 1.2.2
       broccoli-funnel: 3.0.8
       ember-cli-babel: 7.26.11
@@ -6430,7 +6431,7 @@ packages:
       '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.24.0)
       '@babel/preset-env': 7.23.6(@babel/core@7.24.0)
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@embroider/shared-internals': 2.5.1
       babel-loader: 8.3.0(@babel/core@7.24.0)(webpack@5.90.3)
       babel-plugin-ember-modules-api-polyfill: 3.5.0
@@ -6494,7 +6495,7 @@ packages:
     peerDependencies:
       ember-source: ^3.13.0 || ^4.0.0 || >= 5.0.0
     dependencies:
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@glimmer/tracking': 1.1.2
       babel-import-util: 1.4.1
       ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.24.0)
@@ -6696,7 +6697,7 @@ packages:
     dependencies:
       '@babel/core': 7.24.0
       '@ember/test-helpers': 3.3.0(@glint/template@1.2.2)(ember-source@5.6.0)(webpack@5.90.3)
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       broccoli-file-creator: 2.1.1
       broccoli-funnel: 3.0.8
       broccoli-merge-trees: 4.2.0
@@ -7152,7 +7153,7 @@ packages:
       '@ember-data/tracking': 4.12.5(@glint/template@1.2.2)
       '@ember/edition-utils': 1.2.0
       '@ember/string': 3.1.1
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@glimmer/env': 0.1.7
       broccoli-merge-trees: 4.2.0
       ember-auto-import: 2.7.2(@glint/template@1.2.2)(webpack@5.90.3)
@@ -7173,7 +7174,7 @@ packages:
       ember-source: ^3.28.0 || ^4.0.0 || ^5.0.0
     dependencies:
       '@embroider/addon-shim': 1.8.7
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-source: 5.6.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.2.2)(rsvp@4.8.5)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@glint/template'
@@ -7191,7 +7192,7 @@ packages:
         optional: true
     dependencies:
       '@ember/legacy-built-in-components': 0.5.0(@glint/template@1.2.2)(ember-source@5.6.0)
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       amd-name-resolver: 1.3.1
       babel-plugin-compact-reexports: 1.1.0
       broccoli-babel-transpiler: 7.8.1
@@ -7299,7 +7300,7 @@ packages:
     resolution: {integrity: sha512-uNmv1cPG/4qsac8oIf5txJ2FZ8p88LEpG4P3dNcjsJS98Y8hd0GPMFwVqpnzI78Lz7VYRGQWY4jnE4qm5R3j4g==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-babel: 7.26.11
     transitivePeerDependencies:
       - '@glint/template'
@@ -7370,7 +7371,7 @@ packages:
       ember-source: ^4.0.0
     dependencies:
       '@babel/core': 7.24.0
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@glimmer/tracking': 1.1.2
       ember-cli-babel: 8.2.0(@babel/core@7.24.0)
       ember-cli-htmlbars: 6.3.0
@@ -7437,7 +7438,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.23.6
       '@embroider/addon-shim': 1.8.7
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@glimmer/component': 1.1.2(@babel/core@7.24.0)
       '@glimmer/tracking': 1.1.2
       ember-resources: 6.4.2(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.2.2)(ember-concurrency@3.1.1)(ember-source@5.6.0)
@@ -7466,7 +7467,7 @@ packages:
     dependencies:
       '@ember/test-helpers': 3.3.0(@glint/template@1.2.2)(ember-source@5.6.0)(webpack@5.90.3)
       '@embroider/addon-shim': 1.8.7
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-test-loader: 3.1.0
       ember-source: 5.6.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.2.2)(rsvp@4.8.5)(webpack@5.90.3)
       qunit: 2.20.1
@@ -7509,7 +7510,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.23.6
       '@embroider/addon-shim': 1.8.7
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       '@glimmer/component': 1.1.2(@babel/core@7.24.0)
       '@glimmer/tracking': 1.1.2
       '@glint/template': 1.2.2
@@ -7541,7 +7542,7 @@ packages:
     dependencies:
       '@apollo/client': 3.8.8(graphql@16.8.1)
       '@babel/core': 7.24.0
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       base64-js: 1.5.1
       ember-auto-import: 2.7.2(@glint/template@1.2.2)(webpack@5.90.3)
       ember-cli-babel: 8.2.0(@babel/core@7.24.0)
@@ -7576,7 +7577,7 @@ packages:
       '@ember/test-helpers': 3.3.0(@glint/template@1.2.2)(ember-source@5.6.0)(webpack@5.90.3)
       '@ember/test-waiters': 3.1.0
       '@embroider/addon-shim': 1.8.7
-      '@embroider/macros': 1.14.0(@glint/template@1.2.2)
+      '@embroider/macros': 1.15.0(@glint/template@1.2.2)
       ember-cli-is-package-missing: 1.0.0
       ember-cookies: 1.1.1
       silent-error: 1.1.1