From 953f4207b17210fa7231225e6f29a826f77e0832 Mon Sep 17 00:00:00 2001
From: Nikolay Vitkov <34244704+Lightning00Blade@users.noreply.github.com>
Date: Fri, 2 Feb 2024 13:12:28 +0100
Subject: [PATCH] feat!: drop support for node16 (#10912)

---
 package-lock.json                                  |  8 ++++----
 packages/browsers/package.json                     |  2 +-
 packages/ng-schematics/package.json                |  2 +-
 packages/puppeteer-core/package.json               |  2 +-
 .../puppeteer-core/src/common/BrowserConnector.ts  |  4 +---
 packages/puppeteer-core/src/common/common.ts       |  1 -
 packages/puppeteer-core/src/common/fetch.ts        | 14 --------------
 packages/puppeteer/package.json                    |  2 +-
 8 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 packages/puppeteer-core/src/common/fetch.ts

diff --git a/package-lock.json b/package-lock.json
index 14e22c65b84..cce3af3d7bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10893,7 +10893,7 @@
         "@types/yargs": "17.0.32"
       },
       "engines": {
-        "node": ">=16.3.0"
+        "node": ">=18.17.1"
       }
     },
     "packages/browsers/node_modules/cliui": {
@@ -10945,7 +10945,7 @@
         "@schematics/angular": "^17.0.7"
       },
       "engines": {
-        "node": ">=16.13.2"
+        "node": ">=18.17.1"
       }
     },
     "packages/ng-schematics/node_modules/@angular-devkit/architect": {
@@ -11382,7 +11382,7 @@
         "@types/node": "18.17.15"
       },
       "engines": {
-        "node": ">=16.13.2"
+        "node": ">=18.17.1"
       }
     },
     "packages/puppeteer-core": {
@@ -11405,7 +11405,7 @@
         "rxjs": "7.8.1"
       },
       "engines": {
-        "node": ">=16.13.2"
+        "node": ">=18.17.1"
       }
     },
     "packages/puppeteer-core/node_modules/@types/node": {
diff --git a/packages/browsers/package.json b/packages/browsers/package.json
index 7527292da48..817aad5ebf9 100644
--- a/packages/browsers/package.json
+++ b/packages/browsers/package.json
@@ -87,7 +87,7 @@
   "author": "The Chromium Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=16.3.0"
+    "node": ">=18"
   },
   "files": [
     "lib",
diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json
index 9b4fd84582c..23dbb83c399 100644
--- a/packages/ng-schematics/package.json
+++ b/packages/ng-schematics/package.json
@@ -48,7 +48,7 @@
   "author": "The Chromium Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=16.13.2"
+    "node": ">=18"
   },
   "dependencies": {
     "@angular-devkit/architect": "^0.1701.1",
diff --git a/packages/puppeteer-core/package.json b/packages/puppeteer-core/package.json
index e62513ba483..a0882f7b3d4 100644
--- a/packages/puppeteer-core/package.json
+++ b/packages/puppeteer-core/package.json
@@ -31,7 +31,7 @@
     "url": "https://github.com/puppeteer/puppeteer/tree/main/packages/puppeteer-core"
   },
   "engines": {
-    "node": ">=16.13.2"
+    "node": ">=18"
   },
   "scripts": {
     "build:docs": "wireit",
diff --git a/packages/puppeteer-core/src/common/BrowserConnector.ts b/packages/puppeteer-core/src/common/BrowserConnector.ts
index 217e53bedd9..4c8308da6e6 100644
--- a/packages/puppeteer-core/src/common/BrowserConnector.ts
+++ b/packages/puppeteer-core/src/common/BrowserConnector.ts
@@ -14,7 +14,6 @@ import {isErrorLike} from '../util/ErrorLike.js';
 import type {ConnectionTransport} from './ConnectionTransport.js';
 import type {ConnectOptions} from './ConnectOptions.js';
 import type {BrowserConnectOptions} from './ConnectOptions.js';
-import {getFetch} from './fetch.js';
 
 const getWebSocketTransportClass = async () => {
   return isNode
@@ -93,9 +92,8 @@ async function getConnectionTransport(
 async function getWSEndpoint(browserURL: string): Promise<string> {
   const endpointURL = new URL('/json/version', browserURL);
 
-  const fetch = await getFetch();
   try {
-    const result = await fetch(endpointURL.toString(), {
+    const result = await globalThis.fetch(endpointURL.toString(), {
       method: 'GET',
     });
     if (!result.ok) {
diff --git a/packages/puppeteer-core/src/common/common.ts b/packages/puppeteer-core/src/common/common.ts
index 6ef89256054..c8942b72246 100644
--- a/packages/puppeteer-core/src/common/common.ts
+++ b/packages/puppeteer-core/src/common/common.ts
@@ -15,7 +15,6 @@ export * from './Debug.js';
 export * from './Device.js';
 export * from './Errors.js';
 export * from './EventEmitter.js';
-export * from './fetch.js';
 export * from './FileChooser.js';
 export * from './GetQueryHandler.js';
 export * from './HandleIterator.js';
diff --git a/packages/puppeteer-core/src/common/fetch.ts b/packages/puppeteer-core/src/common/fetch.ts
deleted file mode 100644
index 6c7a2b451c1..00000000000
--- a/packages/puppeteer-core/src/common/fetch.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @license
- * Copyright 2020 Google Inc.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Gets the global version if we're in the browser, else loads the node-fetch module.
- *
- * @internal
- */
-export const getFetch = async (): Promise<typeof fetch> => {
-  return (globalThis as any).fetch || (await import('cross-fetch')).fetch;
-};
diff --git a/packages/puppeteer/package.json b/packages/puppeteer/package.json
index b96f3d7ff30..41f26516526 100644
--- a/packages/puppeteer/package.json
+++ b/packages/puppeteer/package.json
@@ -32,7 +32,7 @@
     "url": "https://github.com/puppeteer/puppeteer/tree/main/packages/puppeteer"
   },
   "engines": {
-    "node": ">=16.13.2"
+    "node": ">=18"
   },
   "scripts": {
     "build:docs": "wireit",