From 2e1cd425f53a1cb45f951cde220285f0de9a3424 Mon Sep 17 00:00:00 2001
From: Jonathan Kingston <jonathan@jooped.co.uk>
Date: Fri, 28 Mar 2025 11:52:16 +0000
Subject: [PATCH] Revert "Revert "Add support for non isolated messaging
 (#1586)" (#1591)"

This reverts commit 98b841d5a945ec6eea5950936960493179d09a16.
---
 injected/entry-points/apple.js | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/injected/entry-points/apple.js b/injected/entry-points/apple.js
index 1a10f32f27..6ab6848fea 100644
--- a/injected/entry-points/apple.js
+++ b/injected/entry-points/apple.js
@@ -3,7 +3,7 @@
  */
 import { load, init } from '../src/content-scope-features.js';
 import { processConfig, platformSpecificFeatures } from './../src/utils';
-import { WebkitMessagingConfig, TestTransportConfig } from '../../messaging/index.js';
+import { WebkitMessagingConfig } from '../../messaging/index.js';
 
 function initCode() {
     // @ts-expect-error https://app.asana.com/0/1201614831475344/1203979574128023/f
@@ -15,27 +15,17 @@ function initCode() {
 
     const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
 
+    const handlerNames = [];
     if (import.meta.injectName === 'apple-isolated') {
-        processedConfig.messagingConfig = new WebkitMessagingConfig({
-            webkitMessageHandlerNames: ['contentScopeScriptsIsolated'],
-            secret: '',
-            hasModernWebkitAPI: true,
-        });
+        handlerNames.push('contentScopeScriptsIsolated');
     } else {
-        processedConfig.messagingConfig = new TestTransportConfig({
-            notify() {
-                // noop
-            },
-            request: async () => {
-                // noop
-            },
-            subscribe() {
-                return () => {
-                    // noop
-                };
-            },
-        });
+        handlerNames.push('contentScopeScripts');
     }
+    processedConfig.messagingConfig = new WebkitMessagingConfig({
+        webkitMessageHandlerNames: handlerNames,
+        secret: '',
+        hasModernWebkitAPI: true,
+    });
 
     load({
         platform: processedConfig.platform,