Remove unnecessary resolutions (#4719)

microsoft · Jul 26, 2024 · 38286e6 · 38286e6
1 parent 8d7b8d9
commit 38286e6
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 132 deletions.
diff --git a/libraries/botbuilder-ai/package.json b/libraries/botbuilder-ai/package.json
@@ -39,9 +39,6 @@
     "url-parse": "^1.5.9",
     "zod": "^3.22.4"
   },
-  "resolutions": {
-    "follow-redirects": "^1.14.8"
-  },
   "devDependencies": {
     "@types/node-fetch": "^2.5.7",
     "fs-extra": "^7.0.1",

diff --git a/libraries/botbuilder-dialogs-adaptive-runtime/package.json b/libraries/botbuilder-dialogs-adaptive-runtime/package.json
@@ -39,7 +39,7 @@
     "botbuilder-dialogs-adaptive-runtime-core": "4.1.6",
     "botbuilder-dialogs-declarative": "4.1.6",
     "botframework-connector": "4.1.6",
-    "nconf": "0.11.4",
+    "nconf": "^0.12.1",
     "yargs-parser": "^20.2.7",
     "zod": "^3.22.4"
   },

diff --git a/package.json b/package.json
@@ -42,26 +42,8 @@
     "postinstall": "npx rimraf node_modules/@microsoft/orchestrator-core/node_modules/@babel/traverse"
   },
   "resolutions": {
-    "async": "3.2.3",
-    "minimist": "^1.2.6",
-    "mixme": "0.5.2",
-    "node-fetch": "2.6.7",
-    "underscore": "1.13.1",
-    "json-schema": "0.4.0",
     "@microsoft/recognizers-text-number": "~1.3.1",
-    "@xmldom/xmldom": "0.8.6",
-    "**/botbuilder-azure/@azure/core-auth/@azure/core-tracing": "1.0.0-preview.9",
-    "**/request/tough-cookie": "^4.1.3",
-    "**/request-promise/tough-cookie": "^4.1.3",
-    "**/request-promise-native/tough-cookie": "^4.1.3",
-    "**/istanbul-lib-instrument/@babel/core": "^7.23.2",
-    "**/@babel/plugin-proposal-class-properties/@babel/core": "^7.23.2",
-    "follow-redirects": "^1.15.4",
     "@types/ramda": "0.26.0",
-    "@azure/msal-browser": "^2.38.3",
-    "@azure/msal-node": "^1.18.4",
-    "axios": "^1.7.2",
-    "glob-parent": "5.1.2",
     "babel-traverse": "npm:@babel/traverse@^7.24.7",
     "lodash.pick": "file:overrides/lodash.pick",
     "**/nightwatch/ejs": "^3.1.10"
@@ -92,7 +74,7 @@
     "eslint-plugin-only-warn": "^1.0.2",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-security": "^1.4.0",
-    "exorcist": "^1.0.1",
+    "exorcist": "^2.0.0",
     "mocha": "^10.4.0",
     "mocha-junit-reporter": "^2.0.0",
     "npm-run-all": "^4.1.5",

diff --git a/testing/browser-functional/browser-echo-bot/package.json b/testing/browser-functional/browser-echo-bot/package.json
@@ -40,11 +40,9 @@
     "webpack-dev-server": "^4.15.2"
   },
   "resolutions": {
-    "follow-redirects": "^1.15.4",
     "botframework-webchat/sanitize-html": "^2.13.0"
   },
   "overrides": {
-    "follow-redirects": "^1.15.4",
     "botframework-webchat/sanitize-html": "^2.13.0"
   }
 }
diff --git a/testing/browser-functional/browser-echo-bot/yarn.lock b/testing/browser-functional/browser-echo-bot/yarn.lock
@@ -4580,7 +4580,7 @@ flat@^5.0.2:
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-follow-redirects@^1.0.0, follow-redirects@^1.15.4:
+follow-redirects@^1.0.0:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==