diff --git a/.changeset/brave-owls-wink.md b/.changeset/brave-owls-wink.md new file mode 100644 index 0000000..9905382 --- /dev/null +++ b/.changeset/brave-owls-wink.md @@ -0,0 +1,6 @@ +--- +'@k-phoen/backstage-plugin-announcements-backend': patch +'@k-phoen/backstage-plugin-announcements': patch +--- + +Use node-fetch instead of cross-fetch diff --git a/plugins/announcements-backend/package.json b/plugins/announcements-backend/package.json index 047ef45..6501948 100644 --- a/plugins/announcements-backend/package.json +++ b/plugins/announcements-backend/package.json @@ -40,7 +40,6 @@ "@backstage/plugin-search-common": "^1.2.9", "@k-phoen/backstage-plugin-announcements-common": "^0.0.7", "@types/express": "^4.17.6", - "cross-fetch": "^3.1.5", "express": "^4.17.1", "express-promise-router": "^4.1.0", "knex": "^3.0.0", @@ -53,6 +52,7 @@ }, "devDependencies": { "@backstage/cli": "^0.25.0", + "@types/node-fetch": "^2.6.9", "@types/supertest": "^2.0.8", "@types/uuid": "^8.3.4", "better-sqlite3": "^8.0.0", diff --git a/plugins/announcements-backend/src/search/api.ts b/plugins/announcements-backend/src/search/api.ts index daf15d8..4a8790a 100644 --- a/plugins/announcements-backend/src/search/api.ts +++ b/plugins/announcements-backend/src/search/api.ts @@ -1,4 +1,4 @@ -import crossFetch from 'cross-fetch'; +import fetch from 'node-fetch'; import { DiscoveryApi } from '@backstage/core-plugin-api'; import { ResponseError } from '@backstage/errors'; @@ -21,12 +21,12 @@ export class AnnouncementsClient { private async fetch(input: string): Promise { const baseApiUrl = await this.discoveryApi.getBaseUrl('announcements'); - return crossFetch(`${baseApiUrl}${input}`).then(async response => { - if (!response.ok) { - throw await ResponseError.fromResponse(response); - } - return response.json() as Promise; - }); + const response = await fetch(`${baseApiUrl}${input}`); + if (!response.ok) { + throw await ResponseError.fromResponse(response); + } + + return response.json() as Promise; } async announcements(): Promise { diff --git a/plugins/announcements/package.json b/plugins/announcements/package.json index 6ad788a..3be680a 100644 --- a/plugins/announcements/package.json +++ b/plugins/announcements/package.json @@ -61,7 +61,6 @@ "@testing-library/user-event": "^14.0.0", "@types/luxon": "^3.2.0", "@types/node": "^16.11.26", - "cross-fetch": "^3.1.5", "msw": "^1.0.0" }, "files": [ diff --git a/plugins/announcements/src/setupTests.ts b/plugins/announcements/src/setupTests.ts index 48c09b5..7b0828b 100644 --- a/plugins/announcements/src/setupTests.ts +++ b/plugins/announcements/src/setupTests.ts @@ -1,2 +1 @@ import '@testing-library/jest-dom'; -import 'cross-fetch/polyfill'; diff --git a/yarn.lock b/yarn.lock index d804cc2..7a14bdb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4770,10 +4770,10 @@ __metadata: "@backstage/plugin-search-common": ^1.2.9 "@k-phoen/backstage-plugin-announcements-common": ^0.0.7 "@types/express": ^4.17.6 + "@types/node-fetch": ^2.6.9 "@types/supertest": ^2.0.8 "@types/uuid": ^8.3.4 better-sqlite3: ^8.0.0 - cross-fetch: ^3.1.5 express: ^4.17.1 express-promise-router: ^4.1.0 knex: ^3.0.0 @@ -4824,7 +4824,6 @@ __metadata: "@types/luxon": ^3.2.0 "@types/node": ^16.11.26 "@uiw/react-md-editor": ^3.19.5 - cross-fetch: ^3.1.5 luxon: ^3.2.0 msw: ^1.0.0 react-use: ^17.2.4 @@ -6757,6 +6756,16 @@ __metadata: languageName: node linkType: hard +"@types/node-fetch@npm:^2.6.9": + version: 2.6.9 + resolution: "@types/node-fetch@npm:2.6.9" + dependencies: + "@types/node": "*" + form-data: ^4.0.0 + checksum: 212269aff4b251477c13c33cee6cea23e4fd630be6c0bfa3714968cce7efd7055b52f2f82aab3394596d8c758335cc802e7c5fa3f775e7f2a472fa914c90dc15 + languageName: node + linkType: hard + "@types/node@npm:*": version: 18.11.17 resolution: "@types/node@npm:18.11.17" @@ -9765,15 +9774,6 @@ __metadata: languageName: node linkType: hard -"cross-fetch@npm:^3.1.5": - version: 3.1.5 - resolution: "cross-fetch@npm:3.1.5" - dependencies: - node-fetch: 2.6.7 - checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb - languageName: node - linkType: hard - "cross-fetch@npm:^4.0.0": version: 4.0.0 resolution: "cross-fetch@npm:4.0.0" @@ -17228,9 +17228,9 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:2.6.7, node-fetch@npm:^2.6.7": - version: 2.6.7 - resolution: "node-fetch@npm:2.6.7" +"node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.9": + version: 2.7.0 + resolution: "node-fetch@npm:2.7.0" dependencies: whatwg-url: ^5.0.0 peerDependencies: @@ -17238,13 +17238,13 @@ __metadata: peerDependenciesMeta: encoding: optional: true - checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b + checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5 languageName: node linkType: hard -"node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.9": - version: 2.7.0 - resolution: "node-fetch@npm:2.7.0" +"node-fetch@npm:^2.6.7": + version: 2.6.7 + resolution: "node-fetch@npm:2.6.7" dependencies: whatwg-url: ^5.0.0 peerDependencies: @@ -17252,7 +17252,7 @@ __metadata: peerDependenciesMeta: encoding: optional: true - checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5 + checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b languageName: node linkType: hard