diff --git a/package.json b/package.json index b741af12f..9ff8d6f60 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "filesize": "3.6.1", "fs-extra": "0.30.0", "gzip-size": "3.0.0", - "handlebars": "4.7.6", + "handlebars": "4.7.7", "handlebars-loader": "1.7.1", "html-loader": "1.1.0", "html-webpack-plugin": "4.5.2", @@ -109,9 +109,12 @@ "whatwg-fetch": "3.6.2" }, "resolutions": { - "redux": "4.0.0", + "bootstrap-select": "1.13.6", + "handlebars": "4.7.7", + "jquery": "3.5.1", "js-yaml": "3.13.1", - "lodash": "^4.17.21" + "lodash": "^4.17.21", + "redux": "4.0.0" }, "scripts": { "preinstall": "test -e ./autogen.sh && ./autogen.sh --prefix=/usr --datarootdir=/share || :", diff --git a/yarn.lock b/yarn.lock index 2bbcb4dc7..5faa68230 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3371,14 +3371,7 @@ bootstrap-sass@^3.4.0: resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a" integrity sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA== -bootstrap-select@1.12.2: - version "1.12.2" - resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.12.2.tgz#58d095b3fd584b31443866fbe39b6fdd4e4e12a4" - integrity sha1-WNCVs/1YSzFEOGb745tv3U5OEqQ= - dependencies: - jquery ">=1.8" - -bootstrap-select@1.13.6: +bootstrap-select@1.12.2, bootstrap-select@1.13.6: version "1.13.6" resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.13.6.tgz#dc41f8a7385ab4e385562b400d4cf2422f5ef852" integrity sha512-MsOZjYVv0jjHOCUV6CG3J8MSsosrKL8MlA8DacMhMqFq43tTxMjjd7Czo5a/upKPNHW6asFq29oyKJTrPva6FQ== @@ -7037,10 +7030,10 @@ handlebars-loader@1.7.1: loader-utils "1.0.x" object-assign "^4.1.0" -handlebars@4.7.6, handlebars@^4.4.0: - version "4.7.6" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e" - integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA== +handlebars@4.7.7, handlebars@^4.4.0: + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" + integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== dependencies: minimist "^1.2.5" neo-async "^2.6.0" @@ -8747,16 +8740,11 @@ jquery-match-height@^0.7.2: resolved "https://registry.yarnpkg.com/jquery-match-height/-/jquery-match-height-0.7.2.tgz#f8d9f3ba5314daab109cf07408674be204be5f0e" integrity sha1-+NnzulMU2qsQnPB0CGdL4gS+Xw4= -jquery@3.5.1, jquery@>=1.7, jquery@>=1.7.0, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8, "jquery@^1.8.3 || ^2.0 || ^3.0", jquery@^3.4.1: +jquery@3.5.1, jquery@>=1.7, jquery@>=1.7.0, "jquery@>=1.7.1 <4.0.0", "jquery@^1.8.3 || ^2.0 || ^3.0", jquery@^3.4.1, jquery@~3.4.1: version "3.5.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== -jquery@~3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" - integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== - js-tokens@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"