From cf355b6e4d8463b02d2ce05231a8de18562aa547 Mon Sep 17 00:00:00 2001
From: rgnova <rgnova7@gmail.com>
Date: Fri, 28 Apr 2023 15:24:54 -0400
Subject: [PATCH 1/2] forces loading axios as a cjs package

---
 .gitignore     | 2 ++
 src/request.js | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index dc48777..02a5378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,5 @@ typings/
 ########### Custom ignores ###########
 dev/
 .npmrc
+
+.idea
diff --git a/src/request.js b/src/request.js
index e110bc2..8c9f9d0 100644
--- a/src/request.js
+++ b/src/request.js
@@ -20,7 +20,14 @@
 //COMPARE const requestPromiseNative = require('request-promise-native');
 //COMPARE const requestTriggerFile = 'USE_LEGACY_REQUEST_LIBRARY';
 
-const axios = require('axios');
+let axios;
+try {
+  axios = require('axios');
+}catch(err){
+  // sometimes it tries to load the esm version of axios, even thought we're doing a require(). i cant figure out why.
+  // ideally we'd migrate everything to esm so we dont have to deal with these cjs problems anymore.
+  axios = require('axios/dist/node/axios.cjs');
+}
 const Https = require('https');
 const Stream = require('stream');
 const merge = require('deepmerge');

From cb8dc0058a9fdf2ac30f8f1fd96c03532fab55f2 Mon Sep 17 00:00:00 2001
From: carrolp <carrolp@us.ibm.com>
Date: Thu, 4 May 2023 09:11:15 -0400
Subject: [PATCH 2/2] Update src/request.js

---
 src/request.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/request.js b/src/request.js
index 8c9f9d0..4b580f5 100644
--- a/src/request.js
+++ b/src/request.js
@@ -20,14 +20,9 @@
 //COMPARE const requestPromiseNative = require('request-promise-native');
 //COMPARE const requestTriggerFile = 'USE_LEGACY_REQUEST_LIBRARY';
 
-let axios;
-try {
-  axios = require('axios');
-}catch(err){
-  // sometimes it tries to load the esm version of axios, even thought we're doing a require(). i cant figure out why.
-  // ideally we'd migrate everything to esm so we dont have to deal with these cjs problems anymore.
-  axios = require('axios/dist/node/axios.cjs');
-}
+// In some scenarios Node tries to load the ESM version of axios when doing `require('axios')`, even though using `require` rather than `import`.
+// This require forces loading the CJS version as not everything is converted to ESM.
+const axios = require('axios/dist/node/axios.cjs');
 const Https = require('https');
 const Stream = require('stream');
 const merge = require('deepmerge');