From 398d530a7d2f022c2e675bcbee4ad03c1ec9bd37 Mon Sep 17 00:00:00 2001 From: Zoran Regvart Date: Mon, 11 Mar 2019 13:59:56 +0100 Subject: [PATCH] fix: force bootstrap-select version to 1.13.6 Ref: - https://github.com/patternfly/patternfly/issues/1167 - https://github.com/snapappointments/bootstrap-select/issues/2199 --- app/ui/package.json | 3 ++- app/ui/yarn.lock | 17 +++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/ui/package.json b/app/ui/package.json index 7b493fbb96d..5701ce594f8 100644 --- a/app/ui/package.json +++ b/app/ui/package.json @@ -137,7 +137,8 @@ }, "resolutions": { "ngx-bootstrap": "3.1.4", - "bootstrap": "~3.4" + "bootstrap": "~3.4", + "bootstrap-select": "1.13.6" }, "snyk": true } diff --git a/app/ui/yarn.lock b/app/ui/yarn.lock index 5b477b84692..eb260cc1bf7 100644 --- a/app/ui/yarn.lock +++ b/app/ui/yarn.lock @@ -1299,17 +1299,10 @@ bootstrap-sass@^3.3.7, bootstrap-sass@~3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498" -bootstrap-select@1.12.2: - version "1.12.2" - resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.12.2.tgz#58d095b3fd584b31443866fbe39b6fdd4e4e12a4" - dependencies: - jquery ">=1.8" - -bootstrap-select@~1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.10.0.tgz#9499679e70004dbc00872522322d3b93a0f132e4" - dependencies: - jquery ">=1.8" +bootstrap-select@1.12.2, bootstrap-select@1.13.6, bootstrap-select@~1.10.0: + version "1.13.6" + resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.13.6.tgz#dc41f8a7385ab4e385562b400d4cf2422f5ef852" + integrity sha512-MsOZjYVv0jjHOCUV6CG3J8MSsosrKL8MlA8DacMhMqFq43tTxMjjd7Czo5a/upKPNHW6asFq29oyKJTrPva6FQ== bootstrap-slider@^9.9.0: version "9.10.0" @@ -4830,7 +4823,7 @@ jquery@3.2.1, jquery@~3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" -"jquery@>= 2.1.x", jquery@>=1.7, jquery@>=1.7.0, jquery@>=1.7.1, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8, "jquery@^1.8.3 || ^2.0 || ^3.0": +"jquery@>= 2.1.x", jquery@>=1.7, jquery@>=1.7.0, jquery@>=1.7.1, "jquery@>=1.7.1 <4.0.0", "jquery@^1.8.3 || ^2.0 || ^3.0": version "3.3.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"