From 6e8b68b38f224d33ad99444889c0c34d3bb32405 Mon Sep 17 00:00:00 2001
From: Kevin Ennis <kennis84@gmail.com>
Date: Thu, 1 Dec 2022 12:44:55 -0500
Subject: [PATCH] feat: export mergeConfig

---
 index.js                    | 6 ++++--
 lib/axios.js                | 3 +++
 test/specs/api.spec.js      | 4 ++++
 test/specs/instance.spec.js | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index f91032c024..0abba3f478 100644
--- 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
index ed9d662444..b725724356 100644
--- 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
index 8275469e9a..4c65d13535 100644
--- 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
index 9306e344e5..e95a3cf043 100644
--- 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',