Fix Chrome MV3 deregistration + cleanup internal types (#57)

fregante · web-flow · commit a72b4f615dd8 · 2023-03-09T18:32:03.000+08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,16 +63,16 @@
 	"dependencies": {
 		"content-scripts-register-polyfill": "^3.2.2",
 		"webext-additional-permissions": "^2.3.0",
-		"webext-content-scripts": "^2.4.0",
+		"webext-content-scripts": "^2.5.3",
 		"webext-detect-page": "^4.0.1",
 		"webext-patterns": "^1.2.0",
 		"webext-polyfill-kinda": "^0.10.0"
 	},
 	"devDependencies": {
 		"@parcel/config-webextension": "^2.8.2",
 		"@sindresorhus/tsconfig": "^3.0.1",
-		"@types/chrome": "^0.0.208",
-		"@types/firefox-webext-browser": "^94.0.1",
+		"@types/chrome": "^0.0.220",
+		"@types/firefox-webext-browser": "^111.0.0",
 		"@types/jest": "^29.2.5",
 		"jest": "^29.3.1",
 		"jest-chrome": "^0.8.0",
diff --git a/source/global.d.ts b/source/global.d.ts
diff --git a/source/including-active-tab.ts b/source/including-active-tab.ts
@@ -28,7 +28,7 @@ async function injectToTabUnlessRegistered({id: tabId, origin}: ActiveTab): Prom
 		: [{frameId: 0, url: origin}];
 
 	// .map() needed for async loop
-	frames.map(async ({frameId, url}) => injectIfActive({frameId, url, tabId}));
+	frames?.map(async ({frameId, url}) => injectIfActive({frameId, url, tabId}));
 }
 
 async function injectIfActive(
diff --git a/source/inject-to-existing-tabs.ts b/source/inject-to-existing-tabs.ts
@@ -1,5 +1,7 @@
 import {getTabsByUrl, injectContentScript} from 'webext-content-scripts';
 
+type ManifestContentScripts = NonNullable<chrome.runtime.Manifest['content_scripts']>;
+
 export async function injectToExistingTabs(
 	origins: string[],
 	scripts: ManifestContentScripts,
diff --git a/source/register-content-script-shim.ts b/source/register-content-script-shim.ts
@@ -4,14 +4,14 @@ export const chromeRegister = globalThis.chrome?.scripting?.registerContentScrip
 export const firefoxRegister = globalThis.browser?.contentScripts?.register;
 
 export async function registerContentScript(
-	contentScript: ChromeContentScript,
+	contentScript: Omit<chrome.scripting.RegisteredContentScript, 'id' | 'world'> & {matches: string[]},
 ): Promise<browser.contentScripts.RegisteredContentScript> {
 	if (chromeRegister) {
 		const id = 'webext-dynamic-content-script-' + JSON.stringify(contentScript);
 		try {
 			await chromeRegister([{
-				id,
 				...contentScript,
+				id,
 			}]);
 		} catch (error) {
 			if (!(error as Error)?.message.startsWith('Duplicate script ID')) {
@@ -20,15 +20,15 @@ export async function registerContentScript(
 		}
 
 		return {
-			unregister: async () => chrome.scripting.unregisterContentScripts([id]),
+			unregister: async () => chrome.scripting.unregisterContentScripts({ids: [id]}),
 		};
 	}
 
 	const firefoxContentScript = {
 		...contentScript,
 		js: contentScript.js?.map(file => ({file})),
 		css: contentScript.css?.map(file => ({file})),
-	};
+	} as const;
 
 	if (firefoxRegister) {
 		return firefoxRegister(firefoxContentScript);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ async function injectToTabUnlessRegistered({id: tabId, origin}: ActiveTab): Prom`
`28`	`28`	`: [{frameId: 0, url: origin}];`
`29`	`29`
`30`	`30`	`// .map() needed for async loop`
`31`		`- frames.map(async ({frameId, url}) => injectIfActive({frameId, url, tabId}));`
	`31`	`+ frames?.map(async ({frameId, url}) => injectIfActive({frameId, url, tabId}));`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`async function injectIfActive(`