From 08b0c2f0385090d9e7d5e82c4217413d219fe6f8 Mon Sep 17 00:00:00 2001
From: Jude Agboola <marvinjudehk@gmail.com>
Date: Tue, 19 Jul 2022 15:43:28 +0100
Subject: [PATCH 1/6] prevent escaping textContent for <script> data blocks

---
 .../head/head-export-handler-for-ssr.js       | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
index 2003321cf71cb..975537e819057 100644
--- a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
+++ b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
@@ -62,14 +62,28 @@ export function headHandlerForSSR({
       if (!VALID_NODE_NAMES.includes(rawTagName)) {
         warnForInvalidTags(rawTagName)
       } else {
-        const element = createElement(
-          rawTagName,
-          {
-            ...attributes,
-            "data-gatsby-head": true,
-          },
-          node.childNodes[0]?.textContent
-        )
+        let element
+        // Special hadling for script with data blocks to prevent react from escaping the text
+        if (
+          rawTagName === `script` &&
+          attributes.type === `application/ld+json`
+        ) {
+          element = (
+            <script
+              type="application/ld+json"
+              dangerouslySetInnerHTML={{
+                __html: node.text,
+              }}
+            />
+          )
+        } else {
+          element = (
+            <node.rawTagName {...attributes}>
+              {node.childNodes[0]?.textContent}
+            </node.rawTagName>
+          )
+        }
+
         if (id) {
           if (!seenIds.has(id)) {
             validHeadNodes.push(element)

From 94903e633ce3e0b42339db15663d99c035bc6b51 Mon Sep 17 00:00:00 2001
From: Jude Agboola <marvinjudehk@gmail.com>
Date: Tue, 19 Jul 2022 15:51:40 +0100
Subject: [PATCH 2/6] fix typo

---
 packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
index 975537e819057..082f594b56831 100644
--- a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
+++ b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
@@ -63,7 +63,7 @@ export function headHandlerForSSR({
         warnForInvalidTags(rawTagName)
       } else {
         let element
-        // Special hadling for script with data blocks to prevent react from escaping the text
+        // Special handling for script with data blocks to prevent react from escaping the text
         if (
           rawTagName === `script` &&
           attributes.type === `application/ld+json`

From 9365f339766310293d0ea6bffef4c0e847997c6c Mon Sep 17 00:00:00 2001
From: Jude Agboola <marvinjudehk@gmail.com>
Date: Tue, 19 Jul 2022 15:53:49 +0100
Subject: [PATCH 3/6] touch up

---
 packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
index 082f594b56831..03f29101576b0 100644
--- a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
+++ b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
@@ -63,14 +63,14 @@ export function headHandlerForSSR({
         warnForInvalidTags(rawTagName)
       } else {
         let element
-        // Special handling for script with data blocks to prevent react from escaping the text
+        // Special handling for scripts with data block to prevent React from escaping the text
         if (
           rawTagName === `script` &&
           attributes.type === `application/ld+json`
         ) {
           element = (
             <script
-              type="application/ld+json"
+              type={attributes.type}
               dangerouslySetInnerHTML={{
                 __html: node.text,
               }}

From a315e1025a9e7f38de6c81684ae4ae83492b5e5b Mon Sep 17 00:00:00 2001
From: Jude Agboola <marvinjudehk@gmail.com>
Date: Tue, 19 Jul 2022 17:23:46 +0100
Subject: [PATCH 4/6] spread attributes

---
 packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
index 03f29101576b0..88b047701ca39 100644
--- a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
+++ b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
@@ -70,7 +70,7 @@ export function headHandlerForSSR({
         ) {
           element = (
             <script
-              type={attributes.type}
+              {...attributes}
               dangerouslySetInnerHTML={{
                 __html: node.text,
               }}

From 6649b96aebbffb57e84f325b8f3db2b67ffd62b0 Mon Sep 17 00:00:00 2001
From: Jude Agboola <marvinjudehk@gmail.com>
Date: Wed, 20 Jul 2022 08:56:38 +0100
Subject: [PATCH 5/6] add gatsby-head attribute

---
 packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
index 88b047701ca39..775ecd9f93e35 100644
--- a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
+++ b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
@@ -63,7 +63,7 @@ export function headHandlerForSSR({
         warnForInvalidTags(rawTagName)
       } else {
         let element
-        // Special handling for scripts with data block to prevent React from escaping the text
+        const attributes = { ...attributes, "data-gatsby-head": true }
         if (
           rawTagName === `script` &&
           attributes.type === `application/ld+json`

From 0e095e30684efe4f52aabae92baaae60d32ee85d Mon Sep 17 00:00:00 2001
From: Jude Agboola <marvinjudehk@gmail.com>
Date: Wed, 20 Jul 2022 09:22:43 +0100
Subject: [PATCH 6/6] unescape for all script tags

---
 .../cache-dir/head/head-export-handler-for-ssr.js     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
index 775ecd9f93e35..88c837f7e6d61 100644
--- a/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
+++ b/packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
@@ -56,18 +56,15 @@ export function headHandlerForSSR({
 
     const seenIds = new Map()
     for (const node of headNodes) {
-      const { rawTagName, attributes } = node
-      const id = attributes.id
+      const { rawTagName } = node
+      const id = node.attributes.id
 
       if (!VALID_NODE_NAMES.includes(rawTagName)) {
         warnForInvalidTags(rawTagName)
       } else {
         let element
-        const attributes = { ...attributes, "data-gatsby-head": true }
-        if (
-          rawTagName === `script` &&
-          attributes.type === `application/ld+json`
-        ) {
+        const attributes = { ...node.attributes, "data-gatsby-head": true }
+        if (rawTagName === `script`) {
           element = (
             <script
               {...attributes}