diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json
index 7ec92c35855..c132a0a0198 100644
--- a/app/assets/javascripts/admin/package.json
+++ b/app/assets/javascripts/admin/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.75.0",
diff --git a/app/assets/javascripts/dialog-holder/package.json b/app/assets/javascripts/dialog-holder/package.json
index d441078497a..91add909f9e 100644
--- a/app/assets/javascripts/dialog-holder/package.json
+++ b/app/assets/javascripts/dialog-holder/package.json
@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "a11y-dialog": "7.5.2",
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1"
   },
diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json
index 8794f22ed9c..fb488a24d57 100644
--- a/app/assets/javascripts/discourse-common/package.json
+++ b/app/assets/javascripts/discourse-common/package.json
@@ -21,7 +21,7 @@
     "@uppy/drop-target": "^1.1.3",
     "@uppy/utils": "^4.1.0",
     "@uppy/xhr-upload": "^2.1.2",
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "ember-resolver": "^8.0.3",
diff --git a/app/assets/javascripts/discourse-hbr/package.json b/app/assets/javascripts/discourse-hbr/package.json
index 884b793931c..184c4636d14 100644
--- a/app/assets/javascripts/discourse-hbr/package.json
+++ b/app/assets/javascripts/discourse-hbr/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "handlebars": "^4.7.6",
diff --git a/app/assets/javascripts/discourse-plugins/package.json b/app/assets/javascripts/discourse-plugins/package.json
index ca5b70a81bb..ea47a2bb11c 100644
--- a/app/assets/javascripts/discourse-plugins/package.json
+++ b/app/assets/javascripts/discourse-plugins/package.json
@@ -10,7 +10,7 @@
   "repository": "",
   "dependencies": {
     "discourse-widget-hbs": "1.0.0",
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli": "~3.28.5",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json
index a7c9d6b4488..f4b6d1127cb 100644
--- a/app/assets/javascripts/discourse-widget-hbs/package.json
+++ b/app/assets/javascripts/discourse-widget-hbs/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "handlebars": "^4.7.6",
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 0e832b9d950..505fe5f76a0 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -49,7 +49,7 @@
     "discourse-hbr": "1.0.0",
     "discourse-plugins": "1.0.0",
     "discourse-widget-hbs": "1.0.0",
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-auto-import-chunks-json-generator": "^1.0.0",
     "ember-buffered-proxy": "^2.1.1",
     "ember-cached-decorator-polyfill": "^1.0.1",
diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json
index 7306d6ef6e5..bfaf1c6bab9 100644
--- a/app/assets/javascripts/pretty-text/package.json
+++ b/app/assets/javascripts/pretty-text/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.75.0",
diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json
index 65ec952dc62..d720287f273 100644
--- a/app/assets/javascripts/select-kit/package.json
+++ b/app/assets/javascripts/select-kit/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.75.0"
diff --git a/app/assets/javascripts/truth-helpers/package.json b/app/assets/javascripts/truth-helpers/package.json
index 2bc29843b25..20655254cd9 100644
--- a/app/assets/javascripts/truth-helpers/package.json
+++ b/app/assets/javascripts/truth-helpers/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.75.0"
diff --git a/app/assets/javascripts/wizard/package.json b/app/assets/javascripts/wizard/package.json
index ef995c09d73..7712f0fbeae 100644
--- a/app/assets/javascripts/wizard/package.json
+++ b/app/assets/javascripts/wizard/package.json
@@ -15,7 +15,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "ember-auto-import": "^2.4.3",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.1.1",
     "webpack": "^5.75.0",
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index 859fe1a0e82..44bc525a340 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -1122,7 +1122,7 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/shared-internals@1.8.3", "@embroider/shared-internals@^1.0.0", "@embroider/shared-internals@^1.8.3":
+"@embroider/shared-internals@1.8.3", "@embroider/shared-internals@^1.8.3":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.8.3.tgz#52d868dc80016e9fe983552c0e516f437bf9b9f9"
   integrity sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w==
@@ -1136,6 +1136,20 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
+"@embroider/shared-internals@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316"
+  integrity sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==
+  dependencies:
+    babel-import-util "^1.1.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
 "@embroider/test-setup@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-2.0.1.tgz#57f4e338310a49206671a588f955286568505966"
@@ -3680,17 +3694,17 @@ ember-auto-import-chunks-json-generator@^1.0.0:
     ember-cli-babel "^7.26.6"
     ember-cli-htmlbars "^5.7.1"
 
-ember-auto-import@^2.2.3, ember-auto-import@^2.4.2, ember-auto-import@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.3.tgz#0ff8ebe37a2016dbad2ccc10c0ef2dfbd0289b55"
-  integrity sha512-yqtXDixgtBgaNIiz3DIIjJgpPoV5/UWBnsYIR/IxwDYpsGswyRWQ4D+IamkCDtaGDkZ7dNE9QZDBOrJCAG6KNA==
+ember-auto-import@^2.2.3, ember-auto-import@^2.4.2, ember-auto-import@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.5.0.tgz#627607648e87d154f75cd3f70c435355ef7cced9"
+  integrity sha512-fKERUmpZLn4RJiCwTjS7D5zJxgnbF4E6GiSp1GYh53K96S+5UBs06r7ScDI52rq34z0+qdSrA6qiDJ3i/lWqKg==
   dependencies:
     "@babel/core" "^7.16.7"
     "@babel/plugin-proposal-class-properties" "^7.16.7"
     "@babel/plugin-proposal-decorators" "^7.16.7"
     "@babel/preset-env" "^7.16.7"
     "@embroider/macros" "^1.0.0"
-    "@embroider/shared-internals" "^1.0.0"
+    "@embroider/shared-internals" "^2.0.0"
     babel-loader "^8.0.6"
     babel-plugin-ember-modules-api-polyfill "^3.5.0"
     babel-plugin-htmlbars-inline-precompile "^5.2.1"