From 6c16392477d8c3099d3d1c76c74d2a2f9fd9ba82 Mon Sep 17 00:00:00 2001
From: Federico Brigante <github@bfred.it>
Date: Mon, 8 Jul 2019 17:34:37 +0800
Subject: [PATCH] Fix two dependencies

---
 package-lock.json                          | 32 +++++++++++++++-------
 package.json                               |  4 +--
 source/libs/declarative-content-scripts.ts |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 64378b49fd5..560800105c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2615,11 +2615,6 @@
 			"integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
 			"dev": true
 		},
-		"chrome-permissions-events-polyfill": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/chrome-permissions-events-polyfill/-/chrome-permissions-events-polyfill-1.0.0.tgz",
-			"integrity": "sha512-38rkA6iXako3E4EFXYkRtrorIPe+f2yQ9F3wxb7fKsHhnn5MmHtN5PtVXx6XHVGXn6wA2fA3i5walNlJVNyhJw=="
-		},
 		"chrome-trace-event": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
@@ -9594,12 +9589,13 @@
 			}
 		},
 		"mem": {
-			"version": "github:sindresorhus/mem#10f13c0904e497a35bb4cba907490aad1ba6d879",
-			"from": "github:sindresorhus/mem#10f13c0",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
+			"integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
 			"requires": {
-				"map-age-cleaner": "^0.1.1",
-				"mimic-fn": "^2.0.0",
-				"p-is-promise": "^2.0.0"
+				"map-age-cleaner": "^0.1.3",
+				"mimic-fn": "^2.1.0",
+				"p-is-promise": "^2.1.0"
 			}
 		},
 		"memory-fs": {
@@ -10628,6 +10624,17 @@
 					"requires": {
 						"invert-kv": "^2.0.0"
 					}
+				},
+				"mem": {
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+					"integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+					"dev": true,
+					"requires": {
+						"map-age-cleaner": "^0.1.1",
+						"mimic-fn": "^2.0.0",
+						"p-is-promise": "^2.0.0"
+					}
 				}
 			}
 		},
@@ -15939,6 +15946,11 @@
 				"webext-detect-page": "^0.9.1"
 			}
 		},
+		"webext-permissions-events-polyfill": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/webext-permissions-events-polyfill/-/webext-permissions-events-polyfill-1.0.1.tgz",
+			"integrity": "sha512-dPsU7KtDn+OG+mPy0LLc9UhMXdVeQ8ywD5kK1GFtvceur4IWOnpI5D4uTjMPrKm8+re/8cbHKwVjnviIA9wZ3Q=="
+		},
 		"webext-storage-cache": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/webext-storage-cache/-/webext-storage-cache-1.0.2.tgz",
diff --git a/package.json b/package.json
index 502a25c5169..b7625c2ab72 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
 		"create-git-tag": "git tag $VER -m $VER && git push origin $VER"
 	},
 	"dependencies": {
-		"chrome-permissions-events-polyfill": "^1.0.0",
 		"content-scripts-register-polyfill": "^1.0.0",
 		"copy-text-to-clipboard": "^2.0.0",
 		"debounce-fn": "^3.0.1",
@@ -34,13 +33,14 @@
 		"intervalometer": "^1.0.5",
 		"linkify-issues": "^1.3.0",
 		"linkify-urls": "^2.2.0",
-		"mem": "github:sindresorhus/mem#10f13c0",
+		"mem": "^5.1.1",
 		"onetime": "^5.0.0",
 		"select-dom": "^5.1.0",
 		"shorten-repo-url": "^1.5.1",
 		"tiny-version-compare": "^1.0.0",
 		"webext-domain-permission-toggle": "^1.0.0-1",
 		"webext-options-sync": "^0.21.1",
+		"webext-permissions-events-polyfill": "^1.0.1",
 		"webext-storage-cache": "^1.0.2",
 		"webextension-polyfill": "^0.4.0",
 		"zip-text-nodes": "^1.0.0-0"
diff --git a/source/libs/declarative-content-scripts.ts b/source/libs/declarative-content-scripts.ts
index 6fd7dc30331..8786253a8ed 100644
--- a/source/libs/declarative-content-scripts.ts
+++ b/source/libs/declarative-content-scripts.ts
@@ -1,6 +1,6 @@
 /* global chrome */
 import 'content-scripts-register-polyfill';
-import 'chrome-permissions-events-polyfill';
+import 'webext-permissions-events-polyfill';
 
 const registeredScripts = new Map<
 string,