test: remove node-fetch package usage

clydin · alan-agius4 · commit 1e8029503461 · 2023-10-31T07:57:44.000Z
Native fetch support is now available in Node.js and the `node-fetch` package can now be removed. (cherry picked from commit e588e84)
diff --git a/package.json b/package.json
@@ -105,7 +105,6 @@
     "@types/less": "^3.0.3",
     "@types/loader-utils": "^2.0.0",
     "@types/node": "^18.13.0",
-    "@types/node-fetch": "^2.1.6",
     "@types/npm-package-arg": "^6.1.0",
     "@types/pacote": "^11.1.3",
     "@types/picomatch": "^2.3.0",
@@ -171,7 +170,6 @@
     "mini-css-extract-plugin": "2.7.6",
     "mrmime": "1.0.1",
     "ng-packagr": "17.0.0-rc.0",
-    "node-fetch": "^2.2.0",
     "npm": "^8.11.0",
     "npm-package-arg": "11.0.1",
     "open": "8.4.2",
diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel
@@ -295,7 +295,6 @@ ts_library(
         "//packages/angular_devkit/architect/testing",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core/node",
-        "@npm//@types/node-fetch",
         "@npm//rxjs",
     ],
 )
@@ -314,11 +313,10 @@ LARGE_SPECS = {
         "shards": 10,
         "size": "large",
         "extra_deps": [
-            "@npm//@types/node-fetch",
-            "@npm//node-fetch",
             "@npm//@types/http-proxy",
             "@npm//http-proxy",
             "@npm//puppeteer",
+            "@npm//undici",
         ],
     },
     "extract-i18n": {},
@@ -374,9 +372,8 @@ LARGE_SPECS = {
     "ssr-dev-server": {
         "extra_deps": [
             "@npm//@types/browser-sync",
-            "@npm//@types/node-fetch",
             "@npm//browser-sync",
-            "@npm//node-fetch",
+            "@npm//undici",
             "//packages/angular/ssr",
         ],
     },
diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/specs/index_spec.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/specs/index_spec.ts
@@ -8,7 +8,6 @@
 
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { workspaces } from '@angular-devkit/core';
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Dev Server Builder index', () => {
diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/specs/ssl_spec.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/specs/ssl_spec.ts
@@ -9,8 +9,7 @@
 import { Architect, BuilderRun } from '@angular-devkit/architect';
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { tags } from '@angular-devkit/core';
-import * as https from 'https';
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
+import { Agent, getGlobalDispatcher, setGlobalDispatcher } from 'undici';
 import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Dev Server Builder ssl', () => {
@@ -36,10 +35,20 @@ describe('Dev Server Builder ssl', () => {
     expect(output.success).toBe(true);
     expect(output.baseUrl).toMatch(/^https:\/\/localhost:\d+\//);
 
-    const response = await fetch(output.baseUrl, {
-      agent: new https.Agent({ rejectUnauthorized: false }),
-    });
-    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
+    // The self-signed certificate used by the dev server will cause fetch to fail
+    // unless reject unauthorized is disabled.
+    const originalDispatcher = getGlobalDispatcher();
+    setGlobalDispatcher(
+      new Agent({
+        connect: { rejectUnauthorized: false },
+      }),
+    );
+    try {
+      const response = await fetch(output.baseUrl);
+      expect(await response.text()).toContain('<title>HelloWorldApp</title>');
+    } finally {
+      setGlobalDispatcher(originalDispatcher);
+    }
   });
 
   it('supports key and cert', async () => {
@@ -113,9 +122,19 @@ describe('Dev Server Builder ssl', () => {
     expect(output.success).toBe(true);
     expect(output.baseUrl).toMatch(/^https:\/\/localhost:\d+\//);
 
-    const response = await fetch(output.baseUrl, {
-      agent: new https.Agent({ rejectUnauthorized: false }),
-    });
-    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
+    // The self-signed certificate used by the dev server will cause fetch to fail
+    // unless reject unauthorized is disabled.
+    const originalDispatcher = getGlobalDispatcher();
+    setGlobalDispatcher(
+      new Agent({
+        connect: { rejectUnauthorized: false },
+      }),
+    );
+    try {
+      const response = await fetch(output.baseUrl);
+      expect(await response.text()).toContain('<title>HelloWorldApp</title>');
+    } finally {
+      setGlobalDispatcher(originalDispatcher);
+    }
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/specs/works_spec.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/specs/works_spec.ts
@@ -9,7 +9,6 @@
 import { Architect, BuilderRun } from '@angular-devkit/architect';
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { normalize, virtualFs } from '@angular-devkit/core';
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { createArchitect, host } from '../../../testing/test-utils';
 
 describe('Dev Server Builder', () => {
diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/tests/behavior/build_localize_replaced_watch_spec.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/tests/behavior/build_localize_replaced_watch_spec.ts
@@ -7,7 +7,6 @@
  */
 
 /* eslint-disable max-len */
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { concatMap, count, take, timeout } from 'rxjs';
 import { URL } from 'url';
 import { serveWebpackBrowser } from '../../index';
diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/tests/behavior/build_translation_watch_spec.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/tests/behavior/build_translation_watch_spec.ts
@@ -7,7 +7,6 @@
  */
 
 /* eslint-disable max-len */
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { concatMap, count, take, timeout } from 'rxjs';
 import { URL } from 'url';
 import { serveWebpackBrowser } from '../../index';
diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/tests/behavior/serve_service-worker_spec.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/tests/behavior/serve_service-worker_spec.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// eslint-disable-next-line import/no-extraneous-dependencies
-import fetch from 'node-fetch';
 import { concatMap, count, take, timeout } from 'rxjs';
 import { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
@@ -177,7 +175,7 @@ describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => {
           concatMap(async ({ result }, index) => {
             expect(result?.success).toBeTrue();
             const response = await fetch(new URL('ngsw.json', `${result?.baseUrl}`));
-            const { hashTable } = await response.json();
+            const { hashTable } = (await response.json()) as { hashTable: object };
             const hashTableEntries = Object.keys(hashTable);
 
             switch (index) {
diff --git a/packages/angular_devkit/build_angular/src/builders/dev-server/tests/execute-fetch.ts b/packages/angular_devkit/build_angular/src/builders/dev-server/tests/execute-fetch.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import fetch, { RequestInit, Response } from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { lastValueFrom, mergeMap, take, timeout } from 'rxjs';
 import { URL } from 'url';
 import {
diff --git a/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/proxy_spec.ts b/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/proxy_spec.ts
@@ -10,7 +10,6 @@ import { Architect } from '@angular-devkit/architect';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import * as browserSync from 'browser-sync';
 import * as http from 'http';
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { createArchitect, host } from '../../../testing/test-utils';
 import { SSRDevServerBuilderOutput } from '../index';
 
diff --git a/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/ssl_spec.ts b/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/ssl_spec.ts
@@ -9,8 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import * as browserSync from 'browser-sync';
-import * as https from 'https';
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
+import { Agent, getGlobalDispatcher, setGlobalDispatcher } from 'undici';
 import { createArchitect, host } from '../../../testing/test-utils';
 import { SSRDevServerBuilderOutput } from '../index';
 
@@ -78,12 +77,21 @@ describe('Serve SSR Builder', () => {
     expect(output.success).toBe(true);
     expect(output.baseUrl).toBe(`https://localhost:${output.port}`);
 
-    const response = await fetch(`https://localhost:${output.port}/index.html`, {
-      agent: new https.Agent({ rejectUnauthorized: false }),
-    });
+    // The self-signed certificate used by the dev server will cause fetch to fail
+    // unless reject unauthorized is disabled.
+    const originalDispatcher = getGlobalDispatcher();
+    setGlobalDispatcher(
+      new Agent({
+        connect: { rejectUnauthorized: false },
+      }),
+    );
+    try {
+      const response = await fetch(`https://localhost:${output.port}/index.html`);
+      expect(await response.text()).toContain('<title>HelloWorldApp</title>');
+    } finally {
+      setGlobalDispatcher(originalDispatcher);
+    }
 
     await run.stop();
-
-    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/works_spec.ts b/packages/angular_devkit/build_angular/src/builders/ssr-dev-server/specs/works_spec.ts
@@ -9,7 +9,6 @@
 import { Architect } from '@angular-devkit/architect';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import * as browserSync from 'browser-sync';
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { createArchitect, host } from '../../../testing/test-utils';
 import { SSRDevServerBuilderOutput } from '../index';
 
diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel
@@ -80,8 +80,6 @@ ts_library(
         "@npm//@angular/core",
         "@npm//@angular/platform-browser",
         "@npm//@angular/platform-browser-dynamic",
-        "@npm//@types/node-fetch",
-        "@npm//node-fetch",
         "@npm//tslib",
         "@npm//zone.js",
     ],
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
@@ -12,7 +12,6 @@
   },
   "devDependencies": {
     "@angular-devkit/core": "0.0.0-PLACEHOLDER",
-    "node-fetch": "2.6.7",
     "webpack": "5.89.0"
   },
   "peerDependencies": {
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec.ts
@@ -11,7 +11,6 @@ import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/nod
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
 import { schema, workspaces } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import * as path from 'path';
 import { DevServerBuildOutput } from './index';
 
diff --git a/tests/legacy-cli/e2e/tests/BUILD.bazel b/tests/legacy-cli/e2e/tests/BUILD.bazel
@@ -11,11 +11,9 @@ ts_library(
     deps = [
         "//tests/legacy-cli/e2e/utils",
         "@npm//@types/express",
-        "@npm//@types/node-fetch",
         "@npm//@types/semver",
         "@npm//express",
         "@npm//fast-glob",
-        "@npm//node-fetch",
         "@npm//semver",
     ],
 )
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -1,4 +1,3 @@
-import fetch from 'node-fetch';
 import { getGlobalVariable } from '../../utils/env';
 import { appendToFile, replaceInFile, writeMultipleFiles } from '../../utils/fs';
 import { silentNg, waitForAnyProcessOutputToMatch } from '../../utils/process';
diff --git a/tests/legacy-cli/e2e/tests/basic/serve.ts b/tests/legacy-cli/e2e/tests/basic/serve.ts
@@ -1,4 +1,3 @@
-import fetch from 'node-fetch';
 import { killAllProcesses } from '../../utils/process';
 import { ngServe } from '../../utils/project';
 
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/preflight-request.ts b/tests/legacy-cli/e2e/tests/commands/serve/preflight-request.ts
@@ -1,15 +1,15 @@
-import fetch from 'node-fetch';
 import { ngServe } from '../../../utils/project';
 
 export default async function () {
   const port = await ngServe();
-  const { size, status } = await fetch(`http://localhost:${port}/main.js`, { method: 'OPTIONS' });
+  const result = await fetch(`http://localhost:${port}/main.js`, { method: 'OPTIONS' });
+  const content = await result.blob();
 
-  if (size !== 0) {
-    throw new Error(`Expected "size" to be "0" but got "${size}".`);
+  if (content.size !== 0) {
+    throw new Error(`Expected "size" to be "0" but got "${content.size}".`);
   }
 
-  if (status !== 204) {
-    throw new Error(`Expected "status" to be "204" but got "${status}".`);
+  if (result.status !== 204) {
+    throw new Error(`Expected "status" to be "204" but got "${result.status}".`);
   }
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/serve/serve-path.ts b/tests/legacy-cli/e2e/tests/commands/serve/serve-path.ts
@@ -1,5 +1,4 @@
 import * as assert from 'assert';
-import fetch from 'node-fetch';
 import { killAllProcesses } from '../../../utils/process';
 import { ngServe } from '../../../utils/project';
 
diff --git a/tests/legacy-cli/e2e/tests/misc/fallback.ts b/tests/legacy-cli/e2e/tests/misc/fallback.ts
@@ -1,5 +1,4 @@
 import * as assert from 'assert';
-import fetch from 'node-fetch';
 import { killAllProcesses } from '../../utils/process';
 import { ngServe } from '../../utils/project';
 import { updateJsonFile } from '../../utils/project';
diff --git a/tests/legacy-cli/e2e/tests/misc/proxy-config.ts b/tests/legacy-cli/e2e/tests/misc/proxy-config.ts
@@ -2,8 +2,7 @@ import express from 'express';
 import * as http from 'http';
 
 import { writeFile } from '../../utils/fs';
-import fetch from 'node-fetch';
-import { killAllProcesses, ng } from '../../utils/process';
+import { killAllProcesses } from '../../utils/process';
 import { ngServe } from '../../utils/project';
 import { AddressInfo } from 'net';
 import * as assert from 'assert';
diff --git a/tests/legacy-cli/e2e/utils/BUILD.bazel b/tests/legacy-cli/e2e/utils/BUILD.bazel
@@ -9,7 +9,6 @@ ts_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "@npm//@types/node-fetch",
         "@npm//@types/semver",
         "@npm//@types/tar",
         "@npm//@types/yargs-parser",
diff --git a/tools/quicktype_runner.js b/tools/quicktype_runner.js
@@ -60,7 +60,6 @@ class FetchingJSONSchemaStore extends JSONSchemaStore {
       content = fs.readFileSync(filePath, 'utf-8').trim();
     } else if (url.hostname) {
       try {
-        const fetch = require('node-fetch');
         const response = await fetch(address);
         content = response.text();
       } catch (e) {
diff --git a/yarn.lock b/yarn.lock
@@ -123,8 +123,7 @@
     tslib "^2.3.0"
 
 "@angular/bazel@https://github.com/angular/bazel-builds.git#2a68e955e8b13c9048246509165188bf52b0f930":
-  version "17.1.0-next.0+sha-fc9ba39"
-  uid "2a68e955e8b13c9048246509165188bf52b0f930"
+  version "17.1.0-next.0"
   resolved "https://github.com/angular/bazel-builds.git#2a68e955e8b13c9048246509165188bf52b0f930"
   dependencies:
     "@microsoft/api-extractor" "^7.24.2"
@@ -141,7 +140,6 @@
 
 "@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#1aa5847d4e55262a7e26b59d8d497b1c1a3c3d62":
   version "0.0.0-4ccf7eed68bba0d25f7edd47997852774f61755d"
-  uid "1aa5847d4e55262a7e26b59d8d497b1c1a3c3d62"
   resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1aa5847d4e55262a7e26b59d8d497b1c1a3c3d62"
   dependencies:
     "@angular-devkit/build-angular" "17.0.0-rc.0"
@@ -306,7 +304,6 @@
 
 "@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#162ca6b95d162df53acd87e90ff04972f951e14e":
   version "0.0.0-4ccf7eed68bba0d25f7edd47997852774f61755d"
-  uid "162ca6b95d162df53acd87e90ff04972f951e14e"
   resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#162ca6b95d162df53acd87e90ff04972f951e14e"
   dependencies:
     "@yarnpkg/lockfile" "^1.1.0"
@@ -3310,7 +3307,7 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
-"@types/node-fetch@*", "@types/node-fetch@^2.1.6":
+"@types/node-fetch@*":
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.7.tgz#a1abe2ce24228b58ad97f99480fdcf9bbc6ab16d"
   integrity sha512-lX17GZVpJ/fuCjguZ5b3TjEbSENxmEk1B2z02yoXSK9WMEWRivhdSY73wWMn6bpcCDAOh6qAdktpKHIlkDk2lg==
@@ -8969,7 +8966,7 @@ node-fetch@2.6.7, node-fetch@cjs:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^2.2.0, node-fetch@^2.6.12:
+node-fetch@^2.6.12:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
   integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
@@ -10744,7 +10741,6 @@ sass@1.69.5, sass@^1.55.0:
 
 "sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.9.1-linux.tar.gz":
   version "0.0.0"
-  uid "9310bc860f7870a1f872b11c4dc6073a1ad34e5e"
   resolved "https://saucelabs.com/downloads/sc-4.9.1-linux.tar.gz#9310bc860f7870a1f872b11c4dc6073a1ad34e5e"
 
 saucelabs@^1.5.0:
