diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js index 9fb087e08f0..8b8b2ae09cb 100644 --- a/app/assets/javascripts/discourse/app/app.js +++ b/app/assets/javascripts/discourse/app/app.js @@ -5,6 +5,7 @@ import Application from "@ember/application"; import { buildResolver } from "discourse-common/resolver"; import { isTesting } from "discourse-common/config/environment"; import { normalizeEmberEventHandling } from "./lib/ember-events"; +import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections"; const _pluginCallbacks = []; let _unhandledThemeErrors = []; @@ -28,6 +29,9 @@ const Discourse = Application.extend({ // between Glimmer and Classic components. normalizeEmberEventHandling(this); + // Register Discourse's standard implicit injections on common framework classes. + registerDiscourseImplicitInjections(); + if (Error.stackTraceLimit) { // We need Errors to have full stack traces for `lib/source-identifier` Error.stackTraceLimit = Infinity; diff --git a/app/assets/javascripts/discourse/app/initializers/inject-discourse-objects.js b/app/assets/javascripts/discourse/app/initializers/inject-discourse-objects.js index 57955ee03f9..16d0d730cea 100644 --- a/app/assets/javascripts/discourse/app/initializers/inject-discourse-objects.js +++ b/app/assets/javascripts/discourse/app/initializers/inject-discourse-objects.js @@ -6,8 +6,6 @@ import Session from "discourse/models/session"; import Site from "discourse/models/site"; import User from "discourse/models/user"; -import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections"; - export default { after: "discourse-bootstrap", @@ -38,8 +36,6 @@ export default { app.register("location:discourse-location", DiscourseLocation); - registerDiscourseImplicitInjections(); - startTracking(this.topicTrackingState); },