diff --git a/.yarn/cache/data-uri-to-buffer-npm-4.0.0-e7a49f58f7-a010653869.zip b/.yarn/cache/data-uri-to-buffer-npm-4.0.0-e7a49f58f7-a010653869.zip new file mode 100644 index 0000000000..23b0f43154 Binary files /dev/null and b/.yarn/cache/data-uri-to-buffer-npm-4.0.0-e7a49f58f7-a010653869.zip differ diff --git a/.yarn/cache/fetch-blob-npm-3.2.0-28e01becfc-f19bc28a2a.zip b/.yarn/cache/fetch-blob-npm-3.2.0-28e01becfc-f19bc28a2a.zip new file mode 100644 index 0000000000..e90e7e285c Binary files /dev/null and b/.yarn/cache/fetch-blob-npm-3.2.0-28e01becfc-f19bc28a2a.zip differ diff --git a/.yarn/cache/formdata-polyfill-npm-4.0.10-e03013c013-82a34df292.zip b/.yarn/cache/formdata-polyfill-npm-4.0.10-e03013c013-82a34df292.zip new file mode 100644 index 0000000000..118da5ce6e Binary files /dev/null and b/.yarn/cache/formdata-polyfill-npm-4.0.10-e03013c013-82a34df292.zip differ diff --git a/.yarn/cache/node-fetch-npm-3.2.10-b87c28708a-e65322431f.zip b/.yarn/cache/node-fetch-npm-3.2.10-b87c28708a-e65322431f.zip new file mode 100644 index 0000000000..071e603bff Binary files /dev/null and b/.yarn/cache/node-fetch-npm-3.2.10-b87c28708a-e65322431f.zip differ diff --git a/.yarn/cache/web-streams-polyfill-npm-3.2.1-835bd3857e-b119c78574.zip b/.yarn/cache/web-streams-polyfill-npm-3.2.1-835bd3857e-b119c78574.zip new file mode 100644 index 0000000000..847691560b Binary files /dev/null and b/.yarn/cache/web-streams-polyfill-npm-3.2.1-835bd3857e-b119c78574.zip differ diff --git a/packages/app-builder-backend/package.json b/packages/app-builder-backend/package.json index ddd6d42a20..8cf0135a8b 100644 --- a/packages/app-builder-backend/package.json +++ b/packages/app-builder-backend/package.json @@ -52,7 +52,7 @@ "graphql-type-json": "^0.3.2", "jszip": "^3.10.0", "luxon": "^2.4.0", - "node-fetch": "2.6.7", + "node-fetch": "3.2.10", "pluralize": "^8.0.0", "project-name-generator": "^2.1.9", "reflect-metadata": "^0.1.13", diff --git a/packages/app-builder-backend/src/platform/index.ts b/packages/app-builder-backend/src/platform/index.ts index 1b32b3960b..10937f9dcc 100644 --- a/packages/app-builder-backend/src/platform/index.ts +++ b/packages/app-builder-backend/src/platform/index.ts @@ -6,8 +6,8 @@ import { SchemaModelPagedResult, UpdateSchemaRequest, } from '@reapit/foundations-ts-definitions/types' -import fetch from 'node-fetch' import config from '../config.json' +import { fetch } from '../utils/fetch' const { platformApiUrl } = config diff --git a/packages/app-builder-backend/src/utils/fetch.ts b/packages/app-builder-backend/src/utils/fetch.ts new file mode 100644 index 0000000000..4a8d6c7a11 --- /dev/null +++ b/packages/app-builder-backend/src/utils/fetch.ts @@ -0,0 +1,3 @@ +// workaround cos node-fetch is a cjs module +export const fetch = (url: RequestInfo, init?: RequestInit | undefined) => + import('node-fetch').then(({ default: fetch }) => fetch(url as any, init as any)) diff --git a/packages/app-builder-backend/src/utils/graphql-fetch.ts b/packages/app-builder-backend/src/utils/graphql-fetch.ts index 095ca9ab67..ed7be4d03c 100644 --- a/packages/app-builder-backend/src/utils/graphql-fetch.ts +++ b/packages/app-builder-backend/src/utils/graphql-fetch.ts @@ -1,6 +1,6 @@ import { DocumentNode } from 'graphql' -import fetch from 'node-fetch' import { graphqlUri } from '../config.json' +import { fetch } from './fetch' type AuthTokens = { accessToken: string diff --git a/yarn.lock b/yarn.lock index 8bc04cddae..660ccdb867 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7684,7 +7684,7 @@ __metadata: jest-coverage-badges: ^1.1.2 jszip: ^3.10.0 luxon: ^2.4.0 - node-fetch: 2.6.7 + node-fetch: 3.2.10 pluralize: ^8.0.0 project-name-generator: ^2.1.9 reflect-metadata: ^0.1.13 @@ -18872,6 +18872,13 @@ __metadata: languageName: node linkType: hard +"data-uri-to-buffer@npm:^4.0.0": + version: 4.0.0 + resolution: "data-uri-to-buffer@npm:4.0.0" + checksum: a010653869abe8bb51259432894ac62c52bf79ad761d418d94396f48c346f2ae739c46b254e8bb5987bded8a653d467db1968db3a69bab1d33aa5567baa5cfc7 + languageName: node + linkType: hard + "data-urls@npm:^1.1.0": version: 1.1.0 resolution: "data-urls@npm:1.1.0" @@ -22227,6 +22234,16 @@ __metadata: languageName: node linkType: hard +"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4": + version: 3.2.0 + resolution: "fetch-blob@npm:3.2.0" + dependencies: + node-domexception: ^1.0.0 + web-streams-polyfill: ^3.0.3 + checksum: f19bc28a2a0b9626e69fd7cf3a05798706db7f6c7548da657cbf5026a570945f5eeaedff52007ea35c8bcd3d237c58a20bf1543bc568ab2422411d762dd3d5bf + languageName: node + linkType: hard + "fetch-mock-jest@npm:^1.5.1": version: 1.5.1 resolution: "fetch-mock-jest@npm:1.5.1" @@ -22912,6 +22929,15 @@ __metadata: languageName: node linkType: hard +"formdata-polyfill@npm:^4.0.10": + version: 4.0.10 + resolution: "formdata-polyfill@npm:4.0.10" + dependencies: + fetch-blob: ^3.1.2 + checksum: 82a34df292afadd82b43d4a740ce387bc08541e0a534358425193017bf9fb3567875dc5f69564984b1da979979b70703aa73dee715a17b6c229752ae736dd9db + languageName: node + linkType: hard + "formidable@npm:^1.2.0": version: 1.2.2 resolution: "formidable@npm:1.2.2" @@ -30881,7 +30907,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"node-domexception@npm:1.0.0": +"node-domexception@npm:1.0.0, node-domexception@npm:^1.0.0": version: 1.0.0 resolution: "node-domexception@npm:1.0.0" checksum: ee1d37dd2a4eb26a8a92cd6b64dfc29caec72bff5e1ed9aba80c294f57a31ba4895a60fd48347cf17dd6e766da0ae87d75657dfd1f384ebfa60462c2283f5c7f @@ -30933,6 +30959,17 @@ fsevents@^1.2.7: languageName: node linkType: hard +"node-fetch@npm:3.2.10": + version: 3.2.10 + resolution: "node-fetch@npm:3.2.10" + dependencies: + data-uri-to-buffer: ^4.0.0 + fetch-blob: ^3.1.4 + formdata-polyfill: ^4.0.10 + checksum: e65322431f4897ded04197aa5923eaec63a8d53e00432de4e70a4f7006625c8dc32629c5c35f4fe8ee719a4825544d07bf53f6e146a7265914262f493e8deac1 + languageName: node + linkType: hard + "node-forge@npm:^1": version: 1.3.1 resolution: "node-forge@npm:1.3.1" @@ -41995,6 +42032,13 @@ typescript@^3.7.3: languageName: node linkType: hard +"web-streams-polyfill@npm:^3.0.3": + version: 3.2.1 + resolution: "web-streams-polyfill@npm:3.2.1" + checksum: b119c78574b6d65935e35098c2afdcd752b84268e18746606af149e3c424e15621b6f1ff0b42b2676dc012fc4f0d313f964b41a4b5031e525faa03997457da02 + languageName: node + linkType: hard + "webidl-conversions@npm:^3.0.0": version: 3.0.1 resolution: "webidl-conversions@npm:3.0.1"