Exclude URLs that already overlap with defaults (on first launch too) (#52)

Author: fregante

package-lock.json

@@ -64,7 +64,7 @@
 	"dependencies": {
 		"content-scripts-register-polyfill": "^3.2.2",
 		"webext-additional-permissions": "^2.3.0",
-		"webext-content-scripts": "^1.0.3",
+		"webext-content-scripts": "^2.4.0",
 		"webext-patterns": "^1.2.0"
 	},
 	"devDependencies": {

package.json

@@ -1,19 +1,12 @@
-import {injectContentScript} from 'webext-content-scripts';
+import {getTabsByUrl, injectContentScript} from 'webext-content-scripts';
 
-export function injectToExistingTabs(
+export async function injectToExistingTabs(
 	origins: string[],
-	scripts: ManifestContentScripts) {
-	if (origins.length === 0) {
-		return;
-	}
-
-	chrome.tabs.query({
-		url: origins,
-	}, tabs => {
-		for (const tab of tabs) {
-			if (tab.id) {
-				void injectContentScript(tab.id, scripts);
-			}
-		}
-	});
+	scripts: ManifestContentScripts,
+) {
+	const excludeMatches = scripts.flatMap(script => script.matches ?? []);
+	return injectContentScript(
+		await getTabsByUrl(origins, excludeMatches),
+		scripts,
+	);
 }

source/inject-to-existing-tabs.ts

@@ -40,7 +40,7 @@ async function registerOnOrigins({
 
 	// May not be needed in the future in Firefox
 	// https://bugzilla.mozilla.org/show_bug.cgi?id=1458947
-	injectToExistingTabs(newOrigins || [], manifest);
+	void injectToExistingTabs(newOrigins || [], manifest);
 }
 
 function handleNewPermissions(permissions: chrome.permissions.Permissions) {