From 48a9d61518a061ef383d4ec6de70ff57fdd11dcc Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 19 Jun 2026 13:42:37 +0300 Subject: [PATCH] Remove node-fetch --- .../directLineStreaming/connect.fail.story.js | 2 - .../connect.success.story.js | 2 - __tests__/directLineStreaming/end.story.js | 2 - .../options.networkInformation.story.ts | 2 - .../postActivity.fail.story.js | 2 - .../postActivity.success.story.js | 2 - .../retryConnect.fail.story.js | 2 - .../retryConnect.success.story.js | 2 - __tests__/setup.ts | 1 - __tests__/setup/createDirectLine.js | 2 - __tests__/setup/createServer.test.ts | 2 - __tests__/setup/fetchAsBase64.js | 2 - __tests__/setup/jsdomEnvironmentWithProxy.js | 2 + package-lock.json | 47 ------------------- package.json | 1 - 15 files changed, 2 insertions(+), 71 deletions(-) diff --git a/__tests__/directLineStreaming/connect.fail.story.js b/__tests__/directLineStreaming/connect.fail.story.js index 70ec28c6b..cb3cdbaf9 100644 --- a/__tests__/directLineStreaming/connect.fail.story.js +++ b/__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'; diff --git a/__tests__/directLineStreaming/connect.success.story.js b/__tests__/directLineStreaming/connect.success.story.js index 588ea34e7..542077887 100644 --- a/__tests__/directLineStreaming/connect.success.story.js +++ b/__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'; diff --git a/__tests__/directLineStreaming/end.story.js b/__tests__/directLineStreaming/end.story.js index 8c273ce78..35b6715c1 100644 --- a/__tests__/directLineStreaming/end.story.js +++ b/__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'; diff --git a/__tests__/directLineStreaming/options.networkInformation.story.ts b/__tests__/directLineStreaming/options.networkInformation.story.ts index 956f24de0..0a8c2a330 100644 --- a/__tests__/directLineStreaming/options.networkInformation.story.ts +++ b/__tests__/directLineStreaming/options.networkInformation.story.ts @@ -1,7 +1,5 @@ /// -import fetch from 'node-fetch'; - import { ConnectionStatus } from '../../src/directLine'; import { DirectLineStreaming } from '../../src/directLineStreaming'; import waitFor from './__setup__/external/testing-library/waitFor'; diff --git a/__tests__/directLineStreaming/postActivity.fail.story.js b/__tests__/directLineStreaming/postActivity.fail.story.js index ee2e9dab1..0f990f280 100644 --- a/__tests__/directLineStreaming/postActivity.fail.story.js +++ b/__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'; diff --git a/__tests__/directLineStreaming/postActivity.success.story.js b/__tests__/directLineStreaming/postActivity.success.story.js index 45cfb4e13..47779bbbb 100644 --- a/__tests__/directLineStreaming/postActivity.success.story.js +++ b/__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'; diff --git a/__tests__/directLineStreaming/retryConnect.fail.story.js b/__tests__/directLineStreaming/retryConnect.fail.story.js index fa328a355..fe994bd71 100644 --- a/__tests__/directLineStreaming/retryConnect.fail.story.js +++ b/__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'; diff --git a/__tests__/directLineStreaming/retryConnect.success.story.js b/__tests__/directLineStreaming/retryConnect.success.story.js index 312981361..59441a85d 100644 --- a/__tests__/directLineStreaming/retryConnect.success.story.js +++ b/__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'; diff --git a/__tests__/setup.ts b/__tests__/setup.ts index 254e84f72..581681969 100644 --- a/__tests__/setup.ts +++ b/__tests__/setup.ts @@ -3,7 +3,6 @@ /// import createServer from './setup/createServer'; -import fetch from 'node-fetch'; test('setup correctly', () => {}); diff --git a/__tests__/setup/createDirectLine.js b/__tests__/setup/createDirectLine.js index cdca7cdce..b58ebc63a 100644 --- a/__tests__/setup/createDirectLine.js +++ b/__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'; diff --git a/__tests__/setup/createServer.test.ts b/__tests__/setup/createServer.test.ts index 0d42b1459..1b7bd52f4 100644 --- a/__tests__/setup/createServer.test.ts +++ b/__tests__/setup/createServer.test.ts @@ -1,5 +1,3 @@ -import fetch from 'node-fetch'; - import createServer from './createServer'; import hasResolved from 'has-resolved'; diff --git a/__tests__/setup/fetchAsBase64.js b/__tests__/setup/fetchAsBase64.js index 88cbc37e9..19c043c15 100644 --- a/__tests__/setup/fetchAsBase64.js +++ b/__tests__/setup/fetchAsBase64.js @@ -1,5 +1,3 @@ -import fetch from 'node-fetch'; - export default async function fetchAsBase64(url) { const res = await fetch(url); diff --git a/__tests__/setup/jsdomEnvironmentWithProxy.js b/__tests__/setup/jsdomEnvironmentWithProxy.js index 91205b404..b20714922 100644 --- a/__tests__/setup/jsdomEnvironmentWithProxy.js +++ b/__tests__/setup/jsdomEnvironmentWithProxy.js @@ -16,6 +16,8 @@ class JSDOMEnvironmentWithProxy extends JSDOMEnvironment { this.global._resourceLoader = resources; } + this.global.fetch = fetch; + return super.setup(); } } diff --git a/package-lock.json b/package-lock.json index 49517a9ee..1e0eccca0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,6 @@ "jest-environment-jsdom": "^29.5.0", "jsdom": "^29.1.1", "nock": "^13.5.6", - "node-fetch": "^2.7.0", "on-error-resume-next": "^2.0.3", "path-to-regexp": "^6.3.0", "rimraf": "^6.1.3", @@ -7966,52 +7965,6 @@ "dev": true, "license": "MIT" }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dev": true, - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-fetch/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true, - "license": "MIT" - }, - "node_modules/node-fetch/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/node-fetch/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", diff --git a/package.json b/package.json index a4dab2761..6ed59ec35 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "jest-environment-jsdom": "^29.5.0", "jsdom": "^29.1.1", "nock": "^13.5.6", - "node-fetch": "^2.7.0", "on-error-resume-next": "^2.0.3", "path-to-regexp": "^6.3.0", "rimraf": "^6.1.3",