From e0d63c0dfce64d07ddbdbd84822046f523796df7 Mon Sep 17 00:00:00 2001
From: Robert Helmer <rhelmer@rhelmer.org>
Date: Mon, 14 Jun 2021 11:53:30 -0700
Subject: [PATCH 1/2] Pre-format manifest.json in a way AMO is happy with.

https://github.com/mozilla/addons-server/issues/17302 broke our privileged signature, the AMO team is working on a fix
but this is a workaround.
---
 manifest.json | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/manifest.json b/manifest.json
index e3bc0a7e..1aa69d95 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,19 +5,16 @@
   "name": "Mozilla Rally",
   "version": "1.3.2",
   "homepage_url": "https://github.com/mozilla-rally/rally-core-addon",
-
   "icons": {
     "48": "public/img/rally-favicon.svg",
     "96": "public/img/rally-favicon.svg"
   },
-
   "applications": {
     "gecko": {
       "id": "rally-core@mozilla.org",
       "strict_min_version": "80.0a1"
     }
   },
-
   "permissions": [
     "management",
     "telemetry",
@@ -25,7 +22,6 @@
     "https://firefox.settings.services.mozilla.com/",
     "https://incoming.telemetry.mozilla.org/"
   ],
-
   "telemetry": {
     "pioneer_id": true,
     "study_name": "rally-core",
@@ -41,37 +37,44 @@
       }
     }
   },
-
   "background": {
-    "scripts": ["public/addon-build/background.js"]
+    "scripts": [
+      "public/addon-build/background.js"
+    ]
   },
-
   "content_scripts": [
     {
-      "matches": ["https://rally.mozilla.org/*"],
-      "js": ["public/addon-build/content-script.js"]
+      "matches": [
+        "https://rally.mozilla.org/*"
+      ],
+      "js": [
+        "public/addon-build/content-script.js"
+      ]
     }
   ],
-
   "browser_action": {
     "browser_style": true,
     "default_icon": "public/img/rally-toolbar-icon.svg"
   },
-
   "options_ui": {
     "page": "public/index.html",
     "open_in_tab": true
   },
-
   "experiment_apis": {
     "firefoxPrivilegedApi": {
       "schema": "core-addon/FirefoxPrivilegedApi.schema.json",
       "parent": {
-        "scopes": ["addon_parent"],
+        "scopes": [
+          "addon_parent"
+        ],
         "script": "core-addon/FirefoxPrivilegedApi.js",
         "events": [],
-        "paths": [["firefoxPrivilegedApi"]]
+        "paths": [
+          [
+            "firefoxPrivilegedApi"
+          ]
+        ]
       }
     }
   }
-}
+}
\ No newline at end of file

From d2b8c85525d1824c0b8b8e293d248c3433aefeef Mon Sep 17 00:00:00 2001
From: Robert Helmer <rhelmer@rhelmer.org>
Date: Mon, 14 Jun 2021 11:55:14 -0700
Subject: [PATCH 2/2] add changelog entry for 656

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42846422..048189a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 [Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.3.2...master)
 
+* [#656](https://github.com/mozilla-rally/rally-core-addon/pull/656): Pre-format manifest.json in a way AMO likes, to work around AMO bug.
 * [#653](https://github.com/mozilla-rally/rally-core-addon/pull/653): Bump rally.js version to 0.7.0
 * [#651](https://github.com/mozilla-rally/rally-core-addon/pull/651): Pass Rally ID during core-check response, for use by glean in studies.