From 3c1e3dc18ecfc85a410ac6818ba8f6e37157f7a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2019 18:29:17 +0000
Subject: [PATCH 1/2] Bump serialize-javascript from 1.9.1 to 2.1.1

Bumps [serialize-javascript](https://github.com/yahoo/serialize-javascript) from 1.9.1 to 2.1.1.
- [Release notes](https://github.com/yahoo/serialize-javascript/releases)
- [Commits](https://github.com/yahoo/serialize-javascript/compare/v1.9.1...v2.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 9ad39c4de6c..dbc6e492bb1 100644
--- a/package.json
+++ b/package.json
@@ -277,7 +277,7 @@
     "redux-saga": "0.16.2",
     "regenerator-runtime": "0.13.3",
     "response-time": "2.3.2",
-    "serialize-javascript": "1.9.1",
+    "serialize-javascript": "2.1.1",
     "touch": "3.1.0",
     "ua-parser-js": "0.7.20",
     "universal-cookie-express": "4.0.1",
diff --git a/yarn.lock b/yarn.lock
index 4516071f66c..6af526be9a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13408,16 +13408,16 @@ send@^0.16.1:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-serialize-javascript@1.9.1, serialize-javascript@^1.7.0:
+serialize-javascript@2.1.1, serialize-javascript@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.1.tgz#952907a04a3e3a75af7f73d92d15e233862048b2"
+  integrity sha512-MPLPRpD4FNqWq9tTIjYG5LesFouDhdyH0EPY3gVK4DRD5+g4aDqdNSzLIwceulo3Yj+PL1bPh6laE5+H6LTcrQ==
+
+serialize-javascript@^1.7.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
   integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
 
-serialize-javascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
-  integrity sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==
-
 serve-favicon@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"

From 5b108679f52acfe12b7f9818b8b0b1c936ab5373 Mon Sep 17 00:00:00 2001
From: William Durand <will+git@drnd.me>
Date: Tue, 10 Dec 2019 14:51:54 +0100
Subject: [PATCH 2/2] mark serialized content as json

---
 src/amo/components/AddonHead/index.js   | 4 +++-
 src/core/components/ServerHtml/index.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/amo/components/AddonHead/index.js b/src/amo/components/AddonHead/index.js
index 26dcb7d2c65..6530b35b15d 100644
--- a/src/amo/components/AddonHead/index.js
+++ b/src/amo/components/AddonHead/index.js
@@ -160,7 +160,9 @@ export class AddonHeadBase extends React.Component<InternalProps> {
           <title>{this.getPageTitle()}</title>
 
           <script type="application/ld+json">
-            {serialize(_getAddonJsonLinkedData({ addon, currentVersion }))}
+            {serialize(_getAddonJsonLinkedData({ addon, currentVersion }), {
+              isJSON: true,
+            })}
           </script>
         </Helmet>
 
diff --git a/src/core/components/ServerHtml/index.js b/src/core/components/ServerHtml/index.js
index b3180804d37..38d95980567 100644
--- a/src/core/components/ServerHtml/index.js
+++ b/src/core/components/ServerHtml/index.js
@@ -228,7 +228,9 @@ export default class ServerHtml extends Component {
           <div id="react-view" dangerouslySetInnerHTML={{ __html: content }} />
 
           <script
-            dangerouslySetInnerHTML={{ __html: serialize(appState) }}
+            dangerouslySetInnerHTML={{
+              __html: serialize(appState, { isJSON: true }),
+            }}
             type="application/json"
             id="redux-store-state"
           />