From 473e8a13d78ddd8e1f60845869b8372f92e7837c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Nov 2023 22:26:11 +0000
Subject: [PATCH 1/3] Chore(deps): Bump axios from 0.27.2 to 1.6.0

Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 88594ed..b288097 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "adminjs": "^5.7.3",
     "app-root-path": "^3.0.0",
     "aws-sdk": "^2.1074.0",
-    "axios": "^0.27.2",
+    "axios": "^1.6.0",
     "bcryptjs": "^2.4.3",
     "cache-manager": "^3.6.0",
     "cache-manager-ioredis": "^2.1.0",
diff --git a/yarn.lock b/yarn.lock
index c442685..95043fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3655,13 +3655,14 @@ axios@^0.24.0:
   dependencies:
     follow-redirects "^1.14.4"
 
-axios@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
-    follow-redirects "^1.14.9"
+    follow-redirects "^1.15.0"
     form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 babel-jest@^27.5.1:
   version "27.5.1"
@@ -5397,15 +5398,10 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@^1.14.4, follow-redirects@^1.14.8:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4"
-  integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==
-
-follow-redirects@^1.14.9:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+follow-redirects@^1.14.4, follow-redirects@^1.14.8, follow-redirects@^1.15.0:
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
 
 fork-ts-checker-webpack-plugin@7.2.3:
   version "7.2.3"
@@ -7686,6 +7682,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"

From 713833bf0b2dde00259e5e4708d634ab673580d8 Mon Sep 17 00:00:00 2001
From: Sion Kang <siontama@gmail.com>
Date: Mon, 13 Nov 2023 18:44:18 +0900
Subject: [PATCH 2/3] fix axios module error

---
 jest.config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jest.config.json b/jest.config.json
index 69d7ccb..3cc4441 100644
--- a/jest.config.json
+++ b/jest.config.json
@@ -11,6 +11,7 @@
     "^@test/(.*)$": "<rootDir>/apps/api/test/$1",
     "^@app/common(|/.*)$": "<rootDir>/libs/common/src/$1",
     "^@app/utils(|/.*)$": "<rootDir>/libs/utils/src/$1",
-    "^@app/entity(|/.*)$": "<rootDir>/libs/entity/src/$1"
+    "^@app/entity(|/.*)$": "<rootDir>/libs/entity/src/$1",
+    "^axios$": "axios/dist/node/axios.cjs"
   }
 }

From 9c0742932e33d66051502024c53fd88fc29c09e8 Mon Sep 17 00:00:00 2001
From: Sion Kang <siontama@gmail.com>
Date: Mon, 13 Nov 2023 18:54:40 +0900
Subject: [PATCH 3/3] fix e2e-test axios module error

---
 apps/api/test/e2e/jest-e2e.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/api/test/e2e/jest-e2e.json b/apps/api/test/e2e/jest-e2e.json
index 2d3b920..02d2995 100644
--- a/apps/api/test/e2e/jest-e2e.json
+++ b/apps/api/test/e2e/jest-e2e.json
@@ -11,6 +11,7 @@
     "^@test/(.*)$": "<rootDir>/../../test/$1",
     "^@app/common/(.*)$": "<rootDir>/../../../../libs/common/src/$1",
     "^@app/utils/(.*)$": "<rootDir>/../../../../libs/utils/src/$1",
-    "^@app/entity/(.*)$": "<rootDir>/../../../../libs/entity/src/$1"
+    "^@app/entity/(.*)$": "<rootDir>/../../../../libs/entity/src/$1",
+    "^axios$": "axios/dist/node/axios.cjs"
   }
 }