Skip to content

Commit

Permalink
bump: Upgrade axios version to ^1.7.2 (#4680)
Browse files Browse the repository at this point in the history
* upgrade axios and adapt browserify settings

* revert wrong botbuilder versions

* move devDependencies
  • Loading branch information
JhontSouth committed Jun 18, 2024
1 parent 67a5708 commit 066b405
Show file tree
Hide file tree
Showing 6 changed files with 448 additions and 18 deletions.
2 changes: 1 addition & 1 deletion libraries/botbuilder-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"devDependencies": {
"@microsoft/bf-chatdown": "^4.15.0",
"axios": "^0.28.0",
"axios": "^1.7.2",
"unzipper": "^0.10.9"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion libraries/botbuilder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@azure/core-http": "^3.0.2",
"@azure/msal-node": "^1.18.4",
"axios": "^0.28.0",
"axios": "^1.7.2",
"botbuilder-core": "4.1.6",
"botbuilder-stdlib": "4.1.6",
"botframework-connector": "4.1.6",
Expand Down
27 changes: 27 additions & 0 deletions libraries/botframework-connector/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module.exports = function (api) {
api.cache(false);
const presets = [
['@babel/preset-typescript'],
[
'@babel/preset-env',
{
corejs: { version: 3 },
useBuiltIns: 'usage',
targets: {
browsers: ['last 2 versions', 'ie >= 11', 'not ie < 11', 'not android > 0', 'not ios > 0'],
},
},
],
];
const plugins = [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
['@babel/plugin-proposal-class-properties'],
['@babel/plugin-transform-modules-commonjs'],
['@babel/plugin-transform-runtime', { useESModules: false }],
];
return {
presets,
plugins,
sourceMaps: true,
};
};
4 changes: 2 additions & 2 deletions libraries/botframework-connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@azure/core-http": "^3.0.2",
"@azure/identity": "^2.0.4",
"@azure/msal-node": "^1.18.4",
"axios": "^0.28.0",
"axios": "^1.7.2",
"base64url": "^3.0.0",
"botbuilder-stdlib": "4.1.6",
"botframework-schema": "4.1.6",
Expand All @@ -55,7 +55,7 @@
"build:browserify": "npm-run-all build:browserify:clean build:browserify:init build:browserify:run",
"build:browserify:clean": "rimraf lib/browser.*",
"build:browserify:init": "shx cp lib/index.js lib/browser.js",
"build:browserify:run": "browserify -s BFC --debug lib/browser.js | exorcist lib/browser.js.map | sponge lib/browser.js",
"build:browserify:run": "browserify lib/browser.js -s BFC -p esmify -t [ babelify --extensions .js,.mjs --global ] --debug | exorcist lib/browser.js.map | sponge lib/browser.js",
"build:downlevel-dts": "downlevel-dts lib _ts3.4/lib --checksum",
"clean": "rimraf _ts3.4 lib tsconfig.tsbuildinfo",
"depcheck": "depcheck --config ../../.depcheckrc --ignores azure,sinon",
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@types/ramda": "0.26.0",
"@azure/msal-browser": "^2.38.3",
"@azure/msal-node": "^1.18.4",
"axios": "0.28.0",
"axios": "^1.7.2",
"tar": "6.1.9",
"ws": "7.4.6",
"glob-parent": "5.1.2"
Expand Down Expand Up @@ -106,7 +106,9 @@
"typedoc-plugin-external-module-name": "^4.0.3",
"typedoc-plugin-markdown": "^3.0.11",
"typescript": "^4.1.0",
"wsrun": "^5.2.4"
"wsrun": "^5.2.4",
"esmify": "^2.1.1",
"babelify": "^10.0.0"
},
"nyc": {
"exclude": [
Expand Down
Loading

0 comments on commit 066b405

Please sign in to comment.