Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace node-fetch with native fetch in tests and docs #1327

Closed
wants to merge 1 commit into from
+24 −18
Closed

Replace node-fetch with native fetch in tests and docs #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/metro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"metro-transform-plugins": "0.80.10",
"metro-transform-worker": "0.80.10",
"mime-types": "^2.1.27",
"node-fetch": "^2.2.0",
"nullthrows": "^1.1.1",
"serialize-error": "^2.1.0",
"source-map": "^0.5.6",
Expand All @@ -70,6 +69,7 @@
"metro-memory-fs": "0.80.10",
"mock-req": "^0.2.0",
"mock-res": "^0.6.0",
"node-fetch": "^2.7.0",
"stack-trace": "^0.0.10"
},
"license": "MIT",
Expand Down
25 changes: 16 additions & 9 deletions packages/metro/src/integration_tests/__tests__/server-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,20 @@ jest.unmock('cosmiconfig');

jest.setTimeout(60 * 1000);

// Workaround for https://github.com/nodejs/node/issues/54484:
// Fetch with connection: close to prevent Node reusing connections across tests
const fetchAndClose = (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 fetchAndClose(
'http://localhost:' + config.server.port + path,
);
bundlesDownloaded.add(path);
Expand Down Expand Up @@ -111,14 +118,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 fetchAndClose(
'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 fetchAndClose(
'http://localhost:' +
config.server.port +
'/build-errors/inline-requires-cannot-resolve-import.bundle',
Expand All @@ -128,7 +135,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 fetchAndClose(
'http://localhost:' +
config.server.port +
'/[metro-project]/TestBundle.js',
Expand All @@ -143,7 +150,7 @@ describe('Metro development server serves bundles via HTTP', () => {
});

test('under /[metro-watchFolders]/', async () => {
const response = await fetch(
const response = await fetchAndClose(
'http://localhost:' +
config.server.port +
'/[metro-watchFolders]/1/metro/src/integration_tests/basic_bundle/TestBundle.js',
Expand All @@ -158,7 +165,7 @@ describe('Metro development server serves bundles via HTTP', () => {
});

test('under /[metro-project]/', async () => {
const response = await fetch(
const response = await fetchAndClose(
'http://localhost:' +
config.server.port +
'/[metro-project]/TestBundle.js',
Expand All @@ -173,7 +180,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 fetchAndClose(
'http://localhost:' +
config.server.port +
'/[metro-project]/not_a_source_file.xyz',
Expand All @@ -188,7 +195,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 fetchAndClose(
'http://localhost:' +
config.server.port +
'/[metro-project]/excluded_from_file_map.js',
Expand All @@ -203,7 +210,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 fetchAndClose(
'http://localhost:' +
config.server.port +
'/%5Bmetro-project%5D/Foo%2Ejs',
Expand Down
1 change: 0 additions & 1 deletion website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4930,10 +4930,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"

Expand Down Expand Up @@ -5962,7 +5962,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"
Expand Down Expand Up @@ -6145,12 +6145,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"
Expand Down
Loading