From 744a1e5b024e047b10fe4f95a5f8b9731956a3c0 Mon Sep 17 00:00:00 2001
From: Jasmin Bom <jsmnbom@gmail.com>
Date: Wed, 3 Apr 2019 11:08:39 +0200
Subject: [PATCH 1/2] Updating firefox-webext-browser to v67.0b7

---
 types/firefox-webext-browser/index.d.ts | 27 +++++++++++++++----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/types/firefox-webext-browser/index.d.ts b/types/firefox-webext-browser/index.d.ts
index 77e045fa12..a9575a14d2 100644
--- a/types/firefox-webext-browser/index.d.ts
+++ b/types/firefox-webext-browser/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for non-npm package WebExtension Development in FireFox 65.0
+// Type definitions for non-npm package WebExtension Development in FireFox 67.0
 // Project: https://developer.mozilla.org/en-US/Add-ons/WebExtensions
 // Definitions by: Jasmin Bom <https://github.com/jsmnbom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -112,7 +112,7 @@ declare namespace browser._manifest {
         minimum_chrome_version?: string;
         minimum_opera_version?: string;
         icons?: {
-            [key: number]: string;
+            [key: number]: ExtensionFileUrl;
         };
         incognito?: _WebExtensionManifestIncognito;
         background?: {
@@ -363,6 +363,8 @@ declare namespace browser._manifest {
 
     type ExtensionURL = string;
 
+    type ExtensionFileUrl = string;
+
     type ImageDataOrExtensionURL = string;
 
     type ExtensionID = string;
@@ -414,8 +416,8 @@ declare namespace browser._manifest {
     }
 
     type IconPath = {
-        [key: number]: ExtensionURL;
-    } | ExtensionURL;
+        [key: number]: ExtensionFileUrl;
+    } | ExtensionFileUrl;
 
     type IconImageData = {
         [key: number]: ImageData;
@@ -426,8 +428,7 @@ declare namespace browser._manifest {
     /** @deprecated An unexpected property was found in the WebExtension manifest. */
     type UnrecognizedProperty = any;
 
-    /** @deprecated Event pages are not currently supported. This will run as a persistent background page. */
-    type PersistentBackgroundProperty = boolean;
+    type PersistentBackgroundProperty = _PersistentBackgroundProperty;
 
     /** Represents a native manifest file */
     type NativeManifest = {
@@ -502,6 +503,8 @@ declare namespace browser._manifest {
             sidebar_text?: ThemeColor;
             sidebar_highlight?: ThemeColor;
             sidebar_highlight_text?: ThemeColor;
+            toolbar_field_highlight?: ThemeColor;
+            toolbar_field_highlight_text?: ThemeColor;
         };
         icons?: {
             back?: ExtensionURL;
@@ -648,7 +651,7 @@ declare namespace browser._manifest {
         | "pkcs11"
         | "sessions";
 
-    type _WebExtensionManifestIncognito = "spanning";
+    type _WebExtensionManifestIncognito = "not_allowed" | "spanning";
 
     /** Defines the location the browserAction will appear by default. The default location is navbar. */
     type _WebExtensionManifestBrowserActionDefaultArea =
@@ -697,6 +700,8 @@ declare namespace browser._manifest {
 
     type _MatchPattern = "<all_urls>";
 
+    type _PersistentBackgroundProperty = "undefined" | "undefined";
+
     type _ThemeTypeAdditionalBackgroundsAlignment =
         "bottom"
         | "center"
@@ -1315,7 +1320,7 @@ declare namespace browser.downloads {
         /** Indication of whether this download is thought to be safe or known to be suspicious. */
         danger: DangerType;
         /** The file's MIME type. */
-        mime: string;
+        mime?: string;
         /** Number of milliseconds between the unix epoch and when this download began. */
         startTime: string;
         /** Number of milliseconds between the unix epoch and when this download ended. */
@@ -2904,10 +2909,10 @@ declare namespace browser.runtime {
     /**
      * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and
      * implement surveys. Maximum 255 characters.
-     * @param url URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme.
+     * @param [url] URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme.
      *     Set an empty string to not open a new tab upon uninstallation.
      */
-    function setUninstallURL(url: string): Promise<void>;
+    function setUninstallURL(url?: string): Promise<void>;
 
     /** Reloads the app or extension. */
     function reload(): void;
@@ -3262,7 +3267,7 @@ declare namespace browser.telemetry {
         usePingSender?: boolean;
     }): Promise<any>;
 
-    /** Checks if Telemetry is enabled. */
+    /** Checks if Telemetry upload is enabled. */
     function canUpload(): Promise<any>;
 
     /**

From a77da09a2686a7d7efd257b666d31494f0722e55 Mon Sep 17 00:00:00 2001
From: Jasmin Bom <jsmnbom@gmail.com>
Date: Wed, 3 Apr 2019 20:45:55 +0200
Subject: [PATCH 2/2] Fix weirdness with PersistentBackgroundProperty

---
 types/firefox-webext-browser/index.d.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/types/firefox-webext-browser/index.d.ts b/types/firefox-webext-browser/index.d.ts
index a9575a14d2..d7373635be 100644
--- a/types/firefox-webext-browser/index.d.ts
+++ b/types/firefox-webext-browser/index.d.ts
@@ -428,7 +428,8 @@ declare namespace browser._manifest {
     /** @deprecated An unexpected property was found in the WebExtension manifest. */
     type UnrecognizedProperty = any;
 
-    type PersistentBackgroundProperty = _PersistentBackgroundProperty;
+    /** @deprecated Event pages are not currently supported. This will run as a persistent background page. */
+    type PersistentBackgroundProperty = boolean;
 
     /** Represents a native manifest file */
     type NativeManifest = {
@@ -700,8 +701,6 @@ declare namespace browser._manifest {
 
     type _MatchPattern = "<all_urls>";
 
-    type _PersistentBackgroundProperty = "undefined" | "undefined";
-
     type _ThemeTypeAdditionalBackgroundsAlignment =
         "bottom"
         | "center"