diff --git a/_util/chaos-proxy/package.json b/_util/chaos-proxy/package.json index a4465cf91e..e8ba6ef747 100644 --- a/_util/chaos-proxy/package.json +++ b/_util/chaos-proxy/package.json @@ -10,7 +10,7 @@ "start": "node index.js" }, "dependencies": { - "axios": "^0.21.2", + "axios": "^1.6.0", "faker": "^5.5.3" } } diff --git a/_util/chaos-proxy/yarn.lock b/_util/chaos-proxy/yarn.lock index a38844b868..3920f4849b 100644 --- a/_util/chaos-proxy/yarn.lock +++ b/_util/chaos-proxy/yarn.lock @@ -2,19 +2,64 @@ # yarn lockfile v1 -axios@^0.21.2: - version "0.21.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.2.tgz#21297d5084b2aeeb422f5d38e7be4fbb82239017" - integrity sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg== +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +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.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== dependencies: - follow-redirects "^1.14.0" + delayed-stream "~1.0.0" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== faker@^5.5.3: version "5.5.3" resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e" integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g== -follow-redirects@^1.14.0: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +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== + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +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== diff --git a/admin/package.json b/admin/package.json index 72f30196ee..10fa69319d 100644 --- a/admin/package.json +++ b/admin/package.json @@ -43,11 +43,11 @@ "dependencies": { "@azure/data-tables": "^13.2.1", "@azure/service-bus": "^7.9.1", - "@azure/storage-blob": "^12.8.0", + "@azure/storage-blob": "^12.17.0", "@azure/storage-queue": "^12.7.0", "adm-zip": "^0.5.10", "applicationinsights": "^2.7.0", - "axios": "^1.5.1", + "axios": "^1.6.0", "bcryptjs": "^2.4.3", "bluebird": "^3.5.1", "connect-flash": "^0.1.1", @@ -59,7 +59,7 @@ "ejs": "^3.1.8", "express": "^4.16.2", "express-breadcrumbs": "https://github.com/DFEAGILEDEVOPS/express-breadcrumbs.git", - "express-busboy": "^8.0.2", + "express-busboy": "^9.0.0", "express-partials": "^0.3.0", "express-session": "^1.17.3", "express-winston": "^4.1.0", @@ -89,7 +89,7 @@ "ramda": "^0.28.0", "ramda-adjunct": "^3.4.0", "random-number-csprng": "^1.0.2", - "sass": "^1.67.0", + "sass": "^1.69.5", "simplemde": "^1.11.2", "to-bool": "^0.0.1", "uuid": "^9.0.0", diff --git a/admin/yarn.lock b/admin/yarn.lock index 48112ac2a7..1dc8e8ec50 100644 --- a/admin/yarn.lock +++ b/admin/yarn.lock @@ -317,10 +317,10 @@ rhea-promise "^3.0.0" tslib "^2.2.0" -"@azure/storage-blob@^12.8.0": - version "12.15.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.15.0.tgz#6c0e15bf837f4daa2739a17a7762ba3774932b26" - integrity sha512-e7JBKLOFi0QVJqqLzrjx1eL3je3/Ug2IQj24cTM9b85CsnnFjLGeGjJVIjbGGZaytewiCEG7r3lRwQX7fKj0/w== +"@azure/storage-blob@^12.17.0": + version "12.17.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006" + integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -2908,10 +2908,10 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -axios@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.1.tgz#11fbaa11fc35f431193a9564109c88c1f27b585f" - integrity sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A== +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.15.0" form-data "^4.0.0" @@ -3134,7 +3134,7 @@ body-parser@^1.19.0: type-is "~1.6.18" unpipe "1.0.0" -body@~5.1.0: +body@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069" integrity sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ== @@ -3234,12 +3234,12 @@ builtins@^5.0.1: dependencies: semver "^7.0.0" -busboy@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b" - integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw== +busboy@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893" + integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA== dependencies: - dicer "0.3.0" + streamsearch "^1.1.0" bytes@1: version "1.0.0" @@ -3672,12 +3672,12 @@ concurrently@^6.2.1: tree-kill "^1.2.2" yargs "^16.2.0" -connect-busboy@~0.0.1: - version "0.0.3" - resolved "https://registry.yarnpkg.com/connect-busboy/-/connect-busboy-0.0.3.tgz#b8c23dcc24415b6e0d299f793057b583b201ce51" - integrity sha512-a4o+Jp3e+sh9qYGaqIHb9dodQRHNnV3xVgZkcb5mRmeL3qyS+JxyUVGpZJoVEd9daInfW1wpJ8ndw7wo/cv+gA== +connect-busboy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/connect-busboy/-/connect-busboy-1.0.0.tgz#7ac826e4c60e09934e049c406866f235efdc3d59" + integrity sha512-dKON178N/CpPSeJ8E+kfOekSUBx0nQo5kyIekry7YpM+qRhgHmSRVUN5D2hpLA8SQBV0ZNMF/aG7njDzE8Gl2A== dependencies: - busboy "~0.3.1" + busboy "^1.0.0" connect-flash@^0.1.1: version "0.1.1" @@ -4103,13 +4103,6 @@ diagnostic-channel@1.1.1: dependencies: semver "^7.5.3" -dicer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" - integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== - dependencies: - streamsearch "0.1.2" - diff-sequences@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" @@ -4887,15 +4880,15 @@ expect@^27.5.1: dependencies: lodash "~4.17.15" -express-busboy@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/express-busboy/-/express-busboy-8.0.2.tgz#81a75430a15e06807b1af79227d599b45e72e84d" - integrity sha512-ibujglH1hheInN/h3ZY/JDtSn5WJ1QHsFFBoROX4eb9ENYdYwIeJLIgWUynLnL4gjFoCFE42XJCaEYIUzar2OQ== +express-busboy@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/express-busboy/-/express-busboy-9.0.0.tgz#ccd59d1b7de070ccc07661bb054acde8e7c1de8d" + integrity sha512-F1C6u0eh47Jl9RPcUPb+4TnxkywUjo/DKzfbqqHUj43K/T6/PCh2YDwwCiC0xBd1YnZCKUUhKtP54bPayUb1+Q== dependencies: - body "~5.1.0" - connect-busboy "~0.0.1" + body "^5.1.0" + connect-busboy "^1.0.0" mkdirp "^1.0.4" - qs "^6.4.0" + qs "^6.10.3" uuid "^8.3.2" express-partials@^0.3.0: @@ -7254,23 +7247,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonwebtoken@^9.0.0: - version "9.0.2" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3" - integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ== - dependencies: - jws "^3.2.2" - lodash.includes "^4.3.0" - lodash.isboolean "^3.0.3" - lodash.isinteger "^4.0.4" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.once "^4.0.0" - ms "^2.1.1" - semver "^7.5.4" - -jsonwebtoken@^9.0.2: +jsonwebtoken@^9.0.0, jsonwebtoken@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3" integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ== @@ -8999,7 +8976,7 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" -qs@^6.11.0, qs@^6.4.0: +qs@^6.10.3, qs@^6.11.0: version "6.11.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== @@ -9590,10 +9567,10 @@ safe-stable-stringify@^2.3.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass@^1.67.0: - version "1.68.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669" - integrity sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA== +sass@^1.69.5: + version "1.69.5" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde" + integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -10025,10 +10002,10 @@ streamroller@^3.1.5: debug "^4.3.4" fs-extra "^8.1.0" -streamsearch@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA== +streamsearch@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" + integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== string-length@^4.0.1: version "4.0.2" diff --git a/deploy/sql/package.json b/deploy/sql/package.json index b31ef87ce9..a18f3fca03 100644 --- a/deploy/sql/package.json +++ b/deploy/sql/package.json @@ -13,7 +13,7 @@ "node": ">= 18" }, "dependencies": { - "axios": "^0.21.2", + "axios": "^1.6.0", "command-line-args": "^5.1.1", "dotenv": "^8.2.0", "fast-csv": "^3.6.0", diff --git a/deploy/sql/yarn.lock b/deploy/sql/yarn.lock index 38f72a1ff6..22c034ea05 100644 --- a/deploy/sql/yarn.lock +++ b/deploy/sql/yarn.lock @@ -144,13 +144,22 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -axios@^0.21.1, axios@^0.21.2: +axios@^0.21.1: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: follow-redirects "^1.14.0" +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.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -238,7 +247,7 @@ colorspace@1.1.x: color "^3.1.3" text-hex "1.0.x" -combined-stream@^1.0.6: +combined-stream@^1.0.6, combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -353,10 +362,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.0: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +follow-redirects@^1.14.0, 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== form-data@^2.5.0: version "2.5.1" @@ -367,6 +376,15 @@ form-data@^2.5.0: combined-stream "^1.0.6" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -630,6 +648,11 @@ postgrator@^3.11.0: glob "^7.1.6" newline "0.0.3" +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== + psl@^1.1.28: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" diff --git a/func-consumption/package.json b/func-consumption/package.json index e1e8a79810..c9b277a5c9 100644 --- a/func-consumption/package.json +++ b/func-consumption/package.json @@ -43,12 +43,12 @@ "dependencies": { "@azure/core-asynciterator-polyfill": "^1.0.2", "@azure/data-tables": "^13.2.1", - "@azure/service-bus": "^7.8.1", - "@azure/storage-blob": "^12.16.0", - "@azure/storage-queue": "^12.15.0", + "@azure/service-bus": "^7.9.3", + "@azure/storage-blob": "^12.17.0", + "@azure/storage-queue": "^12.16.0", "adm-zip": "^0.5.10", "applicationinsights": "^2.8.0", - "async": "^3.2.4", + "async": "^3.2.5", "body-parser": "^1.20.2", "cors": "^2.8.5", "csv-string": "^4.1.0", @@ -68,7 +68,7 @@ "random-number-csprng": "^1.0.2", "ua-parser-js": "^1.0.36", "uuid": "^9.0.1", - "winston": "^3.10.0", + "winston": "^3.11.0", "winston-azure-application-insights": "^4.0.0" }, "function-settings": { diff --git a/func-consumption/yarn.lock b/func-consumption/yarn.lock index b5bc4ccf2a..648d1df6ec 100644 --- a/func-consumption/yarn.lock +++ b/func-consumption/yarn.lock @@ -9,10 +9,10 @@ dependencies: tslib "^2.2.0" -"@azure/core-amqp@^3.1.0": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-3.2.2.tgz#62cf7197197509ad4eee30c40a3dc4ab87aa212c" - integrity sha512-6ta1UERwLLO3TUl6xsMGSLkj6zhhyE028h2LA26a9awfMxF62PPlm+ZvdJcidkphr69hT87PtPO6SHeZzguCZw== +"@azure/core-amqp@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-4.1.0.tgz#1da57b3a259409fb8004e5705db3ed6945b8afc7" + integrity sha512-tjnviDypSAgjGBZCPw+sH7vDWz27N+z0xtQewp7+xH17/eb67VH4sApl3XHuxVBro6Y6pOfxCDpqFenOoGWz6Q== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.3.0" @@ -20,10 +20,9 @@ "@azure/logger" "^1.0.0" buffer "^6.0.0" events "^3.0.0" - jssha "^3.1.0" process "^0.11.10" - rhea "^2.0.3" - rhea-promise "^2.1.0" + rhea "^3.0.0" + rhea-promise "^3.0.0" tslib "^2.2.0" util "^0.12.1" @@ -298,13 +297,13 @@ "@opentelemetry/instrumentation" "^0.41.2" tslib "^2.2.0" -"@azure/service-bus@^7.8.1": - version "7.8.1" - resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.8.1.tgz#36d799f667eff11e4529bfabf852a1c2f883e6d3" - integrity sha512-Mo/tCxNiYUT92rKj5mSILeccD5H2ndyPqpZZ+IdtFusa/e3mIz8Kghm1otsxpJCB3XHj6vPJxON/gDRE4exe7Q== +"@azure/service-bus@^7.9.3": + version "7.9.3" + resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.9.3.tgz#c2c6ed2e1506d0423a4141d5ea56649e6e11205e" + integrity sha512-6g37YpVTzRHI75BkYPiB4zqbYhQHM1Jvd+sNfRCbXeRW5FLsWoXgFVTw3Jv5kkMMX1pUNtrkaQhEoeTwtm5v3w== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-amqp" "^3.1.0" + "@azure/core-amqp" "^4.1.0" "@azure/core-auth" "^1.3.0" "@azure/core-client" "^1.0.0" "@azure/core-paging" "^1.4.0" @@ -319,13 +318,13 @@ jssha "^3.1.0" long "^5.2.0" process "^0.11.10" - rhea-promise "^2.1.0" + rhea-promise "^3.0.0" tslib "^2.2.0" -"@azure/storage-blob@^12.16.0": - version "12.16.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.16.0.tgz#c41fb1e538d6f6e2a6756bfcc69382eededf4fa1" - integrity sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q== +"@azure/storage-blob@^12.17.0": + version "12.17.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006" + integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -336,10 +335,10 @@ events "^3.0.0" tslib "^2.2.0" -"@azure/storage-queue@^12.15.0": - version "12.15.0" - resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.15.0.tgz#c124d362f5aabb6d1f450cf644d0a7756cb45a77" - integrity sha512-qotyfMcmocaT1r9bfX7RyQQnkRJcTXGSG/m6LIchtEsNmqLu3ulVqkOlNM+O0XP9wwJ6Da1XQbWz5jQtrDe3DQ== +"@azure/storage-queue@^12.16.0": + version "12.16.0" + resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.16.0.tgz#06ce127c8871058c85139d2ba4788390df54f2a0" + integrity sha512-HzwzMsNAh2PwLtx9WfXndj9elUr6duDFak5CjM6BxdWhLqf37VywPCWmEzjxuFfrq30c1T34+MjMXnN6YgqRUw== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -353,6 +352,11 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== +"@colors/colors@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== + "@dabh/diagnostics@^2.0.2": version "2.0.3" resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" @@ -800,11 +804,16 @@ async@^2.5.0: dependencies: lodash "^4.17.14" -async@^3.2.3, async@^3.2.4: +async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +async@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" + integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1317,13 +1326,6 @@ date-fns@^2.0.1: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== -"debug@0.8.0 - 3.5.0", debug@^3.1.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -1338,6 +1340,13 @@ debug@4, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4: dependencies: ms "2.1.2" +debug@^3.1.0: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -3838,21 +3847,21 @@ rfdc@^1.3.0: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== -rhea-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/rhea-promise/-/rhea-promise-2.1.0.tgz#540e97f62302ad54b368b79a3560a51eefd2b063" - integrity sha512-CRMwdJ/o4oO/xKcvAwAsd0AHy5fVvSlqso7AadRmaaLGzAzc9LCoW7FOFnucI8THasVmOeCnv5c/fH/n7FcNaA== +rhea-promise@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/rhea-promise/-/rhea-promise-3.0.1.tgz#4e18d89cc989b6a287941db92b2a47ed9908c139" + integrity sha512-Fcqgml7lgoyi7fH1ClsSyFr/xwToijEN3rULFgrIcL+7EHeduxkWogFxNHjFzHf2YGScAckJDaDxS1RdlTUQYw== dependencies: debug "^3.1.0" - rhea "^2.0.3" + rhea "^3.0.0" tslib "^2.2.0" -rhea@^2.0.3: - version "2.0.8" - resolved "https://registry.yarnpkg.com/rhea/-/rhea-2.0.8.tgz#2ac355fad923e36a995defffdf314bb1cbe562de" - integrity sha512-IgwlP4D2lzinBSll5f35tAWa30dGCZhG9Ujd1DiaB7MUGegIjAaLzqATCw3ha+h9oq9mXcitqayBbNIXYdvtFg== +rhea@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rhea/-/rhea-3.0.2.tgz#3882ec45ed7620936c8c807833d17d84a5724ac7" + integrity sha512-0G1ZNM9yWin8VLvTxyISKH6KfR6gl1TW/1+5yMKPf2r1efhkzTLze09iFtT2vpDjuWIVtSmXz8r18lk/dO8qwQ== dependencies: - debug "0.8.0 - 3.5.0" + debug "^4.3.3" rimraf@^2.6.2: version "2.7.1" @@ -4703,12 +4712,12 @@ winston-transport@^4.2.0, winston-transport@^4.5.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.10.0.tgz#d033cb7bd3ced026fed13bf9d92c55b903116803" - integrity sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g== +winston@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91" + integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g== dependencies: - "@colors/colors" "1.5.0" + "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" async "^3.2.3" is-stream "^2.0.0" diff --git a/func-ps-report/package.json b/func-ps-report/package.json index 558c093a42..d7e93a641f 100644 --- a/func-ps-report/package.json +++ b/func-ps-report/package.json @@ -33,12 +33,12 @@ "dependencies": { "@azure/core-asynciterator-polyfill": "^1.0.2", "@azure/data-tables": "^13.2.1", - "@azure/service-bus": "^7.8.1", - "@azure/storage-blob": "^12.16.0", - "@azure/storage-queue": "^12.15.0", + "@azure/service-bus": "^7.9.3", + "@azure/storage-blob": "^12.17.0", + "@azure/storage-queue": "^12.16.0", "adm-zip": "^0.5.10", "applicationinsights": "^2.8.0", - "async": "^3.2.4", + "async": "^3.2.5", "body-parser": "^1.20.2", "cors": "^2.8.5", "csv-string": "^4.1.0", @@ -58,7 +58,7 @@ "random-number-csprng": "^1.0.2", "ua-parser-js": "^1.0.36", "uuid": "^9.0.1", - "winston": "^3.10.0", + "winston": "^3.11.0", "winston-azure-application-insights": "^4.0.0" }, "function-settings": { diff --git a/func-ps-report/yarn.lock b/func-ps-report/yarn.lock index 2ece6e40ca..b049ead331 100644 --- a/func-ps-report/yarn.lock +++ b/func-ps-report/yarn.lock @@ -9,10 +9,10 @@ dependencies: tslib "^2.2.0" -"@azure/core-amqp@^3.1.0": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-3.2.2.tgz#62cf7197197509ad4eee30c40a3dc4ab87aa212c" - integrity sha512-6ta1UERwLLO3TUl6xsMGSLkj6zhhyE028h2LA26a9awfMxF62PPlm+ZvdJcidkphr69hT87PtPO6SHeZzguCZw== +"@azure/core-amqp@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-4.1.0.tgz#1da57b3a259409fb8004e5705db3ed6945b8afc7" + integrity sha512-tjnviDypSAgjGBZCPw+sH7vDWz27N+z0xtQewp7+xH17/eb67VH4sApl3XHuxVBro6Y6pOfxCDpqFenOoGWz6Q== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.3.0" @@ -20,10 +20,9 @@ "@azure/logger" "^1.0.0" buffer "^6.0.0" events "^3.0.0" - jssha "^3.1.0" process "^0.11.10" - rhea "^2.0.3" - rhea-promise "^2.1.0" + rhea "^3.0.0" + rhea-promise "^3.0.0" tslib "^2.2.0" util "^0.12.1" @@ -293,13 +292,13 @@ "@opentelemetry/instrumentation" "^0.41.2" tslib "^2.2.0" -"@azure/service-bus@^7.8.1": - version "7.8.1" - resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.8.1.tgz#36d799f667eff11e4529bfabf852a1c2f883e6d3" - integrity sha512-Mo/tCxNiYUT92rKj5mSILeccD5H2ndyPqpZZ+IdtFusa/e3mIz8Kghm1otsxpJCB3XHj6vPJxON/gDRE4exe7Q== +"@azure/service-bus@^7.9.3": + version "7.9.3" + resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.9.3.tgz#c2c6ed2e1506d0423a4141d5ea56649e6e11205e" + integrity sha512-6g37YpVTzRHI75BkYPiB4zqbYhQHM1Jvd+sNfRCbXeRW5FLsWoXgFVTw3Jv5kkMMX1pUNtrkaQhEoeTwtm5v3w== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-amqp" "^3.1.0" + "@azure/core-amqp" "^4.1.0" "@azure/core-auth" "^1.3.0" "@azure/core-client" "^1.0.0" "@azure/core-paging" "^1.4.0" @@ -314,13 +313,13 @@ jssha "^3.1.0" long "^5.2.0" process "^0.11.10" - rhea-promise "^2.1.0" + rhea-promise "^3.0.0" tslib "^2.2.0" -"@azure/storage-blob@^12.16.0": - version "12.16.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.16.0.tgz#c41fb1e538d6f6e2a6756bfcc69382eededf4fa1" - integrity sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q== +"@azure/storage-blob@^12.17.0": + version "12.17.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006" + integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -331,10 +330,10 @@ events "^3.0.0" tslib "^2.2.0" -"@azure/storage-queue@^12.15.0": - version "12.15.0" - resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.15.0.tgz#c124d362f5aabb6d1f450cf644d0a7756cb45a77" - integrity sha512-qotyfMcmocaT1r9bfX7RyQQnkRJcTXGSG/m6LIchtEsNmqLu3ulVqkOlNM+O0XP9wwJ6Da1XQbWz5jQtrDe3DQ== +"@azure/storage-queue@^12.16.0": + version "12.16.0" + resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.16.0.tgz#06ce127c8871058c85139d2ba4788390df54f2a0" + integrity sha512-HzwzMsNAh2PwLtx9WfXndj9elUr6duDFak5CjM6BxdWhLqf37VywPCWmEzjxuFfrq30c1T34+MjMXnN6YgqRUw== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -348,6 +347,11 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== +"@colors/colors@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== + "@dabh/diagnostics@^2.0.2": version "2.0.3" resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" @@ -740,11 +744,16 @@ async@^2.5.0: dependencies: lodash "^4.17.14" -async@^3.2.3, async@^3.2.4: +async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +async@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" + integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1252,13 +1261,6 @@ date-fns@^2.0.1: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== -"debug@0.8.0 - 3.5.0", debug@^3.1.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -1273,6 +1275,13 @@ debug@4, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4: dependencies: ms "2.1.2" +debug@^3.1.0: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -3773,21 +3782,21 @@ rfdc@^1.3.0: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== -rhea-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/rhea-promise/-/rhea-promise-2.1.0.tgz#540e97f62302ad54b368b79a3560a51eefd2b063" - integrity sha512-CRMwdJ/o4oO/xKcvAwAsd0AHy5fVvSlqso7AadRmaaLGzAzc9LCoW7FOFnucI8THasVmOeCnv5c/fH/n7FcNaA== +rhea-promise@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/rhea-promise/-/rhea-promise-3.0.1.tgz#4e18d89cc989b6a287941db92b2a47ed9908c139" + integrity sha512-Fcqgml7lgoyi7fH1ClsSyFr/xwToijEN3rULFgrIcL+7EHeduxkWogFxNHjFzHf2YGScAckJDaDxS1RdlTUQYw== dependencies: debug "^3.1.0" - rhea "^2.0.3" + rhea "^3.0.0" tslib "^2.2.0" -rhea@^2.0.3: - version "2.0.8" - resolved "https://registry.yarnpkg.com/rhea/-/rhea-2.0.8.tgz#2ac355fad923e36a995defffdf314bb1cbe562de" - integrity sha512-IgwlP4D2lzinBSll5f35tAWa30dGCZhG9Ujd1DiaB7MUGegIjAaLzqATCw3ha+h9oq9mXcitqayBbNIXYdvtFg== +rhea@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rhea/-/rhea-3.0.2.tgz#3882ec45ed7620936c8c807833d17d84a5724ac7" + integrity sha512-0G1ZNM9yWin8VLvTxyISKH6KfR6gl1TW/1+5yMKPf2r1efhkzTLze09iFtT2vpDjuWIVtSmXz8r18lk/dO8qwQ== dependencies: - debug "0.8.0 - 3.5.0" + debug "^4.3.3" rimraf@^2.6.2: version "2.7.1" @@ -4633,12 +4642,12 @@ winston-transport@^4.2.0, winston-transport@^4.5.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.10.0.tgz#d033cb7bd3ced026fed13bf9d92c55b903116803" - integrity sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g== +winston@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91" + integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g== dependencies: - "@colors/colors" "1.5.0" + "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" async "^3.2.3" is-stream "^2.0.0" diff --git a/func-throttled/package.json b/func-throttled/package.json index 590d2c04bd..6522b87a21 100644 --- a/func-throttled/package.json +++ b/func-throttled/package.json @@ -33,12 +33,12 @@ "dependencies": { "@azure/core-asynciterator-polyfill": "^1.0.2", "@azure/data-tables": "^13.2.1", - "@azure/service-bus": "^7.8.1", - "@azure/storage-blob": "^12.16.0", - "@azure/storage-queue": "^12.15.0", + "@azure/service-bus": "^7.9.3", + "@azure/storage-blob": "^12.17.0", + "@azure/storage-queue": "^12.16.0", "adm-zip": "^0.5.10", "applicationinsights": "^2.8.0", - "async": "^3.2.4", + "async": "^3.2.5", "body-parser": "^1.20.2", "cors": "^2.8.5", "csv-string": "^4.1.0", @@ -58,7 +58,7 @@ "random-number-csprng": "^1.0.2", "ua-parser-js": "^1.0.36", "uuid": "^9.0.1", - "winston": "^3.10.0", + "winston": "^3.11.0", "winston-azure-application-insights": "^4.0.0" }, "function-settings": { diff --git a/func-throttled/yarn.lock b/func-throttled/yarn.lock index 2ece6e40ca..b049ead331 100644 --- a/func-throttled/yarn.lock +++ b/func-throttled/yarn.lock @@ -9,10 +9,10 @@ dependencies: tslib "^2.2.0" -"@azure/core-amqp@^3.1.0": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-3.2.2.tgz#62cf7197197509ad4eee30c40a3dc4ab87aa212c" - integrity sha512-6ta1UERwLLO3TUl6xsMGSLkj6zhhyE028h2LA26a9awfMxF62PPlm+ZvdJcidkphr69hT87PtPO6SHeZzguCZw== +"@azure/core-amqp@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-4.1.0.tgz#1da57b3a259409fb8004e5705db3ed6945b8afc7" + integrity sha512-tjnviDypSAgjGBZCPw+sH7vDWz27N+z0xtQewp7+xH17/eb67VH4sApl3XHuxVBro6Y6pOfxCDpqFenOoGWz6Q== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.3.0" @@ -20,10 +20,9 @@ "@azure/logger" "^1.0.0" buffer "^6.0.0" events "^3.0.0" - jssha "^3.1.0" process "^0.11.10" - rhea "^2.0.3" - rhea-promise "^2.1.0" + rhea "^3.0.0" + rhea-promise "^3.0.0" tslib "^2.2.0" util "^0.12.1" @@ -293,13 +292,13 @@ "@opentelemetry/instrumentation" "^0.41.2" tslib "^2.2.0" -"@azure/service-bus@^7.8.1": - version "7.8.1" - resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.8.1.tgz#36d799f667eff11e4529bfabf852a1c2f883e6d3" - integrity sha512-Mo/tCxNiYUT92rKj5mSILeccD5H2ndyPqpZZ+IdtFusa/e3mIz8Kghm1otsxpJCB3XHj6vPJxON/gDRE4exe7Q== +"@azure/service-bus@^7.9.3": + version "7.9.3" + resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.9.3.tgz#c2c6ed2e1506d0423a4141d5ea56649e6e11205e" + integrity sha512-6g37YpVTzRHI75BkYPiB4zqbYhQHM1Jvd+sNfRCbXeRW5FLsWoXgFVTw3Jv5kkMMX1pUNtrkaQhEoeTwtm5v3w== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-amqp" "^3.1.0" + "@azure/core-amqp" "^4.1.0" "@azure/core-auth" "^1.3.0" "@azure/core-client" "^1.0.0" "@azure/core-paging" "^1.4.0" @@ -314,13 +313,13 @@ jssha "^3.1.0" long "^5.2.0" process "^0.11.10" - rhea-promise "^2.1.0" + rhea-promise "^3.0.0" tslib "^2.2.0" -"@azure/storage-blob@^12.16.0": - version "12.16.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.16.0.tgz#c41fb1e538d6f6e2a6756bfcc69382eededf4fa1" - integrity sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q== +"@azure/storage-blob@^12.17.0": + version "12.17.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006" + integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -331,10 +330,10 @@ events "^3.0.0" tslib "^2.2.0" -"@azure/storage-queue@^12.15.0": - version "12.15.0" - resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.15.0.tgz#c124d362f5aabb6d1f450cf644d0a7756cb45a77" - integrity sha512-qotyfMcmocaT1r9bfX7RyQQnkRJcTXGSG/m6LIchtEsNmqLu3ulVqkOlNM+O0XP9wwJ6Da1XQbWz5jQtrDe3DQ== +"@azure/storage-queue@^12.16.0": + version "12.16.0" + resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.16.0.tgz#06ce127c8871058c85139d2ba4788390df54f2a0" + integrity sha512-HzwzMsNAh2PwLtx9WfXndj9elUr6duDFak5CjM6BxdWhLqf37VywPCWmEzjxuFfrq30c1T34+MjMXnN6YgqRUw== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -348,6 +347,11 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== +"@colors/colors@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== + "@dabh/diagnostics@^2.0.2": version "2.0.3" resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" @@ -740,11 +744,16 @@ async@^2.5.0: dependencies: lodash "^4.17.14" -async@^3.2.3, async@^3.2.4: +async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +async@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" + integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1252,13 +1261,6 @@ date-fns@^2.0.1: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== -"debug@0.8.0 - 3.5.0", debug@^3.1.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -1273,6 +1275,13 @@ debug@4, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4: dependencies: ms "2.1.2" +debug@^3.1.0: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -3773,21 +3782,21 @@ rfdc@^1.3.0: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== -rhea-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/rhea-promise/-/rhea-promise-2.1.0.tgz#540e97f62302ad54b368b79a3560a51eefd2b063" - integrity sha512-CRMwdJ/o4oO/xKcvAwAsd0AHy5fVvSlqso7AadRmaaLGzAzc9LCoW7FOFnucI8THasVmOeCnv5c/fH/n7FcNaA== +rhea-promise@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/rhea-promise/-/rhea-promise-3.0.1.tgz#4e18d89cc989b6a287941db92b2a47ed9908c139" + integrity sha512-Fcqgml7lgoyi7fH1ClsSyFr/xwToijEN3rULFgrIcL+7EHeduxkWogFxNHjFzHf2YGScAckJDaDxS1RdlTUQYw== dependencies: debug "^3.1.0" - rhea "^2.0.3" + rhea "^3.0.0" tslib "^2.2.0" -rhea@^2.0.3: - version "2.0.8" - resolved "https://registry.yarnpkg.com/rhea/-/rhea-2.0.8.tgz#2ac355fad923e36a995defffdf314bb1cbe562de" - integrity sha512-IgwlP4D2lzinBSll5f35tAWa30dGCZhG9Ujd1DiaB7MUGegIjAaLzqATCw3ha+h9oq9mXcitqayBbNIXYdvtFg== +rhea@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rhea/-/rhea-3.0.2.tgz#3882ec45ed7620936c8c807833d17d84a5724ac7" + integrity sha512-0G1ZNM9yWin8VLvTxyISKH6KfR6gl1TW/1+5yMKPf2r1efhkzTLze09iFtT2vpDjuWIVtSmXz8r18lk/dO8qwQ== dependencies: - debug "0.8.0 - 3.5.0" + debug "^4.3.3" rimraf@^2.6.2: version "2.7.1" @@ -4633,12 +4642,12 @@ winston-transport@^4.2.0, winston-transport@^4.5.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.10.0.tgz#d033cb7bd3ced026fed13bf9d92c55b903116803" - integrity sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g== +winston@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91" + integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g== dependencies: - "@colors/colors" "1.5.0" + "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" async "^3.2.3" is-stream "^2.0.0" diff --git a/load-test/package.json b/load-test/package.json index 5224c9a21d..5bc32daaef 100644 --- a/load-test/package.json +++ b/load-test/package.json @@ -18,8 +18,8 @@ "dependencies": { "@azure/data-tables": "^13.1.1", "@azure/storage-queue": "^12.7.0", - "artillery": "^2.0.0-14", - "axios": "^0.27.2", + "artillery": "^2.0.1", + "axios": "^1.6.0", "bcryptjs": "^2.4.3", "bluebird": "^3.5.3", "dotenv": "^16.0.0", diff --git a/load-test/yarn.lock b/load-test/yarn.lock index 00684eeb55..a416f371d1 100644 --- a/load-test/yarn.lock +++ b/load-test/yarn.lock @@ -1284,13 +1284,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" backo2@~1.0.2: version "1.0.2" @@ -2630,10 +2631,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.9: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== +follow-redirects@^1.14.4, 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== form-data@^3.0.0: version "3.0.1" @@ -5019,7 +5020,7 @@ proxy-agent@^5.0.0: proxy-from-env "^1.0.0" socks-proxy-agent "^5.0.0" -proxy-from-env@^1.0.0: +proxy-from-env@^1.0.0, 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== diff --git a/pupil-api/package.json b/pupil-api/package.json index baff056d50..d9def6fe32 100644 --- a/pupil-api/package.json +++ b/pupil-api/package.json @@ -15,12 +15,12 @@ "dependencies": { "@azure/core-asynciterator-polyfill": "^1.0.2", "@azure/data-tables": "^13.2.1", - "@azure/service-bus": "^7.8.1", - "@azure/storage-blob": "^12.16.0", - "@azure/storage-queue": "^12.15.0", + "@azure/service-bus": "^7.9.3", + "@azure/storage-blob": "^12.17.0", + "@azure/storage-queue": "^12.16.0", "adm-zip": "^0.5.10", "applicationinsights": "^2.8.0", - "async": "^3.2.4", + "async": "^3.2.5", "body-parser": "^1.20.2", "cors": "^2.8.5", "csv-string": "^4.1.0", @@ -40,7 +40,7 @@ "random-number-csprng": "^1.0.2", "ua-parser-js": "^1.0.36", "uuid": "^9.0.1", - "winston": "^3.10.0", + "winston": "^3.11.0", "winston-azure-application-insights": "^4.0.0" }, "devDependencies": { diff --git a/pupil-api/yarn.lock b/pupil-api/yarn.lock index 412764a51d..fb31675159 100644 --- a/pupil-api/yarn.lock +++ b/pupil-api/yarn.lock @@ -9,10 +9,10 @@ dependencies: tslib "^2.2.0" -"@azure/core-amqp@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-4.0.0.tgz#abeebe76b9d1dd55a5d31e84fd9c9c062c5ba1f7" - integrity sha512-5QhtJ69qLbTKTL3arLHkQCN96C7tqENF4oKkPYp5Pqb+YA5Gh0aREL2aqp98sAT/YB/G8wAfvFLnYB7bUyzFVw== +"@azure/core-amqp@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-4.1.0.tgz#1da57b3a259409fb8004e5705db3ed6945b8afc7" + integrity sha512-tjnviDypSAgjGBZCPw+sH7vDWz27N+z0xtQewp7+xH17/eb67VH4sApl3XHuxVBro6Y6pOfxCDpqFenOoGWz6Q== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.3.0" @@ -268,13 +268,13 @@ "@opentelemetry/instrumentation" "^0.41.2" tslib "^2.2.0" -"@azure/service-bus@^7.8.1": - version "7.9.2" - resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.9.2.tgz#013ad19b9e1df85e532ba70c2bbf2a91d5f1d1e1" - integrity sha512-w8d1/KhlbUz8DvY3Ca7GvoU5cJ8ONV4QBW25OfUk4Br6waAKWY+1wugEThQNCueRKvNlJlJyRbr9T14ibYMZeQ== +"@azure/service-bus@^7.9.3": + version "7.9.3" + resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.9.3.tgz#c2c6ed2e1506d0423a4141d5ea56649e6e11205e" + integrity sha512-6g37YpVTzRHI75BkYPiB4zqbYhQHM1Jvd+sNfRCbXeRW5FLsWoXgFVTw3Jv5kkMMX1pUNtrkaQhEoeTwtm5v3w== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-amqp" "^4.0.0" + "@azure/core-amqp" "^4.1.0" "@azure/core-auth" "^1.3.0" "@azure/core-client" "^1.0.0" "@azure/core-paging" "^1.4.0" @@ -292,10 +292,10 @@ rhea-promise "^3.0.0" tslib "^2.2.0" -"@azure/storage-blob@^12.16.0": - version "12.16.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.16.0.tgz#c41fb1e538d6f6e2a6756bfcc69382eededf4fa1" - integrity sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q== +"@azure/storage-blob@^12.17.0": + version "12.17.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006" + integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -306,10 +306,10 @@ events "^3.0.0" tslib "^2.2.0" -"@azure/storage-queue@^12.15.0": - version "12.15.0" - resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.15.0.tgz#c124d362f5aabb6d1f450cf644d0a7756cb45a77" - integrity sha512-qotyfMcmocaT1r9bfX7RyQQnkRJcTXGSG/m6LIchtEsNmqLu3ulVqkOlNM+O0XP9wwJ6Da1XQbWz5jQtrDe3DQ== +"@azure/storage-queue@^12.16.0": + version "12.16.0" + resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.16.0.tgz#06ce127c8871058c85139d2ba4788390df54f2a0" + integrity sha512-HzwzMsNAh2PwLtx9WfXndj9elUr6duDFak5CjM6BxdWhLqf37VywPCWmEzjxuFfrq30c1T34+MjMXnN6YgqRUw== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -714,11 +714,16 @@ async-settle@^1.0.0: dependencies: async-done "^1.2.2" -async@^3.2.3, async@^3.2.4: +async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +async@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" + integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -4480,7 +4485,7 @@ winston-transport@^4.2.0, winston-transport@^4.5.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^3.10.0: +winston@^3.11.0: version "3.11.0" resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91" integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g== diff --git a/pupil-spa/package.json b/pupil-spa/package.json index b6e8879ea4..cb82c23749 100644 --- a/pupil-spa/package.json +++ b/pupil-spa/package.json @@ -42,7 +42,7 @@ "ngx-cookie-service": "^14.0.1", "polly-js": "^1.8.2", "rxjs": "^6.5.3", - "sass": "^1.66.1", + "sass": "^1.69.5", "tslib": "^2.5.2", "uuid": "^9.0.0", "zone.js": "~0.13.1" @@ -63,7 +63,7 @@ "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "5.36.2", "@typescript-eslint/parser": "5.36.2", - "axios": "^1.1.3", + "axios": "^1.6.0", "eslint": "^8.23.0", "fs-extra": "^10.0.0", "govuk-elements-sass": "^3.1.1", diff --git a/pupil-spa/yarn.lock b/pupil-spa/yarn.lock index be4c5a4e1b..5cb0d41ffc 100644 --- a/pupil-spa/yarn.lock +++ b/pupil-spa/yarn.lock @@ -8,9 +8,9 @@ integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== "@adobe/css-tools@^4.0.1": - version "4.3.1" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28" - integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg== + version "4.3.2" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.2.tgz#a6abc715fb6884851fca9dad37fc34739a04fd11" + integrity sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw== "@ampproject/remapping@2.2.0": version "2.2.0" @@ -2738,10 +2738,10 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -axios@^1.1.3: - version "1.5.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.0.tgz#f02e4af823e2e46a9768cfc74691fdd0517ea267" - integrity sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ== +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.15.0" form-data "^4.0.0" @@ -8449,10 +8449,10 @@ sass@1.54.4: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" -sass@^1.66.1: - version "1.66.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.66.1.tgz#04b51c4671e4650aa393740e66a4e58b44d055b1" - integrity sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA== +sass@^1.69.5: + version "1.69.5" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde" + integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" diff --git a/test/admin-hpa/features/step_definitions/build_commit_and_ping_steps.rb b/test/admin-hpa/features/step_definitions/build_commit_and_ping_steps.rb index 3db1eea7f2..a63c13bef5 100644 --- a/test/admin-hpa/features/step_definitions/build_commit_and_ping_steps.rb +++ b/test/admin-hpa/features/step_definitions/build_commit_and_ping_steps.rb @@ -4,8 +4,8 @@ Then(/^I should see the correct build and commit info$/) do build_commit_hash = JSON.parse page.text - expect(build_commit_hash['Build']).to eql ENV["BUILD_BUILDNUMBER"] - expect(build_commit_hash['Commit']).to eql ENV["BUILD_SOURCEVERSION"] + expect(build_commit_hash['Build']).to include ENV["BUILD_BUILDNUMBER"] + expect(build_commit_hash['Commit']).to include ENV["BUILD_SOURCEVERSION"] end Given(/^I ping the Pupil app$/) do @@ -22,7 +22,7 @@ expect(build_commit_hash['Build']).to include '#mtc.build#' expect(build_commit_hash['Commit']).to include '#mtc.commit#' else - expect(build_commit_hash['Build']).to eql ENV["BUILD_BUILDNUMBER"] - expect(build_commit_hash['Commit'].strip).to eql ENV["BUILD_SOURCEVERSION"] + expect(build_commit_hash['Build']).to include ENV["BUILD_BUILDNUMBER"] + expect(build_commit_hash['Commit'].strip).to include ENV["BUILD_SOURCEVERSION"] end end diff --git a/tslib/package.json b/tslib/package.json index e5f5cfb536..d4ab392781 100644 --- a/tslib/package.json +++ b/tslib/package.json @@ -66,12 +66,12 @@ "dependencies": { "@azure/core-asynciterator-polyfill": "^1.0.2", "@azure/data-tables": "^13.2.1", - "@azure/service-bus": "^7.8.1", - "@azure/storage-blob": "^12.16.0", - "@azure/storage-queue": "^12.15.0", + "@azure/service-bus": "^7.9.3", + "@azure/storage-blob": "^12.17.0", + "@azure/storage-queue": "^12.16.0", "adm-zip": "^0.5.10", "applicationinsights": "^2.8.0", - "async": "^3.2.4", + "async": "^3.2.5", "body-parser": "^1.20.2", "cors": "^2.8.5", "csv-string": "^4.1.0", @@ -91,7 +91,7 @@ "random-number-csprng": "^1.0.2", "ua-parser-js": "^1.0.36", "uuid": "^9.0.1", - "winston": "^3.10.0", + "winston": "^3.11.0", "winston-azure-application-insights": "^4.0.0" }, "jest": { diff --git a/tslib/yarn.lock b/tslib/yarn.lock index c17cf757c4..689ae1002f 100644 --- a/tslib/yarn.lock +++ b/tslib/yarn.lock @@ -22,10 +22,10 @@ dependencies: tslib "^2.2.0" -"@azure/core-amqp@^3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-3.3.0.tgz#9e9eac1555fb2581fea4231829b8f9dbcc2db170" - integrity sha512-RYIyC8PtGpMzZRiSokADw0ezFgNq1eUkCPV8rd7tJ85dn8CAhYDEYapzMYxAwIBLWidshu14m9UWjQS7hKYDpA== +"@azure/core-amqp@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@azure/core-amqp/-/core-amqp-4.1.0.tgz#1da57b3a259409fb8004e5705db3ed6945b8afc7" + integrity sha512-tjnviDypSAgjGBZCPw+sH7vDWz27N+z0xtQewp7+xH17/eb67VH4sApl3XHuxVBro6Y6pOfxCDpqFenOoGWz6Q== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-auth" "^1.3.0" @@ -33,7 +33,6 @@ "@azure/logger" "^1.0.0" buffer "^6.0.0" events "^3.0.0" - jssha "^3.1.0" process "^0.11.10" rhea "^3.0.0" rhea-promise "^3.0.0" @@ -299,13 +298,13 @@ "@opentelemetry/instrumentation" "^0.41.2" tslib "^2.2.0" -"@azure/service-bus@^7.8.1": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.9.0.tgz#7c3387bbfd7a5196de74c3e2a3b0cbbc3a77c2ee" - integrity sha512-DzvWGmIertkF404nQ/AZQ6hwgXtOtabjBME7dsNvzXmBMfGRjviNWLD5yGyPT4x+clJzbMjRuzvTER+cbRwTYw== +"@azure/service-bus@^7.9.3": + version "7.9.3" + resolved "https://registry.yarnpkg.com/@azure/service-bus/-/service-bus-7.9.3.tgz#c2c6ed2e1506d0423a4141d5ea56649e6e11205e" + integrity sha512-6g37YpVTzRHI75BkYPiB4zqbYhQHM1Jvd+sNfRCbXeRW5FLsWoXgFVTw3Jv5kkMMX1pUNtrkaQhEoeTwtm5v3w== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-amqp" "^3.3.0" + "@azure/core-amqp" "^4.1.0" "@azure/core-auth" "^1.3.0" "@azure/core-client" "^1.0.0" "@azure/core-paging" "^1.4.0" @@ -323,10 +322,10 @@ rhea-promise "^3.0.0" tslib "^2.2.0" -"@azure/storage-blob@^12.16.0": - version "12.16.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.16.0.tgz#c41fb1e538d6f6e2a6756bfcc69382eededf4fa1" - integrity sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q== +"@azure/storage-blob@^12.17.0": + version "12.17.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006" + integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -337,10 +336,10 @@ events "^3.0.0" tslib "^2.2.0" -"@azure/storage-queue@^12.15.0": - version "12.15.0" - resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.15.0.tgz#c124d362f5aabb6d1f450cf644d0a7756cb45a77" - integrity sha512-qotyfMcmocaT1r9bfX7RyQQnkRJcTXGSG/m6LIchtEsNmqLu3ulVqkOlNM+O0XP9wwJ6Da1XQbWz5jQtrDe3DQ== +"@azure/storage-queue@^12.16.0": + version "12.16.0" + resolved "https://registry.yarnpkg.com/@azure/storage-queue/-/storage-queue-12.16.0.tgz#06ce127c8871058c85139d2ba4788390df54f2a0" + integrity sha512-HzwzMsNAh2PwLtx9WfXndj9elUr6duDFak5CjM6BxdWhLqf37VywPCWmEzjxuFfrq30c1T34+MjMXnN6YgqRUw== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -703,6 +702,11 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== +"@colors/colors@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== + "@dabh/diagnostics@^2.0.2": version "2.0.3" resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" @@ -1759,11 +1763,16 @@ async-listener@^0.6.0: semver "^5.3.0" shimmer "^1.1.0" -async@^3.2.3, async@^3.2.4: +async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +async@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" + integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -5408,12 +5417,12 @@ winston-transport@^4.2.0, winston-transport@^4.5.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.10.0.tgz#d033cb7bd3ced026fed13bf9d92c55b903116803" - integrity sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g== +winston@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91" + integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g== dependencies: - "@colors/colors" "1.5.0" + "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" async "^3.2.3" is-stream "^2.0.0"