[mv3] Force register content scripts when none are found

gorhill · gorhill · commit 2b63dcdcb633 · 2026-02-09T09:25:57.000-05:00
Possibly will fix cases of no content scripts found in Safari. Related issue: uBlockOrigin/uAssets#30158 (comment)
diff --git a/platform/mv3/extension/js/background.js b/platform/mv3/extension/js/background.js
@@ -680,7 +680,7 @@ async function startSession() {
     const shouldInject = isNewVersion || permissionsUpdated ||
         isSideloaded && rulesetConfig.developerMode;
     if ( shouldInject ) {
-        registerInjectables();
+        await registerInjectables();
     }
 
     // Cosmetic filtering-related content scripts cache fitlering data in
@@ -730,6 +730,11 @@ async function start() {
         scrmgr.onWakeupRun();
     }
 
+    const scripts = await scrmgr.getRegisteredContentScripts();
+    if ( scripts.length === 0 ) {
+        registerInjectables();
+    }
+
     toggleDeveloperMode(rulesetConfig.developerMode);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,7 @@ async function startSession() {`
`680`	`680`	`const shouldInject = isNewVersion \|\| permissionsUpdated \|\|`
`681`	`681`	`isSideloaded && rulesetConfig.developerMode;`
`682`	`682`	`if ( shouldInject ) {`
`683`		`- registerInjectables();`
	`683`	`+ await registerInjectables();`
`684`	`684`	`}`
`685`	`685`
`686`	`686`	`// Cosmetic filtering-related content scripts cache fitlering data in`
`@@ -730,6 +730,11 @@ async function start() {`
`730`	`730`	`scrmgr.onWakeupRun();`
`731`	`731`	`}`
`732`	`732`
	`733`	`+ const scripts = await scrmgr.getRegisteredContentScripts();`
	`734`	`+ if ( scripts.length === 0 ) {`
	`735`	`+ registerInjectables();`
	`736`	`+ }`
	`737`	`+`
`733`	`738`	`toggleDeveloperMode(rulesetConfig.developerMode);`
`734`	`739`	`}`
`735`	`740`