Remove node-fetch and cross-fetch

__tests__/directLineStreaming/connect.fail.story.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import { ConnectionStatus } from '../../src/directLine';
 import { DirectLineStreaming } from '../../src/directLineStreaming';
 import waitFor from './__setup__/external/testing-library/waitFor';

__tests__/directLineStreaming/connect.success.story.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import { ConnectionStatus } from '../../src/directLine';
 import { DirectLineStreaming } from '../../src/directLineStreaming';
 import waitFor from './__setup__/external/testing-library/waitFor';

__tests__/directLineStreaming/end.story.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import { ConnectionStatus } from '../../src/directLine';
 import { DirectLineStreaming } from '../../src/directLineStreaming';
 import waitFor from './__setup__/external/testing-library/waitFor';

__tests__/directLineStreaming/options.networkInformation.story.ts

@@ -1,7 +1,5 @@
 /// <reference path="./__setup__/expect/activityContaining.d.ts" />
 
-import fetch from 'node-fetch';
-
 import { ConnectionStatus } from '../../src/directLine';
 import { DirectLineStreaming } from '../../src/directLineStreaming';
 import waitFor from './__setup__/external/testing-library/waitFor';

__tests__/directLineStreaming/postActivity.fail.story.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import { ConnectionStatus } from '../../src/directLine';
 import { DirectLineStreaming } from '../../src/directLineStreaming';
 import mockObserver from './__setup__/mockObserver';

__tests__/directLineStreaming/postActivity.success.story.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import { ConnectionStatus } from '../../src/directLine';
 import { DirectLineStreaming } from '../../src/directLineStreaming';
 import activityTimestampComparer from './__setup__/activityTimestampComparer';

__tests__/directLineStreaming/retryConnect.fail.story.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import { ConnectionStatus } from '../../src/directLine';
 import { DirectLineStreaming } from '../../src/directLineStreaming';
 import waitFor from './__setup__/external/testing-library/waitFor';

__tests__/directLineStreaming/retryConnect.success.story.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import { ConnectionStatus } from '../../src/directLine';
 import { DirectLineStreaming } from '../../src/directLineStreaming';
 import activityTimestampComparer from './__setup__/activityTimestampComparer';

__tests__/setup.ts

@@ -3,7 +3,6 @@
 /// <reference path="../node_modules/@types/jest/index.d.ts" />
 
 import createServer from './setup/createServer';
-import fetch from 'node-fetch';
 
 test('setup correctly', () => {});
 

__tests__/setup/createDirectLine.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 import { userId as DEFAULT_USER_ID } from '../constants.json';
 import { DirectLine, DirectLineStreaming } from '../../dist/directline';
 

__tests__/setup/createServer.test.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch';
 
 import createServer from './createServer';
 import hasResolved from 'has-resolved';

__tests__/setup/fetchAsBase64.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch';
-
 export default async function fetchAsBase64(url) {
   const res = await fetch(url);
 

__tests__/setup/jsdomEnvironmentWithProxy.js

@@ -16,6 +16,9 @@ class JSDOMEnvironmentWithProxy extends JSDOMEnvironment {
       this.global._resourceLoader = resources;
     }
 
+    // Make native fetch available in jsdom environment
+    this.global.fetch = fetch;
+
     return super.setup();
   }
 }

package.json

@@ -30,7 +30,6 @@
     "botframework-streaming": "4.23.0",
     "buffer": "6.0.3",
     "core-js": "3.15.2",
-    "cross-fetch": "^3.1.5",
     "jwt-decode": "3.1.2",
     "rxjs": "5.5.12",
     "url-search-params-polyfill": "8.1.1"
@@ -65,7 +64,6 @@
     "jest-environment-jsdom": "^29.5.0",
     "jsdom": "^16.6.0",
     "nock": "^13.1.1",
-    "node-fetch": "^2.6.7",
     "on-error-resume-next": "^1.1.0",
     "path-to-regexp": "^6.2.1",
     "restify": "^11.0.0",

src/directLineStreaming.ts

@@ -6,7 +6,6 @@ import { Observable } from 'rxjs/Observable';
 import { Subscriber } from 'rxjs/Subscriber';
 import * as BFSE from 'botframework-streaming';
 import createDeferred from './createDeferred';
-import fetch from 'cross-fetch';
 
 import { Activity, ConnectionStatus, Conversation, DirectLine, IBotConnection, Media, Message } from './directLine';
 import WebSocketClientWithNetworkInformation from './streaming/WebSocketClientWithNetworkInformation';