testing/grafana: upgrade to 6.6.1

Switch to prebuilt web assets.
Alpine doesn't support crosscompiling packages and grafana doesn't
support building on anything, but linux/amd64. Node build failures
give me nightmares with every update. JS code is executed in
browser (there's no runtime dep on node), it doesn't matter where
it was built.

3 files changed, 10 insertions, 397 deletions

diff --git a/testing/grafana/APKBUILD b/testing/grafana/APKBUILD
index be5e1f28c1..ed6fe95d92 100644
--- a/testing/grafana/APKBUILD
+++ b/testing/grafana/APKBUILD
@@ -1,20 +1,20 @@
 # Contributor: Konstantin Kulikov <k.kulikov2@gmail.com>
 # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
 pkgname=grafana
-pkgver=6.5.3
+pkgver=6.6.1
 pkgrel=0
-_commit=05025c5495 # git rev-parse --short HEAD
-_stamp=1579080999 # git --no-pager show -s --format=%ct
+_commit=21bf8b71bc # git rev-parse --short HEAD
+_stamp=1580982790 # git --no-pager show -s --format=%ct
 pkgdesc="Open source, feature rich metrics dashboard and graph editor"
 url="https://grafana.com"
 arch="all"
 license="Apache-2.0"
-makedepends="go nodejs yarn python3"
+makedepends="go"
 install="$pkgname.pre-install"
 subpackages="$pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/grafana/archive/v$pkgver.tar.gz
-	$pkgname.initd $pkgname.confd
-	iltorb.patch"
+	$pkgname-$pkgver-bin.tar.gz::https://dl.grafana.com/oss/release/grafana-$pkgver.linux-amd64.tar.gz
+	$pkgname.initd $pkgname.confd"
 
 export GOPATH=${GOPATH:-$srcdir/go}
 export GOCACHE=${GOCACHE:-$srcdir/go-build}
@@ -28,15 +28,6 @@ build() {
 	local ldflags="-X main.version=$pkgver -X main.commit=$_commit -X main.buildstamp=$_stamp"
 	go build -ldflags "$ldflags" -mod=vendor -v github.com/grafana/grafana/pkg/cmd/grafana-server
 	go build -ldflags "$ldflags" -mod=vendor -v github.com/grafana/grafana/pkg/cmd/grafana-cli
-
-	# Don't pollute our git repo with grafanas commit hooks.
-	# Also don't try to install phantomjs since it depends on glibc.
-	# This command also acts as "yarn install".
-	# ignore-engines is needed because grafana specifies max node version 11
-	# but alpine ships 12, quick test shows that it works fine.
-	yarn remove --pure-lockfile -W --ignore-engines husky phantomjs-prebuilt
-
-	yarn --ignore-engines build --force
 }
 
 check() {
@@ -53,7 +44,7 @@ package() {
 	cp -r "$builddir/conf" "$builddir/public" "$pkgdir/usr/share/$pkgname/"
 }
 
-sha512sums="ac0363c9120c961d25a9c154deb974a394bf4b8b911d8e5f913aab29cc4361778cf62122d32e6a24542b5800299fd7063c1ec1d6f5d191b65ce3e044fc050554  grafana-6.5.3.tar.gz
+sha512sums="24da98ddec631d6e596ca8fde874cdc2b834a0eacdbca7ae70b6e3511170d3b2dc63eb3a388d1f11c3cff22659b5e71daccff66f23e74c1c26f9cb5e936cfdb2  grafana-6.6.1.tar.gz
+ad2e744b8ebbc4a118cb28a13f78be29d33fe20cb901f431ba1b81cc5b77af5022efd74d393fd8096a4b63dce226a8621c0b0ef53e133921609687e3e2dde7b8  grafana-6.6.1-bin.tar.gz
 b0a781e1b1e33741a97e231c761b1200239c6f1235ffbe82311fe883387eb23bef262ad68256ebd6cf87d74298041b53b947ea7a493cfa5aa814b2a1c5181e13  grafana.initd
-c2afa7f6baf8f468fbd781b0522cbff173bb0c3964eb08fc4a0951d034e8a1f3f9c14798e2ac487b3c20db834110883db8162039b18195e97bb9f4bc5baffc33  grafana.confd
-1fb96e13d337fed497bbd21ab217650bfdc4a2cc340434b26895e94c76033a4ec9d497200d96b17a7a1c867da68cc79b77da49e4fd53222b764f7ccc855cf7de  iltorb.patch"
+c2d9896ae9a9425f759a47aeab42b7c43b63328e82670d50185de8c08cda7b8df264c8b105c5c3138b90dd46e86598b16826457eb3b2979a899b3a508cbe4e8c  grafana.confd"
diff --git a/testing/grafana/grafana.confd b/testing/grafana/grafana.confd
index a06bcd5c8c..277e7b335d 100644
--- a/testing/grafana/grafana.confd
+++ b/testing/grafana/grafana.confd
@@ -5,6 +5,7 @@ cfg:paths.plugins=$GRAFANA_HOME/plugins
 cfg:paths.provisioning=$GRAFANA_HOME/provisioning
 cfg:server.http_addr=127.0.0.1
 cfg:log.mode=syslog"
+rc_need=logger
 
 # To enable image rendering run
 # $ apk add grafana-image-renderer
diff --git a/testing/grafana/iltorb.patch b/testing/grafana/iltorb.patch
deleted file mode 100644
index 21c93990eb..0000000000
--- a/testing/grafana/iltorb.patch
+++ /dev/null
@@ -1,379 +0,0 @@
-Contains:
- - Backport of https://github.com/grafana/grafana/pull/21096
- - Drop of legacy node-gyp versions to avoid using python2
---- grafana-6.5.2.orig/package.json
-+++ grafana-6.5.2/package.json
-@@ -82,7 +82,7 @@
-     "grunt-angular-templates": "1.1.0",
-     "grunt-cli": "1.2.0",
-     "grunt-contrib-clean": "1.0.0",
--    "grunt-contrib-compress": "1.4.3",
-+    "grunt-contrib-compress": "1.6.0",
-     "grunt-contrib-copy": "1.0.0",
-     "grunt-exec": "1.0.1",
-     "grunt-newer": "1.3.0",
---- grafana-6.5.2.orig/yarn.lock
-+++ grafana-6.5.2/yarn.lock
-@@ -6012,7 +6012,7 @@
-   optionalDependencies:
-     fsevents "^1.2.7"
- 
--chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
-+chownr@^1.1.1, chownr@^1.1.2:
-   version "1.1.3"
-   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
-   integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
-@@ -7823,12 +7823,12 @@
-   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
- 
--decompress-response@^3.3.0:
--  version "3.3.0"
--  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
--  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
-+decompress-response@^4.2.0:
-+  version "4.2.1"
-+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
-+  integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==
-   dependencies:
--    mimic-response "^1.0.0"
-+    mimic-response "^2.0.0"
- 
- dedent@^0.7.0:
-   version "0.7.0"
-@@ -8008,11 +8008,6 @@
-   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
- 
--detect-libc@^0.2.0:
--  version "0.2.0"
--  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-0.2.0.tgz#47fdf567348a17ec25fcbf0b9e446348a76f9fb5"
--  integrity sha1-R/31ZzSKF+wl/L8LnkRjSKdvn7U=
--
- detect-libc@^1.0.2, detect-libc@^1.0.3:
-   version "1.0.3"
-   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-@@ -8446,7 +8441,7 @@
-   dependencies:
-     iconv-lite "~0.4.13"
- 
--end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
-   version "1.4.4"
-   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-@@ -8964,10 +8959,10 @@
-   dependencies:
-     fill-range "^2.1.0"
- 
--expand-template@^1.0.2:
--  version "1.1.1"
--  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.1.tgz#981f188c0c3a87d2e28f559bc541426ff94f21dd"
--  integrity sha512-cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg==
-+expand-template@^2.0.3:
-+  version "2.0.3"
-+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-+  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
- 
- expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-   version "2.0.2"
-@@ -10237,10 +10232,10 @@
-     async "^1.5.2"
-     rimraf "^2.5.1"
- 
--grunt-contrib-compress@1.4.3:
--  version "1.4.3"
--  resolved "https://registry.yarnpkg.com/grunt-contrib-compress/-/grunt-contrib-compress-1.4.3.tgz#01ceffb9c637f52e7081f463750983d0a3b0fa73"
--  integrity sha1-Ac7/ucY39S5wgfRjdQmD0KOw+nM=
-+grunt-contrib-compress@1.6.0:
-+  version "1.6.0"
-+  resolved "https://registry.yarnpkg.com/grunt-contrib-compress/-/grunt-contrib-compress-1.6.0.tgz#9708885c738a97a12c5f3072dc97dbc31b4121db"
-+  integrity sha512-wIFuvk+/Ny4E+OgEfJYFZgoH7KcU/nnNFbYasB7gRvrcRyW6vmTp3Pj8a4rFSR3tbFMjrGvTUszdO6fgLajgZQ==
-   dependencies:
-     archiver "^1.3.0"
-     chalk "^1.1.1"
-@@ -10248,7 +10243,7 @@
-     pretty-bytes "^4.0.2"
-     stream-buffers "^2.1.0"
-   optionalDependencies:
--    iltorb "^1.0.13"
-+    iltorb "^2.4.3"
- 
- grunt-contrib-copy@1.0.0:
-   version "1.0.0"
-@@ -10965,15 +10960,16 @@
-   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
- 
--iltorb@^1.0.13:
--  version "1.3.10"
--  resolved "https://registry.yarnpkg.com/iltorb/-/iltorb-1.3.10.tgz#a0d9e4e7d52bf510741442236cbe0cc4230fc9f8"
--  integrity sha512-nyB4+ru1u8CQqQ6w7YjasboKN3NQTN8GH/V/eEssNRKhW6UbdxdWhB9fJ5EEdjJfezKY0qPrcwLyIcgjL8hHxA==
-+iltorb@^2.4.3:
-+  version "2.4.4"
-+  resolved "https://registry.yarnpkg.com/iltorb/-/iltorb-2.4.4.tgz#7ec303bbbd8c0cd4d44a847eb6c6d8490f9c7433"
-+  integrity sha512-7Qk6O7TK3rSWVRVRkPehcNTSN+P2i7MsG9pWmw6iVw/W6NcoNj0rFKOuBDM6fbZV6NNGuUW3JBRem6Ozn4KXhg==
-   dependencies:
--    detect-libc "^0.2.0"
--    nan "^2.6.2"
--    node-gyp "^3.6.2"
--    prebuild-install "^2.3.0"
-+    detect-libc "^1.0.3"
-+    nan "^2.14.0"
-+    npmlog "^4.1.2"
-+    prebuild-install "^5.3.2"
-+    which-pm-runs "^1.0.0"
- 
- immer@1.10.0:
-   version "1.10.0"
-@@ -13699,10 +13695,10 @@
-   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
- 
--mimic-response@^1.0.0:
--  version "1.0.1"
--  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
--  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-+mimic-response@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.0.0.tgz#996a51c60adf12cb8a87d7fb8ef24c2f3d5ebb46"
-+  integrity sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==
- 
- min-document@^2.19.0:
-   version "2.19.0"
-@@ -13978,7 +13974,7 @@
-     object-assign "^4.0.1"
-     thenify-all "^1.0.0"
- 
--nan@^2.12.1, nan@^2.13.2, nan@^2.6.2:
-+nan@^2.12.1, nan@^2.13.2, nan@^2.14.0:
-   version "2.14.0"
-   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-@@ -14014,6 +14010,11 @@
-     snapdragon "^0.8.1"
-     to-regex "^3.0.1"
- 
-+napi-build-utils@^1.0.1:
-+  version "1.0.1"
-+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
-+  integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==
-+
- natural-compare@^1.4.0:
-   version "1.4.0"
-   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-@@ -14141,10 +14142,10 @@
-   dependencies:
-     lower-case "^1.1.1"
- 
--node-abi@^2.2.0:
--  version "2.11.0"
--  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.11.0.tgz#b7dce18815057544a049be5ae75cd1fdc2e9ea59"
--  integrity sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==
-+node-abi@^2.7.0:
-+  version "2.13.0"
-+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.13.0.tgz#e2f2ec444d0aca3ea1b3874b6de41d1665828f63"
-+  integrity sha512-9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA==
-   dependencies:
-     semver "^5.4.1"
- 
-@@ -14182,45 +14183,10 @@
-   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
-   integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
- 
--node-gyp@^3.6.2, node-gyp@^3.8.0:
--  version "3.8.0"
--  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
--  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
--  dependencies:
--    fstream "^1.0.0"
--    glob "^7.0.3"
--    graceful-fs "^4.1.2"
--    mkdirp "^0.5.0"
--    nopt "2 || 3"
--    npmlog "0 || 1 || 2 || 3 || 4"
--    osenv "0"
--    request "^2.87.0"
--    rimraf "2"
--    semver "~5.3.0"
--    tar "^2.0.0"
--    which "1"
--
--node-gyp@^4.0.0:
--  version "4.0.0"
--  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-4.0.0.tgz#972654af4e5dd0cd2a19081b4b46fe0442ba6f45"
--  integrity sha512-2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==
--  dependencies:
--    glob "^7.0.3"
--    graceful-fs "^4.1.2"
--    mkdirp "^0.5.0"
--    nopt "2 || 3"
--    npmlog "0 || 1 || 2 || 3 || 4"
--    osenv "0"
--    request "^2.87.0"
--    rimraf "2"
--    semver "~5.3.0"
--    tar "^4.4.8"
--    which "1"
--
- node-gyp@^5.0.2:
--  version "5.0.5"
--  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.5.tgz#f6cf1da246eb8c42b097d7cd4d6c3ce23a4163af"
--  integrity sha512-WABl9s4/mqQdZneZHVWVG4TVr6QQJZUC6PAx47ITSk9lreZ1n+7Z9mMAIbA3vnO4J9W20P7LhCxtzfWsAD/KDw==
-+  version "5.0.7"
-+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.7.tgz#dd4225e735e840cf2870e4037c2ed9c28a31719e"
-+  integrity sha512-K8aByl8OJD51V0VbUURTKsmdswkQQusIvlvmTyhHlIT1hBvaSxzdxpSle857XuXa7uc02UEZx9OR5aDxSWS5Qw==
-   dependencies:
-     env-paths "^1.0.0"
-     glob "^7.0.3"
-@@ -14323,7 +14289,7 @@
-     meow "^3.7.0"
-     mkdirp "^0.5.1"
-     nan "^2.13.2"
--    node-gyp "^3.8.0"
-+    node-gyp "^5.0.2"
-     npmlog "^4.0.0"
-     request "^2.88.0"
-     sass-graph "^2.2.4"
-@@ -14452,7 +14418,7 @@
-   dependencies:
-     byline "^5.0.0"
-     graceful-fs "^4.1.15"
--    node-gyp "^4.0.0"
-+    node-gyp "^5.0.2"
-     resolve-from "^4.0.0"
-     slide "^1.1.6"
-     uid-number "0.0.6"
-@@ -14636,7 +14602,7 @@
-     mississippi "^3.0.0"
-     mkdirp "~0.5.1"
-     move-concurrently "^1.0.1"
--    node-gyp "^3.8.0"
-+    node-gyp "^5.0.2"
-     nopt "~4.0.1"
-     normalize-package-data "^2.5.0"
-     npm-audit-report "^1.3.2"
-@@ -16338,24 +16304,24 @@
-     universal-deep-strict-equal "^1.2.1"
-     xtend "^4.0.0"
- 
--prebuild-install@^2.3.0:
--  version "2.5.3"
--  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.3.tgz#9f65f242782d370296353710e9bc843490c19f69"
--  integrity sha512-/rI36cN2g7vDQnKWN8Uzupi++KjyqS9iS+/fpwG4Ea8d0Pip0PQ5bshUNzVwt+/D2MRfhVAplYMMvWLqWrCF/g==
-+prebuild-install@^5.3.2:
-+  version "5.3.3"
-+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e"
-+  integrity sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==
-   dependencies:
-     detect-libc "^1.0.3"
--    expand-template "^1.0.2"
-+    expand-template "^2.0.3"
-     github-from-package "0.0.0"
-     minimist "^1.2.0"
-     mkdirp "^0.5.1"
--    node-abi "^2.2.0"
-+    napi-build-utils "^1.0.1"
-+    node-abi "^2.7.0"
-     noop-logger "^0.1.1"
-     npmlog "^4.0.1"
--    os-homedir "^1.0.1"
--    pump "^2.0.1"
--    rc "^1.1.6"
--    simple-get "^2.7.0"
--    tar-fs "^1.13.0"
-+    pump "^3.0.0"
-+    rc "^1.2.7"
-+    simple-get "^3.0.3"
-+    tar-fs "^2.0.0"
-     tunnel-agent "^0.6.0"
-     which-pm-runs "^1.0.0"
- 
-@@ -16609,15 +16575,7 @@
-     randombytes "^2.0.1"
-     safe-buffer "^5.1.2"
- 
--pump@^1.0.0:
--  version "1.0.3"
--  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
--  integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
--  dependencies:
--    end-of-stream "^1.1.0"
--    once "^1.3.1"
--
--pump@^2.0.0, pump@^2.0.1:
-+pump@^2.0.0:
-   version "2.0.1"
-   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-@@ -17553,7 +17511,7 @@
-     string_decoder "~1.1.1"
-     util-deprecate "~1.0.1"
- 
--"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
-+"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
-   version "3.4.0"
-   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-   integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
-@@ -18786,12 +18744,12 @@
-   resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b"
-   integrity sha1-GRv1ZqWeZTBILLJatTtKjchcOms=
- 
--simple-get@^2.7.0:
--  version "2.8.1"
--  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d"
--  integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==
-+simple-get@^3.0.3:
-+  version "3.1.0"
-+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
-+  integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
-   dependencies:
--    decompress-response "^3.3.0"
-+    decompress-response "^4.2.0"
-     once "^1.3.1"
-     simple-concat "^1.0.0"
- 
-@@ -19782,17 +19740,17 @@
-     string.prototype.trim "~1.1.2"
-     through "~2.3.8"
- 
--tar-fs@^1.13.0:
--  version "1.16.3"
--  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
--  integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
-+tar-fs@^2.0.0:
-+  version "2.0.0"
-+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
-+  integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
-   dependencies:
--    chownr "^1.0.1"
-+    chownr "^1.1.1"
-     mkdirp "^0.5.1"
--    pump "^1.0.0"
--    tar-stream "^1.1.2"
-+    pump "^3.0.0"
-+    tar-stream "^2.0.0"
- 
--tar-stream@^1.1.2, tar-stream@^1.5.0:
-+tar-stream@^1.5.0:
-   version "1.6.2"
-   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-   integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
-@@ -19804,6 +19762,17 @@
-     readable-stream "^2.3.0"
-     to-buffer "^1.1.1"
-     xtend "^4.0.0"
-+
-+tar-stream@^2.0.0:
-+  version "2.1.0"
-+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
-+  integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==
-+  dependencies:
-+    bl "^3.0.0"
-+    end-of-stream "^1.4.1"
-+    fs-constants "^1.0.0"
-+    inherits "^2.0.3"
-+    readable-stream "^3.1.1"
- 
- tar@^2.0.0:
-   version "2.2.2"