From 4cf2e7a5f5b8fb1fe969cb4bbbf3f6a6b222b393 Mon Sep 17 00:00:00 2001
From: Owen Pearson <owen.pearson@ably.com>
Date: Wed, 24 Mar 2021 15:56:22 +0000
Subject: [PATCH 1/2] fix faulty import of jsonp transport to rn and ns
 platforms

---
 browser/lib/transport/withoutjsonp.js |  7 +++++++
 webpack.config.js                     | 22 +++-------------------
 2 files changed, 10 insertions(+), 19 deletions(-)
 create mode 100644 browser/lib/transport/withoutjsonp.js

diff --git a/browser/lib/transport/withoutjsonp.js b/browser/lib/transport/withoutjsonp.js
new file mode 100644
index 0000000000..10702d0c7c
--- /dev/null
+++ b/browser/lib/transport/withoutjsonp.js
@@ -0,0 +1,7 @@
+import XHRPollingTransport from './xhrpollingtransport';
+import XHRStreamingTransport from './xhrstreamingtransport';
+
+export default [
+  XHRPollingTransport,
+  XHRStreamingTransport
+];
diff --git a/webpack.config.js b/webpack.config.js
index 031bb4c647..4f46a5ae8d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -121,17 +121,9 @@ const nativeScriptConfig = {
       'platform-crypto': path.resolve(browserPath, 'lib', 'util', 'crypto'),
       'platform-webstorage': path.resolve(browserPath, 'lib', 'util', 'webstorage'),
       'platform-msgpack': path.resolve(browserPath, 'lib', 'util', 'msgpack'),
-      'platform-transports': path.resolve(browserPath, 'lib', 'transport'),
+      'platform-transports': path.resolve(browserPath, 'lib', 'transport', 'withoutjsonp'),
 		},
 	},
-	module: {
-		rules: [
-			{
-				test: /(jsonptransport\.js|domevent\.js)/,
-				use: 'null-loader',
-			},
-		],
-	},
 	node: {
 		crypto: 'empty',
 		Buffer: false,
@@ -166,17 +158,9 @@ const reactNativeConfig = {
       'platform-crypto': path.resolve(browserPath, 'lib', 'util', 'crypto'),
       'platform-webstorage': path.resolve(browserPath, 'lib', 'util', 'webstorage'),
       'platform-msgpack': path.resolve(browserPath, 'lib', 'util', 'msgpack'),
-      'platform-transports': path.resolve(browserPath, 'lib', 'transport'),
+      'platform-transports': path.resolve(browserPath, 'lib', 'transport', 'withoutjsonp'),
 		},
 	},
-	module: {
-		rules: [
-			{
-				test: /jsonptransport\.js/,
-				use: 'null-loader',
-			},
-		],
-	},
 	node: {
 		crypto: 'empty',
 		Buffer: false,
@@ -267,4 +251,4 @@ module.exports = [
   noEncryptionMinConfig,
   commonJsConfig,
   commonJsNoEncryptionConfig,
-];
\ No newline at end of file
+];

From abeda9a6ee7a31cd71cf8029514f36939e13a25b Mon Sep 17 00:00:00 2001
From: Owen Pearson <owen.pearson@ably.com>
Date: Thu, 25 Mar 2021 10:44:21 +0000
Subject: [PATCH 2/2] add comment explaining the withoutjsonp file

---
 browser/lib/transport/withoutjsonp.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/lib/transport/withoutjsonp.js b/browser/lib/transport/withoutjsonp.js
index 10702d0c7c..ee836375dc 100644
--- a/browser/lib/transport/withoutjsonp.js
+++ b/browser/lib/transport/withoutjsonp.js
@@ -1,3 +1,6 @@
+/**
+ * This file exists for React Native and Nativescript in order to exclude the unsupported JSONP transport from these platforms.
+ */
 import XHRPollingTransport from './xhrpollingtransport';
 import XHRStreamingTransport from './xhrstreamingtransport';