github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 13:03:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Re-use main app registry for raw HBS view lookups (#15456)

Browse Source 
da6edc1 introduced the `lookupView` method, which initialized a fresh resolver, and used it to directly look up raw-views (with no caching). This worked well, but was not a clean solution. It required initializing an entirely new resolver, and did not have any caching.

This commit updates the `helperContext` to include access to the registry, and uses it to perform raw-view lookups. As well as re-using the registry, this also means we're making use of the resolver's built-in cache.

I haven't been able to measure any noticeable performance impact from this change, but there is certainly less work being done, so it may be beneficial on older devices.

Co-authored-by: Ayke Halder <rr-it@users.noreply.github.com>
This commit is contained in:
David Taylor 2022-01-05 22:22:13 +00:00 committed by GitHub
parent 920236fc78
commit e6ab8f5b71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse-common/addon/resolver.js
View File

@ -169,6 +169,10 @@ export function buildResolver(baseName) {
return this.customResolve(parsedName) || this._super(parsedName);
},
resolveRawView(parsedName) {
return this.customResolve(parsedName) || this._super(parsedName);
},
resolveRoute(parsedName) {
if (parsedName.fullNameWithoutType === "basic") {
return requirejs("discourse/routes/discourse", null, null, true)

16
app/assets/javascripts/discourse/app/helpers/raw.js
View File

@ -2,20 +2,6 @@ import { helperContext, registerUnbound } from "discourse-common/lib/helpers";
import { findRawTemplate } from "discourse-common/lib/raw-templates";
import { htmlSafe } from "@ember/template";
import { RUNTIME_OPTIONS } from "discourse-common/lib/raw-handlebars-helpers";
import { buildResolver } from "discourse-common/resolver";
let resolver;
function lookupView(templateName) {
if (!resolver) {
resolver = buildResolver("discourse").create();
}
return resolver.customResolve({
type: "raw-view",
fullNameWithoutType: templateName,
});
}
function renderRaw(ctx, template, templateName, params) {
params = Object.assign({}, params);
@ -23,7 +9,7 @@ function renderRaw(ctx, template, templateName, params) {
let context = helperContext();
if (!params.view) {
const viewClass = lookupView(templateName);
const viewClass = context.registry.resolve(`raw-view:${templateName}`);
if (viewClass) {
params.view = viewClass.create(params, context);

3
app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
View File

@ -25,6 +25,7 @@ export function autoLoadModules(container, registry) {
site: container.lookup("site:main"),
session: container.lookup("session:main"),
topicTrackingState: container.lookup("topic-tracking-state:main"),
registry,
};
setOwner(context, container);
@ -35,5 +36,5 @@ export function autoLoadModules(container, registry) {
export default {
name: "auto-load-modules",
initialize: autoLoadModules,
initialize: (container) => autoLoadModules(container, container.registry),
};

1
app/assets/javascripts/discourse/tests/setup-tests.js
View File

@ -293,6 +293,7 @@ function setupTestsCommon(application, container, config) {
siteSettings: settings,
capabilities: {},
site,
registry: app.__registry__,
});
PreloadStore.reset();