Skip to content

Commit 85b2e93

Browse files
committed
💥 Remove already deprecated, only Axios relevant props
1 parent e92d67e commit 85b2e93

File tree

4 files changed

+4
-50
lines changed

4 files changed

+4
-50
lines changed

‎packages/@ackee/antonio-core/src/modules/request/utils/__tests__/mergeRequestConfigs.test.ts

-8
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,6 @@ describe('mergeRequestConfigs', () => {
6262
};
6363
});
6464

65-
it('assigns cancel to signal', () => {
66-
const configB = {
67-
cancelToken: 'cancelToken',
68-
};
69-
70-
expect(mergeRequestConfigs(configA, configB)).toHaveProperty('signal');
71-
});
72-
7365
it('merges uri params', () => {
7466
const configB = {
7567
uriParams: { id: '1' },

‎packages/@ackee/antonio-core/src/modules/request/utils/mergeRequestConfigs.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Headers from 'fetch-headers';
22

3-
import type { RequestConfig, RequestHeaders, RequestSearchParams, FinalRequestConfig } from '../../../types';
3+
import type { FinalRequestConfig, RequestConfig, RequestHeaders, RequestSearchParams } from '../../../types';
44

55
import type { DefaultRequestConfig } from '../config';
66

@@ -87,10 +87,5 @@ export function mergeRequestConfigs(configA: DefaultRequestConfig, configB: Requ
8787
result.params = mergeParams(parseParams(configA.params), parseParams(configB.params));
8888
}
8989

90-
if (configB.cancelToken) {
91-
delete result.cancelToken;
92-
result.signal = configB.cancelToken;
93-
}
94-
9590
return result as FinalRequestConfig;
9691
}

‎packages/@ackee/antonio-core/src/modules/response/response.ts

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { Header } from '../../constants';
22
import type { RequestConfig, RequestMethod, RequestParams, RequestResult } from '../../types';
33

4-
import type { ResponseInterceptors } from '../interceptors/responseInterceptors';
54
import type { TAntonio } from '../core/models/Antonio';
5+
import type { ResponseInterceptors } from '../interceptors/responseInterceptors';
66

77
import { getResponseDataType } from './responseDataTypes';
88

99
import { AntonioError } from './errors';
10-
import { parseResponse, hasEmptyContentLength } from './utils';
10+
import { hasEmptyContentLength, parseResponse } from './utils';
1111

1212
function chooseResponseDataType(config: RequestConfig, headers: Headers, requestMethod: RequestMethod) {
1313
if (hasEmptyContentLength(headers) || requestMethod === 'HEAD' || requestMethod === 'OPTIONS') {
@@ -80,15 +80,7 @@ export async function* processRequest<TSuccessData, TErrorData>(
8080
requestConfig,
8181
);
8282

83-
const result: RequestResult<TSuccessData> = {
84-
request,
85-
response,
86-
data,
87-
status: response.status,
88-
statusText: response.statusText,
89-
config: requestConfig,
90-
headers: Object.fromEntries(response.headers.entries()),
91-
};
83+
const result: RequestResult<TSuccessData> = { request, response, data };
9284

9385
return result;
9486
}

‎packages/@ackee/antonio-core/src/types.ts

-25
Original file line numberDiff line numberDiff line change
@@ -146,37 +146,12 @@ export interface RequestConfig extends Omit<RequestInit, 'body' | 'headers' | 'm
146146
headers?: RequestHeaders;
147147

148148
params?: RequestSearchParams;
149-
150-
/**
151-
* @deprecated This prop is going to be removed in next major relase. Use `signal` prop instead.
152-
*/
153-
cancelToken?: any;
154149
}
155150

156151
export interface RequestResult<D> {
157152
request: Request;
158153
response: Response;
159154
data: D;
160-
161-
/**
162-
* @deprecated This prop is going to be removed in next major relase. Use `response.status` instead.
163-
*/
164-
status: number;
165-
166-
/**
167-
* @deprecated This prop is going to be removed in next major relase. Use `response.statusText` instead.
168-
*/
169-
statusText: string;
170-
171-
/**
172-
* @deprecated This prop is going to be removed in next major relase. Use `response.headers` instead.
173-
*/
174-
headers: {};
175-
176-
/**
177-
* @deprecated This prop is going to be removed in next major relase. Depend on properties in the `request`.
178-
*/
179-
config: {};
180155
}
181156

182157
export interface FinalRequestConfig extends DefaultRequestConfig {

0 commit comments

Comments
 (0)