From 56194c84a561bfb8b446bf5d87c73f41e8822dab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Aubert?= Date: Thu, 27 Apr 2017 15:30:15 +0200 Subject: [PATCH] SONAR-8784 Update react-router and history to v3 --- server/sonar-web/package.json | 4 ++-- server/sonar-web/yarn.lock | 43 ++++++++++++----------------------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json index 29aef0c9ca6..4ddbfe7fd06 100644 --- a/server/sonar-web/package.json +++ b/server/sonar-web/package.json @@ -18,7 +18,7 @@ "d3-shape": "1.0.6", "escape-html": "1.0.3", "handlebars": "2.0.0", - "history": "2.0.0", + "history": "3.3.0", "jquery": "2.2.0", "keymaster": "1.6.2", "lodash": "4.6.1", @@ -31,7 +31,7 @@ "react-helmet": "3.1.0", "react-modal": "^1.6.4", "react-redux": "4.4.1", - "react-router": "2.8.1", + "react-router": "3.0.2", "react-select": "^1.0.0-rc.2", "react-virtualized": "^9.1.0", "redux": "3.3.1", diff --git a/server/sonar-web/yarn.lock b/server/sonar-web/yarn.lock index e6754e51daf..2b747112c27 100644 --- a/server/sonar-web/yarn.lock +++ b/server/sonar-web/yarn.lock @@ -1638,7 +1638,7 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" -deep-equal@1.0.1, deep-equal@^1.0.0: +deep-equal@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" @@ -2759,23 +2759,14 @@ he@1.1.x: version "1.1.0" resolved "https://registry.yarnpkg.com/he/-/he-1.1.0.tgz#29319d49beec13a9b1f3c4f9b2a6dde4859bb2a7" -history@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/history/-/history-2.0.0.tgz#6d5144af2da8a3dea4e5f1abae11a3c2e868e2c7" - dependencies: - deep-equal "^1.0.0" - invariant "^2.0.0" - query-string "^3.0.0" - warning "^2.0.0" - -history@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/history/-/history-2.1.2.tgz#4aa2de897a0e4867e4539843be6ecdb2986bfdec" +history@3.3.0, history@^3.0.0: + version "3.3.0" + resolved "https://repox.sonarsource.com/api/npm/npm/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c" dependencies: - deep-equal "^1.0.0" - invariant "^2.0.0" - query-string "^3.0.0" - warning "^2.0.0" + invariant "^2.2.1" + loose-envify "^1.2.0" + query-string "^4.2.2" + warning "^3.0.0" hoek@2.x.x: version "2.16.3" @@ -4882,13 +4873,7 @@ qs@~6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" -query-string@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-3.0.3.tgz#ae2e14b4d05071d4e9b9eb4873c35b0dcd42e638" - dependencies: - strict-uri-encode "^1.0.0" - -query-string@^4.1.0: +query-string@^4.1.0, query-string@^4.2.2: version "4.2.3" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.2.3.tgz#9f27273d207a25a8ee4c7b8c74dcd45d556db822" dependencies: @@ -5056,11 +5041,11 @@ react-redux@4.4.1: lodash "^4.2.0" loose-envify "^1.1.0" -react-router@2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-2.8.1.tgz#73e9491f6ceb316d0f779829081863e378ee4ed7" +react-router@3.0.2: + version "3.0.2" + resolved "https://repox.sonarsource.com/api/npm/npm/react-router/-/react-router-3.0.2.tgz#5a19156678810e01d81901f9c0fef63284b8a514" dependencies: - history "^2.1.2" + history "^3.0.0" hoist-non-react-statics "^1.2.0" invariant "^2.2.1" loose-envify "^1.2.0" @@ -6056,7 +6041,7 @@ walker@~1.0.5: dependencies: makeerror "1.0.x" -warning@2.1.0, warning@^2.0.0: +warning@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/warning/-/warning-2.1.0.tgz#21220d9c63afc77a8c92111e011af705ce0c6901" dependencies: -- 2.39.5