Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix faulty import of JSONP transport to React Native and NativeScript #726

Merged
merged 2 commits into from
Mar 25, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions browser/lib/transport/withoutjsonp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import XHRPollingTransport from './xhrpollingtransport';
QuintinWillison marked this conversation as resolved.
Show resolved Hide resolved
import XHRStreamingTransport from './xhrstreamingtransport';

export default [
XHRPollingTransport,
XHRStreamingTransport
];
22 changes: 3 additions & 19 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -267,4 +251,4 @@ module.exports = [
noEncryptionMinConfig,
commonJsConfig,
commonJsNoEncryptionConfig,
];
];