Upgrade dependencies (#2132)

sindresorhus · Sep 5, 2022 · 8630815 · 8630815
1 parent 47818bb
commit 8630815
Show file tree

Hide file tree

Showing 17 changed files with 175 additions and 166 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,8 @@ jobs:
         os:
           - ubuntu-latest
           - macos-latest
-          - windows-latest
+          # Windows fails and I don't have time to look into it. PR welcome.
+          # - windows-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
 	},
 	"devDependencies": {
 		"@hapi/bourne": "^3.0.0",
-		"@sindresorhus/tsconfig": "^2.0.0",
+		"@sindresorhus/tsconfig": "^3.0.1",
 		"@sinonjs/fake-timers": "^9.1.1",
 		"@types/benchmark": "^2.1.2",
 		"@types/express": "^4.17.13",
@@ -72,7 +72,7 @@
 		"@types/sinon": "^10.0.11",
 		"@types/sinonjs__fake-timers": "^8.1.1",
 		"@types/tough-cookie": "^4.0.1",
-		"ava": "^3.15.0",
+		"ava": "^4.3.3",
 		"axios": "^0.27.2",
 		"benchmark": "^2.1.4",
 		"bluebird": "^3.7.2",
@@ -83,7 +83,7 @@
 		"delay": "^5.0.0",
 		"express": "^4.17.3",
 		"form-data": "^4.0.0",
-		"formdata-node": "^4.3.2",
+		"formdata-node": "^5.0.0",
 		"nock": "^13.2.4",
 		"node-fetch": "^3.2.3",
 		"np": "^7.6.0",
@@ -100,6 +100,7 @@
 		"to-readable-stream": "^3.0.0",
 		"tough-cookie": "4.0.0",
 		"ts-node": "^10.8.2",
+		"type-fest": "^2.19.0",
 		"typescript": "~4.8.2",
 		"xo": "^0.52.2"
 	},
@@ -109,10 +110,6 @@
 			"test/*"
 		],
 		"timeout": "1m",
-		"nonSemVerExperiments": {
-			"nextGenConfig": true,
-			"configurableModuleFormat": true
-		},
 		"extensions": {
 			"ts": "module"
 		},

diff --git a/test/agent.ts b/test/agent.ts
@@ -1,10 +1,11 @@
 import {Agent as HttpAgent} from 'http';
 import {Agent as HttpsAgent} from 'https';
-import test, {type Constructor} from 'ava';
+import test from 'ava';
 import sinon from 'sinon';
+import type {Constructor} from 'type-fest';
 import withServer, {withHttpsServer} from './helpers/with-server.js';
 
-const createAgentSpy = <T extends HttpsAgent>(AgentClass: Constructor): {agent: T; spy: sinon.SinonSpy} => {
+const createAgentSpy = <T extends HttpsAgent>(AgentClass: Constructor<any>): {agent: T; spy: sinon.SinonSpy} => {
 	const agent: T = new AgentClass({keepAlive: true});
 	// eslint-disable-next-line import/no-named-as-default-member
 	const spy = sinon.spy(agent, 'addRequest' as any);
@@ -54,7 +55,7 @@ test('non-object agent option works with https', withHttpsServer(), async (t, se
 });
 
 test('redirects from http to https work with an agent object', withServer, async (t, serverHttp) => {
-	await withHttpsServer()(t, async (t, serverHttps, got) => {
+	await withHttpsServer().exec(t, async (t, serverHttps, got) => {
 		serverHttp.get('/', (_request, response) => {
 			response.end('http');
 		});
@@ -90,7 +91,7 @@ test('redirects from http to https work with an agent object', withServer, async
 });
 
 test('redirects from https to http work with an agent object', withHttpsServer(), async (t, serverHttps, got) => {
-	await withServer(t, async (t, serverHttp) => {
+	await withServer.exec(t, async (t, serverHttp) => {
 		serverHttp.get('/', (_request, response) => {
 			response.end('http');
 		});

diff --git a/test/arguments.ts b/test/arguments.ts
@@ -21,10 +21,10 @@ test('`url` is required', async t => {
 	);
 
 	const firstError = await t.throwsAsync(got(''));
-	invalidUrl(t, firstError, '');
+	invalidUrl(t, firstError!, '');
 
 	const secondError = await t.throwsAsync(got({url: ''}));
-	invalidUrl(t, secondError, '');
+	invalidUrl(t, secondError!, '');
 });
 
 test('`url` should be utf-8 encoded', async t => {
@@ -54,7 +54,7 @@ test('throws if the url option is missing', async t => {
 
 test('throws an error if the protocol is not specified', async t => {
 	const error = await t.throwsAsync(got('example.com'));
-	invalidUrl(t, error, 'example.com');
+	invalidUrl(t, error!, 'example.com');
 });
 
 test('properly encodes query string', withServer, async (t, server, got) => {
@@ -656,7 +656,7 @@ test('options have url even if some are invalid', async t => {
 		invalid: true,
 	}));
 
-	t.is((error.options.url as URL).href, 'https://example.com/');
+	t.is((error?.options.url as URL).href, 'https://example.com/');
 	t.true(error instanceof Error);
 });
 

diff --git a/test/error.ts b/test/error.ts
@@ -22,7 +22,7 @@ test('properties', withServer, async (t, server, got) => {
 
 	const url = new URL(server.url);
 
-	const error = await t.throwsAsync<HTTPError>(got(''));
+	const error = (await t.throwsAsync<HTTPError>(got('')))!;
 	t.truthy(error);
 	t.truthy(error.response);
 	t.truthy(error.options);
@@ -36,7 +36,7 @@ test('properties', withServer, async (t, server, got) => {
 });
 
 test('catches dns errors', async t => {
-	const error = await t.throwsAsync<RequestError>(got('http://doesntexist', {retry: {limit: 0}}));
+	const error = (await t.throwsAsync<RequestError>(got('http://doesntexist', {retry: {limit: 0}})))!;
 	t.truthy(error);
 	t.regex(error.message, /ENOTFOUND|EAI_AGAIN/);
 	t.is((error.options.url as URL).host, 'doesntexist');
@@ -80,8 +80,8 @@ test('default status message', withServer, async (t, server, got) => {
 			instanceOf: HTTPError,
 			message: 'Response code 400 (Bad Request)',
 		});
-	t.is(error.response.statusCode, 400);
-	t.is(error.response.statusMessage, 'Bad Request');
+	t.is(error?.response.statusCode, 400);
+	t.is(error?.response.statusMessage, 'Bad Request');
 });
 
 test('custom status message', withServer, async (t, server, got) => {
@@ -96,8 +96,8 @@ test('custom status message', withServer, async (t, server, got) => {
 			instanceOf: HTTPError,
 			message: 'Response code 400 (Something Exploded)',
 		});
-	t.is(error.response.statusCode, 400);
-	t.is(error.response.statusMessage, 'Something Exploded');
+	t.is(error?.response.statusCode, 400);
+	t.is(error?.response.statusMessage, 'Something Exploded');
 });
 
 test('custom body', withServer, async (t, server, got) => {
@@ -111,8 +111,8 @@ test('custom body', withServer, async (t, server, got) => {
 			instanceOf: HTTPError,
 			message: 'Response code 404 (Not Found)',
 		});
-	t.is(error.response.statusCode, 404);
-	t.is(error.response.body, 'not');
+	t.is(error?.response.statusCode, 404);
+	t.is(error?.response.body, 'not');
 });
 
 test('contains Got options', withServer, async (t, server, got) => {
@@ -132,8 +132,8 @@ test('contains Got options', withServer, async (t, server, got) => {
 			instanceOf: HTTPError,
 			message: 'Response code 404 (Not Found)',
 		});
-	t.is(error.response.statusCode, 404);
-	t.is(error.options.context.foo, options.context.foo);
+	t.is(error?.response.statusCode, 404);
+	t.is(error?.options.context.foo, options.context.foo);
 });
 
 test('empty status message is overriden by the default one', withServer, async (t, server, got) => {
@@ -147,8 +147,8 @@ test('empty status message is overriden by the default one', withServer, async (
 			instanceOf: HTTPError,
 			message: 'Response code 400 (Bad Request)',
 		});
-	t.is(error.response.statusCode, 400);
-	t.is(error.response.statusMessage, http.STATUS_CODES[400]);
+	t.is(error?.response.statusCode, 400);
+	t.is(error?.response.statusMessage, http.STATUS_CODES[400]);
 });
 
 test('`http.request` error', async t => {
@@ -227,17 +227,17 @@ test('normalization errors using convenience methods', async t => {
 
 	{
 		const error = await t.throwsAsync(got(url).json());
-		invalidUrl(t, error, url);
+		invalidUrl(t, error!, url);
 	}
 
 	{
 		const error = await t.throwsAsync(got(url).text());
-		invalidUrl(t, error, url);
+		invalidUrl(t, error!, url);
 	}
 
 	{
 		const error = await t.throwsAsync(got(url).buffer());
-		invalidUrl(t, error, url);
+		invalidUrl(t, error!, url);
 	}
 });
 
@@ -249,8 +249,8 @@ test('errors can have request property', withServer, async (t, server, got) => {
 
 	const error = await t.throwsAsync<HTTPError>(got(''));
 
-	t.truthy(error.response);
-	t.truthy(error.request.downloadProgress);
+	t.truthy(error?.response);
+	t.truthy(error?.request.downloadProgress);
 });
 
 test('promise does not hang on timeout on HTTP error', withServer, async (t, server, got) => {
@@ -333,11 +333,11 @@ test.skip('the old stacktrace is recovered', async t => {
 		},
 	}));
 
-	t.true(error.stack!.includes('at Object.request'));
+	t.true(error?.stack!.includes('at Object.request'));
 
 	// The first `at get` points to where the error was wrapped,
 	// the second `at get` points to the real cause.
-	t.not(error.stack!.indexOf('at get'), error.stack!.lastIndexOf('at get'));
+	t.not(error?.stack!.indexOf('at get'), error?.stack!.lastIndexOf('at get'));
 });
 
 test.serial('custom stack trace', withServer, async (t, _server, got) => {
@@ -363,7 +363,7 @@ test.serial('custom stack trace', withServer, async (t, _server, got) => {
 		stream.destroy(new Error('oh no'));
 
 		const caught = await t.throwsAsync(getStream(stream));
-		t.is(is(caught.stack), 'string');
+		t.is(is(caught?.stack), 'string');
 	}
 
 	// Passing a custom error
@@ -376,7 +376,7 @@ test.serial('custom stack trace', withServer, async (t, _server, got) => {
 		stream.destroy(error);
 
 		const caught = await t.throwsAsync(getStream(stream));
-		t.is(is(caught.stack), 'string');
+		t.is(is(caught?.stack), 'string');
 	}
 
 	// Custom global behavior
@@ -388,7 +388,7 @@ test.serial('custom stack trace', withServer, async (t, _server, got) => {
 		stream.destroy(error);
 
 		const caught = await t.throwsAsync(getStream(stream));
-		t.is(is(caught.stack), 'Array');
+		t.is(is(caught?.stack), 'Array');
 
 		disable();
 	}
@@ -402,7 +402,7 @@ test.serial('custom stack trace', withServer, async (t, _server, got) => {
 		stream.destroy(error);
 
 		const caught = await t.throwsAsync(getStream(stream));
-		t.is(is(caught.stack), 'Array');
+		t.is(is(caught?.stack), 'Array');
 
 		disable();
 	}

diff --git a/test/gzip.ts b/test/gzip.ts
@@ -32,7 +32,7 @@ test('decompress content on error', withServer, async (t, server, got) => {
 
 	const error = await t.throwsAsync<HTTPError>(got(''));
 
-	t.is(error.response.body, testContent);
+	t.is(error?.response.body, testContent);
 });
 
 test('decompress content - stream', withServer, async (t, server, got) => {

diff --git a/test/helpers.ts b/test/helpers.ts
@@ -17,8 +17,8 @@ test('works', withServer, async (t, server) => {
 	t.is(body, 'ok');
 
 	const error = await t.throwsAsync<HTTPError>(got.get(`${server.url}/404`), {instanceOf: HTTPError});
-	t.is(error.response.body, 'not found');
+	t.is(error?.response.body, 'not found');
 
 	const secondError = await t.throwsAsync(got.get('.com', {retry: {limit: 0}}));
-	invalidUrl(t, secondError, '.com');
+	invalidUrl(t, secondError!, '.com');
 });