From df07c894a75d732a974ab27c693ccf67c9c60e38 Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Mon, 8 Jun 2020 11:17:17 +0200 Subject: [PATCH 1/2] update to most recent weaveworks-ui-components --- client/package.json | 2 +- client/yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/package.json b/client/package.json index d17dcb5ecd..e94497996b 100644 --- a/client/package.json +++ b/client/package.json @@ -44,7 +44,7 @@ "reselect": "4.0.0", "reselect-map": "1.0.4", "styled-components": "4.3.2", - "weaveworks-ui-components": "^0.22.0", + "weaveworks-ui-components": "^0.22.6", "whatwg-fetch": "3.0.0", "xterm": "3.14.5" }, diff --git a/client/yarn.lock b/client/yarn.lock index 4e03819ad2..9d6c1e1207 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -8260,9 +8260,10 @@ watchpack@^1.6.0: graceful-fs "^4.1.2" neo-async "^2.5.0" -weaveworks-ui-components@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.22.0.tgz#5f314e4b8e0ebba4d81e023d9b068845a38614bb" +weaveworks-ui-components@^0.22.6: + version "0.22.6" + resolved "https://registry.yarnpkg.com/weaveworks-ui-components/-/weaveworks-ui-components-0.22.6.tgz#64d5108fe3a5c5798a4525866080828b27ea406c" + integrity sha512-Vrb7mjs8AEH1MLcx38X/bGjRmGCkwOpHq8g5Nze6EU5Nv9zDECTNdb9J6OHcJFjqgls4aeUncUTSzemK+EPNwg== dependencies: classnames "2.2.5" d3-drag "1.2.3" From a82b6330c100d3209873324d04cfb88c44461210 Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Mon, 8 Jun 2020 11:17:23 +0200 Subject: [PATCH 2/2] Run go mod vendor to fix build issue As this would have deleted some headers in ./vendor/github.com/iovisor/gobpf/elf I also ran git diff vendor/github.com/iovisor/gobpf/ | patch -p0 -R --- vendor/modules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index aeaed0a150..92e7779c89 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -392,7 +392,7 @@ golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm # golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/time/rate -# golang.org/x/tools v0.0.0-20190226205152-f727befe758c +# golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b golang.org/x/tools/cover # google.golang.org/appengine v1.4.0 google.golang.org/appengine/internal