From c06d04cd04296543af54b6f165d7adf82bb5b4f6 Mon Sep 17 00:00:00 2001
From: Chris Lenfest <clenfest@apollographql.com>
Date: Tue, 30 Aug 2022 17:08:39 -0500
Subject: [PATCH] Fix node-fetch runtime build-time regression (#2116)

* Fix node-fetch build time regression
---
 gateway-js/CHANGELOG.md |  1 +
 gateway-js/package.json |  1 +
 package-lock.json       | 26 ++++++--------------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/gateway-js/CHANGELOG.md b/gateway-js/CHANGELOG.md
index f5e0c40e7..ebe59726d 100644
--- a/gateway-js/CHANGELOG.md
+++ b/gateway-js/CHANGELOG.md
@@ -3,6 +3,7 @@
 This CHANGELOG pertains only to Apollo Federation packages in the 2.x range. The Federation v0.x equivalent for this package can be found [here](https://github.com/apollographql/federation/blob/version-0.x/gateway-js/CHANGELOG.md) on the `version-0.x` branch of this repo.
 
 ## vNext
+- Fix build-time regression caused by #1970 (removal of @types/node-fetch from runtime dependencies) [PR #2116](https://github.com/apollographql/federation/pull/2116)
 
 ## 2.1.0
 
diff --git a/gateway-js/package.json b/gateway-js/package.json
index 6e4f87427..c4824d4d4 100644
--- a/gateway-js/package.json
+++ b/gateway-js/package.json
@@ -35,6 +35,7 @@
     "@apollo/utils.logger": "^1.0.0",
     "@josephg/resolvable": "^1.0.1",
     "@opentelemetry/api": "^1.0.1",
+    "@types/node-fetch": "^2.6.2",
     "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
     "async-retry": "^1.3.3",
     "loglevel": "^1.6.1",
diff --git a/package-lock.json b/package-lock.json
index f9bb70491..a7f99b795 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,6 +105,7 @@
         "@apollo/utils.logger": "^1.0.0",
         "@josephg/resolvable": "^1.0.1",
         "@opentelemetry/api": "^1.0.1",
+        "@types/node-fetch": "2.6.2",
         "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
         "async-retry": "^1.3.3",
         "loglevel": "^1.6.1",
@@ -4744,12 +4745,10 @@
     },
     "node_modules/@types/node": {
       "version": "12.20.55",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/node-fetch": {
       "version": "2.6.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -5699,7 +5698,6 @@
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/at-least-node": {
@@ -6737,7 +6735,6 @@
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
@@ -7338,7 +7335,6 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -8581,7 +8577,6 @@
     },
     "node_modules/form-data": {
       "version": "3.0.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -13212,7 +13207,6 @@
     },
     "node_modules/mime-db": {
       "version": "1.51.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -13220,7 +13214,6 @@
     },
     "node_modules/mime-types": {
       "version": "2.1.34",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.51.0"
@@ -18749,6 +18742,7 @@
         "@apollo/utils.logger": "^1.0.0",
         "@josephg/resolvable": "^1.0.1",
         "@opentelemetry/api": "^1.0.1",
+        "@types/node-fetch": "2.6.2",
         "apollo-reporting-protobuf": "^0.8.0 || ^3.0.0",
         "async-retry": "^1.3.3",
         "loglevel": "^1.6.1",
@@ -22066,12 +22060,10 @@
       }
     },
     "@types/node": {
-      "version": "12.20.55",
-      "dev": true
+      "version": "12.20.55"
     },
     "@types/node-fetch": {
       "version": "2.6.2",
-      "dev": true,
       "requires": {
         "@types/node": "*",
         "form-data": "^3.0.0"
@@ -22692,8 +22684,7 @@
       }
     },
     "asynckit": {
-      "version": "0.4.0",
-      "dev": true
+      "version": "0.4.0"
     },
     "at-least-node": {
       "version": "1.0.0",
@@ -23397,7 +23388,6 @@
     },
     "combined-stream": {
       "version": "1.0.8",
-      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -23815,8 +23805,7 @@
       }
     },
     "delayed-stream": {
-      "version": "1.0.0",
-      "dev": true
+      "version": "1.0.0"
     },
     "delegates": {
       "version": "1.0.0",
@@ -24668,7 +24657,6 @@
     },
     "form-data": {
       "version": "3.0.1",
-      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -27828,12 +27816,10 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.51.0",
-      "dev": true
+      "version": "1.51.0"
     },
     "mime-types": {
       "version": "2.1.34",
-      "dev": true,
       "requires": {
         "mime-db": "1.51.0"
       }