feat: export mergeConfig

axios · Dec 1, 2022 · 6e8b68b · 6e8b68b
1 parent e1a4efe
commit 6e8b68b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -16,7 +16,8 @@ const {
   spread,
   toFormData,
   AxiosHeaders,
-  formToJSON
+  formToJSON,
+  mergeConfig
 } = axios;
 
 export {
@@ -33,5 +34,6 @@ export {
   spread,
   toFormData,
   AxiosHeaders,
-  formToJSON
+  formToJSON,
+  mergeConfig
 }
diff --git a/lib/axios.js b/lib/axios.js
@@ -70,6 +70,9 @@ axios.spread = spread;
 // Expose isAxiosError
 axios.isAxiosError = isAxiosError;
 
+// Expose mergeConfig
+axios.mergeConfig = mergeConfig;
+
 axios.AxiosHeaders = AxiosHeaders;
 
 axios.formToJSON = thing => formDataToJSON(utils.isHTMLForm(thing) ? new FormData(thing) : thing);

diff --git a/test/specs/api.spec.js b/test/specs/api.spec.js
@@ -50,6 +50,10 @@ describe('static api', function () {
   it('should have isAxiosError properties', function () {
     expect(typeof axios.isAxiosError).toEqual('function');
   });
+
+  it('should have mergeConfig properties', function () {
+    expect(typeof axios.mergeConfig).toEqual('function');
+  });
 });
 
 describe('instance api', function () {

diff --git a/test/specs/instance.spec.js b/test/specs/instance.spec.js
@@ -23,6 +23,7 @@ describe('instance', function () {
         'spread',
         'getUri',
         'isAxiosError',
+        'mergeConfig',
         'VERSION',
         'default',
         'toFormData',