03b7d71827
Under ember-cli, we rely on the `ember-export-application-global` addon to make `window.Discourse` available. This happens in an initializer. Previously this inititalizer would run after `auto-load-modules`, and so any widget/helper modules would not be able to access it. This commit sets some `after` parameters on the `auto-load-modules` and `inject-objects` initializers to ensure that `export-application-global` is run first.
42 lines
1.4 KiB
JavaScript
42 lines
1.4 KiB
JavaScript
import {
|
|
createHelperContext,
|
|
registerHelpers,
|
|
} from "discourse-common/lib/helpers";
|
|
import Handlebars from "handlebars";
|
|
import RawHandlebars from "discourse-common/lib/raw-handlebars";
|
|
import { registerRawHelpers } from "discourse-common/lib/raw-handlebars-helpers";
|
|
import { setOwner } from "@ember/application";
|
|
|
|
export function autoLoadModules(container, registry) {
|
|
Object.keys(requirejs.entries).forEach((entry) => {
|
|
if (/\/helpers\//.test(entry) && !/-test/.test(entry)) {
|
|
requirejs(entry, null, null, true);
|
|
}
|
|
if (/\/widgets\//.test(entry) && !/-test/.test(entry)) {
|
|
requirejs(entry, null, null, true);
|
|
}
|
|
});
|
|
|
|
let context = {
|
|
siteSettings: container.lookup("site-settings:main"),
|
|
keyValueStore: container.lookup("key-value-store:main"),
|
|
capabilities: container.lookup("capabilities:main"),
|
|
currentUser: container.lookup("current-user:main"),
|
|
site: container.lookup("site:main"),
|
|
session: container.lookup("session:main"),
|
|
topicTrackingState: container.lookup("topic-tracking-state:main"),
|
|
registry,
|
|
};
|
|
setOwner(context, container);
|
|
|
|
createHelperContext(context);
|
|
registerHelpers(registry);
|
|
registerRawHelpers(RawHandlebars, Handlebars);
|
|
}
|
|
|
|
export default {
|
|
name: "auto-load-modules",
|
|
after: "inject-objects",
|
|
initialize: (container) => autoLoadModules(container, container.registry),
|
|
};
|