fix: inject polyfill earlier when world: MAIN is supported

esbuild/plugins.ts

@@ -147,11 +147,6 @@ function processManifestPlugin({
           json.background = {
             scripts: [json.background.service_worker],
           };
-          json.content_scripts?.forEach((contentScript) => {
-            // TODO: Remove this when Firefox supports `world` - at least last 10
-            // versions
-            contentScript.world = undefined;
-          });
           delete json.minimum_chrome_version;
         } else {
           delete json['browser_specific_settings'];

src/background/services/background.ts

@@ -51,6 +51,7 @@ export class Background {
 
   async start() {
     this.bindOnInstalled();
+    await this.injectPolyfill();
     await this.onStart();
     this.heartbeat.start();
     this.bindMessageHandler();
@@ -61,6 +62,30 @@ export class Background {
     this.sendToPopup.start();
   }
 
+  async injectPolyfill() {
+    try {
+      // TODO: When Firefox 128 is old enough, inject directly via manifest.
+      // Also see: injectPolyfill in contentScript
+      await this.browser.scripting.registerContentScripts([
+        {
+          world: 'MAIN',
+          id: 'polyfill',
+          allFrames: true,
+          js: ['polyfill/polyfill.js'],
+          matches: PERMISSION_HOSTS.origins,
+          runAt: 'document_start',
+        },
+      ]);
+    } catch (error) {
+      // Firefox <128 will throw saying world: MAIN isn't supported. So, we'll
+      // inject via contentScript later. Injection via contentScript is slow,
+      // but apart from WM detection on page-load, everything else works fine.
+      if (!error.message.includes(`world`)) {
+        this.logger.error(error);
+      }
+    }
+  }
+
   async onStart() {
     await this.storage.populate();
     await this.checkPermissions();

src/content/polyfill.ts

@@ -1,5 +1,10 @@
 import type { MonetizationEventPayload } from '@/shared/messages';
 (function () {
+  if (document.createElement('link').relList.supports('monetization')) {
+    // console.log('already patched');
+    return;
+  }
+
   const handlers = new WeakMap();
   const attributes: PropertyDescriptor & ThisType<EventTarget> = {
     enumerable: true,

src/content/services/contentScript.ts

@@ -72,7 +72,8 @@ export class ContentScript {
   }
 
   // TODO: When Firefox has good support for `world: MAIN`, inject this directly
-  // via manifest.json https://bugzilla.mozilla.org/show_bug.cgi?id=1736575
+  // via manifest.json https://bugzilla.mozilla.org/show_bug.cgi?id=1736575 and
+  // remove this, along with injectPolyfill from background
   async injectPolyfill() {
     const document = this.window.document;
     const script = document.createElement('script');

src/manifest.json

@@ -22,14 +22,14 @@
   "background": {
     "service_worker": "background/background.js"
   },
-  "permissions": ["tabs", "storage", "alarms"],
+  "permissions": ["tabs", "storage", "alarms", "scripting"],
   "action": {
     "default_title": "Web Monetization",
     "default_popup": "popup/index.html"
   },
   "web_accessible_resources": [
     {
-      "resources": ["assets/*", "polyfill/*"],
+      "resources": ["polyfill/*"],
       "matches": ["<all_urls>"]
     }
   ],