From 1b3d124a4ec48abf429a06428f9a9e85fbcbb418 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 1 Dec 2021 22:04:56 +0100
Subject: [PATCH] DEV: Don't use `?.` in bootstrap-json (#15162)

That code is not transpiled, so it doesn't work on older node versions.
---
 .../discourse/lib/bootstrap-json/index.js        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js
index 1a31ad5f9f0..cb38fbc67c4 100644
--- a/app/assets/javascripts/discourse/lib/bootstrap-json/index.js
+++ b/app/assets/javascripts/discourse/lib/bootstrap-json/index.js
@@ -171,8 +171,13 @@ function replaceIn(bootstrap, template, id, headers, baseURL) {
 
 function extractPreloadJson(html) {
   const dom = new JSDOM(html);
-  return dom.window.document.querySelector("#data-preloaded")?.dataset
-    ?.preloaded;
+  const dataElement = dom.window.document.querySelector("#data-preloaded");
+
+  if (!dataElement || !dataElement.dataset) {
+    return;
+  }
+
+  return dataElement.dataset.preloaded;
 }
 
 async function applyBootstrap(bootstrap, template, response, baseURL, preload) {
@@ -264,17 +269,16 @@ async function handleRequest(proxy, baseURL, req, res) {
     res.set("content-security-policy", newCSP);
   }
 
-  const isHTML = response.headers.get("content-type")?.startsWith("text/html");
+  const contentType = response.headers.get("content-type");
   const responseText = await response.text();
-  const preload = isHTML ? extractPreloadJson(responseText) : null;
 
-  if (preload) {
+  if (contentType && contentType.startsWith("text/html")) {
     const html = await buildFromBootstrap(
       proxy,
       baseURL,
       req,
       response,
-      preload
+      extractPreloadJson(responseText)
     );
     res.set("content-type", "text/html");
     res.send(html);