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: Ensure ember-cli does not attempt to bootstrap non-ember pages (#15168)

Browse Source 
1b3d124a introduced a logic change which meant that we attempted to bootstrap, even on pages without any `preloadJson` (i.e. non-ember HTML pages from Discourse). This commit restores the original logic, making sure to avoid `?.`.
This commit is contained in:
David Taylor 2021-12-02 10:58:54 +00:00 committed by GitHub
parent 44d16fcd8e
commit ceca34aca6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/bootstrap-json/index.js
View File

@ -270,9 +270,11 @@ async function handleRequest(proxy, baseURL, req, res) {
} }
const contentType = response.headers.get("content-type"); const contentType = response.headers.get("content-type");
const isHTML = contentType && contentType.startsWith("text/html");
const responseText = await response.text(); const responseText = await response.text();
const preloadJson = isHTML ? extractPreloadJson(responseText) : null;
if (contentType && contentType.startsWith("text/html")) { if (preloadJson) {
const html = await buildFromBootstrap( const html = await buildFromBootstrap(
proxy, proxy,
baseURL, baseURL,