From 806f87bc4c650cb5d763dd78b860418d3a5bc863 Mon Sep 17 00:00:00 2001 From: Vitali Zaidman Date: Tue, 20 Aug 2024 08:08:34 -0700 Subject: [PATCH] updated node-fetch (#1327) Summary: Pull Request resolved: https://github.com/facebook/metro/pull/1327 Updating `node-fetch` to the latest version caused tests in `packages/metro/src/integration_tests/__tests__/server-test.js` to fail. Running each test case inside the file failed individually, but there seems to have been a race condition between the tests causing subsequent tests to fail with the following error: ``` FetchError: request to http://localhost:10028/import-export/index.bundle?platform=ios&dev=true&minify=false failed, reason: socket hang up ``` It happens because the "connection: close" header is removed in the latest version of `node-fetch`: https://github.com/node-fetch/node-fetch/pull/1765 and can be fixed by adding this header manually to fetches. ``` fetch('path', {headers: {'Connection': 'close'}}); ``` Differential Revision: D61336391 --- packages/metro/package.json | 2 +- .../__tests__/server-test.js | 23 +++++++++++-------- website/package.json | 1 - yarn.lock | 14 +++++------ 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/packages/metro/package.json b/packages/metro/package.json index dce8cf18c7..f34e853eef 100644 --- a/packages/metro/package.json +++ b/packages/metro/package.json @@ -48,7 +48,7 @@ "metro-transform-plugins": "0.80.10", "metro-transform-worker": "0.80.10", "mime-types": "^2.1.27", - "node-fetch": "^2.2.0", + "node-fetch": "^2.7.0", "nullthrows": "^1.1.1", "serialize-error": "^2.1.0", "source-map": "^0.5.6", diff --git a/packages/metro/src/integration_tests/__tests__/server-test.js b/packages/metro/src/integration_tests/__tests__/server-test.js index bd7839067d..3877d7faab 100644 --- a/packages/metro/src/integration_tests/__tests__/server-test.js +++ b/packages/metro/src/integration_tests/__tests__/server-test.js @@ -20,13 +20,18 @@ jest.unmock('cosmiconfig'); jest.setTimeout(60 * 1000); +const noKeepAliveFetch = (path: string) => + fetch(path, { + headers: {Connection: 'close'}, + }); + describe('Metro development server serves bundles via HTTP', () => { let config; let httpServer; const bundlesDownloaded = new Set(); async function downloadAndExec(path: string, context = {}): mixed { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + path, ); bundlesDownloaded.add(path); @@ -111,14 +116,14 @@ describe('Metro development server serves bundles via HTTP', () => { }); test('responds with 404 when the bundle cannot be resolved', async () => { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + '/doesnotexist.bundle', ); expect(response.status).toBe(404); }); test('responds with 500 when an import inside the bundle cannot be resolved', async () => { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + '/build-errors/inline-requires-cannot-resolve-import.bundle', @@ -128,7 +133,7 @@ describe('Metro development server serves bundles via HTTP', () => { describe('dedicated endpoints for serving source files', () => { test('under /[metro-project]/', async () => { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + '/[metro-project]/TestBundle.js', @@ -143,7 +148,7 @@ describe('Metro development server serves bundles via HTTP', () => { }); test('under /[metro-watchFolders]/', async () => { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + '/[metro-watchFolders]/1/metro/src/integration_tests/basic_bundle/TestBundle.js', @@ -158,7 +163,7 @@ describe('Metro development server serves bundles via HTTP', () => { }); test('under /[metro-project]/', async () => { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + '/[metro-project]/TestBundle.js', @@ -173,7 +178,7 @@ describe('Metro development server serves bundles via HTTP', () => { }); test('no access to files without source extensions', async () => { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + '/[metro-project]/not_a_source_file.xyz', @@ -188,7 +193,7 @@ describe('Metro development server serves bundles via HTTP', () => { }); test('no access to source files excluded from the file map', async () => { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + '/[metro-project]/excluded_from_file_map.js', @@ -203,7 +208,7 @@ describe('Metro development server serves bundles via HTTP', () => { }); test('requested with aggressive URL encoding /%5Bmetro-project%5D', async () => { - const response = await fetch( + const response = await noKeepAliveFetch( 'http://localhost:' + config.server.port + '/%5Bmetro-project%5D/Foo%2Ejs', diff --git a/website/package.json b/website/package.json index 5f287e9e48..c289382498 100644 --- a/website/package.json +++ b/website/package.json @@ -30,7 +30,6 @@ "@sideway/formula": "^3.0.1", "got": "^11.8.5", "http-cache-semantics": "^4.1.1", - "node-fetch": "^2.0.0", "terser": "^5.14.2", "trim": "^0.0.3" } diff --git a/yarn.lock b/yarn.lock index f313b30831..87cfc1a443 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4923,10 +4923,10 @@ node-dir@^0.1.17: dependencies: minimatch "^3.0.2" -node-fetch@^2.2.0: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== +node-fetch@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== dependencies: whatwg-url "^5.0.0" @@ -5950,7 +5950,7 @@ to-regex-range@^5.0.1: tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== ts-api-utils@^1.0.1: version "1.0.3" @@ -6133,12 +6133,12 @@ walker@^1.0.8: webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== dependencies: tr46 "~0.0.3" webidl-conversions "^3.0.0"