diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index a0b9ffd534a..686dc7488c0 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -48,7 +48,7 @@
     "@ember/test-helpers": "^4.0.4",
     "@ember/test-waiters": "^3.1.0",
     "@embroider/compat": "^3.6.1",
-    "@embroider/core": "^3.4.15",
+    "@embroider/core": "^3.4.16",
     "@embroider/macros": "^1.13.1",
     "@embroider/router": "^2.1.8",
     "@embroider/webpack": "^4.0.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7bfd4adc89b..979bf1226e2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -154,7 +154,7 @@ importers:
         version: 2.1.0
       '@embroider/test-setup':
         specifier: ^4.0.0
-        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
+        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
       '@glimmer/component':
         specifier: ^1.1.2
         version: 1.1.2(@babel/core@7.25.2)
@@ -356,19 +356,19 @@ importers:
         version: 3.1.0
       '@embroider/compat':
         specifier: ^3.6.1
-        version: 3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c)
+        version: 3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c)
       '@embroider/core':
-        specifier: ^3.4.15
-        version: 3.4.15(@glint/template@1.4.1-unstable.ff9ea6c)
+        specifier: ^3.4.16
+        version: 3.4.16(@glint/template@1.4.1-unstable.ff9ea6c)
       '@embroider/macros':
         specifier: ^1.13.1
         version: 1.16.6(@glint/template@1.4.1-unstable.ff9ea6c)
       '@embroider/router':
         specifier: ^2.1.8
-        version: 2.1.8(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))
+        version: 2.1.8(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))
       '@embroider/webpack':
         specifier: ^4.0.5
-        version: 4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
+        version: 4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
       '@floating-ui/dom':
         specifier: ^1.6.11
         version: 1.6.11
@@ -651,7 +651,7 @@ importers:
         version: 2.1.0
       '@embroider/test-setup':
         specifier: ^4.0.0
-        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
+        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
       '@glimmer/component':
         specifier: ^1.1.2
         version: 1.1.2(@babel/core@7.25.2)
@@ -797,7 +797,7 @@ importers:
         version: 2.1.0
       '@embroider/test-setup':
         specifier: ^4.0.0
-        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
+        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
       '@glimmer/component':
         specifier: ^1.1.2
         version: 1.1.2(@babel/core@7.25.2)
@@ -871,7 +871,7 @@ importers:
         version: 2.1.0
       '@embroider/test-setup':
         specifier: ^4.0.0
-        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
+        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
       '@glimmer/component':
         specifier: ^1.1.2
         version: 1.1.2(@babel/core@7.25.2)
@@ -950,7 +950,7 @@ importers:
         version: 2.1.0
       '@embroider/test-setup':
         specifier: ^4.0.0
-        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
+        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
       '@glimmer/component':
         specifier: ^1.1.2
         version: 1.1.2(@babel/core@7.25.2)
@@ -1029,7 +1029,7 @@ importers:
         version: 2.1.0
       '@embroider/test-setup':
         specifier: ^4.0.0
-        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
+        version: 4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))
       '@glimmer/component':
         specifier: ^1.1.2
         version: 1.1.2(@babel/core@7.25.2)
@@ -1908,8 +1908,8 @@ packages:
     peerDependencies:
       '@embroider/core': ^3.4.15
 
-  '@embroider/core@3.4.15':
-    resolution: {integrity: sha512-aVG+3eU5IWJYw8yP+o6vinG9vvzEzB/YpoVm1fr5T5E30BtbF0cU5jYYn3ItSLNiE1Q1mnG9ebjIhy5VVFiu1Q==}
+  '@embroider/core@3.4.16':
+    resolution: {integrity: sha512-M/Kk5PSi9GcdCFYFNiQLXY4Wz2Lw2nFe78lbfta0ntsM7xp/lig/mBRYAAwu/Vj4SgP3vUV8P2EFMBvGaE7qzg==}
     engines: {node: 12.* || 14.* || >= 16}
 
   '@embroider/hbs-loader@3.0.3':
@@ -10200,16 +10200,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/babel-loader-9@3.1.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(supports-color@8.1.1)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))':
+  '@embroider/babel-loader-9@3.1.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(supports-color@8.1.1)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))':
     dependencies:
       '@babel/core': 7.25.2(supports-color@8.1.1)
-      '@embroider/core': 3.4.15(@glint/template@1.4.1-unstable.ff9ea6c)
+      '@embroider/core': 3.4.16(@glint/template@1.4.1-unstable.ff9ea6c)
       babel-loader: 9.1.3(@babel/core@7.25.2(supports-color@8.1.1))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
     transitivePeerDependencies:
       - supports-color
       - webpack
 
-  '@embroider/compat@3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c)':
+  '@embroider/compat@3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c)':
     dependencies:
       '@babel/code-frame': 7.24.7
       '@babel/core': 7.25.2
@@ -10219,7 +10219,7 @@ snapshots:
       '@babel/preset-env': 7.25.3(@babel/core@7.25.2)
       '@babel/runtime': 7.24.4
       '@babel/traverse': 7.25.6(supports-color@8.1.1)
-      '@embroider/core': 3.4.15(@glint/template@1.4.1-unstable.ff9ea6c)
+      '@embroider/core': 3.4.16(@glint/template@1.4.1-unstable.ff9ea6c)
       '@embroider/macros': 1.16.6(@glint/template@1.4.1-unstable.ff9ea6c)
       '@types/babel__code-frame': 7.0.6
       '@types/yargs': 17.0.33
@@ -10261,7 +10261,7 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c)':
+  '@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c)':
     dependencies:
       '@babel/core': 7.25.2
       '@babel/parser': 7.25.6
@@ -10274,7 +10274,7 @@ snapshots:
       broccoli-persistent-filter: 3.1.3
       broccoli-plugin: 4.0.7
       broccoli-source: 3.0.1
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       fast-sourcemap-concat: 2.1.1
       filesize: 10.1.4
       fs-extra: 9.1.0
@@ -10285,6 +10285,7 @@ snapshots:
       lodash: 4.17.21
       resolve: 1.22.8
       resolve-package-path: 4.0.3
+      semver: 7.6.3
       typescript-memoize: 1.1.1
       walk-sync: 3.0.0
     transitivePeerDependencies:
@@ -10294,9 +10295,9 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@embroider/hbs-loader@3.0.3(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))':
+  '@embroider/hbs-loader@3.0.3(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))':
     dependencies:
-      '@embroider/core': 3.4.15(@glint/template@1.4.1-unstable.ff9ea6c)
+      '@embroider/core': 3.4.16(@glint/template@1.4.1-unstable.ff9ea6c)
       webpack: 5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)
 
   '@embroider/macros@1.16.6(@glint/template@1.4.1-unstable.ff9ea6c)':
@@ -10314,12 +10315,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/router@2.1.8(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))':
+  '@embroider/router@2.1.8(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))':
     dependencies:
       '@ember/test-waiters': 3.1.0
       '@embroider/addon-shim': 1.8.9
     optionalDependencies:
-      '@embroider/core': 3.4.15(@glint/template@1.4.1-unstable.ff9ea6c)
+      '@embroider/core': 3.4.16(@glint/template@1.4.1-unstable.ff9ea6c)
     transitivePeerDependencies:
       - supports-color
 
@@ -10338,22 +10339,22 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@embroider/test-setup@4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))':
+  '@embroider/test-setup@4.0.0(@embroider/compat@3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@embroider/webpack@4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)))':
     dependencies:
       lodash: 4.17.21
       resolve: 1.22.8
     optionalDependencies:
-      '@embroider/compat': 3.6.1(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c)
-      '@embroider/core': 3.4.15(@glint/template@1.4.1-unstable.ff9ea6c)
-      '@embroider/webpack': 4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
+      '@embroider/compat': 3.6.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(@glint/template@1.4.1-unstable.ff9ea6c)
+      '@embroider/core': 3.4.16(@glint/template@1.4.1-unstable.ff9ea6c)
+      '@embroider/webpack': 4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
 
-  '@embroider/webpack@4.0.5(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))':
+  '@embroider/webpack@4.0.5(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))':
     dependencies:
       '@babel/core': 7.25.2(supports-color@8.1.1)
       '@babel/preset-env': 7.25.3(@babel/core@7.25.2(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.4.1-unstable.ff9ea6c))(supports-color@8.1.1)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
-      '@embroider/core': 3.4.15(@glint/template@1.4.1-unstable.ff9ea6c)
-      '@embroider/hbs-loader': 3.0.3(@embroider/core@3.4.15(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
+      '@embroider/babel-loader-9': 3.1.1(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(supports-color@8.1.1)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
+      '@embroider/core': 3.4.16(@glint/template@1.4.1-unstable.ff9ea6c)
+      '@embroider/hbs-loader': 3.0.3(@embroider/core@3.4.16(@glint/template@1.4.1-unstable.ff9ea6c))(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))
       '@embroider/shared-internals': 2.6.3(supports-color@8.1.1)
       '@types/supports-color': 8.1.3
       assert-never: 1.3.0