IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Run implicit-injections shim earlier in boot

Browse Source 
We need these Ember framework class overrides to be applied before anything attempts to extend them. An initializer is too late, because initializer files may `import` a module which defines classes which extend the framework classes.

In the past this rarely mattered because Ember's legacy `SomeObject.extend` is quite forgiving - it will respect changes made to `SomeObject` right up until the first `.create()` call. However, the native class syntax (`class extends SomeObject`) will 'freeze' `SomeObject` as soon as the class is defined.
This commit is contained in:
David Taylor 2023-08-02 20:23:54 +01:00
parent fbabea5c76
commit 5aaf5cbaf4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/app.js
View File

@ -5,6 +5,7 @@ import Application from "@ember/application";
import { buildResolver } from "discourse-common/resolver"; import { buildResolver } from "discourse-common/resolver";
import { isTesting } from "discourse-common/config/environment"; import { isTesting } from "discourse-common/config/environment";
import { normalizeEmberEventHandling } from "./lib/ember-events"; import { normalizeEmberEventHandling } from "./lib/ember-events";
import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections";
const _pluginCallbacks = []; const _pluginCallbacks = [];
let _unhandledThemeErrors = []; let _unhandledThemeErrors = [];
@ -28,6 +29,9 @@ const Discourse = Application.extend({
// between Glimmer and Classic components. // between Glimmer and Classic components.
normalizeEmberEventHandling(this); normalizeEmberEventHandling(this);
// Register Discourse's standard implicit injections on common framework classes.
registerDiscourseImplicitInjections();
if (Error.stackTraceLimit) { if (Error.stackTraceLimit) {
// We need Errors to have full stack traces for `lib/source-identifier` // We need Errors to have full stack traces for `lib/source-identifier`
Error.stackTraceLimit = Infinity; Error.stackTraceLimit = Infinity;

4
app/assets/javascripts/discourse/app/initializers/inject-discourse-objects.js
View File

@ -6,8 +6,6 @@ import Session from "discourse/models/session";
import Site from "discourse/models/site"; import Site from "discourse/models/site";
import User from "discourse/models/user"; import User from "discourse/models/user";
import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections";
export default { export default {
after: "discourse-bootstrap", after: "discourse-bootstrap",
@ -38,8 +36,6 @@ export default {
app.register("location:discourse-location", DiscourseLocation); app.register("location:discourse-location", DiscourseLocation);
registerDiscourseImplicitInjections();
startTracking(this.topicTrackingState); startTracking(this.topicTrackingState);
}, },