From 795c3eddd35f02d8be401fb29e8f8c5b2ffbb28c Mon Sep 17 00:00:00 2001 From: Andy Brown Date: Wed, 5 May 2021 08:54:47 -0700 Subject: [PATCH 1/3] bump wait-on to v5.3.0 --- Composer/package.json | 2 +- Composer/yarn.lock | 35 +++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Composer/package.json b/Composer/package.json index 312c4062f2..0297991fe2 100644 --- a/Composer/package.json +++ b/Composer/package.json @@ -146,7 +146,7 @@ "ts-loader": "7.0.4", "tslib": "^2.0.0", "typescript": "3.9.2", - "wait-on": "^5.2.0", + "wait-on": "^5.3.0", "wsrun": "^5.2.0" } } diff --git a/Composer/yarn.lock b/Composer/yarn.lock index 5dccaefe13..0e33c23dc0 100644 --- a/Composer/yarn.lock +++ b/Composer/yarn.lock @@ -14962,10 +14962,10 @@ jest@^26.0.1: import-local "^3.0.2" jest-cli "^26.0.1" -joi@^17.1.1: - version "17.3.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.3.0.tgz#f1be4a6ce29bc1716665819ac361dfa139fff5d2" - integrity sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg== +joi@^17.3.0: + version "17.4.0" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.0.tgz#b5c2277c8519e016316e49ababd41a1908d9ef20" + integrity sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" @@ -15784,7 +15784,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0: +"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -20386,7 +20386,7 @@ rxjs@5.5.10: dependencies: symbol-observable "1.0.1" -rxjs@>=6.4.0, rxjs@^6.5.5, rxjs@^6.6.0: +rxjs@>=6.4.0, rxjs@^6.6.0: version "6.6.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== @@ -20400,6 +20400,13 @@ rxjs@^6.3.3, rxjs@^6.4.0: dependencies: tslib "^1.9.0" +rxjs@^6.6.3: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -23207,16 +23214,16 @@ w3c-xmlserializer@^2.0.0: dependencies: xml-name-validator "^3.0.0" -wait-on@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-5.2.0.tgz#6711e74422523279714a36d52cf49fb47c9d9597" - integrity sha512-U1D9PBgGw2XFc6iZqn45VBubw02VsLwnZWteQ1au4hUVHasTZuFSKRzlTB2dqgLhji16YVI8fgpEpwUdCr8B6g== +wait-on@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-5.3.0.tgz#584e17d4b3fe7b46ac2b9f8e5e102c005c2776c7" + integrity sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg== dependencies: - axios "^0.19.2" - joi "^17.1.1" - lodash "^4.17.19" + axios "^0.21.1" + joi "^17.3.0" + lodash "^4.17.21" minimist "^1.2.5" - rxjs "^6.5.5" + rxjs "^6.6.3" walker@^1.0.7, walker@~1.0.5: version "1.0.7" From 62fe322cfe7a2b867a75dec5bbc6c0043a6504e1 Mon Sep 17 00:00:00 2001 From: Andy Brown Date: Wed, 5 May 2021 09:10:01 -0700 Subject: [PATCH 2/3] remove unused dependency --- Composer/packages/server/package.json | 1 - Composer/yarn.lock | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json index 2ded4e66da..fb4bce52ba 100644 --- a/Composer/packages/server/package.json +++ b/Composer/packages/server/package.json @@ -68,7 +68,6 @@ "ts-node": "^8.4.1" }, "dependencies": { - "@azure/msal-node": "^1.0.0-beta.1", "@bfc/client": "*", "@bfc/extension": "*", "@bfc/indexers": "*", diff --git a/Composer/yarn.lock b/Composer/yarn.lock index 0e33c23dc0..86215199db 100644 --- a/Composer/yarn.lock +++ b/Composer/yarn.lock @@ -180,23 +180,6 @@ uuid "^3.3.2" xml2js "^0.4.19" -"@azure/msal-common@^1.7.2": - version "1.7.2" - resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-1.7.2.tgz#b0061367efbfd459ebd11f6851ff36121db3278c" - integrity sha512-3/voCdFKONENX+5tMrNOBSrVJb6NbE7YB8vc4FZ/4ZbjpK7GVtq9Bu1MW+HZhrmsUzSF/joHx0ZIJDYIequ/jg== - dependencies: - debug "^4.1.1" - -"@azure/msal-node@^1.0.0-beta.1": - version "1.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.0.0-beta.1.tgz#abc122385f978db0744ba79422ae424dec21e251" - integrity sha512-dO/bgVScpl5loZfsfhHXmFLTNoDxGvUiZIsJCe1+HpHyFWXwGsBZ71P5ixbxRhhf/bPpZS3X+/rm1Fq2uUucJw== - dependencies: - "@azure/msal-common" "^1.7.2" - axios "^0.19.2" - jsonwebtoken "^8.5.1" - uuid "^8.3.0" - "@babel/cli@7.2.3": version "7.2.3" resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.2.3.tgz#1b262e42a3e959d28ab3d205ba2718e1923cfee6" @@ -6726,7 +6709,7 @@ axios-https-proxy@^0.1.1: dependencies: https-proxy-agent "^2.2.1" -axios@^0.18.0, axios@^0.19.2, axios@^0.21.1, axios@~0.21.1: +axios@^0.18.0, axios@^0.21.1, axios@~0.21.1: version "0.21.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== From 389af6ed5778080a4728e8efe9eb3fd57513cf25 Mon Sep 17 00:00:00 2001 From: Andy Brown Date: Wed, 5 May 2021 09:12:52 -0700 Subject: [PATCH 3/3] bump axios to v0.21.1 --- extensions/packageManager/package.json | 2 +- extensions/packageManager/yarn.lock | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/extensions/packageManager/package.json b/extensions/packageManager/package.json index 802dc815c2..b4692f85e5 100644 --- a/extensions/packageManager/package.json +++ b/extensions/packageManager/package.json @@ -52,7 +52,7 @@ "@emotion/core": "^10.0.35", "@microsoft/bf-dialog": "4.13.1", "@uifabric/fluent-theme": "^7.1.4", - "axios": "^0.19.2", + "axios": "^0.21.1", "date-fns": "^2.16.1", "format-message": "^6.2.3", "office-ui-fabric-react": "7.71.0", diff --git a/extensions/packageManager/yarn.lock b/extensions/packageManager/yarn.lock index c739930695..975049a05d 100644 --- a/extensions/packageManager/yarn.lock +++ b/extensions/packageManager/yarn.lock @@ -1011,13 +1011,6 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -axios@^0.19.2: - version "0.19.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27" - integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA== - dependencies: - follow-redirects "1.5.10" - axios@^0.21.1, axios@~0.21.1: version "0.21.1" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" @@ -1712,13 +1705,6 @@ debug@4, debug@^4.0.0, debug@^4.1.1: dependencies: ms "2.1.2" -debug@=3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -2133,13 +2119,6 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@1.5.10: - version "1.5.10" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== - dependencies: - debug "=3.1.0" - follow-redirects@^1.10.0: version "1.14.0" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe"