From f36e1e9fe772bcfdfbe55af9bd8f53f60c8f8483 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 9 Oct 2020 14:14:53 +0200 Subject: [PATCH] chore: remove node-fetch from the project --- packages/backend-common/package.json | 1 - .../cli/templates/default-backend-plugin/package.json.hbs | 5 ++--- packages/core-api/package.json | 3 +-- packages/core-api/src/setupTests.ts | 2 -- packages/core/package.json | 3 +-- packages/core/src/setupTests.ts | 2 -- packages/e2e-test/package.json | 2 +- packages/e2e-test/src/e2e-test.ts | 2 +- plugins/catalog/package.json | 1 - plugins/proxy-backend/package.json | 2 -- plugins/techdocs-backend/package.json | 1 + plugins/techdocs-backend/src/default-branch.ts | 2 +- plugins/techdocs-backend/src/service/metadata.ts | 3 ++- plugins/techdocs-backend/src/service/router.ts | 2 +- yarn.lock | 2 +- 15 files changed, 12 insertions(+), 21 deletions(-) diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index eb74546f23..ad2af992bd 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -65,7 +65,6 @@ "@types/compression": "^1.7.0", "@types/http-errors": "^1.6.3", "@types/morgan": "^1.9.0", - "@types/node-fetch": "^2.5.7", "@types/stoppable": "^1.1.0", "@types/supertest": "^2.0.8", "@types/webpack-env": "^1.15.2", diff --git a/packages/cli/templates/default-backend-plugin/package.json.hbs b/packages/cli/templates/default-backend-plugin/package.json.hbs index c9c8488721..96ceb9784d 100644 --- a/packages/cli/templates/default-backend-plugin/package.json.hbs +++ b/packages/cli/templates/default-backend-plugin/package.json.hbs @@ -29,15 +29,14 @@ "express": "^4.17.1", "express-promise-router": "^3.0.3", "winston": "^3.2.1", - "node-fetch": "^2.6.1", + "cross-fetch": "^3.0.6", "yn": "^4.0.0" }, "devDependencies": { "@backstage/cli": "^{{version}}", "@types/supertest": "^2.0.8", "supertest": "^4.0.2", - "msw": "^0.21.2", - "cross-fetch": "^3.0.6" + "msw": "^0.21.2" }, "files": [ "dist" diff --git a/packages/core-api/package.json b/packages/core-api/package.json index c925471695..d6dd492906 100644 --- a/packages/core-api/package.json +++ b/packages/core-api/package.json @@ -48,8 +48,7 @@ "@testing-library/user-event": "^12.0.7", "@types/jest": "^26.0.7", "@types/node": "^12.0.0", - "@types/zen-observable": "^0.8.0", - "jest-fetch-mock": "^3.0.3" + "@types/zen-observable": "^0.8.0" }, "files": [ "dist" diff --git a/packages/core-api/src/setupTests.ts b/packages/core-api/src/setupTests.ts index 8553642152..825bcd4115 100644 --- a/packages/core-api/src/setupTests.ts +++ b/packages/core-api/src/setupTests.ts @@ -15,5 +15,3 @@ */ import '@testing-library/jest-dom'; - -require('jest-fetch-mock').enableMocks(); diff --git a/packages/core/package.json b/packages/core/package.json index 0a0dc7576c..f125c9d67e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -64,8 +64,7 @@ "@types/jest": "^26.0.7", "@types/node": "^12.0.0", "@types/react-helmet": "^6.1.0", - "@types/zen-observable": "^0.8.0", - "jest-fetch-mock": "^3.0.3" + "@types/zen-observable": "^0.8.0" }, "files": [ "dist" diff --git a/packages/core/src/setupTests.ts b/packages/core/src/setupTests.ts index 8553642152..825bcd4115 100644 --- a/packages/core/src/setupTests.ts +++ b/packages/core/src/setupTests.ts @@ -15,5 +15,3 @@ */ import '@testing-library/jest-dom'; - -require('jest-fetch-mock').enableMocks(); diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json index 8dcfd98ab5..6f8a952547 100644 --- a/packages/e2e-test/package.json +++ b/packages/e2e-test/package.json @@ -26,7 +26,7 @@ "@types/node": "^13.7.2", "fs-extra": "^9.0.0", "handlebars": "^4.7.3", - "node-fetch": "^2.6.0", + "cross-fetch": "^3.0.6", "pgtools": "^0.3.0", "tree-kill": "^1.2.2", "ts-node": "^8.6.2", diff --git a/packages/e2e-test/src/e2e-test.ts b/packages/e2e-test/src/e2e-test.ts index c7f6137ff1..d1529d3af2 100644 --- a/packages/e2e-test/src/e2e-test.ts +++ b/packages/e2e-test/src/e2e-test.ts @@ -16,7 +16,7 @@ import os from 'os'; import fs from 'fs-extra'; -import fetch from 'node-fetch'; +import fetch from 'cross-fetch'; import handlebars from 'handlebars'; import killTree from 'tree-kill'; import { resolve as resolvePath, join as joinPath } from 'path'; diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index b57136b7db..23eeb7c8a1 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -51,7 +51,6 @@ "@types/jest": "^26.0.7", "@types/node": "^12.0.0", "msw": "^0.21.2", - "node-fetch": "^2.6.1", "react-test-renderer": "^16.13.1", "cross-fetch": "^3.0.6" }, diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json index 0e6b8a3458..248c3a4014 100644 --- a/plugins/proxy-backend/package.json +++ b/plugins/proxy-backend/package.json @@ -35,8 +35,6 @@ }, "devDependencies": { "@backstage/cli": "^0.1.1-alpha.24", - "@types/node-fetch": "^2.5.7", - "@types/supertest": "^2.0.8", "@types/uuid": "^8.0.0", "@types/yup": "^0.28.2", "supertest": "^4.0.2" diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json index de50bea910..ed2b952f16 100644 --- a/plugins/techdocs-backend/package.json +++ b/plugins/techdocs-backend/package.json @@ -34,6 +34,7 @@ "git-url-parse": "^11.2.0", "knex": "^0.21.1", "nodegit": "^0.27.0", + "cross-fetch": "^3.0.6", "winston": "^3.2.1" }, "devDependencies": { diff --git a/plugins/techdocs-backend/src/default-branch.ts b/plugins/techdocs-backend/src/default-branch.ts index 05a8f666ce..bbf40c17fc 100644 --- a/plugins/techdocs-backend/src/default-branch.ts +++ b/plugins/techdocs-backend/src/default-branch.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import fetch, { RequestInit } from 'node-fetch'; +import fetch from 'cross-fetch'; import parseGitUrl from 'git-url-parse'; import { ConfigReader, Config } from '@backstage/config'; import { loadBackendConfig } from '@backstage/backend-common'; diff --git a/plugins/techdocs-backend/src/service/metadata.ts b/plugins/techdocs-backend/src/service/metadata.ts index 671fcdda17..760180f8d2 100644 --- a/plugins/techdocs-backend/src/service/metadata.ts +++ b/plugins/techdocs-backend/src/service/metadata.ts @@ -1,4 +1,3 @@ -import fetch from 'node-fetch'; /* * Copyright 2020 Spotify AB * @@ -15,6 +14,8 @@ import fetch from 'node-fetch'; * limitations under the License. */ +import fetch from 'cross-fetch'; + export class TechDocsMetadata { private async getMetadataFile(docsUrl: String) { const metadataURL = `${docsUrl}/techdocs_metadata.json`; diff --git a/plugins/techdocs-backend/src/service/router.ts b/plugins/techdocs-backend/src/service/router.ts index 365534b9d0..ca0dbd45b4 100644 --- a/plugins/techdocs-backend/src/service/router.ts +++ b/plugins/techdocs-backend/src/service/router.ts @@ -17,7 +17,7 @@ import { Logger } from 'winston'; import Router from 'express-promise-router'; import express from 'express'; import Knex from 'knex'; -import fetch from 'node-fetch'; +import fetch from 'cross-fetch'; import { Config } from '@backstage/config'; import Docker from 'dockerode'; import { diff --git a/yarn.lock b/yarn.lock index 9afd4e6e4f..0f81798230 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5180,7 +5180,7 @@ dependencies: "@types/node" "*" -"@types/node-fetch@2.5.7", "@types/node-fetch@^2.5.4", "@types/node-fetch@^2.5.7": +"@types/node-fetch@2.5.7", "@types/node-fetch@^2.5.4": version "2.5.7" resolved "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c" integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==