Fix Opera Mini SIMORGH_DATA object error (#11378)

bbc · Mar 6, 2024 · 12fef2d · 12fef2d
1 parent 1259bab
commit 12fef2d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/server/Document/__snapshots__/component.test.jsx.snap b/src/server/Document/__snapshots__/component.test.jsx.snap
@@ -116,6 +116,9 @@ exports[`Document Component should render APP version correctly 1`] = `
         App!
       </h1>
     </div>
+    <script>
+      window.SIMORGH_DATA={"test":"data"}
+    </script>
     <link
       href="modern.main.js"
       rel="modulePreload"
@@ -152,9 +155,6 @@ exports[`Document Component should render APP version correctly 1`] = `
     <div>
       <!--&lt;![endif]-->
     </div>
-    <script>
-      window.SIMORGH_DATA={"test":"data"}
-    </script>
     <script
       type="text/javascript"
     >
@@ -204,6 +204,9 @@ exports[`Document Component should render correctly 1`] = `
         App!
       </h1>
     </div>
+    <script>
+      window.SIMORGH_DATA={"test":"data"}
+    </script>
     <link
       href="modern.main.js"
       rel="modulePreload"
@@ -240,9 +243,6 @@ exports[`Document Component should render correctly 1`] = `
     <div>
       <!--&lt;![endif]-->
     </div>
-    <script>
-      window.SIMORGH_DATA={"test":"data"}
-    </script>
     <script
       type="text/javascript"
     >

diff --git a/src/server/Document/component.jsx b/src/server/Document/component.jsx
@@ -99,22 +99,22 @@ const Document = ({
       </head>
       <body {...ampGeoPendingAttrs}>
         <div id="root" dangerouslySetInnerHTML={{ __html: html }} />
+        {scriptsAllowed && (
+          <script
+            dangerouslySetInnerHTML={{
+              __html: `window.SIMORGH_DATA=${serialisedData}`,
+            }}
+          />
+        )}
         {!isAmp && links}
+        {scriptsAllowed && scriptTags}
         {scriptsAllowed && (
-          <>
-            {scriptTags}
-            <script
-              dangerouslySetInnerHTML={{
-                __html: `window.SIMORGH_DATA=${serialisedData}`,
-              }}
-            />
-            <script
-              type="text/javascript"
-              dangerouslySetInnerHTML={{
-                __html: `document.documentElement.classList.remove("no-js");`,
-              }}
-            />
-          </>
+          <script
+            type="text/javascript"
+            dangerouslySetInnerHTML={{
+              __html: `document.documentElement.classList.remove("no-js");`,
+            }}
+          />
         )}
       </body>
     </html>