Log error on duplicate webext-messenger execution (#6856)

.github/workflows/ci.yml

@@ -82,13 +82,15 @@ jobs:
           if-no-files-found: error
 
       # The polyfill cannot be used outside the extension context
-      - run: "! grep 'loaded in a browser extension' dist/pageScript.js --quiet"
+      - run: "! grep 'loaded in a browser extension' dist/pageScript.js --files-with-matches"
         name: Detect browser-polyfill in pageScript.js
 
       # The messenger cannot be executed twice; only load it in contentScriptCore
       # https://github.com/pixiebrix/webext-messenger/issues/88
-      - run: "! grep '__getTabData' dist/loadActivationEnhancements.js dist/contentScript.js --quiet"
-        name: Detect webext-messenger in loadActivationEnhancements.js and dist/contentScript.js
+      # - contentScript.js can't have it because the file could be injected multiple times, guarding contentScriptCore
+      # - loadActivationEnhancements.js can't have it because it's always loaded alongside contentScript.js
+      - run: "! grep '__getTabData' dist/loadActivationEnhancements.js dist/contentScript.js --files-with-matches"
+        name: Detect webext-messenger unwanted bundles
 
       - uses: actions/upload-artifact@v3
         name: Save report.html

package.json

@@ -165,7 +165,7 @@
     "webext-base-css": "^1.4.3",
     "webext-content-scripts": "^2.5.5",
     "webext-detect-page": "^4.1.1",
-    "webext-messenger": "^0.24.0",
+    "webext-messenger": "^0.25.0-0",
     "webext-patterns": "^1.3.0",
     "webext-polyfill-kinda": "^1.0.2",
     "webext-storage": "^1.2.2",

src/contentScript/loadActivationEnhancements.ts

@@ -18,9 +18,11 @@
 // WARNING: this file MUST NOT directly or transitively import webext-messenger because it does not support being
 // imported multiple times in the same contentScript. It's only safe to import webext-messenger in contentScriptCore.ts
 // which is behind a guarded dynamic import.
+// https://github.com/pixiebrix/webext-messenger/issues/88
 
 import { initRuntimeLogging } from "@/development/runtimeLogging";
 import { loadActivationEnhancements } from "@/contentScript/loadActivationEnhancementsCore";
+
 // eslint-disable-next-line prefer-destructuring -- process.env substitution
 const DEBUG = process.env.DEBUG;