From 119377adfdbfbf075f922d343defdffd05752cab Mon Sep 17 00:00:00 2001 From: menduz Date: Tue, 9 Aug 2022 10:12:34 -0300 Subject: [PATCH] fix: remove isomorphic fetch (#137) remove isomorphic fetch --- Makefile | 3 +++ declarations.d.ts | 19 +++++++++++++++++++ package-lock.json | 29 ----------------------------- package.json | 3 +-- src/components.ts | 4 ++-- tsconfig.json | 7 +++++-- 6 files changed, 30 insertions(+), 35 deletions(-) create mode 100644 declarations.d.ts diff --git a/Makefile b/Makefile index 3c2fc12..41dca41 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,9 @@ build: ${PBS_TS} @mkdir -p dist @./node_modules/.bin/tsc -p tsconfig.json +start: build + npm start + lint: @node_modules/.bin/eslint . --ext .ts diff --git a/declarations.d.ts b/declarations.d.ts new file mode 100644 index 0000000..88cc6e7 --- /dev/null +++ b/declarations.d.ts @@ -0,0 +1,19 @@ +interface TextEncoder { + encode(input?: string): Uint8Array +} +interface TextDecoder { + decode(input?: Uint8Array): string +} +interface WebSocket { + CONNECTING: number; + OPEN: number; + CLOSING: number; + CLOSED: number; + readyState: number; + close(code?: number, data?: string): void; + send(data: any, cb?: (err: Error) => void): void; + send(data: any, options: any, cb?: (err: Error) => void): void; + terminate?(): void; + addEventListener(type: string, listener: (ev: any) => any, options?: any): void; +} +type ResponseInit = string | object \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1c9e972..ad5a251 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,6 @@ "@well-known-components/metrics": "^1.1.3", "@well-known-components/nats-component": "^1.0.0-20220722202432.commit-34395ec", "google-protobuf": "^3.20.1", - "isomorphic-fetch": "^3.0.0", "jsonwebtoken": "^8.5.1", "mitt": "^3.0.0", "protoc-gen-dcl": "^1.0.0-20220109214200.commit-f45e34a", @@ -6065,15 +6064,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "node_modules/isomorphic-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz", - "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==", - "dependencies": { - "node-fetch": "^2.6.1", - "whatwg-fetch": "^3.4.1" - } - }, "node_modules/istanbul-lib-coverage": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", @@ -9253,11 +9243,6 @@ "iconv-lite": "0.4.24" } }, - "node_modules/whatwg-fetch": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz", - "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" - }, "node_modules/whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", @@ -13983,15 +13968,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "isomorphic-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz", - "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==", - "requires": { - "node-fetch": "^2.6.1", - "whatwg-fetch": "^3.4.1" - } - }, "istanbul-lib-coverage": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", @@ -16439,11 +16415,6 @@ "iconv-lite": "0.4.24" } }, - "whatwg-fetch": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz", - "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" - }, "whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", diff --git a/package.json b/package.json index 56bec84..95d333e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@dcl/explorer-bff", "scripts": { - "build": "tsc -p tsconfig.json", + "build": "make build", "start": "node --trace-warnings --abort-on-uncaught-exception --unhandled-rejections=strict dist/index.js", "test": "jest --forceExit --detectOpenHandles --coverage --verbose" }, @@ -42,7 +42,6 @@ "@well-known-components/metrics": "^1.1.3", "@well-known-components/nats-component": "^1.0.0-20220722202432.commit-34395ec", "google-protobuf": "^3.20.1", - "isomorphic-fetch": "^3.0.0", "jsonwebtoken": "^8.5.1", "mitt": "^3.0.0", "protoc-gen-dcl": "^1.0.0-20220109214200.commit-f45e34a", diff --git a/src/components.ts b/src/components.ts index 67a11d8..f00dd1b 100644 --- a/src/components.ts +++ b/src/components.ts @@ -13,7 +13,6 @@ import { createServiceDiscoveryComponent } from './ports/service-discovery' import { createRealmComponent } from './ports/realm' import { catalystRegistryForProvider } from '@dcl/catalyst-contracts' import { createStatusComponent } from './ports/status' -import 'isomorphic-fetch' import { observeBuildInfo } from './logic/build-info' const DEFAULT_ETH_NETWORK = 'goerli' @@ -44,7 +43,8 @@ export async function initComponents(): Promise { const nats = await createNatsComponent({ config, logs }) const serviceDiscovery = await createServiceDiscoveryComponent({ nats, logs, config }) const ethereumProvider = new HTTPProvider( - `https://rpc.decentraland.org/${encodeURIComponent(ethNetwork)}?project=explorer-bff` + `https://rpc.decentraland.org/${encodeURIComponent(ethNetwork)}?project=explorer-bff`, + { fetch: fetch.fetch } ) const contract = await catalystRegistryForProvider(ethereumProvider) diff --git a/tsconfig.json b/tsconfig.json index 6f5359f..4c9a769 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,9 +15,12 @@ "forceConsistentCasingInFileNames": true, "allowJs": true, "allowSyntheticDefaultImports": true, - "esModuleInterop": true + "esModuleInterop": true, + "lib": ["ES2020"], + "types": ["node"] }, "include": [ - "src" + "src", + "declarations.d.ts" ] } \ No newline at end of file