Merge pull request #8233 from backstage/freben/less-cross

🧹 Align on usage of `cross-fetch` vs `node-fetch` in frontend vs backend packages
2021-11-26 10:15:50 +01:00
parent 5f01829180 37e373d649
commit de1f77b71c
34 changed files with 74 additions and 68 deletions
@@ -42,7 +42,6 @@
    "compression": "^1.7.4",
    "cookie-parser": "^1.4.5",
    "cors": "^2.8.5",
-    "cross-fetch": "^3.0.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "express-session": "^1.17.1",
@@ -56,6 +55,7 @@
    "luxon": "^2.0.2",
    "minimatch": "^3.0.3",
    "morgan": "^1.10.0",
+    "node-fetch": "^2.6.1",
    "node-cache": "^5.1.2",
    "openid-client": "^4.2.1",
    "passport": "^0.4.1",
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import fetch from 'cross-fetch';
+import fetch from 'node-fetch';
 import { JWK, JWT, JWKS, JSONWebKey } from 'jose';
 import { BackstageIdentity } from '../providers';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
@@ -50,7 +50,7 @@ const mockClaims = {
 };

 jest.mock('jose');
-jest.mock('cross-fetch', () => ({
+jest.mock('node-fetch', () => ({
  __esModule: true,
  default: async () => {
    return {
@@ -21,7 +21,7 @@ import {
  SignInResolver,
 } from '../types';
 import express from 'express';
-import fetch from 'cross-fetch';
+import fetch from 'node-fetch';
 import * as crypto from 'crypto';
 import { KeyObject } from 'crypto';
 import { Logger } from 'winston';
@@ -39,7 +39,6 @@
    "@types/express": "^4.17.6",
    "badge-maker": "^3.3.0",
    "cors": "^2.8.5",
-    "cross-fetch": "^3.0.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "winston": "^3.2.1",
@@ -49,7 +49,6 @@
    "@types/jest": "^26.0.7",
    "@types/node": "^14.14.32",
    "@types/recharts": "^1.8.15",
-    "cross-fetch": "^3.0.6",
    "msw": "^0.35.0"
  },
  "files": [
@@ -13,6 +13,7 @@ import { LocationSpec } from '@backstage/catalog-model';
 import { Logger as Logger_2 } from 'winston';
 import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
 import * as msal from '@azure/msal-node';
+import { Response as Response_2 } from 'node-fetch';
 import { UserEntity } from '@backstage/catalog-model';

 // Warning: (ae-missing-release-tag) "defaultGroupTransformer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -88,11 +89,11 @@ export class MicrosoftGraphClient {
  // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/plugin-catalog-backend-module-msgraph" does not have an export "ODataQuery"
  getUsers(query?: ODataQuery): AsyncIterable<MicrosoftGraph.User>;
  // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/plugin-catalog-backend-module-msgraph" does not have an export "ODataQuery"
-  requestApi(path: string, query?: ODataQuery): Promise<Response>;
+  requestApi(path: string, query?: ODataQuery): Promise<Response_2>;
  // Warning: (ae-forgotten-export) The symbol "ODataQuery" needs to be exported by the entry point index.d.ts
  // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/plugin-catalog-backend-module-msgraph" does not have an export "ODataQuery"
  requestCollection<T>(path: string, query?: ODataQuery): AsyncIterable<T>;
-  requestRaw(url: string): Promise<Response>;
+  requestRaw(url: string): Promise<Response_2>;
 }

 // Warning: (ae-missing-release-tag) "MicrosoftGraphOrgEntityProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -34,8 +34,9 @@
    "@backstage/config": "^0.1.10",
    "@backstage/plugin-catalog-backend": "^0.18.0",
    "@microsoft/microsoft-graph-types": "^2.6.0",
-    "cross-fetch": "^3.0.6",
+    "@types/node-fetch": "^2.5.12",
    "lodash": "^4.17.21",
+    "node-fetch": "^2.6.1",
    "p-limit": "^3.0.2",
    "winston": "^3.2.1",
    "qs": "^6.9.4"
@@ -16,7 +16,7 @@

 import * as msal from '@azure/msal-node';
 import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
-import fetch from 'cross-fetch';
+import fetch, { Response } from 'node-fetch';
 import qs from 'qs';
 import { MicrosoftGraphProviderConfig } from './config';

@@ -43,7 +43,6 @@
    "aws-sdk": "^2.840.0",
    "codeowners-utils": "^1.0.2",
    "core-js": "^3.6.5",
-    "cross-fetch": "^3.0.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "fast-json-stable-stringify": "^2.1.0",
@@ -53,6 +52,7 @@
    "knex": "^0.95.1",
    "lodash": "^4.17.21",
    "luxon": "^2.0.2",
+    "node-fetch": "^2.6.1",
    "p-limit": "^3.0.2",
    "prom-client": "^13.2.0",
    "uuid": "^8.0.0",
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import fetch from 'cross-fetch';
+import fetch from 'node-fetch';
 import {
  AzureIntegrationConfig,
  getAzureRequestOptions,
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-import fetch from 'cross-fetch';
+import fetch from 'node-fetch';

 import {
  BitbucketIntegrationConfig,
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-import fetch from 'cross-fetch';
+import fetch from 'node-fetch';
 import {
  getGitLabRequestOptions,
  GitLabIntegrationConfig,
@@ -27,7 +27,6 @@
    "@backstage/errors": "^0.1.5",
    "@backstage/integration": "^0.6.8",
    "@types/express": "^4.17.6",
-    "cross-fetch": "^3.0.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "express-xml-bodyparser": "^0.3.0",
@@ -58,7 +58,6 @@
    "@testing-library/user-event": "^13.1.8",
    "@types/jest": "^26.0.7",
    "@types/node": "^14.14.32",
-    "cross-fetch": "^3.0.6",
    "msw": "^0.35.0"
  },
  "files": [
@@ -27,7 +27,6 @@
    "@backstage/catalog-model": "^0.9.7",
    "@backstage/config": "^0.1.10",
    "@types/express": "^4.17.6",
-    "cross-fetch": "^3.0.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "jenkins": "^0.28.1",
@@ -29,7 +29,6 @@
    "command-exists": "^1.2.9",
    "fs-extra": "10.0.0",
    "winston": "^3.2.1",
-    "cross-fetch": "^3.0.6",
    "yn": "^4.0.0"
  },
  "devDependencies": {
@@ -50,7 +50,6 @@
    "command-exists": "^1.2.9",
    "compression": "^1.7.4",
    "cors": "^2.8.5",
-    "cross-fetch": "^3.0.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "fs-extra": "10.0.0",
@@ -65,6 +64,7 @@
    "lodash": "^4.17.21",
    "luxon": "^2.0.2",
    "morgan": "^1.10.0",
+    "node-fetch": "^2.6.1",
    "nunjucks": "^3.2.3",
    "octokit-plugin-create-pull-request": "^3.10.0",
    "uuid": "^8.2.0",
@@ -19,7 +19,7 @@ import {
  BitbucketIntegrationConfig,
  ScmIntegrationRegistry,
 } from '@backstage/integration';
-import fetch from 'cross-fetch';
+import fetch, { Response, RequestInit } from 'node-fetch';
 import { initRepoAndPush } from '../helpers';
 import { createTemplateAction } from '../../createTemplateAction';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
@@ -58,7 +58,6 @@
    "@testing-library/user-event": "^13.1.8",
    "@types/jest": "^26.0.7",
    "@types/node": "^14.14.32",
-    "cross-fetch": "^3.0.6",
    "msw": "^0.35.0"
  },
  "files": [
@@ -39,7 +39,6 @@
    "@backstage/plugin-tech-insights-common": "^0.1.0",
    "@backstage/plugin-tech-insights-node": "^0.1.0",
    "@types/express": "^4.17.6",
-    "cross-fetch": "^3.0.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "knex": "^0.95.1",
@@ -40,13 +40,13 @@
    "@backstage/search-common": "^0.2.1",
    "@backstage/techdocs-common": "^0.10.8",
    "@types/express": "^4.17.6",
-    "cross-fetch": "^3.0.6",
    "dockerode": "^3.3.1",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "fs-extra": "9.1.0",
    "knex": "^0.95.1",
    "lodash": "^4.17.21",
+    "node-fetch": "^2.6.1",
    "p-limit": "^3.1.0",
    "winston": "^3.2.1"
  },
@@ -17,7 +17,7 @@
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import { Entity, RELATION_OWNED_BY } from '@backstage/catalog-model';
 import { DocumentCollator } from '@backstage/search-common';
-import fetch from 'cross-fetch';
+import fetch from 'node-fetch';
 import unescape from 'lodash/unescape';
 import { Logger } from 'winston';
 import pLimit from 'p-limit';
@@ -24,7 +24,7 @@ import {
  PreparerBuilder,
  PublisherBase,
 } from '@backstage/techdocs-common';
-import fetch from 'cross-fetch';
+import fetch from 'node-fetch';
 import express, { Response } from 'express';
 import Router from 'express-promise-router';
 import { Knex } from 'knex';
@@ -32,7 +32,6 @@
    "@backstage/errors": "^0.1.3",
    "@backstage/integration": "^0.6.7",
    "@types/express": "^4.17.6",
-    "cross-fetch": "^3.0.6",
    "express": "^4.17.1",
    "express-promise-router": "^4.1.0",
    "leasot": "^12.0.0",