Skip to content

Commit 944caa8

Browse files
sindresorhussindresorhus
committed
Tweaks
Closes #2287 Closes #2286
1 parent b1d61c1 commit 944caa8

6 files changed

Lines changed: 21 additions & 26 deletions

File tree

‎source/as-promise/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type {Buffer} from 'node:buffer';
22
import type PCancelable from 'p-cancelable';
33
import {RequestError} from '../core/errors.js';
4-
import type Request from '../core/index.js';
5-
import type {RequestEvents} from '../core/index.js';
4+
import type Request from '../core/index.js'; // eslint-disable-line import/no-duplicates
5+
import {type RequestEvents} from '../core/index.js'; // eslint-disable-line import/no-duplicates -- It's not allowed to combine these imports. The rule is incorrect.
66
import type {Response} from '../core/response.js';
77

88
/**

‎source/core/index.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import process from 'node:process';
22
import {Buffer} from 'node:buffer';
33
import {Duplex, type Readable} from 'node:stream';
4-
import http, {ServerResponse} from 'node:http';
5-
import type {ClientRequest, RequestOptions} from 'node:http';
4+
import http, {ServerResponse, type ClientRequest, type RequestOptions} from 'node:http';
65
import type {Socket} from 'node:net';
7-
import timer from '@szmarczak/http-timer';
6+
import timer, {type ClientRequestWithTimings, type Timings, type IncomingMessageWithTimings} from '@szmarczak/http-timer';
87
import CacheableRequest, {
98
CacheError as CacheableCacheError,
109
type StorageAdapter,
@@ -15,7 +14,6 @@ import decompressResponse from 'decompress-response';
1514
import is from '@sindresorhus/is';
1615
import getStream from 'get-stream';
1716
import {FormDataEncoder, isFormData as isFormDataLike} from 'form-data-encoder';
18-
import type {ClientRequestWithTimings, Timings, IncomingMessageWithTimings} from '@szmarczak/http-timer';
1917
import type ResponseLike from 'responselike';
2018
import getBodySize from './utils/get-body-size.js';
2119
import isFormData from './utils/is-form-data.js';

‎source/core/options.ts‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
11
import process from 'node:process';
22
import type {Buffer} from 'node:buffer';
3-
import {promisify, inspect} from 'node:util';
4-
import {checkServerIdentity} from 'node:tls';
3+
import {promisify, inspect, type InspectOptions} from 'node:util';
4+
import {checkServerIdentity, type SecureContextOptions, type DetailedPeerCertificate} from 'node:tls';
55
// DO NOT use destructuring for `https.request` and `http.request` as it's not compatible with `nock`.
6-
import http from 'node:http';
7-
import https from 'node:https';
6+
import https, {
7+
type RequestOptions as HttpsRequestOptions,
8+
type Agent as HttpsAgent,
9+
} from 'node:https';
10+
import http, {
11+
type Agent as HttpAgent,
12+
type ClientRequest,
13+
} from 'node:http';
814
import type {Readable} from 'node:stream';
915
import type {Socket} from 'node:net';
10-
import type {SecureContextOptions, DetailedPeerCertificate} from 'node:tls';
11-
import type {
12-
Agent as HttpAgent,
13-
ClientRequest,
14-
} from 'node:http';
15-
import type {
16-
RequestOptions as HttpsRequestOptions,
17-
Agent as HttpsAgent,
18-
} from 'node:https';
19-
import type {InspectOptions} from 'node:util';
2016
import is, {assert} from '@sindresorhus/is';
2117
import lowercaseKeys from 'lowercase-keys';
2218
import CacheableLookup from 'cacheable-lookup';
2319
import http2wrapper, {type ClientHttp2Session} from 'http2-wrapper';
24-
import {isFormData} from 'form-data-encoder';
25-
import type {FormDataLike} from 'form-data-encoder';
20+
import {isFormData, type FormDataLike} from 'form-data-encoder';
2621
import type {StorageAdapter} from 'cacheable-request';
2722
import type ResponseLike from 'responselike';
2823
import type {IncomingMessageWithTimings} from '@szmarczak/http-timer';

‎source/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ const defaults: InstanceDefaults = {
1111
const got = create(defaults);
1212

1313
export default got;
14+
15+
// TODO: Remove this in the next major version.
1416
export {got};
1517

1618
export {default as Options} from './core/options.js';

‎source/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type {Buffer} from 'node:buffer';
22
import type {CancelableRequest} from './as-promise/types.js';
33
import type {Response} from './core/response.js';
4-
import type Options from './core/options.js';
5-
import type {PaginationOptions, OptionsInit} from './core/options.js';
4+
import type Options from './core/options.js'; // eslint-disable-line import/no-duplicates
5+
import {type PaginationOptions, type OptionsInit} from './core/options.js'; // eslint-disable-line import/no-duplicates -- It's not allowed to combine these imports. The rule is incorrect.
66
import type Request from './core/index.js';
77

88
// `type-fest` utilities

‎tsconfig.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"extends": "@sindresorhus/tsconfig",
33
"compilerOptions": {
44
"outDir": "dist",
5-
"target": "es2020", // Node.js 14
5+
"target": "es2021", // Node.js 16
66
"lib": [
7-
"es2020"
7+
"es2021"
88
],
99
"noPropertyAccessFromIndexSignature": false,
1010
"isolatedModules": true

0 commit comments

Comments
 (0)