mirror of
https://github.com/tenrok/axios.git
synced 2026-06-20 20:00:40 +03:00
feat: export mergeConfig (#5151)
Co-authored-by: Jay <jasonsaayman@gmail.com>
This commit is contained in:
@@ -16,7 +16,8 @@ const {
|
|||||||
spread,
|
spread,
|
||||||
toFormData,
|
toFormData,
|
||||||
AxiosHeaders,
|
AxiosHeaders,
|
||||||
formToJSON
|
formToJSON,
|
||||||
|
mergeConfig
|
||||||
} = axios;
|
} = axios;
|
||||||
|
|
||||||
export {
|
export {
|
||||||
@@ -33,5 +34,6 @@ export {
|
|||||||
spread,
|
spread,
|
||||||
toFormData,
|
toFormData,
|
||||||
AxiosHeaders,
|
AxiosHeaders,
|
||||||
formToJSON
|
formToJSON,
|
||||||
|
mergeConfig
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,6 +70,9 @@ axios.spread = spread;
|
|||||||
// Expose isAxiosError
|
// Expose isAxiosError
|
||||||
axios.isAxiosError = isAxiosError;
|
axios.isAxiosError = isAxiosError;
|
||||||
|
|
||||||
|
// Expose mergeConfig
|
||||||
|
axios.mergeConfig = mergeConfig;
|
||||||
|
|
||||||
axios.AxiosHeaders = AxiosHeaders;
|
axios.AxiosHeaders = AxiosHeaders;
|
||||||
|
|
||||||
axios.formToJSON = thing => formDataToJSON(utils.isHTMLForm(thing) ? new FormData(thing) : thing);
|
axios.formToJSON = thing => formDataToJSON(utils.isHTMLForm(thing) ? new FormData(thing) : thing);
|
||||||
|
|||||||
@@ -50,6 +50,10 @@ describe('static api', function () {
|
|||||||
it('should have isAxiosError properties', function () {
|
it('should have isAxiosError properties', function () {
|
||||||
expect(typeof axios.isAxiosError).toEqual('function');
|
expect(typeof axios.isAxiosError).toEqual('function');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should have mergeConfig properties', function () {
|
||||||
|
expect(typeof axios.mergeConfig).toEqual('function');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('instance api', function () {
|
describe('instance api', function () {
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ describe('instance', function () {
|
|||||||
'spread',
|
'spread',
|
||||||
'getUri',
|
'getUri',
|
||||||
'isAxiosError',
|
'isAxiosError',
|
||||||
|
'mergeConfig',
|
||||||
'VERSION',
|
'VERSION',
|
||||||
'default',
|
'default',
|
||||||
'toFormData',
|
'toFormData',
|
||||||
|
|||||||
Reference in New Issue
Block a user