From 175dd9fd151d66d5b774046884690ed2fa97a718 Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@utou.ch>
Date: Thu, 1 Jul 2021 08:36:57 +0200
Subject: [PATCH 001/122] Added unidecode

---
 .gitignore       |  7 ++++---
 Pipfile          |  1 +
 Pipfile.lock     | 10 +++++++++-
 requirements.txt |  1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 01020ea..a62cab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
 .env
+env
+/env/
+/venv/
 *.pyc
 .sass-cache
 .DS_Store
 *.swp
 *.sqlite3
-/docker-compose.yml
-/env/
-/venv/
 /static/
 /assets/
 /media/
@@ -14,6 +14,7 @@
 /.keys/
 /.vagrant/
 /Vagrantfile.local
+/docker-compose.yml
 /docs/_build/
 /node_modules/
 /publichealth/static/libs
diff --git a/Pipfile b/Pipfile
index 99fcd1d..f16a9ca 100644
--- a/Pipfile
+++ b/Pipfile
@@ -33,3 +33,4 @@ stellar = "*"
 wagtail = ">=2.0,<2.13"
 whitenoise = "*"
 django-toolbelt = "*"
+unidecode = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 19834d5..bf00f4c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "0476f5577e0add77f248917f00fee07da37ab9c4c1248918ca4565d0f972ced4"
+            "sha256": "a8d6833d674518785c4eeaa99ed3f1a896f26687aa801e2b3510d900a137b0d0"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -690,6 +690,14 @@
             "markers": "python_version >= '3.6'",
             "version": "==3.0.0"
         },
+        "unidecode": {
+            "hashes": [
+                "sha256:12435ef2fc4cdfd9cf1035a1db7e98b6b047fe591892e81f34e94959591fad00",
+                "sha256:8d73a97d387a956922344f6b74243c2c6771594659778744b2dbdaad8f6b727d"
+            ],
+            "index": "pypi",
+            "version": "==1.2.0"
+        },
         "urllib3": {
             "hashes": [
                 "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4",
diff --git a/requirements.txt b/requirements.txt
index c7ebfca..9325c41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,3 +31,4 @@ gunicorn
 whitenoise
 python-dotenv
 ConcurrentLogHandler
+unidecode

From adfeb8c7aa2d9b5e2d24d25c5a0cd564c652c756 Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@utou.ch>
Date: Thu, 1 Jul 2021 08:54:57 +0200
Subject: [PATCH 002/122] Minor library update

---
 Pipfile.lock |  7 ++++---
 yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index bf00f4c..31ab00a 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -890,10 +890,11 @@
         },
         "splinter": {
             "hashes": [
-                "sha256:459e39e7a9f7572db6f1cdb5fdc5ccfc6404f021dccb969ee6287be2386a40db",
-                "sha256:7e5e69c5b76ada909283465cdc3636e2632f7e557932ce96ab9c0432b0b32f7f"
+                "sha256:18b9d992352953cdd61ca8ece9616c9f214b47caebf8893266cb46bce60f6d60",
+                "sha256:218f4433018f9d1710a3201de7c22284273ab8bf29e5793247844fd74aafaf89",
+                "sha256:3f63f946fd96b750b4fd3c49ffb17abd6dc03d094b4836753e6be33f53fcfee1"
             ],
-            "version": "==0.14.0"
+            "version": "==0.15.0"
         },
         "sqlparse": {
             "hashes": [
diff --git a/yarn.lock b/yarn.lock
index e431a1e..23b79f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -411,20 +411,20 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browser-sync-client@^2.26.14:
-  version "2.26.14"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.26.14.tgz#f2f0a8e5febc65b725fb38c8d648389214a38947"
-  integrity sha512-be0m1MchmKv/26r/yyyolxXcBi052aYrmaQep5nm8YNMjFcEyzv0ZoOKn/c3WEXNlEB/KeXWaw70fAOJ+/F1zQ==
+browser-sync-client@^2.27.4:
+  version "2.27.4"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.27.4.tgz#3129299f67bbe016995975924c1f946be3edd31c"
+  integrity sha512-l0krAGZnpLaD+tUYdM25WeS4FP73ZoPeaxlVzOvmtL9uKSlvpmywsnDwa3PJzc3ubmDPAcD74ifJjl6MmVksXw==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
     rxjs "^5.5.6"
 
-browser-sync-ui@^2.26.14:
-  version "2.26.14"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.26.14.tgz#96632c38dda72560a3be8e985716d7a735e94749"
-  integrity sha512-6oT1sboM4KVNnWCCJDMGbRIeTBw97toMFQ+srImvwQ6J5t9KMgizaIX8HcKLiemsUMSJkgGM9RVKIpq2UblgOA==
+browser-sync-ui@^2.27.4:
+  version "2.27.4"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.27.4.tgz#cd1767926528c0e6cfb3abe1eeb61a9026a98953"
+  integrity sha512-E58Mb6ycz57Nm393oqVJj4jxuLJH3MhZnY8AV+zd9LsNVGZjrKRNNIw5JPYYguyb37ZjLjq2x4u+38mRv3Sb7g==
   dependencies:
     async-each-series "0.1.1"
     connect-history-api-fallback "^1"
@@ -434,12 +434,12 @@ browser-sync-ui@^2.26.14:
     stream-throttle "^0.1.3"
 
 browser-sync@^2.6.4:
-  version "2.26.14"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.26.14.tgz#716c13ef91e72dfe092ff84bec3ddf62ea9d81fd"
-  integrity sha512-3TtpsheGolJT6UFtM2CZWEcGJmI4ZEvoCKiKE2bvcDnPxRkhQT4nIGVtfiyPcoHKXGM0LwMOZmYJNWfiNfVXWA==
+  version "2.27.4"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.27.4.tgz#5336c3e370731ee97ab50f94d010c00d43b591e1"
+  integrity sha512-zgjrI6oUXxLa671SxVmWfIH+XiG6yZiGuvsQ1huuGEBlKkWuBVKgYjh+j9kagKm891FARgmK4Ct4PAhckLKaYg==
   dependencies:
-    browser-sync-client "^2.26.14"
-    browser-sync-ui "^2.26.14"
+    browser-sync-client "^2.27.4"
+    browser-sync-ui "^2.27.4"
     bs-recipes "1.3.4"
     bs-snippet-injector "^2.0.1"
     chokidar "^3.5.1"
@@ -466,7 +466,7 @@ browser-sync@^2.6.4:
     serve-static "1.13.2"
     server-destroy "1.0.1"
     socket.io "2.4.0"
-    ua-parser-js "^0.7.18"
+    ua-parser-js "^0.7.28"
     yargs "^15.4.1"
 
 bs-recipes@1.3.4:
@@ -4421,7 +4421,7 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-ua-parser-js@^0.7.18:
+ua-parser-js@^0.7.28:
   version "0.7.28"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
   integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==

From b9b88e82356c10e29c7572b08f0ecf7876628b0a Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@datalets.ch>
Date: Thu, 15 Jul 2021 08:48:37 +0200
Subject: [PATCH 003/122] Minor dependency update

---
 Pipfile.lock | 244 +++++++++++++++++++++++++++------------------------
 yarn.lock    |  12 +--
 2 files changed, 135 insertions(+), 121 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 31ab00a..fc0e9ea 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -37,13 +37,13 @@
             ],
             "version": "==2021.5.30"
         },
-        "chardet": {
+        "charset-normalizer": {
             "hashes": [
-                "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa",
-                "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"
+                "sha256:3c502a35807c9df35697b0f44b1d65008f83071ff29c69677c7c22573bc5a45a",
+                "sha256:951567c2f7433a70ab63f1be67e5ee05d3925d9423306ecb71a3b272757bcc95"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==4.0.0"
+            "markers": "python_version >= '3.0'",
+            "version": "==2.0.2"
         },
         "click": {
             "hashes": [
@@ -156,11 +156,11 @@
         },
         "django-libsass": {
             "hashes": [
-                "sha256:38fab4ce1245542f3afd7248dc48f8a0b261f5f6c61e7cc43969a9c9079b5ffd",
-                "sha256:3e74fd8e75ac0e6ebc0443efc3e530167981bf279fecc2294094c820ae266fbb"
+                "sha256:5234d29100889cac79e36a0f44207ec6d275adfd2da1acb6a94b55c89fe2bd97",
+                "sha256:bfbbb55a8950bb40fa04dd416605f92da34ad1f303b10a41abc3232386ec27b5"
             ],
             "index": "pypi",
-            "version": "==0.8"
+            "version": "==0.9"
         },
         "django-modelcluster": {
             "hashes": [
@@ -188,11 +188,11 @@
         },
         "django-taggit": {
             "hashes": [
-                "sha256:9e1b4772af339e4d49921488e401337c04fe8cad8afcc5080f04a38108c464d5",
-                "sha256:e8d4300e2226f6fa7ad55a8449a482486142d619131a5bc2dd744ff65e7f70ab"
+                "sha256:dfe9e9c10b5929132041de0c00093ef0072c73c2a97d0f74a818ae50fa77149a",
+                "sha256:e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==1.5.0"
+            "version": "==1.5.1"
         },
         "django-toolbelt": {
             "hashes": [
@@ -320,19 +320,19 @@
         },
         "humanize": {
             "hashes": [
-                "sha256:2cc4f7d2f5994ea9fcddd4b681ddea9abd23baa8cc64bd0af041a0162636f31c",
-                "sha256:892a5b7b87763c4c6997a58382c2b1f4614048a2e01c23ef1bb0456e6f9d4d5d"
+                "sha256:aab7625d62dd5e0a054c8413a47d1fa257f3bdd8e9a2442c2fe36061bdd1d9bf",
+                "sha256:b2413730ce6684f85e0439a5b80b8f402e09f03e16ab8023d1da758c6ff41148"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.9.0"
+            "version": "==3.10.0"
         },
         "idna": {
             "hashes": [
-                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
-                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
+                "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a",
+                "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==2.10"
+            "markers": "python_version >= '3.0'",
+            "version": "==3.2"
         },
         "l18n": {
             "hashes": [
@@ -364,43 +364,48 @@
         },
         "pillow": {
             "hashes": [
-                "sha256:01425106e4e8cee195a411f729cff2a7d61813b0b11737c12bd5991f5f14bcd5",
-                "sha256:031a6c88c77d08aab84fecc05c3cde8414cd6f8406f4d2b16fed1e97634cc8a4",
-                "sha256:083781abd261bdabf090ad07bb69f8f5599943ddb539d64497ed021b2a67e5a9",
-                "sha256:0d19d70ee7c2ba97631bae1e7d4725cdb2ecf238178096e8c82ee481e189168a",
-                "sha256:0e04d61f0064b545b989126197930807c86bcbd4534d39168f4aa5fda39bb8f9",
-                "sha256:12e5e7471f9b637762453da74e390e56cc43e486a88289995c1f4c1dc0bfe727",
-                "sha256:22fd0f42ad15dfdde6c581347eaa4adb9a6fc4b865f90b23378aa7914895e120",
-                "sha256:238c197fc275b475e87c1453b05b467d2d02c2915fdfdd4af126145ff2e4610c",
-                "sha256:3b570f84a6161cf8865c4e08adf629441f56e32f180f7aa4ccbd2e0a5a02cba2",
-                "sha256:463822e2f0d81459e113372a168f2ff59723e78528f91f0bd25680ac185cf797",
-                "sha256:4d98abdd6b1e3bf1a1cbb14c3895226816e666749ac040c4e2554231068c639b",
-                "sha256:5afe6b237a0b81bd54b53f835a153770802f164c5570bab5e005aad693dab87f",
-                "sha256:5b70110acb39f3aff6b74cf09bb4169b167e2660dabc304c1e25b6555fa781ef",
-                "sha256:5cbf3e3b1014dddc45496e8cf38b9f099c95a326275885199f427825c6522232",
-                "sha256:624b977355cde8b065f6d51b98497d6cd5fbdd4f36405f7a8790e3376125e2bb",
-                "sha256:63728564c1410d99e6d1ae8e3b810fe012bc440952168af0a2877e8ff5ab96b9",
-                "sha256:66cc56579fd91f517290ab02c51e3a80f581aba45fd924fcdee01fa06e635812",
-                "sha256:6c32cc3145928c4305d142ebec682419a6c0a8ce9e33db900027ddca1ec39178",
-                "sha256:8b56553c0345ad6dcb2e9b433ae47d67f95fc23fe28a0bde15a120f25257e291",
-                "sha256:8bb1e155a74e1bfbacd84555ea62fa21c58e0b4e7e6b20e4447b8d07990ac78b",
-                "sha256:95d5ef984eff897850f3a83883363da64aae1000e79cb3c321915468e8c6add5",
-                "sha256:a013cbe25d20c2e0c4e85a9daf438f85121a4d0344ddc76e33fd7e3965d9af4b",
-                "sha256:a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1",
-                "sha256:a7d5e9fad90eff8f6f6106d3b98b553a88b6f976e51fce287192a5d2d5363713",
-                "sha256:aac00e4bc94d1b7813fe882c28990c1bc2f9d0e1aa765a5f2b516e8a6a16a9e4",
-                "sha256:b91c36492a4bbb1ee855b7d16fe51379e5f96b85692dc8210831fbb24c43e484",
-                "sha256:c03c07ed32c5324939b19e36ae5f75c660c81461e312a41aea30acdd46f93a7c",
-                "sha256:c5236606e8570542ed424849f7852a0ff0bce2c4c8d0ba05cc202a5a9c97dee9",
-                "sha256:c6b39294464b03457f9064e98c124e09008b35a62e3189d3513e5148611c9388",
-                "sha256:cb7a09e173903541fa888ba010c345893cd9fc1b5891aaf060f6ca77b6a3722d",
-                "sha256:d68cb92c408261f806b15923834203f024110a2e2872ecb0bd2a110f89d3c602",
-                "sha256:dc38f57d8f20f06dd7c3161c59ca2c86893632623f33a42d592f097b00f720a9",
-                "sha256:e98eca29a05913e82177b3ba3d198b1728e164869c613d76d0de4bde6768a50e",
-                "sha256:f217c3954ce5fd88303fc0c317af55d5e0204106d86dea17eb8205700d47dec2"
+                "sha256:0b2efa07f69dc395d95bb9ef3299f4ca29bcb2157dc615bae0b42c3c20668ffc",
+                "sha256:114f816e4f73f9ec06997b2fde81a92cbf0777c9e8f462005550eed6bae57e63",
+                "sha256:147bd9e71fb9dcf08357b4d530b5167941e222a6fd21f869c7911bac40b9994d",
+                "sha256:15a2808e269a1cf2131930183dcc0419bc77bb73eb54285dde2706ac9939fa8e",
+                "sha256:196560dba4da7a72c5e7085fccc5938ab4075fd37fe8b5468869724109812edd",
+                "sha256:1c03e24be975e2afe70dfc5da6f187eea0b49a68bb2b69db0f30a61b7031cee4",
+                "sha256:1fd5066cd343b5db88c048d971994e56b296868766e461b82fa4e22498f34d77",
+                "sha256:29c9569049d04aaacd690573a0398dbd8e0bf0255684fee512b413c2142ab723",
+                "sha256:2b6dfa068a8b6137da34a4936f5a816aba0ecc967af2feeb32c4393ddd671cba",
+                "sha256:2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792",
+                "sha256:2ee77c14a0299d0541d26f3d8500bb57e081233e3fa915fa35abd02c51fa7fae",
+                "sha256:37730f6e68bdc6a3f02d2079c34c532330d206429f3cee651aab6b66839a9f0e",
+                "sha256:3f08bd8d785204149b5b33e3b5f0ebbfe2190ea58d1a051c578e29e39bfd2367",
+                "sha256:479ab11cbd69612acefa8286481f65c5dece2002ffaa4f9db62682379ca3bb77",
+                "sha256:4bc3c7ef940eeb200ca65bd83005eb3aae8083d47e8fcbf5f0943baa50726856",
+                "sha256:660a87085925c61a0dcc80efb967512ac34dbb256ff7dd2b9b4ee8dbdab58cf4",
+                "sha256:67b3666b544b953a2777cb3f5a922e991be73ab32635666ee72e05876b8a92de",
+                "sha256:70af7d222df0ff81a2da601fab42decb009dc721545ed78549cb96e3a1c5f0c8",
+                "sha256:75e09042a3b39e0ea61ce37e941221313d51a9c26b8e54e12b3ececccb71718a",
+                "sha256:8960a8a9f4598974e4c2aeb1bff9bdd5db03ee65fd1fce8adf3223721aa2a636",
+                "sha256:9364c81b252d8348e9cc0cb63e856b8f7c1b340caba6ee7a7a65c968312f7dab",
+                "sha256:969cc558cca859cadf24f890fc009e1bce7d7d0386ba7c0478641a60199adf79",
+                "sha256:9a211b663cf2314edbdb4cf897beeb5c9ee3810d1d53f0e423f06d6ebbf9cd5d",
+                "sha256:a17ca41f45cf78c2216ebfab03add7cc350c305c38ff34ef4eef66b7d76c5229",
+                "sha256:a2f381932dca2cf775811a008aa3027671ace723b7a38838045b1aee8669fdcf",
+                "sha256:a4eef1ff2d62676deabf076f963eda4da34b51bc0517c70239fafed1d5b51500",
+                "sha256:c088a000dfdd88c184cc7271bfac8c5b82d9efa8637cd2b68183771e3cf56f04",
+                "sha256:c0e0550a404c69aab1e04ae89cca3e2a042b56ab043f7f729d984bf73ed2a093",
+                "sha256:c11003197f908878164f0e6da15fce22373ac3fc320cda8c9d16e6bba105b844",
+                "sha256:c2a5ff58751670292b406b9f06e07ed1446a4b13ffced6b6cab75b857485cbc8",
+                "sha256:c35d09db702f4185ba22bb33ef1751ad49c266534339a5cebeb5159d364f6f82",
+                "sha256:c379425c2707078dfb6bfad2430728831d399dc95a7deeb92015eb4c92345eaf",
+                "sha256:cc866706d56bd3a7dbf8bac8660c6f6462f2f2b8a49add2ba617bc0c54473d83",
+                "sha256:d0da39795049a9afcaadec532e7b669b5ebbb2a9134576ebcc15dd5bdae33cc0",
+                "sha256:f156d6ecfc747ee111c167f8faf5f4953761b5e66e91a4e6767e548d0f80129c",
+                "sha256:f4ebde71785f8bceb39dcd1e7f06bcc5d5c3cf48b9f69ab52636309387b097c8",
+                "sha256:fc214a6b75d2e0ea7745488da7da3c381f41790812988c7a92345978414fad37",
+                "sha256:fd7eef578f5b2200d066db1b50c4aa66410786201669fb76d5238b007918fb24",
+                "sha256:ff04c373477723430dce2e9d024c708a047d44cf17166bf16e604b379bf0ca14"
             ],
             "index": "pypi",
-            "version": "==8.2.0"
+            "version": "==8.3.1"
         },
         "psutil": {
             "hashes": [
@@ -566,11 +571,11 @@
         },
         "requests": {
             "hashes": [
-                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
-                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
+                "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24",
+                "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==2.25.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+            "version": "==2.26.0"
         },
         "rjsmin": {
             "hashes": [
@@ -615,39 +620,39 @@
         },
         "sqlalchemy": {
             "hashes": [
-                "sha256:0f6d467b67a7e5048f1408e8ea60d6caa70be5b386d0eebbf1185ab49cb8c7e4",
-                "sha256:238d78b3110b7f7cffdb70bf9cda686e0d876a849bc78ba4d471aa7b1461f306",
-                "sha256:25c0e0f3a7e8c19350086b3c0fe93c4def045cec053d749ef15da710c4d54c81",
-                "sha256:2f60a2e599cf5cf5e5327ce60f2918b897e42ad9f405d10dd01e37869c0ce6fc",
-                "sha256:38ee3a266afef2978e82824650457f70c5d74ec0cadec1b10fe5ed6f038eb5d0",
-                "sha256:46361690f1e1c5385994a4caeb6e8126063ff593a5c635700bbc1245de793c1e",
-                "sha256:46b99eab618cdc1c871ea707b7c52edc23cfea6c750740cd242ba62b5c84de7f",
-                "sha256:4a67371752fd86d1d03a3b82d4e75404608f6f4d579b9676124079a22a40c79f",
-                "sha256:525dd3c2205b11a2bc6d770bf1ec63bde0253fd754b4c19c399d27ddc9dad0d3",
-                "sha256:6c8406c3d8c1c7d15da454de15d77f7bb48d14ede5db994f74226c348cf1050e",
-                "sha256:6da83225a23eaf7b3f48f3d5f53c91b2cf00fbfa48b24a7a758160112dd3e123",
-                "sha256:7150e5b543b466f45f668b352f7abda27998cc8035f051d1b7e9524ca9eb2f5f",
-                "sha256:76fbc24311a3d039d6cd147d396719f606d96d1413f3816c028a48e29367f646",
-                "sha256:854a7b15750e617e16f8d65dbc004f065a7963544b253b923f16109557648777",
-                "sha256:86c079732328f1add097b0b8079cd532b5d28e207fac93e9d6ea5f487506deef",
-                "sha256:8d860c62e3f51623ccd528d8fac44580501df557d4b467cc5581587fcf057719",
-                "sha256:9675d5bc7e4f96a7bb2b54d14e9b269a5fb6e5d36ecc7d01f0f65bb9af3185f9",
-                "sha256:9841762d114018c49483c089fa2d47f7e612e57666323f615913d7d7f46e9606",
-                "sha256:9eb25bcf9161e2fcbe9eebe8e829719b2334e849183f0e496bf4b83722bcccfa",
-                "sha256:aad3234a41340e9cf6184e621694e2a7233ba3f8aef9b1e6de8cba431b45ebd2",
-                "sha256:b502b5e2f08500cc4b8d29bfc4f51d805adcbc00f8d149e98fda8aae85ddb644",
-                "sha256:b86d83fefc8a8c394f3490c37e1953bc16c311a3d1d1cf91518793bfb9847fb4",
-                "sha256:c0eb2cd3ad4967fcbdd9e066e8cd91fe2c23c671dbae9952f0b4d3d42832cc5f",
-                "sha256:e0d48456e1aa4f0537f9c9af7be71e1f0659ff68bc1cd538ebc785f6b007bd0d",
-                "sha256:eaee5dd378f6f0d7c3ec49aeeb26564d55ac0ad73b9b4688bf29e66deabddf73",
-                "sha256:f14acb0fd16d404fda9370f93aace682f284340c89c3442ac747c5466ac7e2b5",
-                "sha256:f6fc526bd70898489d02bf52c8f0632ab377592ae954d0c0a5bb38d618dddaa9",
-                "sha256:fcd84e4d46a86291495d131a7824ba38d2e8278bda9425c50661a04633174319",
-                "sha256:ff38ecf89c69a531a7326c2dae71982edfe2f805f3c016cdc5bfd1a04ebf80cb",
-                "sha256:ff8bebc7a9d297dff2003460e01db2c20c63818b45fb19170f388b1a72fe5a14"
+                "sha256:07e9054f4df612beadd12ca8a5342246bffcad74a1fa8df1368d1f2bb07d8fc7",
+                "sha256:0b7af10ecd1c3829ddf824e39129e026476af6a261388db4d26bf11525fd8d05",
+                "sha256:20a5ecd03134c7ed2c05dfdf5bd96d84480afeebe3484e416f7d7ec8c92596ae",
+                "sha256:2ad74f0a7ae8c4fa374d3be26cdf8c0897669ba3fd8bad4607710bc2fb7f132d",
+                "sha256:340fb8eda79e5b116f761c953879c98c423eca82481d5cdad762beb108ee763e",
+                "sha256:4c8dc1ca3330b716c48317b4d91911e00a54c0f2de486c9c25ec0c54ebf12b5f",
+                "sha256:5042a7d43a8e0a8ffc8d2acacbd5fad1edf8336c376714632a5c61eff56ac06e",
+                "sha256:538544799d537684e83e697298fd5078252ee68f23b44d8271f77647f225bca3",
+                "sha256:53b17656bacdb3b194bc6cff1bd2e044879cf015ab5352c932173c2172a4b99d",
+                "sha256:5dbcb3fd1d64d0835e383ea091037ca6aa70a43bd1cabb0c71c27796f2c5173f",
+                "sha256:628120ce7ef7f31824929c244894ee22a98d706d8879fb5441e1c572e02ca2ae",
+                "sha256:640fc3556a1022a781f3f07fd5dc9da842ef87f873139402d5d98d64d776360f",
+                "sha256:6774f2001e6359b041b8af3b9bc7669afc6adce39438fae99bfacf4b03490d54",
+                "sha256:6bc28702213988c96e394685ad4103a4e347305cf90569693bef8e3d12f233ae",
+                "sha256:70b978fb1bbb629e9ce41235511d89ef9d694e3933b5a52dd6d0a4040b6c7830",
+                "sha256:87cf4054632c20160592ca2917aec93bb83b12b3a39c865feab1ba44e0ed120d",
+                "sha256:89dbe4a792f28fd21d3319d26ceea32a3132f1c5ae578ec513f77e4c2adb9b91",
+                "sha256:8a98e38cb07b63459070c3a63abd5059f254d2ddec7afe77824e160f6b9e26c3",
+                "sha256:8f77ad5628e82f76ace2ff9a5b10ee87688bda0867f3e269cab5ed8be7e4ccc5",
+                "sha256:92c9f6dbe3b3d7059beea12e5601b0b37dd7a51f9bb29fbc98ab314e2a8ffdb7",
+                "sha256:ba84fb12826e4db193d5fbfdcf475f85c07fdfb76b84b3fb1504905f540db7ab",
+                "sha256:ba8fd99b546aacac74c97bb0676dd5270a1cd84c44fb67adc71d00ccabcb34a8",
+                "sha256:bee8b2a399c6be1642d5cfcfb9d0d438fcacdd5188e0b16366fa15dbd49ec667",
+                "sha256:cfa0c25e4c87517a679d97d0617ddaccb46337f558beac72e7d85c2f34365a35",
+                "sha256:da11e254ab264f515b59d16f5d1ff24f5f02fbf0b9de2d2981e704176a75c03a",
+                "sha256:dae7ab0c4d34d40895e92b71149bcd72a2f7c5971dc013d1c29393b6067448e3",
+                "sha256:decb9caf3a5695a8a4ebe7153b8ef7dcc57f85dc16896e3a33d5cf3e629ac396",
+                "sha256:e10be2b717979260db0f0fa6a531e6ddccf0d85cca11983b41d04049214fa0fc",
+                "sha256:eb418ec022538b24d73260b694ddb5f3878d554614a4611decb433d8eee69acd",
+                "sha256:ef998f03ee92e6c98acdfac464c145e0a9949301b6e83688d7194e746314fcba"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==1.4.20"
+            "version": "==1.4.21"
         },
         "sqlalchemy-utils": {
             "hashes": [
@@ -708,11 +713,11 @@
         },
         "wagtail": {
             "hashes": [
-                "sha256:4b866d9cfbfb15b0ca4482761afea3b12a1b3a5c5d8834e045cc9aa492decba7",
-                "sha256:93afb1c8c1dae6261ba54a65ceabf7a8d20fe43ae20ceb2ae6956e69aa1963bd"
+                "sha256:aa577f78f0cdbbabbd837b4d90986f6c6357d1b0172bcb79fd1c83fcee3681ba",
+                "sha256:f39b2ca9d106567a74aad34fc3c63b8acf4a07ff0737c6e1e071334885dc7252"
             ],
             "index": "pypi",
-            "version": "==2.12.5"
+            "version": "==2.12.6"
         },
         "webencodings": {
             "hashes": [
@@ -745,10 +750,10 @@
         },
         "xlsxwriter": {
             "hashes": [
-                "sha256:1a7fac99687020e76aa7dd0d7de4b9b576547ed748e5cd91a99d52a6df54ca16",
-                "sha256:641db6e7b4f4982fd407a3f372f45b878766098250d26963e95e50121168cbe2"
+                "sha256:15b65f02f7ecdcfb1f22794b1fcfed8e9a49e8b7414646f90347be5cbf464234",
+                "sha256:791567acccc485ba76e0b84bccced2651981171de5b47d541520416f2f9f93e3"
             ],
-            "version": "==1.4.3"
+            "version": "==1.4.4"
         },
         "xlwt": {
             "hashes": [
@@ -759,20 +764,13 @@
         }
     },
     "develop": {
-        "appdirs": {
-            "hashes": [
-                "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41",
-                "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"
-            ],
-            "version": "==1.4.4"
-        },
         "asgiref": {
             "hashes": [
-                "sha256:05914d0fa65a21711e732adc6572edad6c8da5f1435c3f0c060689ced5e85195",
-                "sha256:d36fa91dd90e3aa3c81a6bd426ccc8fb20bd3d22b0cf14a12800289e9c3e2563"
+                "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9",
+                "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.4.0"
+            "version": "==3.4.1"
         },
         "attrs": {
             "hashes": [
@@ -782,6 +780,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==21.2.0"
         },
+        "backports.entry-points-selectable": {
+            "hashes": [
+                "sha256:988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a",
+                "sha256:a6d9a871cde5e15b4c4a53e3d43ba890cc6861ec1332c9c2428c92f977192acc"
+            ],
+            "markers": "python_version >= '2.7'",
+            "version": "==1.1.0"
+        },
         "distlib": {
             "hashes": [
                 "sha256:106fef6dc37dd8c0e2c0a60d3fca3e77460a48907f335fa28420463a6f799736",
@@ -821,11 +827,19 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5",
-                "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"
+                "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7",
+                "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.9"
+            "markers": "python_version >= '3.6'",
+            "version": "==21.0"
+        },
+        "platformdirs": {
+            "hashes": [
+                "sha256:0b9547541f599d3d242078ae60b927b3e453f0ad52f58b4d4bc3be86aed3ec41",
+                "sha256:3b00d081227d9037bbbca521a5787796b5ef5000faea1e43fd76f1d44b06fcfa"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==2.0.2"
         },
         "pluggy": {
             "hashes": [
@@ -914,11 +928,11 @@
         },
         "tox": {
             "hashes": [
-                "sha256:307a81ddb82bd463971a273f33e9533a24ed22185f27db8ce3386bff27d324e3",
-                "sha256:b0b5818049a1c1997599d42012a637a33f24c62ab8187223fdd318fa8522637b"
+                "sha256:67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8",
+                "sha256:c990028355f0d0b681e3db9baa89dd9f839a6e999c320029339f6a6b36160591"
             ],
             "index": "pypi",
-            "version": "==3.23.1"
+            "version": "==3.24.0"
         },
         "urllib3": {
             "hashes": [
@@ -930,11 +944,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467",
-                "sha256:2b0126166ea7c9c3661f5b8e06773d28f83322de7a3ff7d06f0aed18c9de6a76"
+                "sha256:51df5d8a2fad5d1b13e088ff38a433475768ff61f202356bb9812c454c20ae45",
+                "sha256:e4fc84337dce37ba34ef520bf2d4392b392999dbe47df992870dc23230f6b758"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.4.7"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==20.6.0"
         }
     }
 }
diff --git a/yarn.lock b/yarn.lock
index 23b79f9..ff17c0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2237,9 +2237,9 @@ is-bzip2@^1.0.0:
   integrity sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=
 
 is-core-module@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
-  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
+  integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
   dependencies:
     has "^1.0.3"
 
@@ -3104,9 +3104,9 @@ object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-inspect@^1.9.0:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
-  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
 object.defaults@^1.1.0:
   version "1.1.0"

From e847172599f7575f539c7ef33e3a4e27e5a8f3c3 Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@datalets.ch>
Date: Sun, 25 Jul 2021 00:24:38 +0200
Subject: [PATCH 004/122] Bumped charset, dotenv

---
 Pipfile.lock | 80 ++++++++++++++++++++++++++--------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index fc0e9ea..2e2ab33 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -39,11 +39,11 @@
         },
         "charset-normalizer": {
             "hashes": [
-                "sha256:3c502a35807c9df35697b0f44b1d65008f83071ff29c69677c7c22573bc5a45a",
-                "sha256:951567c2f7433a70ab63f1be67e5ee05d3925d9423306ecb71a3b272757bcc95"
+                "sha256:88fce3fa5b1a84fdcb3f603d889f723d1dd89b26059d0123ca435570e848d5e1",
+                "sha256:c46c3ace2d744cfbdebceaa3c19ae691f53ae621b39fd7570f59d14fb7f2fd12"
             ],
             "markers": "python_version >= '3.0'",
-            "version": "==2.0.2"
+            "version": "==2.0.3"
         },
         "click": {
             "hashes": [
@@ -507,11 +507,11 @@
         },
         "python-dotenv": {
             "hashes": [
-                "sha256:dd8fe852847f4fbfadabf6183ddd4c824a9651f02d51714fa075c95561959c7d",
-                "sha256:effaac3c1e58d89b3ccb4d04a40dc7ad6e0275fda25fd75ae9d323e2465e202d"
+                "sha256:aae25dc1ebe97c420f50b81fb0e5c949659af713f31fdb63c749ca68748f34b1",
+                "sha256:f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"
             ],
             "index": "pypi",
-            "version": "==0.18.0"
+            "version": "==0.19.0"
         },
         "pytz": {
             "hashes": [
@@ -620,39 +620,39 @@
         },
         "sqlalchemy": {
             "hashes": [
-                "sha256:07e9054f4df612beadd12ca8a5342246bffcad74a1fa8df1368d1f2bb07d8fc7",
-                "sha256:0b7af10ecd1c3829ddf824e39129e026476af6a261388db4d26bf11525fd8d05",
-                "sha256:20a5ecd03134c7ed2c05dfdf5bd96d84480afeebe3484e416f7d7ec8c92596ae",
-                "sha256:2ad74f0a7ae8c4fa374d3be26cdf8c0897669ba3fd8bad4607710bc2fb7f132d",
-                "sha256:340fb8eda79e5b116f761c953879c98c423eca82481d5cdad762beb108ee763e",
-                "sha256:4c8dc1ca3330b716c48317b4d91911e00a54c0f2de486c9c25ec0c54ebf12b5f",
-                "sha256:5042a7d43a8e0a8ffc8d2acacbd5fad1edf8336c376714632a5c61eff56ac06e",
-                "sha256:538544799d537684e83e697298fd5078252ee68f23b44d8271f77647f225bca3",
-                "sha256:53b17656bacdb3b194bc6cff1bd2e044879cf015ab5352c932173c2172a4b99d",
-                "sha256:5dbcb3fd1d64d0835e383ea091037ca6aa70a43bd1cabb0c71c27796f2c5173f",
-                "sha256:628120ce7ef7f31824929c244894ee22a98d706d8879fb5441e1c572e02ca2ae",
-                "sha256:640fc3556a1022a781f3f07fd5dc9da842ef87f873139402d5d98d64d776360f",
-                "sha256:6774f2001e6359b041b8af3b9bc7669afc6adce39438fae99bfacf4b03490d54",
-                "sha256:6bc28702213988c96e394685ad4103a4e347305cf90569693bef8e3d12f233ae",
-                "sha256:70b978fb1bbb629e9ce41235511d89ef9d694e3933b5a52dd6d0a4040b6c7830",
-                "sha256:87cf4054632c20160592ca2917aec93bb83b12b3a39c865feab1ba44e0ed120d",
-                "sha256:89dbe4a792f28fd21d3319d26ceea32a3132f1c5ae578ec513f77e4c2adb9b91",
-                "sha256:8a98e38cb07b63459070c3a63abd5059f254d2ddec7afe77824e160f6b9e26c3",
-                "sha256:8f77ad5628e82f76ace2ff9a5b10ee87688bda0867f3e269cab5ed8be7e4ccc5",
-                "sha256:92c9f6dbe3b3d7059beea12e5601b0b37dd7a51f9bb29fbc98ab314e2a8ffdb7",
-                "sha256:ba84fb12826e4db193d5fbfdcf475f85c07fdfb76b84b3fb1504905f540db7ab",
-                "sha256:ba8fd99b546aacac74c97bb0676dd5270a1cd84c44fb67adc71d00ccabcb34a8",
-                "sha256:bee8b2a399c6be1642d5cfcfb9d0d438fcacdd5188e0b16366fa15dbd49ec667",
-                "sha256:cfa0c25e4c87517a679d97d0617ddaccb46337f558beac72e7d85c2f34365a35",
-                "sha256:da11e254ab264f515b59d16f5d1ff24f5f02fbf0b9de2d2981e704176a75c03a",
-                "sha256:dae7ab0c4d34d40895e92b71149bcd72a2f7c5971dc013d1c29393b6067448e3",
-                "sha256:decb9caf3a5695a8a4ebe7153b8ef7dcc57f85dc16896e3a33d5cf3e629ac396",
-                "sha256:e10be2b717979260db0f0fa6a531e6ddccf0d85cca11983b41d04049214fa0fc",
-                "sha256:eb418ec022538b24d73260b694ddb5f3878d554614a4611decb433d8eee69acd",
-                "sha256:ef998f03ee92e6c98acdfac464c145e0a9949301b6e83688d7194e746314fcba"
+                "sha256:09dbb4bc01a734ccddbf188deb2a69aede4b3c153a72b6d5c6900be7fb2945b1",
+                "sha256:12bac5fa1a6ea870bdccb96fe01610641dd44ebe001ed91ef7fcd980e9702db5",
+                "sha256:1fdae7d980a2fa617d119d0dc13ecb5c23cc63a8b04ffcb5298f2c59d86851e9",
+                "sha256:26daa429f039e29b1e523bf763bfab17490556b974c77b5ca7acb545b9230e9a",
+                "sha256:36a089dc604032d41343d86290ce85d4e6886012eea73faa88001260abf5ff81",
+                "sha256:39b5d36ab71f73c068cdcf70c38075511de73616e6c7fdd112d6268c2704d9f5",
+                "sha256:4014978de28163cd8027434916a92d0f5bb1a3a38dff5e8bf8bff4d9372a9117",
+                "sha256:44d23ea797a5e0be71bc5454b9ae99158ea0edc79e2393c6e9a2354de88329c0",
+                "sha256:488608953385d6c127d2dcbc4b11f8d7f2f30b89f6bd27c01b042253d985cc2f",
+                "sha256:5102b9face693e8b2db3b2539c7e1a5d9a5b4dc0d79967670626ffd2f710d6e6",
+                "sha256:5908ea6c652a050d768580d01219c98c071e71910ab8e7b42c02af4010608397",
+                "sha256:5d856cc50fd26fc8dd04892ed5a5a3d7eeb914fea2c2e484183e2d84c14926e0",
+                "sha256:68393d3fd31469845b6ba11f5b4209edbea0b58506be0e077aafbf9aa2e21e11",
+                "sha256:6a16c7c4452293da5143afa3056680db2d187b380b3ef4d470d4e29885720de3",
+                "sha256:756f5d2f5b92d27450167247fb574b09c4cd192a3f8c2e493b3e518a204ee543",
+                "sha256:891927a49b2363a4199763a9d436d97b0b42c65922a4ea09025600b81a00d17e",
+                "sha256:9bfe882d5a1bbde0245dca0bd48da0976bd6634cf2041d2fdf0417c5463e40e5",
+                "sha256:9fcbb4b4756b250ed19adc5e28c005b8ed56fdb5c21efa24c6822c0575b4964d",
+                "sha256:a00d9c6d3a8afe1d1681cd8a5266d2f0ed684b0b44bada2ca82403b9e8b25d39",
+                "sha256:a5e14cb0c0a4ac095395f24575a0e7ab5d1be27f5f9347f1762f21505e3ba9f1",
+                "sha256:b48148ceedfb55f764562e04c00539bb9ea72bf07820ca15a594a9a049ff6b0e",
+                "sha256:b7fb937c720847879c7402fe300cfdb2aeff22349fa4ea3651bca4e2d6555939",
+                "sha256:bc34a007e604091ca3a4a057525efc4cefd2b7fe970f44d20b9cfa109ab1bddb",
+                "sha256:c9373ef67a127799027091fa53449125351a8c943ddaa97bec4e99271dbb21f4",
+                "sha256:d09a760b0a045b4d799102ae7965b5491ccf102123f14b2a8cc6c01d1021a2d9",
+                "sha256:ec1be26cdccd60d180359a527d5980d959a26269a2c7b1b327a1eea0cab37ed8",
+                "sha256:eedd76f135461cf237534a6dc0d1e0f6bb88a1dc193678fab48a11d223462da5",
+                "sha256:f028ef6a1d828bc754852a022b2160e036202ac8658a6c7d34875aafd14a9a15",
+                "sha256:f814d80844969b0d22ea63663da4de5ca1c434cfbae226188901e5d368792c17",
+                "sha256:fd2102a8f8a659522719ed73865dff3d3cc76eb0833039dc473e0ad3041d04be"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==1.4.21"
+            "version": "==1.4.22"
         },
         "sqlalchemy-utils": {
             "hashes": [
@@ -728,11 +728,11 @@
         },
         "whitenoise": {
             "hashes": [
-                "sha256:05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7",
-                "sha256:05d00198c777028d72d8b0bbd234db605ef6d60e9410125124002518a48e515d"
+                "sha256:d234b871b52271ae7ed6d9da47ffe857c76568f11dd30e28e18c5869dbd11e12",
+                "sha256:d963ef25639d1417e8a247be36e6aedd8c7c6f0a08adcb5a89146980a96b577c"
             ],
             "index": "pypi",
-            "version": "==5.2.0"
+            "version": "==5.3.0"
         },
         "willow": {
             "hashes": [

From 0e3b52abc551d19bb336e00a9e6e96d0cfe2cd0e Mon Sep 17 00:00:00 2001
From: Amal Elshihaby <amal.sh87@gmail.com>
Date: Wed, 29 Sep 2021 10:40:34 +0200
Subject: [PATCH 005/122] Task #9790 Add newsletter signup button

---
 .gitignore                                    |  1 +
 .../migrations/0030_auto_20210928_1850.py     | 29 +++++++++++
 .../0031_articleindexpage_subscribe_action.py | 18 +++++++
 .../migrations/0032_auto_20210928_1858.py     | 33 +++++++++++++
 publichealth/home/models/models.py            | 21 ++++++++
 .../templates/home/article_index_page.html    |  5 +-
 .../templates/home/subscription_form.html     | 49 +++++++++++++++++++
 publichealth/static/css/main.scss             |  7 +++
 publichealth/templates/base.html              | 26 +++++++++-
 9 files changed, 187 insertions(+), 2 deletions(-)
 create mode 100644 publichealth/home/migrations/0030_auto_20210928_1850.py
 create mode 100644 publichealth/home/migrations/0031_articleindexpage_subscribe_action.py
 create mode 100644 publichealth/home/migrations/0032_auto_20210928_1858.py
 create mode 100644 publichealth/home/templates/home/subscription_form.html

diff --git a/.gitignore b/.gitignore
index 01020ea..09a87d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /node_modules/
 /publichealth/static/libs
 publichealth.home.json
+.history
diff --git a/publichealth/home/migrations/0030_auto_20210928_1850.py b/publichealth/home/migrations/0030_auto_20210928_1850.py
new file mode 100644
index 0000000..45f7cf6
--- /dev/null
+++ b/publichealth/home/migrations/0030_auto_20210928_1850.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.0.14 on 2021-09-28 16:50
+
+from django.db import migrations
+import wagtail.core.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0029_contactformfield_clean_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='articleindexpage',
+            name='subscribe_label_de',
+            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='articleindexpage',
+            name='subscribe_label_en',
+            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+        ),
+        migrations.AddField(
+            model_name='articleindexpage',
+            name='subscribe_label_fr',
+            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+        ),
+    ]
diff --git a/publichealth/home/migrations/0031_articleindexpage_subscribe_action.py b/publichealth/home/migrations/0031_articleindexpage_subscribe_action.py
new file mode 100644
index 0000000..6188351
--- /dev/null
+++ b/publichealth/home/migrations/0031_articleindexpage_subscribe_action.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.14 on 2021-09-28 16:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0030_auto_20210928_1850'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='articleindexpage',
+            name='subscribe_action',
+            field=models.URLField(blank=True, default=''),
+        ),
+    ]
diff --git a/publichealth/home/migrations/0032_auto_20210928_1858.py b/publichealth/home/migrations/0032_auto_20210928_1858.py
new file mode 100644
index 0000000..3db35e9
--- /dev/null
+++ b/publichealth/home/migrations/0032_auto_20210928_1858.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.0.14 on 2021-09-28 16:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0031_articleindexpage_subscribe_action'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articleindexpage',
+            name='subscribe_action',
+            field=models.URLField(blank=True, default='', verbose_name='Action'),
+        ),
+        migrations.AlterField(
+            model_name='articleindexpage',
+            name='subscribe_label_de',
+            field=models.CharField(blank=True, default='', max_length=250, verbose_name='Button Label (de)'),
+        ),
+        migrations.AlterField(
+            model_name='articleindexpage',
+            name='subscribe_label_en',
+            field=models.CharField(blank=True, default='', max_length=250, verbose_name='Button Label (en)'),
+        ),
+        migrations.AlterField(
+            model_name='articleindexpage',
+            name='subscribe_label_fr',
+            field=models.CharField(blank=True, default='', max_length=250, verbose_name='Button Label (fr)'),
+        ),
+    ]
diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index e9f2312..7853dd2 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -47,6 +47,17 @@ class ArticleIndexPage(Page):
         'intro_en',
     )
 
+    subscribe_label_de = models.CharField("Button Label (de)", default='', blank=True, max_length=250)
+    subscribe_label_fr = models.CharField("Button Label (fr)", default='', blank=True, max_length=250)
+    subscribe_label_en = models.CharField("Button Label (en)", default='', blank=True, max_length=250)
+    subscribe_action = models.URLField("Action", default='', blank=True)
+
+    trans_subscribe_label = TranslatedField(
+        'subscribe_label_de',
+        'subscribe_label_fr',
+        'subscribe_label_en',
+    )
+
     feed_image = models.ForeignKey(
         'wagtailimages.Image',
         null=True, blank=True,
@@ -61,6 +72,16 @@ class ArticleIndexPage(Page):
         FieldPanel('title_en'),
         FieldPanel('intro_en'),
         ImageChooserPanel('feed_image'),
+        MultiFieldPanel(
+        [
+            FieldPanel('subscribe_label_de'),
+            FieldPanel('subscribe_label_fr'),
+            FieldPanel('subscribe_label_en'),
+            FieldPanel('subscribe_action')
+                    ],
+        heading="Newsletters",
+        classname="collapsible collapsed"
+    )
     ]
 
     def get_context(self, request):
diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html
index c4bca27..6cd4cca 100644
--- a/publichealth/home/templates/home/article_index_page.html
+++ b/publichealth/home/templates/home/article_index_page.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load wagtailcore_tags wagtailimages_tags %}
+{% load i18n wagtailcore_tags wagtailimages_tags %}
 
 {% block body_class %}template-{{ self.get_verbose_name|slugify }}{% endblock %}
 
@@ -21,6 +21,9 @@
     <div class="container">
     	<h2>{{ page.trans_title }}</h2>
     	<p class="lead">{{ page.trans_intro|richtext }}</p>
+      {% if page.subscribe_action %}
+        {% include 'home/subscription_form.html' %}
+      {% endif %}
       <div class="article-body" role="main">
       {% for entry in articles %}
         <div class="item">
diff --git a/publichealth/home/templates/home/subscription_form.html b/publichealth/home/templates/home/subscription_form.html
new file mode 100644
index 0000000..ce2c91b
--- /dev/null
+++ b/publichealth/home/templates/home/subscription_form.html
@@ -0,0 +1,49 @@
+<a href="#" class="btn btn-sm btn-primary pull-right" style="text-transform: uppercase;" data-toggle="modal" data-target="#subscribeModal">{{ page.trans_subscribe_label }}</a>
+<div class="modal fade" id="subscribeModal" tabindex="-1" role="dialog" aria-labelledby="subscribeModal" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title" id="myModalLabel">{{ page.trans_subscribe_label }}</h4>
+            </div>
+            <div class="modal-body">
+                <div id="mc_embed_signup">
+                    <form action="{{page.subscribe_action}}" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
+                        <div id="mc_embed_signup_scroll">
+                        <div class="indicates-required"><span class="asterisk"></span> indicates required</div>
+                        <div class="mc-field-group">
+                        <label for="mce-EMAIL">Mailadresse/ Adresse e-mail <span class="asterisk">*</span>
+                        </label>
+                        <input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
+                        </div>
+                        <div class="mc-field-group">
+                        <label for="mce-FNAME">Vorname/ Prénom <span class="asterisk">*</span>
+                        </label>
+                        <input type="text" value="" name="FNAME" class="required" id="mce-FNAME">
+                        </div>
+                        <div class="mc-field-group">
+                        <label for="mce-LNAME">Nachname/ Nom <span class="asterisk">*</span>
+                        </label>
+                        <input type="text" value="" name="LNAME" class="required" id="mce-LNAME">
+                        </div>
+                        <div class="mc-field-group input-group">
+                        <strong>Sprache/ Langue <span class="asterisk">*</span>
+                        </strong>
+                        <ul><li><input class="pull-left" type="radio" value="Deutsch" name="MMERGE9" id="mce-MMERGE9-0"><label class="pull-left" for="mce-MMERGE9-0">Deutsch</label></li>
+                        <li class="clearfix"></li>
+                        <li><input class="pull-left" type="radio" value="Français" name="MMERGE9" id="mce-MMERGE9-1"><label class="pull-left" for="mce-MMERGE9-1">Français</label></li>
+                        </ul>
+                        </div>
+                        <div id="mce-responses" class="clear">
+                        <div class="response" id="mce-error-response" style="display:none"></div>
+                        <div class="response" id="mce-success-response" style="display:none"></div>
+                        </div> <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
+                        <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_8368e636ee0d8404d5452a0ef_77f535b64d" tabindex="-1" value=""></div>
+                        <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/publichealth/static/css/main.scss b/publichealth/static/css/main.scss
index e952926..006b7f2 100644
--- a/publichealth/static/css/main.scss
+++ b/publichealth/static/css/main.scss
@@ -128,5 +128,12 @@ $slider-nav: 200px;
 
 // Fix Bootstrap 3 warning
 .media, .media-body { zoom: none !important; transform: scale(1); }
+ 
+#mc_embed_signup input[type=radio] {
+  -webkit-appearance: none; padding: 0px;margin-top: 0px;
+} 
+#mc_embed_signup {
+  background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif; 
+}
 
 @import "subsites";
diff --git a/publichealth/templates/base.html b/publichealth/templates/base.html
index f867fba..bf34b34 100644
--- a/publichealth/templates/base.html
+++ b/publichealth/templates/base.html
@@ -11,6 +11,9 @@
         <meta name="description" content="{% block description %}{% endblock %}">
 
         {% block extra_css %}{% endblock %}
+        {% if page.subscribe_action %}
+        <link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
+        {% endif %}
         {% compress css %}
             <link rel="stylesheet" type="text/x-scss" href="{% static 'css/main.scss' %}">
         {% endcompress %}
@@ -35,7 +38,28 @@
         <script src="{% static 'libs/slick-carousel/slick/slick.min.js' %}"></script>
         <script src="{% static 'libs/slick-lightbox/dist/slick-lightbox.js' %}"></script>
         <script src="{% static 'libs/cookieconsent/build/cookieconsent.min.js' %}"></script>
-
+        {% if page.subscribe_action %}
+            <script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script>
+            <script type='text/javascript'>(function($) {
+                window.fnames = new Array(); 
+                window.ftypes = new Array();
+                fnames0='EMAIL';
+                ftypes0='email';
+                fnames1='FNAME';
+                ftypes1='text';
+                fnames2='LNAME';
+                ftypes2='text';
+                fnames9='MMERGE9';
+                ftypes9='radio';
+                $.extend($.validator.messages, {
+                required: "Dieses Feld ist ein Pflichtfeld.",
+                maxlength: $.validator.format("Geben Sie bitte maximal {0} Zeichen ein."),
+                minlength: $.validator.format("Geben Sie bitte mindestens {0} Zeichen ein."),
+                email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
+                });}(jQuery));
+                var $mcj = jQuery.noConflict(true);
+            </script>
+        {% endif %} 
         {% block extra_js %}{% endblock %}
 
         {% compress js %}

From 67eefbd5608dfefb819dde6d983fabc1f3aca291 Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@datalets.ch>
Date: Sat, 11 Dec 2021 22:39:34 +0100
Subject: [PATCH 006/122] node-sass replaced with Dart Sass

---
 package.json |   2 +-
 yarn.lock    | 983 ++++++++++-----------------------------------------
 2 files changed, 186 insertions(+), 799 deletions(-)

diff --git a/package.json b/package.json
index 0ba27a8..8f485ab 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "grunt-contrib-sass": "^1.0.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-sass": "^3.0.2",
-    "node-sass": "^4.12.0"
+    "sass": "^1.45.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/yarn.lock b/yarn.lock
index ff17c0c..76630fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -40,21 +40,6 @@ after@0.8.2:
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-ajv@^6.12.3:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 ansi-gray@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
@@ -67,33 +52,16 @@ ansi-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -114,11 +82,6 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 archive-type@^3.0.0, archive-type@^3.0.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-3.2.0.tgz#9cd9c006957ebe95fadad5bd6098942a813737f6"
@@ -126,14 +89,6 @@ archive-type@^3.0.0, archive-type@^3.0.1:
   dependencies:
     file-type "^3.1.0"
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -195,18 +150,6 @@ arraybuffer.slice@~0.0.7:
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
   integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
 async-each-series@0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
@@ -217,11 +160,6 @@ async-each-series@^1.1.0:
   resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-1.1.0.tgz#f42fd8155d38f21a5b8ea07c28e063ed1700b138"
   integrity sha1-9C/YFV048hpbjqB8KOBj7RcAsTg=
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
 async@1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -240,31 +178,16 @@ async@^2.6.0:
     lodash "^4.17.14"
 
 async@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
-  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd"
+  integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-axios@0.21.1:
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
-  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+axios@0.21.4:
+  version "0.21.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
-    follow-redirects "^1.10.0"
+    follow-redirects "^1.14.0"
 
 backo2@1.0.2:
   version "1.0.2"
@@ -291,13 +214,6 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
 beeper@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
@@ -370,13 +286,6 @@ blob@0.0.5:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
@@ -411,20 +320,20 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browser-sync-client@^2.27.4:
-  version "2.27.4"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.27.4.tgz#3129299f67bbe016995975924c1f946be3edd31c"
-  integrity sha512-l0krAGZnpLaD+tUYdM25WeS4FP73ZoPeaxlVzOvmtL9uKSlvpmywsnDwa3PJzc3ubmDPAcD74ifJjl6MmVksXw==
+browser-sync-client@^2.27.7:
+  version "2.27.7"
+  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.27.7.tgz#e09dce1add876984cf8232de95d2332d29401a64"
+  integrity sha512-wKg9UP9a4sCIkBBAXUdbkdWFJzfSAQizGh+nC19W9y9zOo9s5jqeYRFUUbs7x5WKhjtspT+xetVp9AtBJ6BmWg==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
     rxjs "^5.5.6"
 
-browser-sync-ui@^2.27.4:
-  version "2.27.4"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.27.4.tgz#cd1767926528c0e6cfb3abe1eeb61a9026a98953"
-  integrity sha512-E58Mb6ycz57Nm393oqVJj4jxuLJH3MhZnY8AV+zd9LsNVGZjrKRNNIw5JPYYguyb37ZjLjq2x4u+38mRv3Sb7g==
+browser-sync-ui@^2.27.7:
+  version "2.27.7"
+  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.27.7.tgz#38cd65f7ba058544310591ad8ac2e7fdf29934f2"
+  integrity sha512-Bt4OQpx9p18OIzk0KKyu7jqlvmjacasUlk8ARY3uuIyiFWSBiRgr2i6XY8dEMF14DtbooaEBOpHEu9VCYvMcCw==
   dependencies:
     async-each-series "0.1.1"
     connect-history-api-fallback "^1"
@@ -434,12 +343,12 @@ browser-sync-ui@^2.27.4:
     stream-throttle "^0.1.3"
 
 browser-sync@^2.6.4:
-  version "2.27.4"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.27.4.tgz#5336c3e370731ee97ab50f94d010c00d43b591e1"
-  integrity sha512-zgjrI6oUXxLa671SxVmWfIH+XiG6yZiGuvsQ1huuGEBlKkWuBVKgYjh+j9kagKm891FARgmK4Ct4PAhckLKaYg==
+  version "2.27.7"
+  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.27.7.tgz#65ec55d6c6e33283e505e06e5113bc32d9d0a8f0"
+  integrity sha512-9ElnnA/u+s2Jd+IgY+2SImB+sAEIteHsMG0NR96m7Ph/wztpvJCUpyC2on1KqmG9iAp941j+5jfmd34tEguGbg==
   dependencies:
-    browser-sync-client "^2.27.4"
-    browser-sync-ui "^2.27.4"
+    browser-sync-client "^2.27.7"
+    browser-sync-ui "^2.27.7"
     bs-recipes "1.3.4"
     bs-snippet-injector "^2.0.1"
     chokidar "^3.5.1"
@@ -466,7 +375,7 @@ browser-sync@^2.6.4:
     serve-static "1.13.2"
     server-destroy "1.0.1"
     socket.io "2.4.0"
-    ua-parser-js "^0.7.28"
+    ua-parser-js "1.0.2"
     yargs "^15.4.1"
 
 bs-recipes@1.3.4:
@@ -503,9 +412,9 @@ buffer-fill@^1.0.0:
   integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
 buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer-to-vinyl@^1.0.0:
   version "1.1.0"
@@ -522,10 +431,10 @@ bytes@1:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
   integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+bytes@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
+  integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
 
 call-bind@^1.0.0:
   version "1.0.2"
@@ -558,11 +467,6 @@ capture-stack-trace@^1.0.0:
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
   integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
 caw@^1.0.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/caw/-/caw-1.2.0.tgz#ffb226fe7efc547288dc62ee3e97073c212d1034"
@@ -573,7 +477,7 @@ caw@^1.0.1:
     object-assign "^3.0.0"
     tunnel-agent "^0.4.0"
 
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -585,14 +489,14 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     supports-color "^2.0.0"
 
 chalk@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
-  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chokidar@^3.5.1:
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
   integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
@@ -614,15 +518,6 @@ clap@^1.0.9:
   dependencies:
     chalk "^1.1.3"
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -668,22 +563,10 @@ coa@~1.0.1:
   dependencies:
     q "^1.1.2"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 coffeescript@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.5.1.tgz#b2442a1f2c806139669534a54adc35010559d16a"
-  integrity sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.6.1.tgz#f9e5d4930e1b8a1c5cfba7f95eebd18694ce58fd"
+  integrity sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg==
 
 color-convert@^2.0.1:
   version "2.0.1"
@@ -692,11 +575,6 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
 color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
@@ -712,13 +590,6 @@ colors@~1.1.2:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
   integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@^2.2.0, commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -774,11 +645,6 @@ connect@3.6.6:
     parseurl "~1.3.2"
     utils-merge "1.0.1"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 console-stream@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44"
@@ -801,10 +667,10 @@ cookie@~0.4.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 create-error-class@^3.0.1:
   version "3.0.2"
@@ -820,14 +686,6 @@ cross-spawn@^0.2.3:
   dependencies:
     lru-cache "^2.5.0"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -859,13 +717,6 @@ dargs@^4.0.0:
   dependencies:
     number-is-nan "^1.0.0"
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
 dateformat@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
@@ -883,10 +734,10 @@ debug@2.6.9, debug@^2.2.0:
   dependencies:
     ms "2.0.0"
 
-debug@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+debug@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
   dependencies:
     ms "2.1.2"
 
@@ -986,16 +837,6 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -1088,24 +929,11 @@ eazy-logger@3.1.0:
   dependencies:
     tfunk "^4.0.0"
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -1289,7 +1117,7 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
-extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.0, extend@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -1301,16 +1129,6 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
 fancy-log@^1.1.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
@@ -1321,16 +1139,6 @@ fancy-log@^1.1.0:
     parse-node-version "^1.0.0"
     time-stamp "^1.0.0"
 
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
 faye-websocket@~0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -1421,13 +1229,6 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
 find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -1484,10 +1285,10 @@ flagged-respawn@^1.0.1:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
-follow-redirects@^1.0.0, follow-redirects@^1.10.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
-  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+  version "1.14.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd"
+  integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==
 
 for-in@^1.0.1:
   version "1.0.2"
@@ -1508,20 +1309,6 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 fresh@0.5.2, fresh@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -1551,36 +1338,12 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
-fstream@^1.0.0, fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-gaze@^1.0.0, gaze@^1.1.0:
+gaze@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
   integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
@@ -1619,16 +1382,9 @@ get-stream@^3.0.0:
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 getobject@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.1.tgz#17d86a05913c15d173a5bcf8662dc7c7ac5ce147"
-  integrity sha512-tj18lLe+917AACr6BdVoUuHnBPTVd9BEJp1vxnMZ58ztNvuxz9Ufa+wf3g37tlGITH35jggwZ2d9lcgHJJgXfQ==
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.2.tgz#25ec87a50370f6dcc3c6ba7ef43c4c16215c4c89"
+  integrity sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==
 
 gifsicle@^3.0.0:
   version "3.0.4"
@@ -1694,7 +1450,19 @@ glob@^5.0.3, glob@~5.0.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1, glob@~7.1.6:
+glob@^7.0.3, glob@^7.1.3:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@~7.1.1, glob@~7.1.6:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
@@ -1738,9 +1506,9 @@ globby@^6.1.0:
     pinkie-promise "^2.0.0"
 
 globule@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
-  integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.3.tgz#811919eeac1ab7344e905f2e3be80a13447973c2"
+  integrity sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -1775,9 +1543,9 @@ got@^5.0.0:
     url-parse-lax "^1.0.0"
 
 graceful-fs@^4.0.0, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
-  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
 grunt-bg-shell@^2.3.3:
   version "2.3.3"
@@ -1958,19 +1726,6 @@ gulplog@^1.0.0:
   dependencies:
     glogg "^1.0.0"
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -2007,11 +1762,6 @@ has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -2041,16 +1791,16 @@ html-comment-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
   integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
-http-errors@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+http-errors@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
   dependencies:
     depd "~1.1.2"
     inherits "2.0.4"
-    setprototypeof "1.1.1"
+    setprototypeof "1.2.0"
     statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
+    toidentifier "1.0.1"
 
 http-errors@~1.6.2:
   version "1.6.3"
@@ -2063,9 +1813,9 @@ http-errors@~1.6.2:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.5.1:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
-  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
+  integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
 http-proxy@^1.18.1:
   version "1.18.1"
@@ -2076,15 +1826,6 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 iconv-lite@0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -2144,10 +1885,10 @@ immutable@^3:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
   integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
-in-publish@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"
-  integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==
+immutable@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
+  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
 
 indent-string@^2.1.0:
   version "2.1.0"
@@ -2169,7 +1910,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -2237,9 +1978,9 @@ is-bzip2@^1.0.0:
   integrity sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=
 
 is-core-module@^2.2.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
-  integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
   dependencies:
     has "^1.0.3"
 
@@ -2275,18 +2016,6 @@ is-finite@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
   integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -2312,9 +2041,9 @@ is-glob@^3.1.0:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -2423,11 +2152,6 @@ is-tar@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-tar/-/is-tar-1.0.0.tgz#2f6b2e1792c1f5bb36519acaa9d65c0d26fe853d"
   integrity sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=
 
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
 is-unc-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
@@ -2497,11 +2221,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
 jpegtran-bin@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/jpegtran-bin/-/jpegtran-bin-3.2.0.tgz#f60ecf4ae999c0bdad2e9fbcdf2b6f0981e7a29b"
@@ -2511,11 +2230,6 @@ jpegtran-bin@^3.0.0:
     bin-wrapper "^3.0.0"
     logalot "^2.0.0"
 
-js-base64@^2.1.8:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
-  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
-
 js-yaml@~3.14.0:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -2532,31 +2246,11 @@ js-yaml@~3.7.0:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
 jsonfile@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
@@ -2564,16 +2258,6 @@ jsonfile@^3.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -2592,9 +2276,9 @@ lazy-req@^1.0.0:
   integrity sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=
 
 lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
+  integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
   dependencies:
     readable-stream "^2.0.5"
 
@@ -2634,22 +2318,14 @@ load-json-file@^1.0.0:
     strip-bom "^2.0.0"
 
 localtunnel@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-2.0.1.tgz#8f7c593f3005647f7675e6e69af9bf746571a631"
-  integrity sha512-LiaI5wZdz0xFkIQpXbNI62ZnNn8IMsVhwxHmhA+h4vj8R9JG/07bQHWwQlyy7b95/5fVOCHJfIHv+a5XnkvaJA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-2.0.2.tgz#528d50087151c4790f89c2db374fe7b0a48501f0"
+  integrity sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==
   dependencies:
-    axios "0.21.1"
-    debug "4.3.1"
+    axios "0.21.4"
+    debug "4.3.2"
     openurl "1.1.1"
-    yargs "16.2.0"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
+    yargs "17.1.1"
 
 locate-path@^5.0.0:
   version "5.0.0"
@@ -2767,7 +2443,7 @@ lodash.templatesettings@^3.0.0:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@~4.17.10, lodash@~4.17.19, lodash@~4.17.21:
+lodash@^4.17.10, lodash@^4.17.14, lodash@~4.17.10, lodash@~4.17.19, lodash@~4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -2850,7 +2526,7 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
-meow@^3.1.0, meow@^3.3.0, meow@^3.5.0, meow@^3.7.0:
+meow@^3.1.0, meow@^3.3.0, meow@^3.5.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
@@ -2900,17 +2576,17 @@ micromatch@^4.0.2:
     braces "^3.0.1"
     picomatch "^2.2.3"
 
-mime-db@1.48.0:
-  version "1.48.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
-  integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
+mime-db@1.51.0:
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.31"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
-  integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
+mime-types@~2.1.17, mime-types@~2.1.24:
+  version "2.1.34"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
   dependencies:
-    mime-db "1.48.0"
+    mime-db "1.51.0"
 
 mime@1.4.1:
   version "1.4.1"
@@ -2934,7 +2610,7 @@ mitt@^1.1.3:
   resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d"
   integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@^0.5.0, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -2968,63 +2644,17 @@ multipipe@^0.1.2:
   dependencies:
     duplexer2 "0.0.2"
 
-nan@^2.13.2:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
-
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-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-sass@^4.12.0:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
-  integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash "^4.17.15"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.13.2"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "2.2.5"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
 node-status-codes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
   integrity sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=
 
-"nopt@2 || 3", nopt@~3.0.6:
+nopt@~3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
@@ -3068,26 +2698,11 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
@@ -3104,9 +2719,9 @@ object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-inspect@^1.9.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
-  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b"
+  integrity sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==
 
 object.defaults@^1.1.0:
   version "1.1.0"
@@ -3204,7 +2819,7 @@ os-tmpdir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4:
+osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -3217,20 +2832,13 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -3316,11 +2924,6 @@ path-exists@^2.0.0:
   dependencies:
     pinkie-promise "^2.0.0"
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -3367,11 +2970,6 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
@@ -3439,16 +3037,6 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -3460,17 +3048,12 @@ qs@6.2.3:
   integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
 qs@^6.4.0:
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
-  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"
+  integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==
   dependencies:
     side-channel "^1.0.4"
 
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
 randomatic@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
@@ -3486,12 +3069,12 @@ range-parser@~1.2.0:
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
 raw-body@^2.3.2:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c"
-  integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
+  integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
   dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.3"
+    bytes "3.1.1"
+    http-errors "1.8.1"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
@@ -3548,7 +3131,7 @@ read-pkg@^1.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6:
+readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -3579,9 +3162,9 @@ readdirp@~3.6.0:
     picomatch "^2.2.1"
 
 rechoir@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca"
-  integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
   dependencies:
     resolve "^1.9.0"
 
@@ -3632,32 +3215,6 @@ replace-ext@^1.0.0:
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
   integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
-request@^2.87.0, request@^2.88.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -3697,7 +3254,7 @@ resp-modifier@6.0.2:
     debug "^2.2.0"
     minimatch "^3.0.2"
 
-rimraf@2, rimraf@^2.2.6, rimraf@^2.5.4:
+rimraf@^2.2.6, rimraf@^2.5.4:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -3723,7 +3280,7 @@ rxjs@^5.5.6:
   dependencies:
     symbol-observable "1.0.1"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
+safe-buffer@>=5.1.0, safe-buffer@^5.1.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -3738,34 +3295,25 @@ safe-json-parse@~1.0.1:
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
   integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-graph@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
-  integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
+sass@^1.45.0:
+  version "1.45.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.45.0.tgz#192ede1908324bb293a3e403d1841dbcaafdd323"
+  integrity sha512-ONy5bjppoohtNkFJRqdz1gscXamMzN3wQy1YH9qO2FiNpgjLhpz/IPRGg0PpCjyz/pWfCOaNEaiEGCcjOFAjqw==
   dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^13.3.2"
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
 
 sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
-  dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
-
 seek-bzip@^1.0.3:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4"
@@ -3795,11 +3343,6 @@ semver@^4.0.3:
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
   integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -3847,7 +3390,7 @@ server-destroy@1.0.1:
   resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
   integrity sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -3862,10 +3405,10 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 shebang-command@^1.2.0:
   version "1.2.0"
@@ -3889,9 +3432,9 @@ side-channel@^1.0.4:
     object-inspect "^1.9.0"
 
 signal-exit@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
+  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
 
 socket.io-adapter@~1.1.0:
   version "1.1.2"
@@ -3945,12 +3488,10 @@ socket.io@2.4.0:
     socket.io-client "2.4.0"
     socket.io-parser "~3.4.0"
 
-source-map@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
+"source-map-js@>=0.6.2 <2.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"
+  integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==
 
 source-map@^0.5.3:
   version "0.5.7"
@@ -3984,9 +3525,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f"
-  integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
+  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
 
 sprintf-js@^1.0.3:
   version "1.1.2"
@@ -4007,21 +3548,6 @@ squeak@^1.0.0:
     console-stream "^0.1.1"
     lpad-align "^1.0.1"
 
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
 stat-mode@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
@@ -4042,13 +3568,6 @@ statuses@~1.4.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
   integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
 stream-combiner2@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
@@ -4075,40 +3594,14 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
 string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
-  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
 
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
@@ -4122,33 +3615,19 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
 
 strip-bom-stream@^1.0.0:
   version "1.0.0"
@@ -4251,15 +3730,6 @@ tar-stream@^1.1.1:
     to-buffer "^1.1.1"
     xtend "^4.0.0"
 
-tar@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
-  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.12"
-    inherits "2"
-
 temp-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
@@ -4367,18 +3837,10 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
 trim-newlines@^1.0.0:
   version "1.0.0"
@@ -4392,39 +3854,20 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-"true-case-path@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
-  dependencies:
-    glob "^7.1.2"
-
 tunnel-agent@^0.4.0:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
   integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-ua-parser-js@^0.7.28:
-  version "0.7.28"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
-  integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
+ua-parser-js@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.2.tgz#e2976c34dbfb30b15d2c300b2a53eac87c57a775"
+  integrity sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
@@ -4462,13 +3905,6 @@ unzip-response@^1.0.2:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
   integrity sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=
 
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
@@ -4498,7 +3934,7 @@ uuid@^2.0.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
   integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
 
-uuid@^3.0.1, uuid@^3.3.2:
+uuid@^3.0.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -4523,15 +3959,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vinyl-assign@^1.0.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/vinyl-assign/-/vinyl-assign-1.2.1.tgz#4d198891b5515911d771a8cd9c5480a46a074a45"
@@ -4620,7 +4047,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.0.5, which@^1.2.14, which@^1.2.9:
+which@^1.0.5, which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -4634,22 +4061,6 @@ which@~2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -4710,14 +4121,6 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
@@ -4731,10 +4134,10 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+yargs@17.1.1:
+  version "17.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"
+  integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==
   dependencies:
     cliui "^7.0.2"
     escalade "^3.1.1"
@@ -4744,22 +4147,6 @@ yargs@16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^13.3.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
 yargs@^15.4.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"

From 68b13e06a8352f1fc98200c9533decac23d3d17b Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@datalets.ch>
Date: Sat, 11 Dec 2021 22:53:06 +0100
Subject: [PATCH 007/122] Wagtail 2.15.1 psycopg2 2.9.2 puput 1.1.3 redis 5.1
 crispy-forms 1.13 libsass 0.9 Pillow 8.4

---
 Pipfile          |   6 +-
 Pipfile.lock     | 713 ++++++++++++++++++++++++-----------------------
 requirements.txt |  16 +-
 3 files changed, 381 insertions(+), 354 deletions(-)

diff --git a/Pipfile b/Pipfile
index f16a9ca..b233eb1 100644
--- a/Pipfile
+++ b/Pipfile
@@ -10,10 +10,10 @@ tox = "*"
 django-debug-toolbar = "*"
 
 [packages]
-"psycopg2-binary" = "<2.9"
+"psycopg2-binary" = "*"
 ConcurrentLogHandler = "*"
 dj-database-url = "*"
-django = "<2.3"
+django = "<4"
 django-anymail = "*"
 django-colorful = "*"
 django-crispy-forms = "*"
@@ -30,7 +30,7 @@ Pillow = ">=4.0.0"
 puput = ">=1.0.0"
 python-dotenv = "*"
 stellar = "*"
-wagtail = ">=2.0,<2.13"
+wagtail = ">=2.0,<2.16"
 whitenoise = "*"
 django-toolbelt = "*"
 unidecode = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 2e2ab33..d86cabc 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "a8d6833d674518785c4eeaa99ed3f1a896f26687aa801e2b3510d900a137b0d0"
+            "sha256": "1d1f964f29366a8b2502ef51088a83d3e0c1878f594ea9d3056ea4ed77a2d625"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -16,42 +16,50 @@
     "default": {
         "anyascii": {
             "hashes": [
-                "sha256:18a77d22da66f2b5e6951f7f365b543656f16c5d7c68f7c70055f030767df403",
-                "sha256:7036c5fdefa40fe9d73a6552ac4f2821916a2a29c1368925f0b7846e536bd2ac"
+                "sha256:24f27431fb64c6c93a33125fb66f8cba007a5262bc1faabeafeda5f4bb70b593",
+                "sha256:68f6917fe5b22caf7dde8551b838e5e17d5e3c96c55734485699bd03ad92237f"
             ],
             "markers": "python_version >= '3.3'",
-            "version": "==0.2.0"
+            "version": "==0.3.0"
+        },
+        "asgiref": {
+            "hashes": [
+                "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9",
+                "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.1"
         },
         "beautifulsoup4": {
             "hashes": [
-                "sha256:05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a",
-                "sha256:9fbb4d6e48ecd30bcacc5b63b94088192dcda178513b2ae3c394229f8911b887",
-                "sha256:e1505eeed31b0f4ce2dbb3bc8eb256c04cc2b3b72af7d551a4ab6efd5cbe5dae"
+                "sha256:4c98143716ef1cb40bf7f39a8e3eec8f8b009509e74904ba3a7b315431577e35",
+                "sha256:84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25",
+                "sha256:fff47e031e34ec82bf17e00da8f592fe7de69aeea38be00523c04623c04fb666"
             ],
-            "version": "==4.8.2"
+            "version": "==4.9.3"
         },
         "certifi": {
             "hashes": [
-                "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee",
-                "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"
+                "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
+                "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
             ],
-            "version": "==2021.5.30"
+            "version": "==2021.10.8"
         },
         "charset-normalizer": {
             "hashes": [
-                "sha256:88fce3fa5b1a84fdcb3f603d889f723d1dd89b26059d0123ca435570e848d5e1",
-                "sha256:c46c3ace2d744cfbdebceaa3c19ae691f53ae621b39fd7570f59d14fb7f2fd12"
+                "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721",
+                "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"
             ],
             "markers": "python_version >= '3.0'",
-            "version": "==2.0.3"
+            "version": "==2.0.9"
         },
         "click": {
             "hashes": [
-                "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a",
-                "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"
+                "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3",
+                "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==8.0.1"
+            "version": "==8.0.3"
         },
         "concurrentloghandler": {
             "hashes": [
@@ -87,11 +95,11 @@
         },
         "django": {
             "hashes": [
-                "sha256:3339ff0e03dee13045aef6ae7b523edff75b6d726adf7a7a48f53d5a501f7db7",
-                "sha256:f2084ceecff86b1e631c2cd4107d435daf4e12f1efcdf11061a73bf0b5e95f92"
+                "sha256:074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4",
+                "sha256:df6f5eb3c797b27c096d61494507b7634526d4ce8d7c8ca1e57a4fb19c0738a3"
             ],
             "index": "pypi",
-            "version": "==2.2.24"
+            "version": "==3.2.10"
         },
         "django-anymail": {
             "hashes": [
@@ -103,10 +111,11 @@
         },
         "django-appconf": {
             "hashes": [
-                "sha256:1b1d0e1069c843ebe8ae5aa48ec52403b1440402b320c3e3a206a0907e97bb06",
-                "sha256:be58deb54a43d77d2e1621fe59f787681376d3cd0b8bd8e4758ef6c3a6453380"
+                "sha256:ae9f864ee1958c815a965ed63b3fba4874eec13de10236ba063a788f9a17389d",
+                "sha256:be3db0be6c81fa84742000b89a81c016d70ae66a7ccb620cdef592b1f1a6aaa4"
             ],
-            "version": "==1.0.4"
+            "markers": "python_version >= '3.6'",
+            "version": "==1.0.5"
         },
         "django-colorful": {
             "hashes": [
@@ -133,11 +142,11 @@
         },
         "django-crispy-forms": {
             "hashes": [
-                "sha256:a3320356c84d0cdc631e1ec7b8908aa0117bc2a5f0ab1d053d33eba08f584808",
-                "sha256:d196db62ee8b4fc32d1f9583d0e4be1bb17328b662682c1ecb9fb77bbc0fcf77"
+                "sha256:4dc9e5263c91c5f51766806a050ca2ec5c349d34c5cd91fcca3a1a0363b5e29e",
+                "sha256:9c49d29dd9e98dc2e6e3a8b02670d72deb6edf7bc616986ca412d72c306b36a0"
             ],
             "index": "pypi",
-            "version": "==1.12.0"
+            "version": "==1.13.0"
         },
         "django-el-pagination": {
             "hashes": [
@@ -148,11 +157,11 @@
         },
         "django-filter": {
             "hashes": [
-                "sha256:84e9d5bb93f237e451db814ed422a3a625751cbc9968b484ecc74964a8696b06",
-                "sha256:e00d32cebdb3d54273c48f4f878f898dced8d5dfaad009438fe61ebdf535ace1"
+                "sha256:632a251fa8f1aadb4b8cceff932bb52fe2f826dd7dfe7f3eac40e5c463d6836e",
+                "sha256:f4a6737a30104c98d2e2a5fb93043f36dd7978e0c7ddc92f5998e85433ea5063"
             ],
-            "markers": "python_version >= '3.5'",
-            "version": "==2.4.0"
+            "markers": "python_version >= '3.6'",
+            "version": "==21.1"
         },
         "django-libsass": {
             "hashes": [
@@ -164,19 +173,19 @@
         },
         "django-modelcluster": {
             "hashes": [
-                "sha256:783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08",
-                "sha256:d4a0f90e85ae1a193f417e149b6b01d0b2a867dcf97f7fae1d34a4363a9d7baa"
+                "sha256:767084078b9e172540b271454ecc73cb320927131ca4b2c5f276daf771f9542f",
+                "sha256:e541a46a0a899ef4778a4708be22e71cac3efacc09a6ff44bc065c5c9194c054"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==5.1"
+            "version": "==5.2"
         },
         "django-redis": {
             "hashes": [
-                "sha256:048f665bbe27f8ff2edebae6aa9c534ab137f1e8fa7234147ef470df3f3aa9b8",
-                "sha256:97739ca9de3f964c51412d1d7d8aecdfd86737bb197fce6e1ff12620c63c97ee"
+                "sha256:98fb3d31633a1addea1aeb558a647359908bbcf78c0833f99496c5348fe3c1b4",
+                "sha256:bf75bce0d6f65c3a6165dd6789506c8d22238f3bfaf7c4ad447e55afbc5b68cb"
             ],
             "index": "pypi",
-            "version": "==5.0.0"
+            "version": "==5.1.0"
         },
         "django-social-share": {
             "hashes": [
@@ -242,58 +251,59 @@
         },
         "greenlet": {
             "hashes": [
-                "sha256:03f28a5ea20201e70ab70518d151116ce939b412961c33827519ce620957d44c",
-                "sha256:06d7ac89e6094a0a8f8dc46aa61898e9e1aec79b0f8b47b2400dd51a44dbc832",
-                "sha256:06ecb43b04480e6bafc45cb1b4b67c785e183ce12c079473359e04a709333b08",
-                "sha256:096cb0217d1505826ba3d723e8981096f2622cde1eb91af9ed89a17c10aa1f3e",
-                "sha256:0c557c809eeee215b87e8a7cbfb2d783fb5598a78342c29ade561440abae7d22",
-                "sha256:0de64d419b1cb1bfd4ea544bedea4b535ef3ae1e150b0f2609da14bbf48a4a5f",
-                "sha256:14927b15c953f8f2d2a8dffa224aa78d7759ef95284d4c39e1745cf36e8cdd2c",
-                "sha256:16183fa53bc1a037c38d75fdc59d6208181fa28024a12a7f64bb0884434c91ea",
-                "sha256:206295d270f702bc27dbdbd7651e8ebe42d319139e0d90217b2074309a200da8",
-                "sha256:22002259e5b7828b05600a762579fa2f8b33373ad95a0ee57b4d6109d0e589ad",
-                "sha256:2325123ff3a8ecc10ca76f062445efef13b6cf5a23389e2df3c02a4a527b89bc",
-                "sha256:258f9612aba0d06785143ee1cbf2d7361801c95489c0bd10c69d163ec5254a16",
-                "sha256:3096286a6072553b5dbd5efbefc22297e9d06a05ac14ba017233fedaed7584a8",
-                "sha256:3d13da093d44dee7535b91049e44dd2b5540c2a0e15df168404d3dd2626e0ec5",
-                "sha256:408071b64e52192869129a205e5b463abda36eff0cebb19d6e63369440e4dc99",
-                "sha256:598bcfd841e0b1d88e32e6a5ea48348a2c726461b05ff057c1b8692be9443c6e",
-                "sha256:5d928e2e3c3906e0a29b43dc26d9b3d6e36921eee276786c4e7ad9ff5665c78a",
-                "sha256:5f75e7f237428755d00e7460239a2482fa7e3970db56c8935bd60da3f0733e56",
-                "sha256:60848099b76467ef09b62b0f4512e7e6f0a2c977357a036de602b653667f5f4c",
-                "sha256:6b1d08f2e7f2048d77343279c4d4faa7aef168b3e36039cba1917fffb781a8ed",
-                "sha256:70bd1bb271e9429e2793902dfd194b653221904a07cbf207c3139e2672d17959",
-                "sha256:76ed710b4e953fc31c663b079d317c18f40235ba2e3d55f70ff80794f7b57922",
-                "sha256:7920e3eccd26b7f4c661b746002f5ec5f0928076bd738d38d894bb359ce51927",
-                "sha256:7db68f15486d412b8e2cfcd584bf3b3a000911d25779d081cbbae76d71bd1a7e",
-                "sha256:8833e27949ea32d27f7e96930fa29404dd4f2feb13cce483daf52e8842ec246a",
-                "sha256:944fbdd540712d5377a8795c840a97ff71e7f3221d3fddc98769a15a87b36131",
-                "sha256:9a6b035aa2c5fcf3dbbf0e3a8a5bc75286fc2d4e6f9cfa738788b433ec894919",
-                "sha256:9bdcff4b9051fb1aa4bba4fceff6a5f770c6be436408efd99b76fc827f2a9319",
-                "sha256:a9017ff5fc2522e45562882ff481128631bf35da444775bc2776ac5c61d8bcae",
-                "sha256:aa4230234d02e6f32f189fd40b59d5a968fe77e80f59c9c933384fe8ba535535",
-                "sha256:ad80bb338cf9f8129c049837a42a43451fc7c8b57ad56f8e6d32e7697b115505",
-                "sha256:adb94a28225005890d4cf73648b5131e885c7b4b17bc762779f061844aabcc11",
-                "sha256:b3090631fecdf7e983d183d0fad7ea72cfb12fa9212461a9b708ff7907ffff47",
-                "sha256:b33b51ab057f8a20b497ffafdb1e79256db0c03ef4f5e3d52e7497200e11f821",
-                "sha256:b97c9a144bbeec7039cca44df117efcbeed7209543f5695201cacf05ba3b5857",
-                "sha256:be13a18cec649ebaab835dff269e914679ef329204704869f2f167b2c163a9da",
-                "sha256:be9768e56f92d1d7cd94185bab5856f3c5589a50d221c166cc2ad5eb134bd1dc",
-                "sha256:c1580087ab493c6b43e66f2bdd165d9e3c1e86ef83f6c2c44a29f2869d2c5bd5",
-                "sha256:c35872b2916ab5a240d52a94314c963476c989814ba9b519bc842e5b61b464bb",
-                "sha256:c70c7dd733a4c56838d1f1781e769081a25fade879510c5b5f0df76956abfa05",
-                "sha256:c767458511a59f6f597bfb0032a1c82a52c29ae228c2c0a6865cfeaeaac4c5f5",
-                "sha256:c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee",
-                "sha256:ca1c4a569232c063615f9e70ff9a1e2fee8c66a6fb5caf0f5e8b21a396deec3e",
-                "sha256:cc407b68e0a874e7ece60f6639df46309376882152345508be94da608cc0b831",
-                "sha256:da862b8f7de577bc421323714f63276acb2f759ab8c5e33335509f0b89e06b8f",
-                "sha256:dfe7eac0d253915116ed0cd160a15a88981a1d194c1ef151e862a5c7d2f853d3",
-                "sha256:ed1377feed808c9c1139bdb6a61bcbf030c236dd288d6fca71ac26906ab03ba6",
-                "sha256:f42ad188466d946f1b3afc0a9e1a266ac8926461ee0786c06baac6bd71f8a6f3",
-                "sha256:f92731609d6625e1cc26ff5757db4d32b6b810d2a3363b0ff94ff573e5901f6f"
+                "sha256:00e44c8afdbe5467e4f7b5851be223be68adb4272f44696ee71fe46b7036a711",
+                "sha256:013d61294b6cd8fe3242932c1c5e36e5d1db2c8afb58606c5a67efce62c1f5fd",
+                "sha256:049fe7579230e44daef03a259faa24511d10ebfa44f69411d99e6a184fe68073",
+                "sha256:14d4f3cd4e8b524ae9b8aa567858beed70c392fdec26dbdb0a8a418392e71708",
+                "sha256:166eac03e48784a6a6e0e5f041cfebb1ab400b394db188c48b3a84737f505b67",
+                "sha256:17ff94e7a83aa8671a25bf5b59326ec26da379ace2ebc4411d690d80a7fbcf23",
+                "sha256:1e12bdc622676ce47ae9abbf455c189e442afdde8818d9da983085df6312e7a1",
+                "sha256:21915eb821a6b3d9d8eefdaf57d6c345b970ad722f856cd71739493ce003ad08",
+                "sha256:288c6a76705dc54fba69fbcb59904ae4ad768b4c768839b8ca5fdadec6dd8cfd",
+                "sha256:32ca72bbc673adbcfecb935bb3fb1b74e663d10a4b241aaa2f5a75fe1d1f90aa",
+                "sha256:356b3576ad078c89a6107caa9c50cc14e98e3a6c4874a37c3e0273e4baf33de8",
+                "sha256:40b951f601af999a8bf2ce8c71e8aaa4e8c6f78ff8afae7b808aae2dc50d4c40",
+                "sha256:572e1787d1460da79590bf44304abbc0a2da944ea64ec549188fa84d89bba7ab",
+                "sha256:58df5c2a0e293bf665a51f8a100d3e9956febfbf1d9aaf8c0677cf70218910c6",
+                "sha256:64e6175c2e53195278d7388c454e0b30997573f3f4bd63697f88d855f7a6a1fc",
+                "sha256:7227b47e73dedaa513cdebb98469705ef0d66eb5a1250144468e9c3097d6b59b",
+                "sha256:7418b6bfc7fe3331541b84bb2141c9baf1ec7132a7ecd9f375912eca810e714e",
+                "sha256:7cbd7574ce8e138bda9df4efc6bf2ab8572c9aff640d8ecfece1b006b68da963",
+                "sha256:7ff61ff178250f9bb3cd89752df0f1dd0e27316a8bd1465351652b1b4a4cdfd3",
+                "sha256:833e1551925ed51e6b44c800e71e77dacd7e49181fdc9ac9a0bf3714d515785d",
+                "sha256:8639cadfda96737427330a094476d4c7a56ac03de7265622fcf4cfe57c8ae18d",
+                "sha256:8c790abda465726cfb8bb08bd4ca9a5d0a7bd77c7ac1ca1b839ad823b948ea28",
+                "sha256:8d2f1fb53a421b410751887eb4ff21386d119ef9cde3797bf5e7ed49fb51a3b3",
+                "sha256:903bbd302a2378f984aef528f76d4c9b1748f318fe1294961c072bdc7f2ffa3e",
+                "sha256:93f81b134a165cc17123626ab8da2e30c0455441d4ab5576eed73a64c025b25c",
+                "sha256:95e69877983ea39b7303570fa6760f81a3eec23d0e3ab2021b7144b94d06202d",
+                "sha256:9633b3034d3d901f0a46b7939f8c4d64427dfba6bbc5a36b1a67364cf148a1b0",
+                "sha256:97e5306482182170ade15c4b0d8386ded995a07d7cc2ca8f27958d34d6736497",
+                "sha256:9f3cba480d3deb69f6ee2c1825060177a22c7826431458c697df88e6aeb3caee",
+                "sha256:aa5b467f15e78b82257319aebc78dd2915e4c1436c3c0d1ad6f53e47ba6e2713",
+                "sha256:abb7a75ed8b968f3061327c433a0fbd17b729947b400747c334a9c29a9af6c58",
+                "sha256:aec52725173bd3a7b56fe91bc56eccb26fbdff1386ef123abb63c84c5b43b63a",
+                "sha256:b11548073a2213d950c3f671aa88e6f83cda6e2fb97a8b6317b1b5b33d850e06",
+                "sha256:b1692f7d6bc45e3200844be0dba153612103db241691088626a33ff1f24a0d88",
+                "sha256:b92e29e58bef6d9cfd340c72b04d74c4b4e9f70c9fa7c78b674d1fec18896dc4",
+                "sha256:be5f425ff1f5f4b3c1e33ad64ab994eed12fc284a6ea71c5243fd564502ecbe5",
+                "sha256:dd0b1e9e891f69e7675ba5c92e28b90eaa045f6ab134ffe70b52e948aa175b3c",
+                "sha256:e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a",
+                "sha256:e6a36bb9474218c7a5b27ae476035497a6990e21d04c279884eb10d9b290f1b1",
+                "sha256:e859fcb4cbe93504ea18008d1df98dee4f7766db66c435e4882ab35cf70cac43",
+                "sha256:eb6ea6da4c787111adf40f697b4e58732ee0942b5d3bd8f435277643329ba627",
+                "sha256:ec8c433b3ab0419100bd45b47c9c8551248a5aee30ca5e9d399a0b57ac04651b",
+                "sha256:eff9d20417ff9dcb0d25e2defc2574d10b491bf2e693b4e491914738b7908168",
+                "sha256:f0214eb2a23b85528310dad848ad2ac58e735612929c8072f6093f3585fd342d",
+                "sha256:f276df9830dba7a333544bd41070e8175762a7ac20350786b322b714b0e654f5",
+                "sha256:f3acda1924472472ddd60c29e5b9db0cec629fbe3c5c5accb74d6d6d14773478",
+                "sha256:f70a9e237bb792c7cc7e44c531fd48f5897961701cdaa06cf22fc14965c496cf",
+                "sha256:f9d29ca8a77117315101425ec7ec2a47a22ccf59f5593378fc4077ac5b754fce",
+                "sha256:fa877ca7f6b48054f847b61d6fa7bed5cebb663ebc55e018fda12db09dcc664c",
+                "sha256:fdcec0b8399108577ec290f55551d926d9a1fa6cad45882093a7a07ac5ec147b"
             ],
-            "markers": "python_version >= '3.0'",
-            "version": "==1.1.0"
+            "markers": "python_version >= '3.0' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))",
+            "version": "==1.1.2"
         },
         "guess-language-spirit": {
             "hashes": [
@@ -320,25 +330,26 @@
         },
         "humanize": {
             "hashes": [
-                "sha256:aab7625d62dd5e0a054c8413a47d1fa257f3bdd8e9a2442c2fe36061bdd1d9bf",
-                "sha256:b2413730ce6684f85e0439a5b80b8f402e09f03e16ab8023d1da758c6ff41148"
+                "sha256:12f113f2e369dac7f35d3823f49262934f4a22a53a6d3d4c86b736f50db88c7b",
+                "sha256:a6f7cc1597db69a4e571ad5e19b4da07ee871da5a9de2b233dbfab02d98e9754"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.10.0"
+            "version": "==3.13.1"
         },
         "idna": {
             "hashes": [
-                "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a",
-                "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"
+                "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff",
+                "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
             ],
             "markers": "python_version >= '3.0'",
-            "version": "==3.2"
+            "version": "==3.3"
         },
         "l18n": {
             "hashes": [
-                "sha256:ea7a65b2f0935b14601a3295f2c5e5e8b54126dd1e6a7fef4e44d2b8dd5b695a"
+                "sha256:1956e890d673d17135cc20913253c154f6bc1c00266c22b7d503cc1a5a42d848",
+                "sha256:78495d1df95b6f7dcc694d1ba8994df709c463a1cbac1bf016e1b9a5ce7280b9"
             ],
-            "version": "==2020.6.1"
+            "version": "==2021.3"
         },
         "libsass": {
             "hashes": [
@@ -349,6 +360,7 @@
                 "sha256:6b984510ed94993708c0d697b4fef2d118929bbfffc3b90037be0f5ccadf55e7",
                 "sha256:a005f298f64624f313a3ac618ab03f844c71d84ae4f4a4aec4b68d2a4ffe75eb",
                 "sha256:abc29357ee540849faf1383e1746d40d69ed5cb6d4c346df276b258f5aa8977a",
+                "sha256:c9ec490609752c1d81ff6290da33485aa7cb6d7365ac665b74464c1b7d97f7da",
                 "sha256:d5ba529d9ce668be9380563279f3ffe988f27bc5b299c5a28453df2e0b0fbaf2",
                 "sha256:e2b1a7d093f2e76dc694c17c0c285e846d0b0deb0e8b21dc852ba1a3a4e2f1d6"
             ],
@@ -357,55 +369,57 @@
         },
         "openpyxl": {
             "hashes": [
-                "sha256:46af4eaf201a89b610fcca177eed957635f88770a5462fb6aae4a2a52b0ff516",
-                "sha256:6456a3b472e1ef0facb1129f3c6ef00713cebf62e736cd7a75bcc3247432f251"
+                "sha256:40f568b9829bf9e446acfffce30250ac1fa39035124d55fc024025c41481c90f",
+                "sha256:8f3b11bd896a95468a4ab162fc4fcd260d46157155d1f8bfaabb99d88cfcf79f"
             ],
-            "version": "==3.0.7"
+            "version": "==3.0.9"
         },
         "pillow": {
             "hashes": [
-                "sha256:0b2efa07f69dc395d95bb9ef3299f4ca29bcb2157dc615bae0b42c3c20668ffc",
-                "sha256:114f816e4f73f9ec06997b2fde81a92cbf0777c9e8f462005550eed6bae57e63",
-                "sha256:147bd9e71fb9dcf08357b4d530b5167941e222a6fd21f869c7911bac40b9994d",
-                "sha256:15a2808e269a1cf2131930183dcc0419bc77bb73eb54285dde2706ac9939fa8e",
-                "sha256:196560dba4da7a72c5e7085fccc5938ab4075fd37fe8b5468869724109812edd",
-                "sha256:1c03e24be975e2afe70dfc5da6f187eea0b49a68bb2b69db0f30a61b7031cee4",
-                "sha256:1fd5066cd343b5db88c048d971994e56b296868766e461b82fa4e22498f34d77",
-                "sha256:29c9569049d04aaacd690573a0398dbd8e0bf0255684fee512b413c2142ab723",
-                "sha256:2b6dfa068a8b6137da34a4936f5a816aba0ecc967af2feeb32c4393ddd671cba",
-                "sha256:2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792",
-                "sha256:2ee77c14a0299d0541d26f3d8500bb57e081233e3fa915fa35abd02c51fa7fae",
-                "sha256:37730f6e68bdc6a3f02d2079c34c532330d206429f3cee651aab6b66839a9f0e",
-                "sha256:3f08bd8d785204149b5b33e3b5f0ebbfe2190ea58d1a051c578e29e39bfd2367",
-                "sha256:479ab11cbd69612acefa8286481f65c5dece2002ffaa4f9db62682379ca3bb77",
-                "sha256:4bc3c7ef940eeb200ca65bd83005eb3aae8083d47e8fcbf5f0943baa50726856",
-                "sha256:660a87085925c61a0dcc80efb967512ac34dbb256ff7dd2b9b4ee8dbdab58cf4",
-                "sha256:67b3666b544b953a2777cb3f5a922e991be73ab32635666ee72e05876b8a92de",
-                "sha256:70af7d222df0ff81a2da601fab42decb009dc721545ed78549cb96e3a1c5f0c8",
-                "sha256:75e09042a3b39e0ea61ce37e941221313d51a9c26b8e54e12b3ececccb71718a",
-                "sha256:8960a8a9f4598974e4c2aeb1bff9bdd5db03ee65fd1fce8adf3223721aa2a636",
-                "sha256:9364c81b252d8348e9cc0cb63e856b8f7c1b340caba6ee7a7a65c968312f7dab",
-                "sha256:969cc558cca859cadf24f890fc009e1bce7d7d0386ba7c0478641a60199adf79",
-                "sha256:9a211b663cf2314edbdb4cf897beeb5c9ee3810d1d53f0e423f06d6ebbf9cd5d",
-                "sha256:a17ca41f45cf78c2216ebfab03add7cc350c305c38ff34ef4eef66b7d76c5229",
-                "sha256:a2f381932dca2cf775811a008aa3027671ace723b7a38838045b1aee8669fdcf",
-                "sha256:a4eef1ff2d62676deabf076f963eda4da34b51bc0517c70239fafed1d5b51500",
-                "sha256:c088a000dfdd88c184cc7271bfac8c5b82d9efa8637cd2b68183771e3cf56f04",
-                "sha256:c0e0550a404c69aab1e04ae89cca3e2a042b56ab043f7f729d984bf73ed2a093",
-                "sha256:c11003197f908878164f0e6da15fce22373ac3fc320cda8c9d16e6bba105b844",
-                "sha256:c2a5ff58751670292b406b9f06e07ed1446a4b13ffced6b6cab75b857485cbc8",
-                "sha256:c35d09db702f4185ba22bb33ef1751ad49c266534339a5cebeb5159d364f6f82",
-                "sha256:c379425c2707078dfb6bfad2430728831d399dc95a7deeb92015eb4c92345eaf",
-                "sha256:cc866706d56bd3a7dbf8bac8660c6f6462f2f2b8a49add2ba617bc0c54473d83",
-                "sha256:d0da39795049a9afcaadec532e7b669b5ebbb2a9134576ebcc15dd5bdae33cc0",
-                "sha256:f156d6ecfc747ee111c167f8faf5f4953761b5e66e91a4e6767e548d0f80129c",
-                "sha256:f4ebde71785f8bceb39dcd1e7f06bcc5d5c3cf48b9f69ab52636309387b097c8",
-                "sha256:fc214a6b75d2e0ea7745488da7da3c381f41790812988c7a92345978414fad37",
-                "sha256:fd7eef578f5b2200d066db1b50c4aa66410786201669fb76d5238b007918fb24",
-                "sha256:ff04c373477723430dce2e9d024c708a047d44cf17166bf16e604b379bf0ca14"
+                "sha256:066f3999cb3b070a95c3652712cffa1a748cd02d60ad7b4e485c3748a04d9d76",
+                "sha256:0a0956fdc5defc34462bb1c765ee88d933239f9a94bc37d132004775241a7585",
+                "sha256:0b052a619a8bfcf26bd8b3f48f45283f9e977890263e4571f2393ed8898d331b",
+                "sha256:1394a6ad5abc838c5cd8a92c5a07535648cdf6d09e8e2d6df916dfa9ea86ead8",
+                "sha256:1bc723b434fbc4ab50bb68e11e93ce5fb69866ad621e3c2c9bdb0cd70e345f55",
+                "sha256:244cf3b97802c34c41905d22810846802a3329ddcb93ccc432870243211c79fc",
+                "sha256:25a49dc2e2f74e65efaa32b153527fc5ac98508d502fa46e74fa4fd678ed6645",
+                "sha256:2e4440b8f00f504ee4b53fe30f4e381aae30b0568193be305256b1462216feff",
+                "sha256:3862b7256046fcd950618ed22d1d60b842e3a40a48236a5498746f21189afbbc",
+                "sha256:3eb1ce5f65908556c2d8685a8f0a6e989d887ec4057326f6c22b24e8a172c66b",
+                "sha256:3f97cfb1e5a392d75dd8b9fd274d205404729923840ca94ca45a0af57e13dbe6",
+                "sha256:493cb4e415f44cd601fcec11c99836f707bb714ab03f5ed46ac25713baf0ff20",
+                "sha256:4acc0985ddf39d1bc969a9220b51d94ed51695d455c228d8ac29fcdb25810e6e",
+                "sha256:5503c86916d27c2e101b7f71c2ae2cddba01a2cf55b8395b0255fd33fa4d1f1a",
+                "sha256:5b7bb9de00197fb4261825c15551adf7605cf14a80badf1761d61e59da347779",
+                "sha256:5e9ac5f66616b87d4da618a20ab0a38324dbe88d8a39b55be8964eb520021e02",
+                "sha256:620582db2a85b2df5f8a82ddeb52116560d7e5e6b055095f04ad828d1b0baa39",
+                "sha256:62cc1afda735a8d109007164714e73771b499768b9bb5afcbbee9d0ff374b43f",
+                "sha256:70ad9e5c6cb9b8487280a02c0ad8a51581dcbbe8484ce058477692a27c151c0a",
+                "sha256:72b9e656e340447f827885b8d7a15fc8c4e68d410dc2297ef6787eec0f0ea409",
+                "sha256:72cbcfd54df6caf85cc35264c77ede902452d6df41166010262374155947460c",
+                "sha256:792e5c12376594bfcb986ebf3855aa4b7c225754e9a9521298e460e92fb4a488",
+                "sha256:7b7017b61bbcdd7f6363aeceb881e23c46583739cb69a3ab39cb384f6ec82e5b",
+                "sha256:81f8d5c81e483a9442d72d182e1fb6dcb9723f289a57e8030811bac9ea3fef8d",
+                "sha256:82aafa8d5eb68c8463b6e9baeb4f19043bb31fefc03eb7b216b51e6a9981ae09",
+                "sha256:84c471a734240653a0ec91dec0996696eea227eafe72a33bd06c92697728046b",
+                "sha256:8c803ac3c28bbc53763e6825746f05cc407b20e4a69d0122e526a582e3b5e153",
+                "sha256:93ce9e955cc95959df98505e4608ad98281fff037350d8c2671c9aa86bcf10a9",
+                "sha256:9a3e5ddc44c14042f0844b8cf7d2cd455f6cc80fd7f5eefbe657292cf601d9ad",
+                "sha256:a4901622493f88b1a29bd30ec1a2f683782e57c3c16a2dbc7f2595ba01f639df",
+                "sha256:a5a4532a12314149d8b4e4ad8ff09dde7427731fcfa5917ff16d0291f13609df",
+                "sha256:b8831cb7332eda5dc89b21a7bce7ef6ad305548820595033a4b03cf3091235ed",
+                "sha256:b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed",
+                "sha256:c70e94281588ef053ae8998039610dbd71bc509e4acbc77ab59d7d2937b10698",
+                "sha256:c8a17b5d948f4ceeceb66384727dde11b240736fddeda54ca740b9b8b1556b29",
+                "sha256:d82cdb63100ef5eedb8391732375e6d05993b765f72cb34311fab92103314649",
+                "sha256:d89363f02658e253dbd171f7c3716a5d340a24ee82d38aab9183f7fdf0cdca49",
+                "sha256:d99ec152570e4196772e7a8e4ba5320d2d27bf22fdf11743dd882936ed64305b",
+                "sha256:ddc4d832a0f0b4c52fff973a0d44b6c99839a9d016fe4e6a1cb8f3eea96479c2",
+                "sha256:e3dacecfbeec9a33e932f00c6cd7996e62f53ad46fbe677577394aaa90ee419a",
+                "sha256:eb9fc393f3c61f9054e1ed26e6fe912c7321af2f41ff49d3f83d05bacf22cc78"
             ],
             "index": "pypi",
-            "version": "==8.3.1"
+            "version": "==8.4.0"
         },
         "psutil": {
             "hashes": [
@@ -443,117 +457,123 @@
         },
         "psycopg2": {
             "hashes": [
-                "sha256:079d97fc22de90da1d370c90583659a9f9a6ee4007355f5825e5f1c70dffc1fa",
-                "sha256:2087013c159a73e09713294a44d0c8008204d06326006b7f652bef5ace66eebb",
-                "sha256:2c992196719fadda59f72d44603ee1a2fdcc67de097eea38d41c7ad9ad246e62",
-                "sha256:7640e1e4d72444ef012e275e7b53204d7fab341fb22bc76057ede22fe6860b25",
-                "sha256:7f91312f065df517187134cce8e395ab37f5b601a42446bdc0f0d51773621854",
-                "sha256:830c8e8dddab6b6716a4bf73a09910c7954a92f40cf1d1e702fb93c8a919cc56",
-                "sha256:89409d369f4882c47f7ea20c42c5046879ce22c1e4ea20ef3b00a4dfc0a7f188",
-                "sha256:bf35a25f1aaa8a3781195595577fcbb59934856ee46b4f252f56ad12b8043bcf",
-                "sha256:de5303a6f1d0a7a34b9d40e4d3bef684ccc44a49bbe3eb85e3c0bffb4a131b7c"
+                "sha256:26322c3f114de1f60c1b0febf8fdd595c221b4f624524178f515d07350a71bd1",
+                "sha256:6796ac614412ce374587147150e56d03b7845c9e031b88aacdcadc880e81bb38",
+                "sha256:77b9105ef37bc005b8ffbcb1ed6d8685bb0e8ce84773738aa56421a007ec5a7a",
+                "sha256:77d09a79f9739b97099d2952bbbf18eaa4eaf825362387acbb9552ec1b3fa228",
+                "sha256:91c7fd0fe9e6c118e8ff5b665bc3445781d3615fa78e131d0b4f8c85e8ca9ec8",
+                "sha256:a761b60da0ecaf6a9866985bcde26327883ac3cdb90535ab68b8d784f02b05ef",
+                "sha256:a84da9fa891848e0270e8e04dcca073bc9046441eeb47069f5c0e36783debbea",
+                "sha256:b8816c6410fa08d2a022e4e38d128bae97c1855e176a00493d6ec62ccd606d57",
+                "sha256:dfc32db6ce9ecc35a131320888b547199f79822b028934bb5b332f4169393e15",
+                "sha256:f65cba7924363e0d2f416041b48ff69d559548f2cb168ff972c54e09e1e64db8",
+                "sha256:fd7ddab7d6afee4e21c03c648c8b667b197104713e57ec404d5b74097af21e31"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==2.9.1"
+            "version": "==2.9.2"
         },
         "psycopg2-binary": {
             "hashes": [
-                "sha256:0deac2af1a587ae12836aa07970f5cb91964f05a7c6cdb69d8425ff4c15d4e2c",
-                "sha256:0e4dc3d5996760104746e6cfcdb519d9d2cd27c738296525d5867ea695774e67",
-                "sha256:11b9c0ebce097180129e422379b824ae21c8f2a6596b159c7659e2e5a00e1aa0",
-                "sha256:15978a1fbd225583dd8cdaf37e67ccc278b5abecb4caf6b2d6b8e2b948e953f6",
-                "sha256:1fabed9ea2acc4efe4671b92c669a213db744d2af8a9fc5d69a8e9bc14b7a9db",
-                "sha256:2dac98e85565d5688e8ab7bdea5446674a83a3945a8f416ad0110018d1501b94",
-                "sha256:42ec1035841b389e8cc3692277a0bd81cdfe0b65d575a2c8862cec7a80e62e52",
-                "sha256:6422f2ff0919fd720195f64ffd8f924c1395d30f9a495f31e2392c2efafb5056",
-                "sha256:6a32f3a4cb2f6e1a0b15215f448e8ce2da192fd4ff35084d80d5e39da683e79b",
-                "sha256:7312e931b90fe14f925729cde58022f5d034241918a5c4f9797cac62f6b3a9dd",
-                "sha256:7d92a09b788cbb1aec325af5fcba9fed7203897bbd9269d5691bb1e3bce29550",
-                "sha256:833709a5c66ca52f1d21d41865a637223b368c0ee76ea54ca5bad6f2526c7679",
-                "sha256:89705f45ce07b2dfa806ee84439ec67c5d9a0ef20154e0e475e2b2ed392a5b83",
-                "sha256:8cd0fb36c7412996859cb4606a35969dd01f4ea34d9812a141cd920c3b18be77",
-                "sha256:950bc22bb56ee6ff142a2cb9ee980b571dd0912b0334aa3fe0fe3788d860bea2",
-                "sha256:a0c50db33c32594305b0ef9abc0cb7db13de7621d2cadf8392a1d9b3c437ef77",
-                "sha256:a0eb43a07386c3f1f1ebb4dc7aafb13f67188eab896e7397aa1ee95a9c884eb2",
-                "sha256:aaa4213c862f0ef00022751161df35804127b78adf4a2755b9f991a507e425fd",
-                "sha256:ac0c682111fbf404525dfc0f18a8b5f11be52657d4f96e9fcb75daf4f3984859",
-                "sha256:ad20d2eb875aaa1ea6d0f2916949f5c08a19c74d05b16ce6ebf6d24f2c9f75d1",
-                "sha256:b4afc542c0ac0db720cf516dd20c0846f71c248d2b3d21013aa0d4ef9c71ca25",
-                "sha256:b8a3715b3c4e604bcc94c90a825cd7f5635417453b253499664f784fc4da0152",
-                "sha256:ba28584e6bca48c59eecbf7efb1576ca214b47f05194646b081717fa628dfddf",
-                "sha256:ba381aec3a5dc29634f20692349d73f2d21f17653bda1decf0b52b11d694541f",
-                "sha256:bd1be66dde2b82f80afb9459fc618216753f67109b859a361cf7def5c7968729",
-                "sha256:c2507d796fca339c8fb03216364cca68d87e037c1f774977c8fc377627d01c71",
-                "sha256:cec7e622ebc545dbb4564e483dd20e4e404da17ae07e06f3e780b2dacd5cee66",
-                "sha256:d14b140a4439d816e3b1229a4a525df917d6ea22a0771a2a78332273fd9528a4",
-                "sha256:d1b4ab59e02d9008efe10ceabd0b31e79519da6fb67f7d8e8977118832d0f449",
-                "sha256:d5227b229005a696cc67676e24c214740efd90b148de5733419ac9aaba3773da",
-                "sha256:e1f57aa70d3f7cc6947fd88636a481638263ba04a742b4a37dd25c373e41491a",
-                "sha256:e74a55f6bad0e7d3968399deb50f61f4db1926acf4a6d83beaaa7df986f48b1c",
-                "sha256:e82aba2188b9ba309fd8e271702bd0d0fc9148ae3150532bbb474f4590039ffb",
-                "sha256:ee69dad2c7155756ad114c02db06002f4cded41132cc51378e57aad79cc8e4f4",
-                "sha256:f5ab93a2cb2d8338b1674be43b442a7f544a0971da062a5da774ed40587f18f5"
+                "sha256:029e09a892b9ebc3c77851f69ce0720e1b72a9c6850460cee49b14dfbf9ccdd2",
+                "sha256:108b0380969ddab7c8ef2a813a57f87b308b2f88ec15f1a1e7b653964a3cfb25",
+                "sha256:14427437117f38e65f71db65d8eafd0e86837be456567798712b8da89db2b2dd",
+                "sha256:234b1f48488b2f86aac04fb00cb04e5e9bcb960f34fa8a8e41b73149d581a93b",
+                "sha256:2e4bbcfb403221ea1953f3e0a85cef00ed15c1683a66cf35c956a7e37c33a4c4",
+                "sha256:2eecbdc5fa5886f2dd6cc673ce4291cc0fb8900965315268960ad9c2477f8276",
+                "sha256:37c8f00f7a2860bac9f7a54f03c243fc1dd9b367e5b2b52f5a02e5f4e9d8c49b",
+                "sha256:3865d0cd919349c45603bd7e80249a382c5ecf8106304cfd153282adf9684b6a",
+                "sha256:3a320e7a804f3886a599fea507364aaafbb8387027fffcdfbd34d96316c806c7",
+                "sha256:3ac83656ff4fbe7f2a956ab085e3eb1d678df54759965d509bdd6a06ce520d49",
+                "sha256:497372cc76e6cbce2f51b37be141f360a321423c03eb9be45524b1d123f4cd11",
+                "sha256:4c2dea4deac3dd3687e32daeb0712ee96c535970dfdded37a11de6a21145ab0e",
+                "sha256:53912199abb626a7249c662e72b70b4f57bf37f840599cec68625171435790dd",
+                "sha256:5671699aff57d22a245b7f4bba89e3de97dc841c5e98bd7f685429b2b20eca47",
+                "sha256:578c279cd1ce04f05ae0912530ece00bab92854911808e5aec27588aba87e361",
+                "sha256:717525cdc97b23182ff6f470fb5bf6f0bc796b5a7000c6f6699d6679991e4a5e",
+                "sha256:7585ca73dcfe326f31fafa8f96e6bb98ea9e9e46c7a1924ec8101d797914ae27",
+                "sha256:7e6bd4f532c2cd297b81114526176b240109a1c52020adca69c3f3226c65dc18",
+                "sha256:8d2aafe46eb87742425ece38130510fbb035787ee89a329af299029c4d9ae318",
+                "sha256:9c0aaad07941419926b9bd00171e49fe6b06e42e5527fb91671e137fe6c93d77",
+                "sha256:a04cfa231e7d9b63639e62166a4051cb47ca599fa341463fa3e1c48585fcee64",
+                "sha256:a1852c5bef7e5f52bd43fde5eda610d4df0fb2efc31028150933e84b4140d47a",
+                "sha256:a507db7758953b1b170c4310691a1a89877029b1e11b08ba5fc8ae3ddb35596b",
+                "sha256:a77e98c68b0e6c51d4d6a994d22b30e77276cbd33e4aabdde03b9ad3a2c148aa",
+                "sha256:aa2847d8073951dbc84c4f8b32c620764db3c2eb0d99a04835fecfab7d04816e",
+                "sha256:b592f09ff18cfcc9037b9a976fcd62db48cae9dbd5385f2471d4c2ba40c52b4d",
+                "sha256:b9d45374ba98c1184df9cce93a0b766097544f8bdfcd5de83ff10f939c193125",
+                "sha256:bf31e6fdb4ec1f6d98a07f48836508ed6edd19b48b13bbf168fbc1bd014b4ca2",
+                "sha256:c0e1fb7097ded2cc44d9037cfc68ad86a30341261492e7de95d180e534969fb2",
+                "sha256:c6e16e085fe6dc6c099ee0be56657aa9ad71027465ef9591d302ba230c404c7e",
+                "sha256:daf6b5c62eb738872d61a1fa740d7768904911ba5a7e055ed72169d379b58beb",
+                "sha256:db1b03c189f85b8df29030ad32d521dd7dcb862fd5f8892035314f5b886e70ce",
+                "sha256:eeee7b18c51d02e49bf1984d7af26e8843fe68e31fa1cbab5366ebdfa1c89ade",
+                "sha256:ef97578fab5115e3af4334dd3376dea3c3a79328a3314b21ec7ced02920b916d",
+                "sha256:f4dff0f15af6936c6fe6da7067b4216edbbe076ad8625da819cc066591b1133c",
+                "sha256:f9c37ecb173d76cf49e519133fd70851b8f9c38b6b8c1cb7fcfc71368d4cc6fc"
             ],
             "index": "pypi",
-            "version": "==2.8.6"
+            "version": "==2.9.2"
         },
         "puput": {
             "hashes": [
-                "sha256:01749d0c1cf9680313691ec6ddb7c5123e1a8d18d894499c93ceba34262b9a55",
-                "sha256:a0c8df9d2be2ab85a78d22a7d245e6bddbff085244e7eaa6815e7930f6944225"
+                "sha256:9db5626816f3afff400ada74dbb5fdc38b32e3a4dfa5eb0b04e5a25a20c503cb"
             ],
             "index": "pypi",
-            "version": "==1.1.1"
+            "version": "==1.1.3"
         },
         "python-dotenv": {
             "hashes": [
-                "sha256:aae25dc1ebe97c420f50b81fb0e5c949659af713f31fdb63c749ca68748f34b1",
-                "sha256:f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"
+                "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3",
+                "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"
             ],
             "index": "pypi",
-            "version": "==0.19.0"
+            "version": "==0.19.2"
         },
         "pytz": {
             "hashes": [
-                "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da",
-                "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"
+                "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c",
+                "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"
             ],
-            "version": "==2021.1"
+            "version": "==2021.3"
         },
         "pyyaml": {
             "hashes": [
-                "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf",
-                "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696",
-                "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393",
-                "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77",
-                "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922",
-                "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5",
-                "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8",
-                "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10",
-                "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc",
-                "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018",
-                "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e",
-                "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253",
-                "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347",
-                "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183",
-                "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541",
-                "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb",
-                "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185",
-                "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc",
-                "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db",
-                "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa",
-                "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46",
-                "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122",
-                "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b",
-                "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63",
-                "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df",
-                "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc",
-                "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247",
-                "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6",
-                "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"
+                "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293",
+                "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b",
+                "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57",
+                "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b",
+                "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4",
+                "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07",
+                "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba",
+                "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9",
+                "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287",
+                "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513",
+                "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0",
+                "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0",
+                "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92",
+                "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f",
+                "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2",
+                "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc",
+                "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c",
+                "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86",
+                "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4",
+                "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c",
+                "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34",
+                "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b",
+                "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c",
+                "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb",
+                "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737",
+                "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3",
+                "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d",
+                "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53",
+                "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78",
+                "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803",
+                "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a",
+                "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174",
+                "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==5.4.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==6.0"
         },
         "rcssmin": {
             "hashes": [
@@ -597,10 +617,10 @@
         },
         "schema": {
             "hashes": [
-                "sha256:cf97e4cd27e203ab6bb35968532de1ed8991bce542a646f0ff1d643629a4945d",
-                "sha256:fbb6a52eb2d9facf292f233adcc6008cffd94343c63ccac9a1cb1f3e6de1db17"
+                "sha256:f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197",
+                "sha256:f3ffdeeada09ec34bf40d7d79996d9f7175db93b7a5065de0faa7f41083c1e6c"
             ],
-            "version": "==0.7.4"
+            "version": "==0.7.5"
         },
         "six": {
             "hashes": [
@@ -612,63 +632,68 @@
         },
         "soupsieve": {
             "hashes": [
-                "sha256:052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc",
-                "sha256:c2c1c2d44f158cdbddab7824a9af8c4f83c76b1e23e049479aa432feb6c4c23b"
+                "sha256:1a3cca2617c6b38c0343ed661b1fa5de5637f257d4fe22bd9f1338010a1efefb",
+                "sha256:b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9"
             ],
-            "markers": "python_version >= '3.6'",
-            "version": "==2.2.1"
+            "markers": "python_version >= '3.0'",
+            "version": "==2.3.1"
         },
         "sqlalchemy": {
             "hashes": [
-                "sha256:09dbb4bc01a734ccddbf188deb2a69aede4b3c153a72b6d5c6900be7fb2945b1",
-                "sha256:12bac5fa1a6ea870bdccb96fe01610641dd44ebe001ed91ef7fcd980e9702db5",
-                "sha256:1fdae7d980a2fa617d119d0dc13ecb5c23cc63a8b04ffcb5298f2c59d86851e9",
-                "sha256:26daa429f039e29b1e523bf763bfab17490556b974c77b5ca7acb545b9230e9a",
-                "sha256:36a089dc604032d41343d86290ce85d4e6886012eea73faa88001260abf5ff81",
-                "sha256:39b5d36ab71f73c068cdcf70c38075511de73616e6c7fdd112d6268c2704d9f5",
-                "sha256:4014978de28163cd8027434916a92d0f5bb1a3a38dff5e8bf8bff4d9372a9117",
-                "sha256:44d23ea797a5e0be71bc5454b9ae99158ea0edc79e2393c6e9a2354de88329c0",
-                "sha256:488608953385d6c127d2dcbc4b11f8d7f2f30b89f6bd27c01b042253d985cc2f",
-                "sha256:5102b9face693e8b2db3b2539c7e1a5d9a5b4dc0d79967670626ffd2f710d6e6",
-                "sha256:5908ea6c652a050d768580d01219c98c071e71910ab8e7b42c02af4010608397",
-                "sha256:5d856cc50fd26fc8dd04892ed5a5a3d7eeb914fea2c2e484183e2d84c14926e0",
-                "sha256:68393d3fd31469845b6ba11f5b4209edbea0b58506be0e077aafbf9aa2e21e11",
-                "sha256:6a16c7c4452293da5143afa3056680db2d187b380b3ef4d470d4e29885720de3",
-                "sha256:756f5d2f5b92d27450167247fb574b09c4cd192a3f8c2e493b3e518a204ee543",
-                "sha256:891927a49b2363a4199763a9d436d97b0b42c65922a4ea09025600b81a00d17e",
-                "sha256:9bfe882d5a1bbde0245dca0bd48da0976bd6634cf2041d2fdf0417c5463e40e5",
-                "sha256:9fcbb4b4756b250ed19adc5e28c005b8ed56fdb5c21efa24c6822c0575b4964d",
-                "sha256:a00d9c6d3a8afe1d1681cd8a5266d2f0ed684b0b44bada2ca82403b9e8b25d39",
-                "sha256:a5e14cb0c0a4ac095395f24575a0e7ab5d1be27f5f9347f1762f21505e3ba9f1",
-                "sha256:b48148ceedfb55f764562e04c00539bb9ea72bf07820ca15a594a9a049ff6b0e",
-                "sha256:b7fb937c720847879c7402fe300cfdb2aeff22349fa4ea3651bca4e2d6555939",
-                "sha256:bc34a007e604091ca3a4a057525efc4cefd2b7fe970f44d20b9cfa109ab1bddb",
-                "sha256:c9373ef67a127799027091fa53449125351a8c943ddaa97bec4e99271dbb21f4",
-                "sha256:d09a760b0a045b4d799102ae7965b5491ccf102123f14b2a8cc6c01d1021a2d9",
-                "sha256:ec1be26cdccd60d180359a527d5980d959a26269a2c7b1b327a1eea0cab37ed8",
-                "sha256:eedd76f135461cf237534a6dc0d1e0f6bb88a1dc193678fab48a11d223462da5",
-                "sha256:f028ef6a1d828bc754852a022b2160e036202ac8658a6c7d34875aafd14a9a15",
-                "sha256:f814d80844969b0d22ea63663da4de5ca1c434cfbae226188901e5d368792c17",
-                "sha256:fd2102a8f8a659522719ed73865dff3d3cc76eb0833039dc473e0ad3041d04be"
+                "sha256:08e39d65b38d4c3f77c4c9bf090b0ba4ec5721a6e0a74b63d2a9781cdcacf142",
+                "sha256:2019b332cf4f9a513133fdf056dc4cecec7fbae7016ebc574d0f310103eed7ee",
+                "sha256:261fcb3ff8c59e17ec44f9e61713a44ceaa97ae816da978d5cd1dc2c36f32478",
+                "sha256:29d10796e5604ab7bc067eda7231a2d2411a51eda43082673641245a49d1c4bb",
+                "sha256:387365c157e96eceacdd6c5468815ad05a523ba778680de4c8139a029e1fe044",
+                "sha256:38df997ffa9007e953ad574f2263f61b9b683fd63ae397480ea4960be9bda0fd",
+                "sha256:3b64f5d1c1d0e5f2ed4aa66f2b65ff6bdcdf4c5cc83b71c4bbf69695b09e9e19",
+                "sha256:41a02030f8934b0de843341e7014192a0c16ee2726a06da154c81153fbe56b33",
+                "sha256:4490b10f83cd56ca2cdcd94b140d89911ac331e42a727b79157963b1b04fdd0c",
+                "sha256:4999b03daa6c9afb9a0bf9e3b8769128ef1880557dacfca86fa7562920c49f6b",
+                "sha256:525e962af8f25fc24ce019e6f237d49f8720d757a8a56c9b4caa2d91e2c66111",
+                "sha256:555d56b71f61b4c9fa55fe203fe6e1e561c9385fa97c5849783ae050a89113af",
+                "sha256:5639800f1cfe751569af2242041b30a08a6c0b9e5d95ed674ec8082d381eff13",
+                "sha256:5d91dce14ac3347bce301062ca825e7fb7e15c133f3909f15989e94878b1082f",
+                "sha256:61965abc63c8b54038574698888e91a126753a4bdc0ec001397acb14501834e0",
+                "sha256:6dd6fa51cf08d9433d28802228d2204e175324f1a284c4492e4af2dd36a2d485",
+                "sha256:7fdb7b775fb0739d3e71461509f978beb788935bc0aa9e47df14837cb33e5226",
+                "sha256:83ee7f6fa5faed23996c67044376d46815f65183ad6d744d94d68b18cdef060b",
+                "sha256:853de08e881dae0305647dd61b4429758f11d1bf02a9faf02793cad44bb2e0d5",
+                "sha256:b5541355b8d4970753d4f7292f73a320704b20406e06cd29b469d156f0a484d8",
+                "sha256:b72744fed32ecf2bf786d2e2f6756c04126c323ba939f47177b9722775626889",
+                "sha256:bb2d8530b7cc94b7fd9341843c3e49b6db48ea22313a8db9df21c41615b5e7b1",
+                "sha256:bf2c1d64c4ee0f30e08e1844ff0acf3c1b6c4277c0e89ec3e8bf1722d245b108",
+                "sha256:c3497cd63c5f90112b8882ea4dd694052166f779ce9055cd5c4305e0b76d72d9",
+                "sha256:c85ead1d17acc5e8b282c578394dba253728bcbcbeb66e4ef0e25f4bab53935a",
+                "sha256:c90b21360cf14d33c8a004f991aa336c7906a8db825d4ec38722c5ff1c47dada",
+                "sha256:ca500f30619daf863ab1c66d57d53a0987361a8f3266454290198aabd18f2599",
+                "sha256:ce4f2b34378561bc2e42635888fe86efe13d104ba1d95b5ca67b4d60d8e53e67",
+                "sha256:cf3a3c2f32d53a4166b2eb8de35f93bcb640e51c32033024af500017d8e8a8c9",
+                "sha256:daddcd6ba1706cc5fcc9cfaa913aa4bf331172dc7efd385fe3ee1feae3b513bc",
+                "sha256:dd041324328cece3ccdf70cfbd71b5ab968e564a22318ffd88b054f5eadeb9be",
+                "sha256:dfa093bd8ecfceafff62078910178567323005e44fbe4d7933e6cbce4512cea2",
+                "sha256:e659f256b7d402338563913bdeba53bf1eadd4c09e6f6dc93cc47938f7962a8f",
+                "sha256:f25c02991e22ddce134ef1093ef5a9d5de448fc87b91432e4f879826e93cd1c7",
+                "sha256:f667a947378bcb12a371ab38bed1b708f3a682d1ba30176422652082919285a2"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==1.4.22"
+            "version": "==1.4.28"
         },
         "sqlalchemy-utils": {
             "hashes": [
-                "sha256:a6aaee154f798be4e479af0ceffaa5034d35fcf6f40707c0947d21bde64e05e5",
-                "sha256:b1bf67d904fed16b16ef1dc07f03e5e93a6b23899f920f6b41c09be45fbb85f2"
+                "sha256:4667edbdcb1ece011076b69772ef524bfbb17cc97e03f11ee6b85d98e7741d61",
+                "sha256:bb6f4da8ac044cb0dd4d0278b1fb434141a5ee9d1881c757a076830ddbb04160"
             ],
             "markers": "python_version ~= '3.4'",
-            "version": "==0.37.8"
+            "version": "==0.37.9"
         },
         "sqlparse": {
             "hashes": [
-                "sha256:017cde379adbd6a1f15a61873f43e8274179378e95ef3fede90b5aa64d304ed0",
-                "sha256:0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8"
+                "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae",
+                "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==0.4.1"
+            "version": "==0.4.2"
         },
         "static3": {
             "hashes": [
@@ -689,35 +714,43 @@
                 "xlsx"
             ],
             "hashes": [
-                "sha256:41aa40981cddd7ec4d1fabeae7c38d271601b306386bd05b5c3bcae13e5aeb20",
-                "sha256:f83cac08454f225a34a305daa20e2110d5e6335135d505f93bc66583a5f9c10d"
+                "sha256:26141c9cf2d5904a2228d3f5d45f8a46a3f3f2f0fbb4c33b4a1c1ddca9f31348",
+                "sha256:d64c9f6712918a3d90ec5d71b44b8bab1083e3609e4844ad2be80eb633e097ed"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==3.0.0"
+            "version": "==3.1.0"
+        },
+        "telepath": {
+            "hashes": [
+                "sha256:801615094d3d964e178183099bf04020f4ff9c84ec43945d40b096df0a5767ee",
+                "sha256:ef4cf2a45ed1908c58639c346756955f8a73ae79002a8116d596b3fd702bf84c"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==0.2"
         },
         "unidecode": {
             "hashes": [
-                "sha256:12435ef2fc4cdfd9cf1035a1db7e98b6b047fe591892e81f34e94959591fad00",
-                "sha256:8d73a97d387a956922344f6b74243c2c6771594659778744b2dbdaad8f6b727d"
+                "sha256:215fe33c9d1c889fa823ccb66df91b02524eb8cc8c9c80f9c5b8129754d27829",
+                "sha256:669898c1528912bcf07f9819dc60df18d057f7528271e31f8ec28cc88ef27504"
             ],
             "index": "pypi",
-            "version": "==1.2.0"
+            "version": "==1.3.2"
         },
         "urllib3": {
             "hashes": [
-                "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4",
-                "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"
+                "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece",
+                "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==1.26.6"
+            "version": "==1.26.7"
         },
         "wagtail": {
             "hashes": [
-                "sha256:aa577f78f0cdbbabbd837b4d90986f6c6357d1b0172bcb79fd1c83fcee3681ba",
-                "sha256:f39b2ca9d106567a74aad34fc3c63b8acf4a07ff0737c6e1e071334885dc7252"
+                "sha256:6f1bc7960a7028a6e665a0f5a15ef2ba89faad66060bc4b3952a922fbef1713b",
+                "sha256:97eb520db0056d576b698e832de2ecfa3d795e9ed12e4b9ab738623c1b6277a0"
             ],
             "index": "pypi",
-            "version": "==2.12.6"
+            "version": "==2.15.1"
         },
         "webencodings": {
             "hashes": [
@@ -750,10 +783,11 @@
         },
         "xlsxwriter": {
             "hashes": [
-                "sha256:15b65f02f7ecdcfb1f22794b1fcfed8e9a49e8b7414646f90347be5cbf464234",
-                "sha256:791567acccc485ba76e0b84bccced2651981171de5b47d541520416f2f9f93e3"
+                "sha256:1aa65166697c42284e82f5bf9a33c2e913341eeef2b262019c3f5b5334768765",
+                "sha256:53005f03e8eb58f061ebf41d5767c7495ee0772c2396fe26b7e0ca22fa9c2570"
             ],
-            "version": "==1.4.4"
+            "markers": "python_version >= '3.4'",
+            "version": "==3.0.2"
         },
         "xlwt": {
             "hashes": [
@@ -782,41 +816,42 @@
         },
         "backports.entry-points-selectable": {
             "hashes": [
-                "sha256:988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a",
-                "sha256:a6d9a871cde5e15b4c4a53e3d43ba890cc6861ec1332c9c2428c92f977192acc"
+                "sha256:7fceed9532a7aa2bd888654a7314f864a3c16a4e710b34a58cfc0f08114c663b",
+                "sha256:914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"
             ],
             "markers": "python_version >= '2.7'",
-            "version": "==1.1.0"
+            "version": "==1.1.1"
         },
         "distlib": {
             "hashes": [
-                "sha256:106fef6dc37dd8c0e2c0a60d3fca3e77460a48907f335fa28420463a6f799736",
-                "sha256:23e223426b28491b1ced97dc3bbe183027419dfc7982b4fa2f05d5f3ff10711c"
+                "sha256:6564fe0a8f51e734df6333d08b8b94d4ea8ee6b99b5ed50613f731fd4089f34b",
+                "sha256:e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"
             ],
-            "version": "==0.3.2"
+            "version": "==0.3.4"
         },
         "django": {
             "hashes": [
-                "sha256:3339ff0e03dee13045aef6ae7b523edff75b6d726adf7a7a48f53d5a501f7db7",
-                "sha256:f2084ceecff86b1e631c2cd4107d435daf4e12f1efcdf11061a73bf0b5e95f92"
+                "sha256:074e8818b4b40acdc2369e67dcd6555d558329785408dcd25340ee98f1f1d5c4",
+                "sha256:df6f5eb3c797b27c096d61494507b7634526d4ce8d7c8ca1e57a4fb19c0738a3"
             ],
             "index": "pypi",
-            "version": "==2.2.24"
+            "version": "==3.2.10"
         },
         "django-debug-toolbar": {
             "hashes": [
-                "sha256:a5ff2a54f24bf88286f9872836081078f4baa843dc3735ee88524e89f8821e33",
-                "sha256:e759e63e3fe2d3110e0e519639c166816368701eab4a47fed75d7de7018467b9"
+                "sha256:8c5b13795d4040008ee69ba82dcdd259c49db346cf7d0de6e561a49d191f0860",
+                "sha256:d7bab7573fab35b0fd029163371b7182f5826c13da69734beb675c761d06a4d3"
             ],
             "index": "pypi",
-            "version": "==3.2.1"
+            "version": "==3.2.2"
         },
         "filelock": {
             "hashes": [
-                "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59",
-                "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"
+                "sha256:2e139a228bcf56dd8b2274a65174d005c4a6b68540ee0bdbb92c76f43f29f7e8",
+                "sha256:93d512b32a23baf4cac44ffd72ccf70732aeff7b8050fcaf6d3ec406d954baf4"
             ],
-            "version": "==3.0.12"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.4.0"
         },
         "iniconfig": {
             "hashes": [
@@ -827,51 +862,51 @@
         },
         "packaging": {
             "hashes": [
-                "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7",
-                "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"
+                "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb",
+                "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"
             ],
             "markers": "python_version >= '3.6'",
-            "version": "==21.0"
+            "version": "==21.3"
         },
         "platformdirs": {
             "hashes": [
-                "sha256:0b9547541f599d3d242078ae60b927b3e453f0ad52f58b4d4bc3be86aed3ec41",
-                "sha256:3b00d081227d9037bbbca521a5787796b5ef5000faea1e43fd76f1d44b06fcfa"
+                "sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2",
+                "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==2.0.2"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.4.0"
         },
         "pluggy": {
             "hashes": [
-                "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0",
-                "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"
+                "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159",
+                "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==0.13.1"
+            "markers": "python_version >= '3.6'",
+            "version": "==1.0.0"
         },
         "py": {
             "hashes": [
-                "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3",
-                "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"
+                "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719",
+                "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.10.0"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==1.11.0"
         },
         "pyparsing": {
             "hashes": [
-                "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1",
-                "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"
+                "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4",
+                "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==2.4.7"
+            "markers": "python_version >= '3.6'",
+            "version": "==3.0.6"
         },
         "pytest": {
             "hashes": [
-                "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b",
-                "sha256:91ef2131a9bd6be8f76f1f08eac5c5317221d6ad1e143ae03894b862e8976890"
+                "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89",
+                "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"
             ],
             "index": "pypi",
-            "version": "==6.2.4"
+            "version": "==6.2.5"
         },
         "pytest-splinter": {
             "hashes": [
@@ -880,13 +915,6 @@
             "index": "pypi",
             "version": "==3.3.1"
         },
-        "pytz": {
-            "hashes": [
-                "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da",
-                "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"
-            ],
-            "version": "==2021.1"
-        },
         "selenium": {
             "hashes": [
                 "sha256:2d7131d7bc5a5b99a2d9b04aaf2612c411b03b8ca1b1ee8d3de5845a9be2cb3c",
@@ -904,19 +932,18 @@
         },
         "splinter": {
             "hashes": [
-                "sha256:18b9d992352953cdd61ca8ece9616c9f214b47caebf8893266cb46bce60f6d60",
-                "sha256:218f4433018f9d1710a3201de7c22284273ab8bf29e5793247844fd74aafaf89",
-                "sha256:3f63f946fd96b750b4fd3c49ffb17abd6dc03d094b4836753e6be33f53fcfee1"
+                "sha256:8d0734d483cb288f9edef2c7f5f5ad007dce6918e7bb902fe72057361219bf96",
+                "sha256:dbbbbee217d47d63bf607afdd2e2bdcee173dfbf492480115a5b99b201963ef0"
             ],
-            "version": "==0.15.0"
+            "version": "==0.16.0"
         },
         "sqlparse": {
             "hashes": [
-                "sha256:017cde379adbd6a1f15a61873f43e8274179378e95ef3fede90b5aa64d304ed0",
-                "sha256:0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8"
+                "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae",
+                "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d"
             ],
             "markers": "python_version >= '3.5'",
-            "version": "==0.4.1"
+            "version": "==0.4.2"
         },
         "toml": {
             "hashes": [
@@ -928,27 +955,27 @@
         },
         "tox": {
             "hashes": [
-                "sha256:67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8",
-                "sha256:c990028355f0d0b681e3db9baa89dd9f839a6e999c320029339f6a6b36160591"
+                "sha256:5e274227a53dc9ef856767c21867377ba395992549f02ce55eb549f9fb9a8d10",
+                "sha256:c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca"
             ],
             "index": "pypi",
-            "version": "==3.24.0"
+            "version": "==3.24.4"
         },
         "urllib3": {
             "hashes": [
-                "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4",
-                "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"
+                "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece",
+                "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==1.26.6"
+            "version": "==1.26.7"
         },
         "virtualenv": {
             "hashes": [
-                "sha256:51df5d8a2fad5d1b13e088ff38a433475768ff61f202356bb9812c454c20ae45",
-                "sha256:e4fc84337dce37ba34ef520bf2d4392b392999dbe47df992870dc23230f6b758"
+                "sha256:4b02e52a624336eece99c96e3ab7111f469c24ba226a53ec474e8e787b365814",
+                "sha256:576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==20.6.0"
+            "version": "==20.10.0"
         }
     }
 }
diff --git a/requirements.txt b/requirements.txt
index 9325c41..7faa249 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,30 +1,30 @@
 # Updated: 21.07.2021
 
 # Core
-wagtail==2.12.5
-elasticsearch>=5.0.0,<6.0.0
+wagtail==2.15.1
+elasticsearch==5.5.3
 
 # Database
-psycopg2-binary>=2.8.6,<2.9
+psycopg2-binary==2.9.2
 dj-database-url==0.5.0
 
 # Content
-puput==1.1.1
+puput==1.1.3
 guess-language-spirit==0.5.3
 
 # Caching
-django-redis==5.0.0
+django-redis==5.1.0
 
 # Frontend
 django-anymail==8.4
 django-colorful==1.3
 django-contrib-comments==2.1.0
-django-crispy-forms==1.12.0
+django-crispy-forms==1.13.0
 django-el-pagination==3.3.0
-django-libsass==0.8
+django-libsass==0.9
 django-social-share==2.2.1
 libsass==0.21.0
-Pillow==8.2.0
+Pillow==8.4.0
 
 # Runtime dependencies
 gunicorn

From 57503d1cfa6a7c3241c3fdb4ac2710069e427f91 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 27 Jan 2022 22:25:12 +0530
Subject: [PATCH 008/122] Replace emails with info@ungleich.ch

---
 publichealth/home/models/admin.py | 4 ++--
 publichealth/templates/500.html   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/publichealth/home/models/admin.py b/publichealth/home/models/admin.py
index 1d72f5b..5c03da2 100644
--- a/publichealth/home/models/admin.py
+++ b/publichealth/home/models/admin.py
@@ -36,8 +36,8 @@ def handle_save_settings(sender, instance, *args, **kwargs):
                 str(instance.feedback_status),
                 instance.feedback_question,
                 instance.feedback_comment,
-            ), "wagtail@datalets.ch",
-            [ "support@datalets.ch" ]
+            ), "info@ungleich.ch",
+            [ "info@ungleich.ch" ]
         )
         instance.feedback_status = None
         instance.feedback_question = ""
diff --git a/publichealth/templates/500.html b/publichealth/templates/500.html
index c186fc9..d085d59 100644
--- a/publichealth/templates/500.html
+++ b/publichealth/templates/500.html
@@ -11,6 +11,6 @@
 
         <h2>Sorry, there seems to be an error. Please try again soon.</h2>
 
-        <p>In case of persistent issues, write to <b>info@datalets.ch</b></p>
+        <p>In case of persistent issues, write to <b>info@ungleich.ch</b></p>
     </body>
 </html>

From 048faf479c6bcf4e3f22f98d3fb894c8df839a94 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 7 Feb 2022 12:19:14 +0530
Subject: [PATCH 009/122] Add functionality to show news_letter

---
 publichealth/home/models/snippets.py             | 16 ++++++++++++++++
 .../home/templates/tags/news_letter.html         |  3 +++
 publichealth/home/templatetags/information.py    |  8 ++++++++
 publichealth/templates/footer.html               |  1 +
 4 files changed, 28 insertions(+)
 create mode 100644 publichealth/home/templates/tags/news_letter.html

diff --git a/publichealth/home/models/snippets.py b/publichealth/home/models/snippets.py
index a18f9ca..5d058fe 100644
--- a/publichealth/home/models/snippets.py
+++ b/publichealth/home/models/snippets.py
@@ -97,6 +97,15 @@ class Contact(models.Model):
         on_delete=models.SET_NULL,
         related_name='+',
     )
+    news_letter_url = models.URLField(default='', blank=True)
+    news_letter_text = models.CharField(default='', blank=True, max_length=256)
+    news_letter_text_fr = models.CharField(max_length=255, blank=True, default="")
+    news_letter_text_en = models.CharField(max_length=255, blank=True, default="")
+    trans_news_letter_text = TranslatedField(
+        'news_letter_text',
+        'news_letter_text_fr',
+        'news_letter_text_en',
+    )
 
     panels = Page.content_panels + [
         FieldPanel('title_fr'),
@@ -114,6 +123,13 @@ class Contact(models.Model):
         PageChooserPanel('contact_form', 'home.ContactForm'),
     ]
 
+    panels = panels + [
+        FieldPanel('news_letter_url', classname="full"),
+        FieldPanel('news_letter_text'),
+        FieldPanel('news_letter_text_fr'),
+        FieldPanel('news_letter_text_en'),
+    ]
+
     def phone_link(self):
         return 'tel:%s' % self.phone.replace(' ', '')
     def email_link(self):
diff --git a/publichealth/home/templates/tags/news_letter.html b/publichealth/home/templates/tags/news_letter.html
new file mode 100644
index 0000000..3c2d914
--- /dev/null
+++ b/publichealth/home/templates/tags/news_letter.html
@@ -0,0 +1,3 @@
+{% if contact.trans_news_letter_text %}
+<a href="{{ contact.news_letter_url }}">{{ contact.trans_news_letter_text }}</a>
+{% endif %}
diff --git a/publichealth/home/templatetags/information.py b/publichealth/home/templatetags/information.py
index 133a7ea..bc037de 100644
--- a/publichealth/home/templatetags/information.py
+++ b/publichealth/home/templatetags/information.py
@@ -35,11 +35,19 @@ def get_contacts(the_site):
         'socials': social_contacts
     }
 
+
 # Contact information (footer)
 @register.inclusion_tag('tags/contact_info.html')
 def contact_info(the_site):
     return get_contacts(the_site)
 
+
+# Newsletter (footer)
+@register.inclusion_tag('tags/news_letter.html')
+def news_letter(the_site):
+    return get_contacts(the_site)
+
+
 # Contact form (footer)
 @register.inclusion_tag('tags/footer_form.html')
 def footer_form(the_site):
diff --git a/publichealth/templates/footer.html b/publichealth/templates/footer.html
index 0245064..0224355 100644
--- a/publichealth/templates/footer.html
+++ b/publichealth/templates/footer.html
@@ -24,6 +24,7 @@
 	</div>
 	<div class="col-md-4" id="contact-form">
 		{% footer_form the_site=the_site %}
+        {% news_letter the_site=the_site %}
 	</div>
 </div><!-- /row -->
 </div><!-- /container -->

From 705ad68500bfb4b3ca31e9c65590989c01295297 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 7 Feb 2022 12:44:04 +0530
Subject: [PATCH 010/122] Add migration file

---
 .../migrations/0033_auto_20220207_0731.py     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 publichealth/home/migrations/0033_auto_20220207_0731.py

diff --git a/publichealth/home/migrations/0033_auto_20220207_0731.py b/publichealth/home/migrations/0033_auto_20220207_0731.py
new file mode 100644
index 0000000..4586195
--- /dev/null
+++ b/publichealth/home/migrations/0033_auto_20220207_0731.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.2.11 on 2022-02-07 06:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0032_auto_20210928_1858'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contact',
+            name='news_letter_text',
+            field=models.CharField(blank=True, default='', max_length=256),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='news_letter_text_en',
+            field=models.CharField(blank=True, default='', max_length=255),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='news_letter_text_fr',
+            field=models.CharField(blank=True, default='', max_length=255),
+        ),
+        migrations.AddField(
+            model_name='contact',
+            name='news_letter_url',
+            field=models.URLField(blank=True, default=''),
+        ),
+    ]

From d1a0c930ebd55fd199a57098f7891df61cb86866 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 7 Feb 2022 13:09:43 +0530
Subject: [PATCH 011/122] Fix style for newsletter

---
 publichealth/home/templates/tags/news_letter.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/publichealth/home/templates/tags/news_letter.html b/publichealth/home/templates/tags/news_letter.html
index 3c2d914..db99a53 100644
--- a/publichealth/home/templates/tags/news_letter.html
+++ b/publichealth/home/templates/tags/news_letter.html
@@ -1,3 +1,5 @@
 {% if contact.trans_news_letter_text %}
-<a href="{{ contact.news_letter_url }}">{{ contact.trans_news_letter_text }}</a>
+    <div style="text-align: center">
+<a href="{{ contact.news_letter_url }}" style="border: 1px solid; padding: 15px;">{{ contact.trans_news_letter_text }}</a>
+    </div>
 {% endif %}

From 4847b02c9006612a6532971c9227d5cbf68f9956 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 3 May 2022 15:32:34 +0530
Subject: [PATCH 012/122] Add expire_at field to Entry model

---
 feedler/models/models.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/feedler/models/models.py b/feedler/models/models.py
index 7eb7569..1444b93 100644
--- a/feedler/models/models.py
+++ b/feedler/models/models.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
+import datetime
 
 from django.db import models
 from django.utils import translation
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-
+from django.utils.translation import gettext_lazy as _
 from wagtail.core.models import Page, Orderable
 from wagtail.admin.edit_handlers import FieldPanel
 from wagtail.core.fields import RichTextField
@@ -39,6 +40,11 @@ class Entry(models.Model):
     lang = models.CharField(max_length=2, blank=True, default='', choices=LANGUAGE_CHOICES)
     content = models.TextField()
     tags = models.TextField(blank=True)
+    expire_at = models.DateTimeField(
+        verbose_name=_("expiry date/time"),
+        blank=True,
+        null=True
+    )
 
     stream = models.ForeignKey(Stream,
         blank=False, on_delete=models.CASCADE,
@@ -68,7 +74,9 @@ class FeedPage(Page):
     @property
     def feedentries(self):
         if self.stream:
-            entries = Entry.objects.filter(stream=self.stream)
+            entries = Entry.objects.filter(stream=self.stream).filter(
+                models.Q(expire_at__isnull=True) | models.Q(expire_at__gt=datetime.datetime.now())
+            )
         else:
             entries = Entry.objects.all()
         # Filter out by chosen language

From 2d287dff3280a0f66cb13e03f799a0e36ca46822 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 3 May 2022 15:43:49 +0530
Subject: [PATCH 013/122] Add migration

---
 feedler/migrations/0009_entry_expire_at.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 feedler/migrations/0009_entry_expire_at.py

diff --git a/feedler/migrations/0009_entry_expire_at.py b/feedler/migrations/0009_entry_expire_at.py
new file mode 100644
index 0000000..cb54fc0
--- /dev/null
+++ b/feedler/migrations/0009_entry_expire_at.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-05-03 10:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('feedler', '0008_auto_20171117_1647'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='entry',
+            name='expire_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='expiry date/time'),
+        ),
+    ]

From 7d11a440c69089bef80cbd42e9e8ef8ead49e26e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 4 May 2022 10:28:34 +0530
Subject: [PATCH 014/122] Also filter entries by expire_at in the news section
 of the home page

---
 publichealth/home/models/models.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 7853dd2..de655aa 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -2,6 +2,8 @@
 
 from __future__ import unicode_literals
 
+import datetime
+
 from django.db import models
 from django.utils import translation
 from django.conf import settings
@@ -320,7 +322,9 @@ class HomePage(Page):
     @property
     def newsentries(self):
         # Get the last few news entries for the home page
-        entries = Entry.objects.all().order_by('-published')
+        entries = Entry.objects.filter(
+            models.Q(expire_at__isnull=True) | models.Q(expire_at__gt=datetime.datetime.now())
+        ).all().order_by('-published')
         # Filter out by current language
         curlang = translation.get_language()
         if curlang in ['de']:

From 57e30e6217f585cc8d90698eef7fe2ad366c91de Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 7 Jul 2022 11:27:38 +0200
Subject: [PATCH 015/122] WIP: dirty hack to add table to content (not working)

---
 publichealth/home/models/models.py            | 35 ++++++++++++++++++-
 .../home/templates/home/page_content.html     | 11 +++++-
 publichealth/settings/base.py                 |  1 +
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index de655aa..725edcd 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -17,6 +17,7 @@ from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel, InlinePane
 from wagtail.images.blocks import ImageChooserBlock
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.search import index
+from wagtail.contrib.table_block.blocks import TableBlock
 
 from puput.models import EntryPage, BlogPage
 from feedler.models import Entry, Stream
@@ -49,6 +50,15 @@ class ArticleIndexPage(Page):
         'intro_en',
     )
 
+    table_en = TableBlock()
+    table_fr = TableBlock()
+    table_de = TableBlock()
+    trans_table = TranslatedField(
+        'table_de',
+        'table_fr',
+        'table_en',
+    )
+
     subscribe_label_de = models.CharField("Button Label (de)", default='', blank=True, max_length=250)
     subscribe_label_fr = models.CharField("Button Label (fr)", default='', blank=True, max_length=250)
     subscribe_label_en = models.CharField("Button Label (en)", default='', blank=True, max_length=250)
@@ -73,6 +83,9 @@ class ArticleIndexPage(Page):
         FieldPanel('intro_fr'),
         FieldPanel('title_en'),
         FieldPanel('intro_en'),
+        #FieldPanel('table_en'),
+        #FieldPanel('table_fr'),
+        #FieldPanel('table_de'),
         ImageChooserPanel('feed_image'),
         MultiFieldPanel(
         [
@@ -168,6 +181,14 @@ class ArticlePage(Page):
         'body_fr',
         'body_en',
     )
+    table_en = TableBlock()
+    table_fr = TableBlock()
+    table_de = TableBlock()
+    trans_table = TranslatedField(
+        'table_en',
+        'table_fr',
+        'table_de',
+    )
 
     date = models.DateField("Date", null=True, blank=True)
 
@@ -261,6 +282,15 @@ class HomePage(Page):
         'body_en',
     )
 
+    #table_en = TableBlock()
+    #table_fr = TableBlock()
+    #table_de = TableBlock()
+    #trans_table = TranslatedField(
+    #    'table_en',
+    #    'table_fr',
+    #    'table_de',
+    #)
+
     infos_de = StreamField([
         ('info', InfoBlock())
     ], null=True, blank=True)
@@ -275,24 +305,27 @@ class HomePage(Page):
         'infos_fr',
         'infos_en',
     )
-
+#    content_table = StreamField(TableBlock(), verbose_name=_('Content Table'), blank=True)
     content_panels = Page.content_panels + [
         MultiFieldPanel([
             FieldPanel('intro_de', classname="full"),
             FieldPanel('body_de', classname="full"),
             StreamFieldPanel('infos_de'),
+	    #StreamFieldPanel('table_de'),
         ], heading="Deutsch",
            classname="collapsible collapsed"),
         MultiFieldPanel([
             FieldPanel('intro_fr', classname="full"),
             FieldPanel('body_fr', classname="full"),
             StreamFieldPanel('infos_fr'),
+	    #StreamFieldPanel('table_fr'),
         ], heading="Français",
            classname="collapsible collapsed"),
         MultiFieldPanel([
             FieldPanel('intro_en', classname="full"),
             FieldPanel('body_en', classname="full"),
             StreamFieldPanel('infos_en'),
+	    #StreamFieldPanel('table_fr'),
         ], heading="English",
            classname="collapsible collapsed"),
     ]
diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html
index a2c4165..a2cb8a1 100644
--- a/publichealth/home/templates/home/page_content.html
+++ b/publichealth/home/templates/home/page_content.html
@@ -27,10 +27,19 @@
   <p class="block-{{ block.block_type }}">
     {% include_block block %}
   </p>
-  {% endif %}
+
 {% endfor %}
 </div>
 
+<!-- Table content -->
+<div class="article-table" role="main">
+{% for block in page.trans_table %}
+  {% elif block.block_type == 'table' %}
+    {% include_block block %}
+  {% endif %}
+{% endfor %}
+
+
 <!-- Infoblocks -->
 <div class="row infoblocks">
   {% for block in page.trans_body %}
diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py
index f9d716a..6d4c5df 100644
--- a/publichealth/settings/base.py
+++ b/publichealth/settings/base.py
@@ -44,6 +44,7 @@ INSTALLED_APPS = [
     'wagtail.contrib.redirects',
     'wagtail.contrib.search_promotions',
     "wagtail.contrib.legacy.richtext",
+    'wagtail.contrib.table_block',
 
     'wagtail.embeds',
     'wagtail.sites',

From 3ff5f1eb50c96c050b76d71a129c4dbc36036098 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 09:32:09 +0200
Subject: [PATCH 016/122] Working TableBlock (but it would be lot easier using
 a RawHTMLBlock)

---
 publichealth/home/models/models.py            | 35 +++++++++++++++----
 .../templates/home/article_index_page.html    |  8 +++++
 .../home/templates/home/page_content.html     |  5 +--
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 725edcd..7f9fd03 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -50,9 +50,32 @@ class ArticleIndexPage(Page):
         'intro_en',
     )
 
-    table_en = TableBlock()
-    table_fr = TableBlock()
-    table_de = TableBlock()
+
+    table_en = StreamField(
+        [
+            ('table_en', TableBlock())
+        ],
+        null=True,
+        blank = True,
+    )
+    table_de = StreamField(
+        [
+            ('table_de', TableBlock())
+        ],
+        null=True,
+        blank = True,
+    )
+    table_fr = StreamField(
+        [
+            ('table_fr', TableBlock())
+        ],
+        null=True,
+        blank = True,
+    )
+
+    #table_en = TableBlock()
+    #table_fr = TableBlock()
+    #table_de = TableBlock()
     trans_table = TranslatedField(
         'table_de',
         'table_fr',
@@ -83,9 +106,9 @@ class ArticleIndexPage(Page):
         FieldPanel('intro_fr'),
         FieldPanel('title_en'),
         FieldPanel('intro_en'),
-        #FieldPanel('table_en'),
-        #FieldPanel('table_fr'),
-        #FieldPanel('table_de'),
+        FieldPanel('table_en'),
+        FieldPanel('table_fr'),
+        FieldPanel('table_de'),
         ImageChooserPanel('feed_image'),
         MultiFieldPanel(
         [
diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html
index 6cd4cca..644ff26 100644
--- a/publichealth/home/templates/home/article_index_page.html
+++ b/publichealth/home/templates/home/article_index_page.html
@@ -34,6 +34,14 @@
         </div>
       {% endfor %}
       </div>
+<!-- Table content -->
+<div class="article-table" role="main">
+{% for block in page.trans_table %}
+  {% if block.block_type == 'table_en' or block.block_type == 'table_fr' or block.block_type == 'table_de' %}
+    {% include_block block %}
+  {% endif %}
+{% endfor %}
+</div>
     </div><!-- /container -->
   </section>
 
diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html
index a2cb8a1..57ea93a 100644
--- a/publichealth/home/templates/home/page_content.html
+++ b/publichealth/home/templates/home/page_content.html
@@ -30,11 +30,12 @@
 
 {% endfor %}
 </div>
-
+<h1>Mmmm</h1>
 <!-- Table content -->
 <div class="article-table" role="main">
 {% for block in page.trans_table %}
-  {% elif block.block_type == 'table' %}
+  {% if block.block_type == 'table' %}
+    Inside if
     {% include_block block %}
   {% endif %}
 {% endfor %}

From 6fa462dcf698c8d60ae7f092c0820a9c3cf6f2d0 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 16:09:50 +0530
Subject: [PATCH 017/122] Minimal table style

---
 .../home/templates/home/article_index_page.html        |  2 +-
 publichealth/static/css/main.scss                      | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html
index 644ff26..83fa86c 100644
--- a/publichealth/home/templates/home/article_index_page.html
+++ b/publichealth/home/templates/home/article_index_page.html
@@ -35,7 +35,7 @@
       {% endfor %}
       </div>
 <!-- Table content -->
-<div class="article-table" role="main">
+<div class="article-table table-program" role="main">
 {% for block in page.trans_table %}
   {% if block.block_type == 'table_en' or block.block_type == 'table_fr' or block.block_type == 'table_de' %}
     {% include_block block %}
diff --git a/publichealth/static/css/main.scss b/publichealth/static/css/main.scss
index 006b7f2..7bb9576 100644
--- a/publichealth/static/css/main.scss
+++ b/publichealth/static/css/main.scss
@@ -128,12 +128,16 @@ $slider-nav: 200px;
 
 // Fix Bootstrap 3 warning
 .media, .media-body { zoom: none !important; transform: scale(1); }
- 
+
 #mc_embed_signup input[type=radio] {
   -webkit-appearance: none; padding: 0px;margin-top: 0px;
-} 
+}
 #mc_embed_signup {
-  background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif; 
+  background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif;
+}
+
+.table-program td th {
+  padding: 0 10px !important;
 }
 
 @import "subsites";

From c70b86a54bb0ac0ace54e026277e8aca2cd68b5e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 16:16:57 +0530
Subject: [PATCH 018/122] Revert back change in page_content

---
 publichealth/home/templates/home/page_content.html | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html
index 57ea93a..a2c4165 100644
--- a/publichealth/home/templates/home/page_content.html
+++ b/publichealth/home/templates/home/page_content.html
@@ -27,19 +27,9 @@
   <p class="block-{{ block.block_type }}">
     {% include_block block %}
   </p>
-
-{% endfor %}
-</div>
-<h1>Mmmm</h1>
-<!-- Table content -->
-<div class="article-table" role="main">
-{% for block in page.trans_table %}
-  {% if block.block_type == 'table' %}
-    Inside if
-    {% include_block block %}
   {% endif %}
 {% endfor %}
-
+</div>
 
 <!-- Infoblocks -->
 <div class="row infoblocks">

From a6a00a33f38431de8b8e12a3992c2549ad29e79c Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 16:21:11 +0530
Subject: [PATCH 019/122] Attempt classname for table

---
 publichealth/home/templates/home/article_index_page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html
index 83fa86c..ac25181 100644
--- a/publichealth/home/templates/home/article_index_page.html
+++ b/publichealth/home/templates/home/article_index_page.html
@@ -38,7 +38,7 @@
 <div class="article-table table-program" role="main">
 {% for block in page.trans_table %}
   {% if block.block_type == 'table_en' or block.block_type == 'table_fr' or block.block_type == 'table_de' %}
-    {% include_block block %}
+    {% include_block block with classname="table-program" %}
   {% endif %}
 {% endfor %}
 </div>

From 0691476d99b1a576e5b3fc16f014befee10462d5 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 16:45:46 +0530
Subject: [PATCH 020/122] Cleanup unused code + format

---
 publichealth/home/models/models.py | 32 ++++--------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 7f9fd03..7ebbad6 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -50,32 +50,28 @@ class ArticleIndexPage(Page):
         'intro_en',
     )
 
-
     table_en = StreamField(
         [
             ('table_en', TableBlock())
         ],
         null=True,
-        blank = True,
+        blank=True,
     )
     table_de = StreamField(
         [
             ('table_de', TableBlock())
         ],
         null=True,
-        blank = True,
+        blank=True,
     )
     table_fr = StreamField(
         [
             ('table_fr', TableBlock())
         ],
         null=True,
-        blank = True,
+        blank=True,
     )
 
-    #table_en = TableBlock()
-    #table_fr = TableBlock()
-    #table_de = TableBlock()
     trans_table = TranslatedField(
         'table_de',
         'table_fr',
@@ -204,14 +200,6 @@ class ArticlePage(Page):
         'body_fr',
         'body_en',
     )
-    table_en = TableBlock()
-    table_fr = TableBlock()
-    table_de = TableBlock()
-    trans_table = TranslatedField(
-        'table_en',
-        'table_fr',
-        'table_de',
-    )
 
     date = models.DateField("Date", null=True, blank=True)
 
@@ -305,15 +293,6 @@ class HomePage(Page):
         'body_en',
     )
 
-    #table_en = TableBlock()
-    #table_fr = TableBlock()
-    #table_de = TableBlock()
-    #trans_table = TranslatedField(
-    #    'table_en',
-    #    'table_fr',
-    #    'table_de',
-    #)
-
     infos_de = StreamField([
         ('info', InfoBlock())
     ], null=True, blank=True)
@@ -328,27 +307,24 @@ class HomePage(Page):
         'infos_fr',
         'infos_en',
     )
-#    content_table = StreamField(TableBlock(), verbose_name=_('Content Table'), blank=True)
+
     content_panels = Page.content_panels + [
         MultiFieldPanel([
             FieldPanel('intro_de', classname="full"),
             FieldPanel('body_de', classname="full"),
             StreamFieldPanel('infos_de'),
-	    #StreamFieldPanel('table_de'),
         ], heading="Deutsch",
            classname="collapsible collapsed"),
         MultiFieldPanel([
             FieldPanel('intro_fr', classname="full"),
             FieldPanel('body_fr', classname="full"),
             StreamFieldPanel('infos_fr'),
-	    #StreamFieldPanel('table_fr'),
         ], heading="Français",
            classname="collapsible collapsed"),
         MultiFieldPanel([
             FieldPanel('intro_en', classname="full"),
             FieldPanel('body_en', classname="full"),
             StreamFieldPanel('infos_en'),
-	    #StreamFieldPanel('table_fr'),
         ], heading="English",
            classname="collapsible collapsed"),
     ]

From f1aa2ad41884ace882cdd9a122d76f7880173d7b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 16:51:25 +0530
Subject: [PATCH 021/122] Use custom table template

---
 publichealth/home/models/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 7ebbad6..341866d 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -52,7 +52,7 @@ class ArticleIndexPage(Page):
 
     table_en = StreamField(
         [
-            ('table_en', TableBlock())
+            ('table_en', TableBlock(template='templates/home/program_table.html'))
         ],
         null=True,
         blank=True,

From 59356a783fe279aaf398efb14805b5d650d3891f Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 16:51:55 +0530
Subject: [PATCH 022/122] Add program_table.html template

---
 .../home/templates/home/program_table.html    | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 publichealth/home/templates/home/program_table.html

diff --git a/publichealth/home/templates/home/program_table.html b/publichealth/home/templates/home/program_table.html
new file mode 100644
index 0000000..bbbbd89
--- /dev/null
+++ b/publichealth/home/templates/home/program_table.html
@@ -0,0 +1,48 @@
+<table class="table-program">
+    {% if table_header %}
+        <thead>
+        <tr>
+            {% for column in table_header %}
+                <th>
+                    {% if column.strip %}
+                        {% if html_renderer %}
+                            {{ column.strip|safe|linebreaksbr }}
+                        {% else %}
+                            {{ column.strip|linebreaksbr }}
+                        {% endif %}
+                    {% endif %}
+                </th>
+            {% endfor %}
+        </tr>
+        </thead>
+    {% endif %}
+    <tbody>
+    {% for row in data %}
+        <tr>
+            {% for column in row %}
+                {% if first_col_is_header and forloop.first %}
+                    <th>
+                        {% if column.strip %}
+                            {% if html_renderer %}
+                                {{ column.strip|safe|linebreaksbr }}
+                            {% else %}
+                                {{ column.strip|linebreaksbr }}
+                            {% endif %}
+                        {% endif %}
+                    </th>
+                 {% else %}
+                    <td>
+                        {% if column.strip %}
+                            {% if html_renderer %}
+                                {{ column.strip|safe|linebreaksbr }}
+                            {% else %}
+                                {{ column.strip|linebreaksbr }}
+                            {% endif %}
+                        {% endif %}
+                    </td>
+                 {% endif %}
+            {% endfor %}
+        </tr>
+    {% endfor %}
+    </tbody>
+</table>

From 78c3548e23f98d3ecf196a91fe718cecc58910df Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 13:36:14 +0200
Subject: [PATCH 023/122] Use correct template path

---
 publichealth/home/models/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 341866d..8760562 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -52,7 +52,7 @@ class ArticleIndexPage(Page):
 
     table_en = StreamField(
         [
-            ('table_en', TableBlock(template='templates/home/program_table.html'))
+            ('table_en', TableBlock(template='home/program_table.html'))
         ],
         null=True,
         blank=True,

From 08ca710b996cc63e1856f498b9e5939451762c41 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 17:16:20 +0530
Subject: [PATCH 024/122] Put styles into template for the moment

---
 publichealth/home/templates/home/program_table.html | 5 +++++
 publichealth/static/css/main.scss                   | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/publichealth/home/templates/home/program_table.html b/publichealth/home/templates/home/program_table.html
index bbbbd89..075d690 100644
--- a/publichealth/home/templates/home/program_table.html
+++ b/publichealth/home/templates/home/program_table.html
@@ -1,3 +1,8 @@
+<style>
+.table-program td th {
+  padding: 0 10px !important;
+}
+</style>
 <table class="table-program">
     {% if table_header %}
         <thead>
diff --git a/publichealth/static/css/main.scss b/publichealth/static/css/main.scss
index 7bb9576..167e077 100644
--- a/publichealth/static/css/main.scss
+++ b/publichealth/static/css/main.scss
@@ -136,8 +136,4 @@ $slider-nav: 200px;
   background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif;
 }
 
-.table-program td th {
-  padding: 0 10px !important;
-}
-
 @import "subsites";

From 86242dbfb1b4f34807b8677527a68fe00238b5ce Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 17:19:11 +0530
Subject: [PATCH 025/122] Add missing comma

---
 publichealth/home/templates/home/program_table.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templates/home/program_table.html b/publichealth/home/templates/home/program_table.html
index 075d690..24bda39 100644
--- a/publichealth/home/templates/home/program_table.html
+++ b/publichealth/home/templates/home/program_table.html
@@ -1,5 +1,5 @@
 <style>
-.table-program td th {
+.table-program td, th {
   padding: 0 10px !important;
 }
 </style>

From ae12f220ec97c709befe67edabea3706ffcb78af Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 17:35:12 +0530
Subject: [PATCH 026/122] Use program_table template for all language tables

---
 publichealth/home/models/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 8760562..2025fda 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -59,14 +59,14 @@ class ArticleIndexPage(Page):
     )
     table_de = StreamField(
         [
-            ('table_de', TableBlock())
+            ('table_de', TableBlock(template='home/program_table.html'))
         ],
         null=True,
         blank=True,
     )
     table_fr = StreamField(
         [
-            ('table_fr', TableBlock())
+            ('table_fr', TableBlock(template='home/program_table.html'))
         ],
         null=True,
         blank=True,

From 849d53947857df1289e25df548493ea417a5dca9 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 18:12:53 +0530
Subject: [PATCH 027/122] Add header_image to Article Index Page

---
 publichealth/home/models/models.py                     |  3 +++
 .../home/templates/home/article_index_page.html        | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index de655aa..46e47d1 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -40,6 +40,8 @@ class ArticleIndexPage(Page):
         'title_en',
     )
 
+    header_image = ImageChooserBlock(required=False)
+
     intro_de = RichTextField(default='', blank=True)
     intro_fr = RichTextField(default='', blank=True)
     intro_en = RichTextField(default='', blank=True)
@@ -73,6 +75,7 @@ class ArticleIndexPage(Page):
         FieldPanel('intro_fr'),
         FieldPanel('title_en'),
         FieldPanel('intro_en'),
+        ImageChooserPanel('header_image'),
         ImageChooserPanel('feed_image'),
         MultiFieldPanel(
         [
diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html
index 6cd4cca..802e245 100644
--- a/publichealth/home/templates/home/article_index_page.html
+++ b/publichealth/home/templates/home/article_index_page.html
@@ -16,7 +16,17 @@
   </section>
 
 {% else %}
+  {% if page.header_image %}
+<div id="carousel-banner" class="slide">
+	<div class="carousel-inner slick slick-initialized slick-slider" role="listbox">
 
+		<div class="slick-list draggable" tabindex="0"><div class="slick-track" style="opacity: 1; width: 1908px;"><div class="item slick-slide slick-active" data-slick-index="0" style="width: 1908px; position: relative; left: 0px; top: 0px; z-index: 900; opacity: 1;">
+			<img style="background-image:url({{page.header_image}})">
+		</div></div></div>
+
+	</div>
+</div>
+  {% endif %}
   <section id="article-index" class="article-index-page">
     <div class="container">
     	<h2>{{ page.trans_title }}</h2>

From 3a1fa6d724eac0de9ea70f913f7e8f7b1c9ce7e1 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 18:18:55 +0530
Subject: [PATCH 028/122] Use proper field for image

---
 publichealth/home/models/models.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 46e47d1..6c63c7b 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -40,7 +40,12 @@ class ArticleIndexPage(Page):
         'title_en',
     )
 
-    header_image = ImageChooserBlock(required=False)
+    header_image = models.ForeignKey(
+        'wagtailimages.Image',
+        null=True, blank=True,
+        on_delete=models.SET_NULL,
+        related_name='+'
+    )
 
     intro_de = RichTextField(default='', blank=True)
     intro_fr = RichTextField(default='', blank=True)

From 8927460dd63a3496a393e9581592f26cfb5d1ea9 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 11 Jul 2022 15:04:51 +0200
Subject: [PATCH 029/122] Fix accessing the header image's url

---
 publichealth/home/templates/home/article_index_page.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html
index 802e245..f829852 100644
--- a/publichealth/home/templates/home/article_index_page.html
+++ b/publichealth/home/templates/home/article_index_page.html
@@ -17,11 +17,12 @@
 
 {% else %}
   {% if page.header_image %}
+  {% image page.header_image fill-1908x400 as img %}
 <div id="carousel-banner" class="slide">
 	<div class="carousel-inner slick slick-initialized slick-slider" role="listbox">
 
 		<div class="slick-list draggable" tabindex="0"><div class="slick-track" style="opacity: 1; width: 1908px;"><div class="item slick-slide slick-active" data-slick-index="0" style="width: 1908px; position: relative; left: 0px; top: 0px; z-index: 900; opacity: 1;">
-			<img style="background-image:url({{page.header_image}})">
+			<img style="background-image:url({{img.url}})">
 		</div></div></div>
 
 	</div>

From 673ad6b9242ddcb686bd372fff22320d57be3e94 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 12 Jul 2022 12:11:17 +0530
Subject: [PATCH 030/122] Remove unwanted code

---
 publichealth/home/templates/home/article_index_page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templates/home/article_index_page.html b/publichealth/home/templates/home/article_index_page.html
index 3ed544b..7b878cb 100644
--- a/publichealth/home/templates/home/article_index_page.html
+++ b/publichealth/home/templates/home/article_index_page.html
@@ -49,7 +49,7 @@
 <div class="article-table table-program" role="main">
 {% for block in page.trans_table %}
   {% if block.block_type == 'table_en' or block.block_type == 'table_fr' or block.block_type == 'table_de' %}
-    {% include_block block with classname="table-program" %}
+    {% include_block block %}
   {% endif %}
 {% endfor %}
 </div>

From ae3a7d5ca9dc95bbbf9b323678e06d6e7835c130 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 12 Jul 2022 12:14:03 +0530
Subject: [PATCH 031/122] Revert back changes to main.scss

---
 publichealth/static/css/main.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/publichealth/static/css/main.scss b/publichealth/static/css/main.scss
index 167e077..006b7f2 100644
--- a/publichealth/static/css/main.scss
+++ b/publichealth/static/css/main.scss
@@ -128,12 +128,12 @@ $slider-nav: 200px;
 
 // Fix Bootstrap 3 warning
 .media, .media-body { zoom: none !important; transform: scale(1); }
-
+ 
 #mc_embed_signup input[type=radio] {
   -webkit-appearance: none; padding: 0px;margin-top: 0px;
-}
+} 
 #mc_embed_signup {
-  background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif;
+  background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif; 
 }
 
 @import "subsites";

From df9448e74531ffca146a2a2da9905fd6d70298cc Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 12 Jul 2022 12:21:49 +0530
Subject: [PATCH 032/122] Update Changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41059b5..7bd6c67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
 # Change Log
 
 Please see [Pull Request history](https://github.com/datalets/public-health-ch/pulls?q=is%3Apr+is%3Aclosed) on GitHub.
+
+## 2.0.0 - 2022-07-12
+
+- 10694: Introduce table block to show program details
+- 10695: Add a header image to the article index template

From ed9648d81d7df61d70436b36c8bf8fbe53a79052 Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Thu, 14 Jul 2022 09:47:21 +0000
Subject: [PATCH 033/122] Add migration

---
 .../migrations/0034_auto_20220714_1145.py     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 publichealth/home/migrations/0034_auto_20220714_1145.py

diff --git a/publichealth/home/migrations/0034_auto_20220714_1145.py b/publichealth/home/migrations/0034_auto_20220714_1145.py
new file mode 100644
index 0000000..38d68f8
--- /dev/null
+++ b/publichealth/home/migrations/0034_auto_20220714_1145.py
@@ -0,0 +1,37 @@
+# Generated by Django 3.2.13 on 2022-07-14 09:45
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.contrib.table_block.blocks
+import wagtail.core.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailimages', '0023_add_choose_permissions'),
+        ('home', '0033_auto_20220207_0731'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='articleindexpage',
+            name='header_image',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image'),
+        ),
+        migrations.AddField(
+            model_name='articleindexpage',
+            name='table_de',
+            field=wagtail.core.fields.StreamField([('table_de', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='articleindexpage',
+            name='table_en',
+            field=wagtail.core.fields.StreamField([('table_en', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='articleindexpage',
+            name='table_fr',
+            field=wagtail.core.fields.StreamField([('table_fr', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
+        ),
+    ]

From e056b086099070a0fad62cfc3842773bcbfade04 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 19 Jul 2022 14:53:30 +0200
Subject: [PATCH 034/122] Remove styles to hide footer for sphc.ch

---
 publichealth/static/css/subsites.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/static/css/subsites.scss b/publichealth/static/css/subsites.scss
index 488d854..b9aa5ce 100644
--- a/publichealth/static/css/subsites.scss
+++ b/publichealth/static/css/subsites.scss
@@ -10,7 +10,7 @@
   // Language menu hack, until this is configurable
   nav .language-nav a[lang='en'] { display: inline; }
 
-  #footer, .contact-nav .link { display: none; }
+  //#footer, .contact-nav .link { display: none; }
 
   a.navbar-brand {
     height: 60px;

From 8a87944e10525080e563f3b92850451fb0940b24 Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Thu, 21 Jul 2022 14:53:45 +0000
Subject: [PATCH 035/122] Update year in the footer

---
 publichealth/templates/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/templates/footer.html b/publichealth/templates/footer.html
index 0224355..f94d5f4 100644
--- a/publichealth/templates/footer.html
+++ b/publichealth/templates/footer.html
@@ -32,7 +32,7 @@
 
 <div class="copyright">
 	{% contact_name the_site=the_site %}
-	&copy; 2020
+	&copy; 2022
 	&bull; <a href="https://public-health.ch/privacy/">Privacy</a>
 	&bull; <a href="https://public-health.ch/impressum/">Impressum</a>
 </div>

From bdff34cf2b59b8b5d21f08600f1e9c298214faa1 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 28 Jul 2022 20:19:00 +0530
Subject: [PATCH 036/122] Introduce Original image format

---
 publichealth/home/models/__init__.py      |  1 +
 publichealth/home/models/image_formats.py | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 publichealth/home/models/image_formats.py

diff --git a/publichealth/home/models/__init__.py b/publichealth/home/models/__init__.py
index 52e04bb..bc6c174 100644
--- a/publichealth/home/models/__init__.py
+++ b/publichealth/home/models/__init__.py
@@ -2,3 +2,4 @@ from .forms import *
 from .models import *
 from .snippets import *
 from .admin import *
+from .image_formats import *
diff --git a/publichealth/home/models/image_formats.py b/publichealth/home/models/image_formats.py
new file mode 100644
index 0000000..a625261
--- /dev/null
+++ b/publichealth/home/models/image_formats.py
@@ -0,0 +1,17 @@
+# image_formats.py
+from django.utils.html import format_html
+from wagtail.images.formats import Format, register_image_format
+
+
+class OriginalImageFormat(Format):
+
+    def image_to_html(self, image, alt_text, extra_attributes=None):
+
+        default_html = super().image_to_html(image, alt_text, extra_attributes)
+
+        return format_html("{}<figcaption>{}</figcaption>", default_html, alt_text)
+
+
+register_image_format(
+    OriginalImageFormat('original_fullwidth', 'Original image', 'bodytext-image', 'original')
+)

From 6818359e1a6e2349fb9d5fe8f174897fc605c82b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 28 Jul 2022 20:36:01 +0530
Subject: [PATCH 037/122] Remove unwanted code

---
 publichealth/home/models/image_formats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/models/image_formats.py b/publichealth/home/models/image_formats.py
index a625261..ebf4968 100644
--- a/publichealth/home/models/image_formats.py
+++ b/publichealth/home/models/image_formats.py
@@ -9,7 +9,7 @@ class OriginalImageFormat(Format):
 
         default_html = super().image_to_html(image, alt_text, extra_attributes)
 
-        return format_html("{}<figcaption>{}</figcaption>", default_html, alt_text)
+        return format_html("{}", default_html, alt_text)
 
 
 register_image_format(

From 3f46a5c25f095b4e3bdc7e60d6fe5201899fbaec Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 27 Oct 2022 21:12:34 +0530
Subject: [PATCH 038/122] Remove title case for menuitem title

---
 publichealth/home/templatetags/navigation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 8dd8f5a..7082a43 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -78,7 +78,7 @@ def menuitems_children(parent):
     for menuitem in menuitems_children:
         try:
             if type(menuitem) == ContactForm:
-                menuitem.title = menuitem.title.title()
+                menuitem.title = menuitem.title
             else:
                 menuitem.title = menuitem.trans_title
             if 'devenez' in menuitem.title.lower() and remove_devenez:

From 79dbc2aa7f102289b6cb790277d13a60fc4f7cf0 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 28 Oct 2022 19:45:46 +0200
Subject: [PATCH 039/122] Remove title case in template

---
 publichealth/home/templates/tags/top_menu_children.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templates/tags/top_menu_children.html b/publichealth/home/templates/tags/top_menu_children.html
index 59ba231..ba5f63f 100644
--- a/publichealth/home/templates/tags/top_menu_children.html
+++ b/publichealth/home/templates/tags/top_menu_children.html
@@ -3,6 +3,6 @@
 <ul class="dropdown-menu">
     <!--<li><a href="{% pageurl parent %}">{{ parent.title }}</a></li>-->
     {% for child in menuitems_children %}
-        <li><a href="{% pageurl child %}">{{ child.title|title }}</a></li>
+        <li><a href="{% pageurl child %}">{{ child.title }}</a></li>
     {% endfor %}
 </ul>

From bd2de384287c249b411bf930037965caef0c1a4c Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 15 May 2023 18:14:06 +0530
Subject: [PATCH 040/122] Add iframe block for article page

---
 publichealth/home/models/models.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 1ad4c20..fce7401 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -14,6 +14,7 @@ from wagtail.core.blocks import StructBlock, CharBlock, URLBlock, RichTextBlock,
 from wagtail.core.models import Page, Orderable
 from wagtail.core.fields import StreamField, RichTextField
 from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel, InlinePanel, MultiFieldPanel
+from wagtail.embeds.blocks import EmbedBlock
 from wagtail.images.blocks import ImageChooserBlock
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.search import index
@@ -185,7 +186,8 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media'))
+        ], icon='media')),
+        ('iframe', EmbedBlock())
     ], null=True, blank=True)
     body_fr = StreamField([
         ('paragraph', RichTextBlock()),
@@ -193,7 +195,8 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media'))
+        ], icon='media')),
+        ('iframe', EmbedBlock())
     ], null=True, blank=True)
     body_en = StreamField([
         ('paragraph', RichTextBlock()),
@@ -201,7 +204,8 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media'))
+        ], icon='media')),
+        ('iframe', EmbedBlock())
     ], null=True, blank=True)
     trans_body = TranslatedField(
         'body_de',

From 9f621c9c3eb5da89daa42a7680c47f8858b1e200 Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Mon, 15 May 2023 12:48:46 +0000
Subject: [PATCH 041/122] Add migration home.0035_auto_20230515_1447

---
 .../migrations/0035_auto_20230515_1447.py     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 publichealth/home/migrations/0035_auto_20230515_1447.py

diff --git a/publichealth/home/migrations/0035_auto_20230515_1447.py b/publichealth/home/migrations/0035_auto_20230515_1447.py
new file mode 100644
index 0000000..dd08cbe
--- /dev/null
+++ b/publichealth/home/migrations/0035_auto_20230515_1447.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.13 on 2023-05-15 12:47
+
+from django.db import migrations
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.embeds.blocks
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0034_auto_20220714_1145'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_de',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_en',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_fr',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
+        ),
+    ]

From 5ddcf13803fab28ca433504d5450d3ba4751ccc4 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 15 May 2023 19:23:37 +0530
Subject: [PATCH 042/122] New changes

---
 publichealth/home/models/models.py                | 15 ++++++++-------
 .../home/templates/home/page_content.html         |  7 +++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index fce7401..fb29684 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -14,7 +14,6 @@ from wagtail.core.blocks import StructBlock, CharBlock, URLBlock, RichTextBlock,
 from wagtail.core.models import Page, Orderable
 from wagtail.core.fields import StreamField, RichTextField
 from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel, InlinePanel, MultiFieldPanel
-from wagtail.embeds.blocks import EmbedBlock
 from wagtail.images.blocks import ImageChooserBlock
 from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.search import index
@@ -186,8 +185,7 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media')),
-        ('iframe', EmbedBlock())
+        ], icon='media'))
     ], null=True, blank=True)
     body_fr = StreamField([
         ('paragraph', RichTextBlock()),
@@ -195,8 +193,7 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media')),
-        ('iframe', EmbedBlock())
+        ], icon='media'))
     ], null=True, blank=True)
     body_en = StreamField([
         ('paragraph', RichTextBlock()),
@@ -204,8 +201,7 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media')),
-        ('iframe', EmbedBlock())
+        ], icon='media'))
     ], null=True, blank=True)
     trans_body = TranslatedField(
         'body_de',
@@ -218,6 +214,8 @@ class ArticlePage(Page):
     on_homepage = models.BooleanField(default=False, verbose_name="Featured",
         help_text="Auf der Frontpage anzeigen")
 
+    html_content = RichTextField(blank=True)
+
     feed_image = models.ForeignKey(
         'wagtailimages.Image',
         null=True, blank=True,
@@ -260,6 +258,9 @@ class ArticlePage(Page):
         ], heading="Images"),
         StreamFieldPanel('gallery'),
     ]
+    content_panels = Page.content_panels + [
+        FieldPanel('html_content', classname='full'),
+    ]
     promote_panels = [
         InlinePanel('related_links', label="Links"),
         MultiFieldPanel([
diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html
index a2c4165..b4c646c 100644
--- a/publichealth/home/templates/home/page_content.html
+++ b/publichealth/home/templates/home/page_content.html
@@ -31,6 +31,13 @@
 {% endfor %}
 </div>
 
+{% if page.html_content %}
+<!-- Any other content -->
+<div class="article-body">
+  {{ page.html_content|richtext }}
+</div>
+{% endif %}
+
 <!-- Infoblocks -->
 <div class="row infoblocks">
   {% for block in page.trans_body %}

From a7fdf769c49786d52aec61ee506c1ebc442f7a26 Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Mon, 15 May 2023 13:56:56 +0000
Subject: [PATCH 043/122] Add migration home.0036_auto_20230515_1556

---
 .../migrations/0036_auto_20230515_1556.py     | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 publichealth/home/migrations/0036_auto_20230515_1556.py

diff --git a/publichealth/home/migrations/0036_auto_20230515_1556.py b/publichealth/home/migrations/0036_auto_20230515_1556.py
new file mode 100644
index 0000000..0fe63ff
--- /dev/null
+++ b/publichealth/home/migrations/0036_auto_20230515_1556.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.2.13 on 2023-05-15 13:56
+
+from django.db import migrations
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0035_auto_20230515_1447'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='articlepage',
+            name='html_content',
+            field=wagtail.core.fields.RichTextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_de',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_en',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_fr',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
+        ),
+    ]

From 028958681101930b5259eb8ae54d057788c79d72 Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Tue, 16 May 2023 10:28:45 +0000
Subject: [PATCH 044/122] Add custom_filters : ph_html_decode

---
 publichealth/home/custom_filters.py | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 publichealth/home/custom_filters.py

diff --git a/publichealth/home/custom_filters.py b/publichealth/home/custom_filters.py
new file mode 100644
index 0000000..d7be0da
--- /dev/null
+++ b/publichealth/home/custom_filters.py
@@ -0,0 +1,8 @@
+from django import template
+from html import unescape
+
+register = template.Library()
+
+@register.filter
+def ph_html_decode(value):
+    return unescape(value) 

From 713f9ca9e352bedd6d449eb73aa6617edcbc6ff5 Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Tue, 16 May 2023 10:30:01 +0000
Subject: [PATCH 045/122] Working version of adding html_content

---
 publichealth/home/models/models.py                 | 2 --
 publichealth/home/templates/home/page_content.html | 6 ++++--
 publichealth/settings/base.py                      | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index fb29684..1a4224f 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -257,8 +257,6 @@ class ArticlePage(Page):
             ImageChooserPanel('feed_image'),
         ], heading="Images"),
         StreamFieldPanel('gallery'),
-    ]
-    content_panels = Page.content_panels + [
         FieldPanel('html_content', classname='full'),
     ]
     promote_panels = [
diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html
index b4c646c..8b1d979 100644
--- a/publichealth/home/templates/home/page_content.html
+++ b/publichealth/home/templates/home/page_content.html
@@ -1,4 +1,4 @@
-{% load wagtailcore_tags wagtailimages_tags %}
+{% load wagtailcore_tags wagtailimages_tags custom_filters %}
 
 {% if page.feed_image %}
 <div class="image">
@@ -34,7 +34,9 @@
 {% if page.html_content %}
 <!-- Any other content -->
 <div class="article-body">
-  {{ page.html_content|richtext }}
+{% autoescape off %}
+    {{ page.html_content|ph_html_decode }}
+{% endautoescape %}
 </div>
 {% endif %}
 
diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py
index 6d4c5df..f66b723 100644
--- a/publichealth/settings/base.py
+++ b/publichealth/settings/base.py
@@ -109,6 +109,9 @@ TEMPLATES = [
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
             ],
+            'libraries': {
+                'custom_filters': 'publichealth.home.custom_filters',
+            },
         },
     },
 ]

From fc03ea59273385dbf06307e26a47253b90bde602 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 16 May 2023 16:11:05 +0530
Subject: [PATCH 046/122] Add richtext as a block

---
 publichealth/home/models/models.py                 | 12 ++++++------
 publichealth/home/templates/home/page_content.html | 13 ++++---------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 1a4224f..5d04089 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -185,7 +185,8 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media'))
+        ], icon='media')),
+        ('iframe', RichTextBlock())
     ], null=True, blank=True)
     body_fr = StreamField([
         ('paragraph', RichTextBlock()),
@@ -193,7 +194,8 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media'))
+        ], icon='media')),
+        ('iframe', RichTextBlock())
     ], null=True, blank=True)
     body_en = StreamField([
         ('paragraph', RichTextBlock()),
@@ -201,7 +203,8 @@ class ArticlePage(Page):
         ('info', InfoBlock(icon='help')),
         ('media', ChoiceBlock(choices=[
             ('gallery', 'Image gallery'),
-        ], icon='media'))
+        ], icon='media')),
+        ('iframe', RichTextBlock())
     ], null=True, blank=True)
     trans_body = TranslatedField(
         'body_de',
@@ -214,8 +217,6 @@ class ArticlePage(Page):
     on_homepage = models.BooleanField(default=False, verbose_name="Featured",
         help_text="Auf der Frontpage anzeigen")
 
-    html_content = RichTextField(blank=True)
-
     feed_image = models.ForeignKey(
         'wagtailimages.Image',
         null=True, blank=True,
@@ -257,7 +258,6 @@ class ArticlePage(Page):
             ImageChooserPanel('feed_image'),
         ], heading="Images"),
         StreamFieldPanel('gallery'),
-        FieldPanel('html_content', classname='full'),
     ]
     promote_panels = [
         InlinePanel('related_links', label="Links"),
diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html
index 8b1d979..45814a2 100644
--- a/publichealth/home/templates/home/page_content.html
+++ b/publichealth/home/templates/home/page_content.html
@@ -23,6 +23,10 @@
     {% if block.value == 'gallery' %}
       {% include 'home/photo_gallery.html' %}
     {% endif %}
+  {% elif block.block_type == 'iframe' %}
+    {% autoescape off %}
+      {{ block.value|ph_html_decode }}
+    {% endautoescape %}
   {% elif block.block_type != 'info' %}
   <p class="block-{{ block.block_type }}">
     {% include_block block %}
@@ -31,15 +35,6 @@
 {% endfor %}
 </div>
 
-{% if page.html_content %}
-<!-- Any other content -->
-<div class="article-body">
-{% autoescape off %}
-    {{ page.html_content|ph_html_decode }}
-{% endautoescape %}
-</div>
-{% endif %}
-
 <!-- Infoblocks -->
 <div class="row infoblocks">
   {% for block in page.trans_body %}

From fdfebf783e561b97536292c01d51f4aab9d0249b Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Tue, 16 May 2023 11:49:02 +0000
Subject: [PATCH 047/122] Converting richtext stream to str

---
 publichealth/home/custom_filters.py                | 2 +-
 publichealth/home/templates/home/page_content.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/publichealth/home/custom_filters.py b/publichealth/home/custom_filters.py
index d7be0da..970546e 100644
--- a/publichealth/home/custom_filters.py
+++ b/publichealth/home/custom_filters.py
@@ -5,4 +5,4 @@ register = template.Library()
 
 @register.filter
 def ph_html_decode(value):
-    return unescape(value) 
+    return unescape(str(value)) 
diff --git a/publichealth/home/templates/home/page_content.html b/publichealth/home/templates/home/page_content.html
index 45814a2..589c7c4 100644
--- a/publichealth/home/templates/home/page_content.html
+++ b/publichealth/home/templates/home/page_content.html
@@ -25,7 +25,7 @@
     {% endif %}
   {% elif block.block_type == 'iframe' %}
     {% autoescape off %}
-      {{ block.value|ph_html_decode }}
+      {{ block.value|richtext|ph_html_decode}}
     {% endautoescape %}
   {% elif block.block_type != 'info' %}
   <p class="block-{{ block.block_type }}">

From e4a1cf5a77e9bcc0a3348ca72a3971988ebfde3e Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Tue, 16 May 2023 11:49:32 +0000
Subject: [PATCH 048/122] Add migration

---
 .../migrations/0037_auto_20230516_1241.py     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 publichealth/home/migrations/0037_auto_20230516_1241.py

diff --git a/publichealth/home/migrations/0037_auto_20230516_1241.py b/publichealth/home/migrations/0037_auto_20230516_1241.py
new file mode 100644
index 0000000..03ad22e
--- /dev/null
+++ b/publichealth/home/migrations/0037_auto_20230516_1241.py
@@ -0,0 +1,35 @@
+# Generated by Django 3.2.13 on 2023-05-16 10:41
+
+from django.db import migrations
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0036_auto_20230515_1556'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='articlepage',
+            name='html_content',
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_de',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_en',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='articlepage',
+            name='body_fr',
+            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
+        ),
+    ]

From 53ae04404b523a0e44e39fbbafc163749cbf8b09 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mravi@ungleich.ch>
Date: Wed, 15 May 2024 01:44:31 +0000
Subject: [PATCH 049/122] Changes on the nations server

---
 publichealth/settings/dev.py          | 14 ++++++++++++--
 publichealth/static/css/subsites.scss | 16 ++++++++++++++++
 publichealth/templates/header.html    | 16 +++++++++++++---
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/publichealth/settings/dev.py b/publichealth/settings/dev.py
index afa6a7d..e53fcf1 100644
--- a/publichealth/settings/dev.py
+++ b/publichealth/settings/dev.py
@@ -17,10 +17,20 @@ BASE_URL = 'http://localhost:8000'
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
+#DATABASES = {
+#    'default': {
+#        'ENGINE': 'django.db.backends.sqlite3',
+#        'NAME': 'publichealth-dev.sqlite3',
+#    }
+#}
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'publichealth-dev.sqlite3',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'publichealth',
+        'CONN_MAX_AGE': 600,  # number of seconds database connections should persist for
+
+        # User, host and port can be configured by the PGUSER, PGHOST and
+        # PGPORT environment variables (these get picked up by libpq).
     }
 }
 
diff --git a/publichealth/static/css/subsites.scss b/publichealth/static/css/subsites.scss
index 488d854..ba117f8 100644
--- a/publichealth/static/css/subsites.scss
+++ b/publichealth/static/css/subsites.scss
@@ -49,6 +49,7 @@
 html[lang='fr'] .site-ngo-allianz-ebk .navbar-brand {
   background-image: url('/static/org/NGO-Allianz_Logo-fr.jpg');
 }
+
 // -site-ngo-allianz-ebk
 
 // Custom styles for gesundheitsmanifest.ch
@@ -61,3 +62,18 @@ html[lang='fr'] .site-ngo-allianz-ebk .navbar-brand {
     border-bottom: 1px solid #ddd;
   }
 }
+
+.site-dev-pro-salutech {
+  .navbar-brand {
+    width: 240px;
+    height: 64px;
+    background-size: contain !important;
+    background-repeat: no-repeat;
+    background-image: url('/static/images/pro-salute-logo.png');
+
+    font-size: 0px !important;
+    img { display: none !important; }
+  }
+  #carousel-banner .carousel-caption { display: none; }
+}
+
diff --git a/publichealth/templates/header.html b/publichealth/templates/header.html
index 2f4033f..7594be0 100644
--- a/publichealth/templates/header.html
+++ b/publichealth/templates/header.html
@@ -2,6 +2,9 @@
 {% get_site_root as site_root %}
 {% get_site as the_site %}
 
+
+<style>
+</style>
 <nav class="navbar-pre navbar-fixed-top">
   <div class="container">
       <div class="nav">
@@ -27,9 +30,16 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-      <a class="navbar-brand" href="{% pageurl site_root %}">
-        <img src="{% static 'images/public-health-logo-sign.png' %}" alt="[logo]">
-        <span class="hidden-xs">{% contact_name the_site=the_site %}</span></a>
+
+	   <a class="navbar-brand" href="{% pageurl site_root %}">
+
+               {% if the_site|default:""|truncatechars:"255" == "dev.pro-salute.ch"%}
+               <img src="{% static 'images/pro-salute-logo.png' %}" alt="Pro Salute Logo">
+     	       {% else %}
+               <img src="{% static 'images/public-health-logo-sign.png' %}" alt="[logo]">
+   	       {% endif %}
+
+          <span class="hidden-xs">{% contact_name the_site=the_site %}</span></a>
     </div>
 
     {% block menu %}

From 4099b039f5f9daa9f0ea625b115895309edada9e Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mravi@ungleich.ch>
Date: Wed, 15 May 2024 04:04:32 +0000
Subject: [PATCH 050/122] Add Dockerfile

---
 Dockerfile | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ec46d16
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,88 @@
+#FROM python:3.10-alpine
+FROM docker.io/python:3.10-slim AS base
+
+ENV \
+   LANG=C.UTF-8 \
+   LC_ALL=C.UTF-8 \
+   # python:
+   PYTHONFAULTHANDLER=1 \
+   PYTHONUNBUFFERED=1 \
+   PYTHONHASHSEED=random \
+   PYTHONDONTWRITEBYTECODE=1
+
+RUN apt-get update
+
+RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpango-1.0-0 libpangoft2-1.0-0
+
+ENV VIRTUAL_ENV=/venv
+
+# Use production configuration.
+ENV DJANGO_SETTINGS_MODULE=project.settings
+ENV DJANGO_CONFIGURATION=production
+
+
+### builder image
+
+FROM base as build
+
+ENV \
+   # pip:
+   PIP_NO_CACHE_DIR=off \
+   PIP_DISABLE_PIP_VERSION_CHECK=on \
+   PIP_DEFAULT_TIMEOUT=100 \
+
+RUN apt-get install -y --no-install-recommends build-essential gcc
+
+# Install python build tools.
+RUN pip install --upgrade pip
+RUN pip install poetry wheel
+
+RUN python3 -m venv $VIRTUAL_ENV
+
+RUN mkdir -p /build
+WORKDIR /build
+
+# Install python dependencies.
+COPY requirements.txt requirements.txt ./
+RUN . /venv/bin/activate && pip install -r requirements.txt
+
+# We will run dumb-init as pid 1.
+RUN . /venv/bin/activate && pip install dumb-init
+
+# We will run our app using gunicorn.
+RUN . /venv/bin/activate && pip install gunicorn
+
+# Copy local code into to the build image.
+COPY . /build
+
+# Copy code required for runtime to the /app folder.
+RUN mkdir /app
+RUN cp -r apps project templates manage.py /app/
+
+# Collect static data into /app/static.
+RUN . /venv/bin/activate && \
+   DJANGO_STATIC_ROOT=/app/static ./manage.py collectstatic --no-input
+
+RUN ls -al /app/
+
+
+### runtime image
+
+FROM base as runtime
+
+#RUN apt-get install -y --no-install-recommends libpango-1.0-0 libpangoft2-1.0-0
+#RUN apt-get install -y --no-install-recommends procps iproute2 curl
+
+COPY --from=build /venv /venv
+COPY --from=build /app /app
+
+WORKDIR /app
+
+# Ensure exectutables from virtualenv are prefered.
+ENV PATH="/venv/bin:$PATH"
+ENTRYPOINT ["/venv/bin/dumb-init", "--", "gunicorn", \
+   "-b [::]:8000", \
+   "--log-file=-", \
+   "--worker-tmp-dir", "/dev/shm", \
+   "--workers=2", "--threads=4", "--worker-class=gthread"]
+CMD ["project.wsgi"]

From 6e835a10e6fdc466c29dc8f30275ef18d5a965af Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 15 May 2024 11:01:32 +0530
Subject: [PATCH 051/122] Fix required changes

---
 Dockerfile       | 13 +++++++------
 requirements.txt |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ec46d16..5a26a1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpa
 ENV VIRTUAL_ENV=/venv
 
 # Use production configuration.
-ENV DJANGO_SETTINGS_MODULE=project.settings
+ENV DJANGO_SETTINGS_MODULE=publichealth.settings
 ENV DJANGO_CONFIGURATION=production
 
 
@@ -29,13 +29,14 @@ ENV \
    # pip:
    PIP_NO_CACHE_DIR=off \
    PIP_DISABLE_PIP_VERSION_CHECK=on \
-   PIP_DEFAULT_TIMEOUT=100 \
+   PIP_DEFAULT_TIMEOUT=100
+
 
 RUN apt-get install -y --no-install-recommends build-essential gcc
 
 # Install python build tools.
-RUN pip install --upgrade pip
-RUN pip install poetry wheel
+RUN pip install --upgrade pip setuptools==58
+RUN pip install wheel
 
 RUN python3 -m venv $VIRTUAL_ENV
 
@@ -57,7 +58,7 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir /app
-RUN cp -r apps project templates manage.py /app/
+RUN cp -r publichealth yarn.lock manage.py /app/
 
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \
@@ -85,4 +86,4 @@ ENTRYPOINT ["/venv/bin/dumb-init", "--", "gunicorn", \
    "--log-file=-", \
    "--worker-tmp-dir", "/dev/shm", \
    "--workers=2", "--threads=4", "--worker-class=gthread"]
-CMD ["project.wsgi"]
+CMD ["publichealth.wsgi"]
diff --git a/requirements.txt b/requirements.txt
index 7faa249..5e6e6d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,5 +30,5 @@ Pillow==8.4.0
 gunicorn
 whitenoise
 python-dotenv
-ConcurrentLogHandler
+#ConcurrentLogHandler
 unidecode

From 9863959d88eb4bed5fe919a6b8a88c7438656b85 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 17 May 2024 19:06:50 +0530
Subject: [PATCH 052/122] Add feedler module to the app folder

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5a26a1f..b443d30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,7 +58,7 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir /app
-RUN cp -r publichealth yarn.lock manage.py /app/
+RUN cp -r publichealth feedler yarn.lock manage.py /app/
 
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \

From 0e0b464534181b0ddf97f2dbfb5340c79ceb73e4 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 16:53:37 +0530
Subject: [PATCH 053/122] Add django-configurations requirement

---
 requirements.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5e6e6d3..9f5f471 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-# Updated: 21.07.2021
+# Updated: 22.05.2024
 
 # Core
 wagtail==2.15.1
@@ -32,3 +32,5 @@ whitenoise
 python-dotenv
 #ConcurrentLogHandler
 unidecode
+
+django-configurations

From 1af8fe37672679f035b21f3a8dba371f09d1869e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:50:52 +0530
Subject: [PATCH 054/122] Use RotatingFileHandler instead of
 ConcurrentLogHandler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Why?
  error: subprocess-exited-with-error

  × python setup.py egg_info did not run successfully.
  │ exit code: 1
  ╰─> [1 lines of output]
      error in ConcurrentLogHandler setup command: use_2to3 is invalid.
      [end of output]

Looks like the module is incompatible with the latest setuptools. The recommended solution on the Internet seems to be to downgrade setuptools to 57.5.0 ;; however, this still does not solve the issue for my setup
---
 publichealth/settings/production.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/publichealth/settings/production.py b/publichealth/settings/production.py
index 78f27dc..e46caee 100644
--- a/publichealth/settings/production.py
+++ b/publichealth/settings/production.py
@@ -1,6 +1,8 @@
+import logging
 import os
 import dj_database_url
 
+from logging.handlers import RotatingFileHandler
 from .base import *
 
 # Do not set SECRET_KEY, Postgres or LDAP password or any other sensitive data here.
@@ -194,7 +196,7 @@ if 'LOG_DIR' in env:
     # Public Health Schweiz log
     LOGGING['handlers']['publichealth_file'] = {
         'level':        'INFO',
-        'class':        'cloghandler.ConcurrentRotatingFileHandler',
+        'class':        'logging.handlers.RotatingFileHandler',
         'filename':     os.path.join(env['LOG_DIR'], 'publichealth.log'),
         'maxBytes':     5242880, # 5MB
         'backupCount':  5
@@ -204,7 +206,7 @@ if 'LOG_DIR' in env:
     # Wagtail log
     LOGGING['handlers']['wagtail_file'] = {
         'level':        'WARNING',
-        'class':        'cloghandler.ConcurrentRotatingFileHandler',
+        'class':        'logging.handlers.RotatingFileHandler',
         'filename':     os.path.join(env['LOG_DIR'], 'wagtail.log'),
         'maxBytes':     5242880, # 5MB
         'backupCount':  5
@@ -214,7 +216,7 @@ if 'LOG_DIR' in env:
     # Error log
     LOGGING['handlers']['errors_file'] = {
         'level':        'ERROR',
-        'class':        'cloghandler.ConcurrentRotatingFileHandler',
+        'class':        'logging.handlers.RotatingFileHandler',
         'filename':     os.path.join(env['LOG_DIR'], 'error.log'),
         'maxBytes':     5242880, # 5MB
         'backupCount':  5

From aaf1fc1d9b2ec9041df28e9c5ceaffe6649a5176 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:52:23 +0530
Subject: [PATCH 055/122] Install yarn + tools

---
 Dockerfile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b443d30..6cafa97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,16 @@ RUN apt-get update
 
 RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpango-1.0-0 libpangoft2-1.0-0
 
+RUN apt-get update && \
+    apt-get install -y curl gnupg && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y yarn && \
+    apt-get install -y --no-install-recommends build-essential gcc && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
 ENV VIRTUAL_ENV=/venv
 
 # Use production configuration.
@@ -31,13 +41,6 @@ ENV \
    PIP_DISABLE_PIP_VERSION_CHECK=on \
    PIP_DEFAULT_TIMEOUT=100
 
-
-RUN apt-get install -y --no-install-recommends build-essential gcc
-
-# Install python build tools.
-RUN pip install --upgrade pip setuptools==58
-RUN pip install wheel
-
 RUN python3 -m venv $VIRTUAL_ENV
 
 RUN mkdir -p /build

From c013387b03967bbf0d2d8172fa4795e4f8079828 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:55:04 +0530
Subject: [PATCH 056/122] Generate / copy staticfiles + node libraries

---
 Dockerfile | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6cafa97..122ffe8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ ENV \
 
 RUN python3 -m venv $VIRTUAL_ENV
 
-RUN mkdir -p /build
+RUN mkdir -p /build/static
 WORKDIR /build
 
 # Install python dependencies.
@@ -60,12 +60,23 @@ RUN . /venv/bin/activate && pip install gunicorn
 COPY . /build
 
 # Copy code required for runtime to the /app folder.
-RUN mkdir /app
+RUN mkdir -p /app
 RUN cp -r publichealth feedler yarn.lock manage.py /app/
 
+# node / yarn
+RUN rm -rf node_modules
+RUN yarn install
+
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \
-   DJANGO_STATIC_ROOT=/app/static ./manage.py collectstatic --no-input
+   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
+
+RUN mkdir -p /app/publichealth/static/libs
+RUN ls -al /app/publichealth/static/libs
+RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
+#RUN mkdir -p /app/static/libs
+#RUN cp -rf node_modules/@bower_components/* /app/static/libs
+#RUN ls -al /app/publichealth/static/libs
 
 RUN ls -al /app/
 

From b5e786e09855a99e8bd8b5ad019a415da4dedad6 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:55:41 +0530
Subject: [PATCH 057/122] Copy built static files to app

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 122ffe8..661cd05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -80,6 +80,7 @@ RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
 
 RUN ls -al /app/
 
+RUN cp -r /build/static /app/static
 
 ### runtime image
 

From daf3a6baadcd00269b22c13d99991492f622db3f Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 21:56:55 +0530
Subject: [PATCH 058/122] Cleanup

---
 Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 661cd05..81417cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -74,11 +74,8 @@ RUN . /venv/bin/activate && \
 RUN mkdir -p /app/publichealth/static/libs
 RUN ls -al /app/publichealth/static/libs
 RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
-#RUN mkdir -p /app/static/libs
-#RUN cp -rf node_modules/@bower_components/* /app/static/libs
-#RUN ls -al /app/publichealth/static/libs
 
-RUN ls -al /app/
+
 
 RUN cp -r /build/static /app/static
 

From c18fb883cca8d949077101214e79d7e32f2c11d2 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 22 May 2024 22:25:54 +0530
Subject: [PATCH 059/122] Revert back dev configuration

---
 publichealth/settings/dev.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/publichealth/settings/dev.py b/publichealth/settings/dev.py
index e53fcf1..afa6a7d 100644
--- a/publichealth/settings/dev.py
+++ b/publichealth/settings/dev.py
@@ -17,20 +17,10 @@ BASE_URL = 'http://localhost:8000'
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-#DATABASES = {
-#    'default': {
-#        'ENGINE': 'django.db.backends.sqlite3',
-#        'NAME': 'publichealth-dev.sqlite3',
-#    }
-#}
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'publichealth',
-        'CONN_MAX_AGE': 600,  # number of seconds database connections should persist for
-
-        # User, host and port can be configured by the PGUSER, PGHOST and
-        # PGPORT environment variables (these get picked up by libpq).
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'publichealth-dev.sqlite3',
     }
 }
 

From c88b94f20f47636899de0e46f67784c5787c7fab Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 23 May 2024 17:05:21 +0530
Subject: [PATCH 060/122] Final changes

---
 Dockerfile | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 81417cf..0fe153f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,23 +61,26 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir -p /app
-RUN cp -r publichealth feedler yarn.lock manage.py /app/
+RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js /app/
 
-# node / yarn
-RUN rm -rf node_modules
-RUN yarn install
+
+RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x
+RUN apt install -y nodejs
+RUN npm install -g grunt-cli
 
 # Collect static data into /app/static.
-RUN . /venv/bin/activate && \
-   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
+#RUN . /venv/bin/activate && \
+#   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
 
-RUN mkdir -p /app/publichealth/static/libs
-RUN ls -al /app/publichealth/static/libs
-RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
+#RUN mkdir -p /app/publichealth/static/libs
+
+#RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
 
 
+#RUN . /venv/bin/activate && \
+#   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py compress --force
 
-RUN cp -r /build/static /app/static
+#RUN cp -r /build/static /app/static
 
 ### runtime image
 

From 5c173f0ffbad86bbca1f896859054157f7d36a6e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 24 May 2024 15:55:48 +0530
Subject: [PATCH 061/122] Revert back installing grunt-cli

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0fe153f..e48bf7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,9 +64,9 @@ RUN mkdir -p /app
 RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js /app/
 
 
-RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x
-RUN apt install -y nodejs
-RUN npm install -g grunt-cli
+#RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x
+#RUN apt install -y nodejs
+#RUN npm install -g grunt-cli
 
 # Collect static data into /app/static.
 #RUN . /venv/bin/activate && \

From 5ba9ee52ea5057ad30882e43adf78e0fa0f91b53 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 31 May 2024 19:08:08 +0530
Subject: [PATCH 062/122] Create setup_libs.sh

---
 setup_libs.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 setup_libs.sh

diff --git a/setup_libs.sh b/setup_libs.sh
new file mode 100755
index 0000000..ebd4ea3
--- /dev/null
+++ b/setup_libs.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cd /app 
+rm -rf node_modules
+yarn install
+mkdir -p /app/publichealth/static/libs
+echo "created /app/publichealth/static/libs contents "
+ls /app/publichealth/static/libs
+cp -rf node_modules/@bower_components/* /app/publichealth/static/libs/
+
+# static resources
+python manage.py collectstatic --no-input -i media --settings=publichealth.settings.production
+python manage.py compress --force --settings=publichealth.settings.production
+
+if [ -d /app/static ]; then
+  echo "Copying"
+  cp -a /app/static /pod
+fi

From b918903fcf475a7e2adeb413200b88d0d3118e38 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 31 May 2024 19:08:30 +0530
Subject: [PATCH 063/122] Copy setup_libs.sh to /app

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e48bf7b..ca4358a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,7 +61,7 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir -p /app
-RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js /app/
+RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js setup_libs.sh /app/
 
 
 #RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x

From a3cdc6b58a0ed0245f6fb84ed00c9165639f57c6 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 31 May 2024 19:09:01 +0530
Subject: [PATCH 064/122] Write DEBUG level logs to stdout

---
 publichealth/settings/production.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/publichealth/settings/production.py b/publichealth/settings/production.py
index e46caee..56096e0 100644
--- a/publichealth/settings/production.py
+++ b/publichealth/settings/production.py
@@ -1,5 +1,6 @@
 import logging
 import os
+import sys
 import dj_database_url
 
 from logging.handlers import RotatingFileHandler
@@ -151,10 +152,19 @@ LOGGING = {
             'level': 'ERROR',
             'class': 'django.utils.log.AdminEmailHandler',
         },
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
+            'stream': sys.stdout,
+            'formatter': 'simple',
+        },
     },
     'formatters': {
         'default': {
             'verbose': '[%(asctime)s] (%(process)d/%(thread)d) %(name)s %(levelname)s: %(message)s'
+        },
+        'simple': {
+            'verbose': '[%(asctime)s] (%(process)d/%(thread)d) %(name)s %(levelname)s: %(message)s'
         }
     },
     'loggers': {

From cd99b1bc4f907de4591686bb3e7f6bfb2fa2134b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 4 Jun 2024 17:07:38 +0530
Subject: [PATCH 065/122] Check variable before accessing attribute

---
 publichealth/home/templatetags/navigation.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 7082a43..9d984e9 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -54,12 +54,13 @@ def top_menu(context, parent, calling_page=None):
     menuitems = parent.get_children().live().in_menu().specific()
     for menuitem in menuitems:
         menuitem.show_dropdown = has_menu_children(menuitem)
-        menuitem.active = (calling_page.url.startswith(menuitem.url)
-                           if calling_page else False)
-        try:
-            menuitem.title = menuitem.trans_title
-        except AttributeError:
-            pass
+        if calling_page:
+            menuitem.active = (calling_page.url.startswith(menuitem.url)
+                               if calling_page else False)
+            try:
+                menuitem.title = menuitem.trans_title
+            except AttributeError:
+                pass
     return {
         'calling_page': calling_page,
         'menuitems': menuitems,

From 34ad67e8cd512a848c3bba44c4ef792a2f64c38d Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 17 Jun 2024 17:37:28 +0530
Subject: [PATCH 066/122] Add favicon-prosalute.ico

---
 .../static/images/favicon-prosalute.ico         | Bin 0 -> 15406 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 publichealth/static/images/favicon-prosalute.ico

diff --git a/publichealth/static/images/favicon-prosalute.ico b/publichealth/static/images/favicon-prosalute.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7611f740c0788b6de15c012f90bfd8da6a5fc190
GIT binary patch
literal 15406
zcmeHN2e1@H5M6UtFl!kw6k;ev%Y+e?QpqSuL;;l~2uhM53MxTCqT-kE2_`@hQItXi
z1*Ak22`WfZBwddG;=k1PoBOl3w|oEYA7D||->K@Fy}jA#o}QlWp6*tZqm*Nm8Z{K|
zYbo82Rg_y5MX6OQ{ku+0MVZO(>ej9JzqX?Mc#fjf;W7LPf02IAUCu_;tff*!0NLJb
z@1Yq3{PJg|{l0B+dih~DwW?vIHZ`p@qNRsC)&xC!y@Q4~cUSry{s6wNbsW_7Y6q?S
zI7}<v4^ziW?euChxA^|02VLacpCGS2snWJ&YLKS%^a*h6Nzk03e%ktDxxkZ55WUvI
zBjy19hKfanr!KS8t_?A<rWbB=62Q*i$D%1(HY-G<AM;TA3vFV2$@6}Jf8c#C`g?PX
zHZG4+n=@@Rx~<2so{_CR)bJ<^b-UIfXj=DGgi=W|tiSgyP8!_6W%#}|^K4q*44>zZ
z3efk=3(();5<89S=%ryz+|-D1d^Ehw@IB^y`U*QO92cZ_p7n`wOQ(luT0cL5HozP0
zJhW(1kP<P?23O4FK9C^n^)px6>A4#n^!bFK%4-9%YV;zfQYhjj^h_;=`V7!dm9=Wb
zQgf*$2dW<jSmh=YDM}`dx);n?J|{#ay?p}yT${FIhs-2K_1nsF8rR87-L7%aW9QhY
z-MKdEd4q#WdiiMYpK%ohbicHdOG|_5`-6Q*#8Wi6TiOoEdG&qsldQCSc1WN&-1z5@
z4yfyCbhL%~)^pOt&OTvBd%!1PI|_Q59%m8$z~RJ?wYR?@?Lz<$_Lel;4!>Z|OJyp3
zle+kX?Unqg3jc%NB<<N6Ge9_y624LsURRT2E!4TTUHBpTecZDpuHx@|hcgR5e5q~g
z$_4EBB}SH=af<7FhGjED>i3dv^gn%>_Io0MBmv69nuS*o5ecS*k0iev{D3P9zkDxy
z_&o5t;2(v{((~oRuU{+tot?kNXwk%=@Ppc%Y0aYjlQ#o-@k=_;ztY$({Gx3?m8<7f
zo?G<){2o)$JN72TI@_JcvQQy!+PU!D|85t7A6ogF*u_gLJ_rf;rj&hB_BXZPZ~wWl
zez5F{)8pq?$ROj<;%$1oh5GTHe_aw1elG~t;@8U`{PUsg+siq=m|R#tyw$<0j>q}y
zb(5234)W74OCl6t+10mv_%U|&kj#1c=vAZttDg^kEa+`~jD^-OjT(H}fG0`LeF*`O
z(L(rfFOchBI6nXS!LLqyf5G_HHEpc-_0%yxA7Wpg`2yIqBASK2^hG~y{w^v2w3iO_
zi?b~8Z~39{{ts`O*)QA)<oS)2r)bHvkl+jEYjLubzzgmAC7xXUAifJFjoW8f;O6h6
zDh|xk_H3KD-|5d@X~o^L5Ps-0++WIERX|=r&624hYJOt&S(j^qTugb+r{0BNb63p|
z8({S(VIe<mOO8!6tlId(`gfe>jwqwoAMwzO_qynnMs9Hq{@Rq$6UML1Hzo&64pb)&
zR2CPgF7FX1;SjCTiNTDMR42(d*J^UW<bcTmlLICPswW2!A3%%>aYMug^EKou5krxH
zdv-KrjIrgL<52$#`jUjW;DWIMk!S63y;I~`J8^Cmah@?xcnP`3{oCVed`aT`swAk!
zQE(UUc&Uvne`Vs(a@>E>gTIKijB4W%v2er{WjsLNBQAq{>a4+KB1R<XIa2gPE`H!x
z1oGnf=+>_Tag!mO8+LLm675LQk6c5StFm+PSVyZftkmIRyWll)^G|T@{gG3$V>XD@
zl=Sjbl;d<qivDSR{8@ZQ3>7sFYd(z-V(EwvA>NBPGh)*NIIgSRC#-8X*AN^D`Vn8&
z$AS?bba72Zu7>y}>K%|fkn)7JAbx(h=!ZNbR}u0jD+SbKpzY<_lE$3N01W`dED^f~
zot3o^>!^{fGBI1M19_IiMZeFH6tVqL9GkBUR(~26<e@%g7RSC3{{|p_y?1MVo#(YB
z2z4it|LDg)={3-gxGMGqwIUK$&JEML#Sx*SkuS-`C)@6X(7oFE_0Jy+OUK#qJ#=RV
zvTKC2dw{Wst559gHN;+L4fY%8*W=Xw#$LDPdLq~p)b>bu0KQ`A*V3nbMjSiD{6TFI
zYJzZXAu}ymCu!-xGjf$1zKs?|zjhAfUXhc;SwxfcOPS8qOa5zV#xrDl!?GyN8yOHW
z@gAJdZF#zpW{DrR4CmeNOdd4-m<u^L#K^J7(8cgQq#u&2Kd>WP#^L9z{USnrI2Q}K
zMSfD!n6JnBc5RFay!!L|=&4r0gUQ{zoNrFU_@}%y=zbSHj=USwt%Wx@kApogwjqD=
z^?RYbe3p1%uVB|;?@&AE*W@hp^jGHpK-Q51>Rdb9W+IOdJ5y|f?Ron0j6RpNqKE9k
z=61i%L8I9>`jG3()_fKbGOEw@RF!^7-<NN*zsK`Sd^lUE6)d*ReLaw6Pca|lXTUu!
zQLDCnT}<emke_QT^022^`u|v6E@}iM{moCb(9ZS6=WdYWmUE!TKK{O{Jg063Z?FcO
zF$u9qT8|e?KWY}W=d1<mF`T7h8qPavMkM{1Z|;adUOuDlWKvhJ3iC#m5$+Ae(mz{M
zCjtCz&$5wTuT*6%ed}fT-}E>uEf|x(z7aY^$Sq`-0s9A=uc!aXi)@5^ypL;BC3tN~
zadvPAg0CX^hQ813POghBaLLQDpea3kS@R5O;HCpym!Xw)>=W$ETCTy+<~?z~Q4@+h
zx1N5CLk%o)lM?#h<q~=awJ}=SvG2%DLl%o|n^+D}8!YF8j_h}*Q^?VGABJh=yf7_(
zH%Jqn@e11@$DxN0ux0`KQjAtlzjj=q=Pp;-g|A*L?HCU~bu9ZKu%%i&;0bI{%hRla
z=is&We>|gpL)!gf>BoGKq24z;X~+7)dH;NC!+pFz>r31T^)%-C4V!>F4*Yc4uuomD
zu@?Xb!DgejWjxoO!EPRG{#@dfJ#62cp=ClJH9H~4I+$OedtiMREuIn*wGHxH^jHh#
zC<M40;T&V%3dLl!^H=3L&NUdo4;_g*>*@XdG?{hf4DP|JZEVY+OA^JK$*Q0?$Cw;2
dIbd?Y<bcTmlLICP{#P8}@*uOB95`qW{0n(Mm;3+#

literal 0
HcmV?d00001


From a68dcb7574624569d36b0316426ef6cd590c9bad Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 13:38:15 +0530
Subject: [PATCH 067/122] Show terms and conditions link in the footer bottom

---
 publichealth/home/templatetags/navigation.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 9d984e9..f9e9896 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -67,7 +67,7 @@ def top_menu(context, parent, calling_page=None):
         'request': context['request'],
     }
 
-def menuitems_children(parent):
+def menuitems_children(parent, context=None):
     remove_mitglied = False
     remove_devenez = False
     if 'Qui sommes-nous' in parent.title:
@@ -90,6 +90,18 @@ def menuitems_children(parent):
             pass
     for item in items_to_remove:
         menuitems_children = menuitems_children & Page.objects.not_page(item)
+    if context:
+        request = context['request']
+        site = Site.find_for_request(request)
+        if site in ['sphc.ch', 'public-health.ch']:
+            print("site is %s, add terms and conditions to footer" % site.hostname)
+            # custom page here is the terms and conditions page for public-health.ch and sphc.ch (common)
+            custom_page_id = 994
+            custom_page = Page.objects.get(id=custom_page_id)
+            menuitems_children = list(menuitems_children)
+            menuitems_children.append(custom_page)
+            page_ids = [page.id for page in menuitems_children]
+            menuitems_children = Page.objects.filter(id__in=page_ids).specific()
     return menuitems_children
 
 # Retrieves the children of the top menu items for the drop downs
@@ -106,6 +118,6 @@ def top_menu_children(context, parent):
 def footer_menu(context, parent, calling_page=None):
     return {
         'calling_page': calling_page,
-        'menuitems': menuitems_children(parent),
+        'menuitems': menuitems_children(parent, context),
         'request': context['request'],
     }

From 31a0a6b0607bc432684f9d827f2a0a25c9cb1d04 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 14:03:53 +0530
Subject: [PATCH 068/122] Search hostname instead of site object

---
 publichealth/home/templatetags/navigation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index f9e9896..7025c5d 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -93,7 +93,7 @@ def menuitems_children(parent, context=None):
     if context:
         request = context['request']
         site = Site.find_for_request(request)
-        if site in ['sphc.ch', 'public-health.ch']:
+        if site.hostname in ['sphc.ch', 'public-health.ch']:
             print("site is %s, add terms and conditions to footer" % site.hostname)
             # custom page here is the terms and conditions page for public-health.ch and sphc.ch (common)
             custom_page_id = 994

From 780a4ce2d73d4285a3659e94aaa71aa5cf9770cc Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 14:04:15 +0530
Subject: [PATCH 069/122] Fix bug footer menu items not translated

---
 publichealth/home/templatetags/navigation.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 7025c5d..f03aea3 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -78,15 +78,13 @@ def menuitems_children(parent, context=None):
     items_to_remove = []
     for menuitem in menuitems_children:
         try:
-            if type(menuitem) == ContactForm:
-                menuitem.title = menuitem.title
-            else:
-                menuitem.title = menuitem.trans_title
             if 'devenez' in menuitem.title.lower() and remove_devenez:
                 items_to_remove.append(menuitem)
             elif 'mitglied werden' in menuitem.title.lower() and remove_mitglied:
                 items_to_remove.append(menuitem)
+            menuitem.title = menuitem.trans_title
         except AttributeError:
+            print("Menuitem %s has an issue :: %s" % (menuitem.title, str(ae)))
             pass
     for item in items_to_remove:
         menuitems_children = menuitems_children & Page.objects.not_page(item)

From 99eb7c39fe9d4f167f7c5dc46c43d875baf35462 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 16:20:19 +0530
Subject: [PATCH 070/122] Fix error instance

---
 publichealth/home/templatetags/navigation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index f03aea3..3db9dab 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -83,7 +83,7 @@ def menuitems_children(parent, context=None):
             elif 'mitglied werden' in menuitem.title.lower() and remove_mitglied:
                 items_to_remove.append(menuitem)
             menuitem.title = menuitem.trans_title
-        except AttributeError:
+        except AttributeError as ae:
             print("Menuitem %s has an issue :: %s" % (menuitem.title, str(ae)))
             pass
     for item in items_to_remove:

From 454767b55122193c49b3ea913e7b9558b23d0886 Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Fri, 19 Jul 2024 11:58:23 +0000
Subject: [PATCH 071/122] Fix footer menuitems translation

---
 publichealth/home/templatetags/navigation.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index f03aea3..669f443 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -77,13 +77,16 @@ def menuitems_children(parent, context=None):
     menuitems_children = parent.get_children().live().in_menu().specific()
     items_to_remove = []
     for menuitem in menuitems_children:
+        print('type => %s' % type(menuitem))
         try:
             if 'devenez' in menuitem.title.lower() and remove_devenez:
                 items_to_remove.append(menuitem)
             elif 'mitglied werden' in menuitem.title.lower() and remove_mitglied:
                 items_to_remove.append(menuitem)
-            menuitem.title = menuitem.trans_title
-        except AttributeError:
+            #menuitem.title = menuitem.trans_title
+            if context:
+                print(" title=%s ---- trans_title=%s" % (menuitem.title, menuitem.trans_title))
+        except AttributeError as ae:
             print("Menuitem %s has an issue :: %s" % (menuitem.title, str(ae)))
             pass
     for item in items_to_remove:
@@ -100,6 +103,11 @@ def menuitems_children(parent, context=None):
             menuitems_children.append(custom_page)
             page_ids = [page.id for page in menuitems_children]
             menuitems_children = Page.objects.filter(id__in=page_ids).specific()
+            for menuitem in menuitems_children:
+                try:
+                    menuitem.title = menuitem.trans_title
+                except AttributeError as aee:
+                    pass
     return menuitems_children
 
 # Retrieves the children of the top menu items for the drop downs

From 9618ac009427c449612416bb4d8383f53186534c Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 17:50:38 +0530
Subject: [PATCH 072/122] Cleanup and use correct page for EN

---
 publichealth/home/templatetags/navigation.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 9b5afe5..21d1d8a 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -77,14 +77,12 @@ def menuitems_children(parent, context=None):
     menuitems_children = parent.get_children().live().in_menu().specific()
     items_to_remove = []
     for menuitem in menuitems_children:
-        print('type => %s' % type(menuitem))
         try:
             if 'devenez' in menuitem.title.lower() and remove_devenez:
                 items_to_remove.append(menuitem)
             elif 'mitglied werden' in menuitem.title.lower() and remove_mitglied:
                 items_to_remove.append(menuitem)
         except AttributeError as ae:
-            print("Menuitem %s has an issue :: %s" % (menuitem.title, str(ae)))
             pass
     for item in items_to_remove:
         menuitems_children = menuitems_children & Page.objects.not_page(item)
@@ -94,7 +92,10 @@ def menuitems_children(parent, context=None):
         if site.hostname in ['sphc.ch', 'public-health.ch']:
             print("site is %s, add terms and conditions to footer" % site.hostname)
             # custom page here is the terms and conditions page for public-health.ch and sphc.ch (common)
-            custom_page_id = 994
+            if request.__dict__.get('LANGUAGE_CODE', 'de').lower() == 'en':
+                custom_page_id = 1020
+            else:
+                custom_page_id = 994
             custom_page = Page.objects.get(id=custom_page_id)
             menuitems_children = list(menuitems_children)
             menuitems_children.append(custom_page)

From 822fca63c3852968ca9fdb680756b33ce2997582 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 16:21:47 +0200
Subject: [PATCH 073/122] Add add_item_to_page_queryset method

---
 publichealth/home/templatetags/navigation.py | 23 +++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 21d1d8a..3bb6ea9 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import template
 from django.utils import translation
+from django.db.models import Case, When
 
 from wagtail.core.models import Site, Page
 from ..models.forms import ContactForm
@@ -98,16 +99,36 @@ def menuitems_children(parent, context=None):
                 custom_page_id = 994
             custom_page = Page.objects.get(id=custom_page_id)
             menuitems_children = list(menuitems_children)
-            menuitems_children.append(custom_page)
+            if custom_page not in menuitems_children:
+                #menuitems_children.append(custom_page)
+                print("custom_page == ")
             page_ids = [page.id for page in menuitems_children]
+            print("hostname is %s" % site.hostname)
             menuitems_children = Page.objects.filter(id__in=page_ids).specific()
             for menuitem in menuitems_children:
                 try:
                     menuitem.title = menuitem.trans_title
+                    print(menuitem.title)
                 except AttributeError as aee:
                     pass
+            menuitems_children = add_item_to_page_queryset(menuitems_children, custom_page)
     return menuitems_children
 
+def add_item_to_page_queryset(queryset, custom_page):
+    # Convert queryset to a list
+    pages_list = list(queryset)
+    
+    # Add the custom page to the list
+    pages_list.append(custom_page)
+    
+    # Create a new ordered queryset based on the list order
+    page_ids = [page.id for page in pages_list]
+    preserved_order = Case(*[When(pk=pk, then=pos) for pos, pk in enumerate(page_ids)])
+    new_queryset = Page.objects.filter(id__in=page_ids).order_by(preserved_order).specific()
+    
+    return new_queryset
+
+
 # Retrieves the children of the top menu items for the drop downs
 @register.inclusion_tag('tags/top_menu_children.html', takes_context=True)
 def top_menu_children(context, parent):

From 87332a9f0532e9f782b970e96efd057af0390e5e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 19:56:32 +0530
Subject: [PATCH 074/122] Cleanup

---
 publichealth/home/templatetags/navigation.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 3bb6ea9..74018dd 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -91,7 +91,6 @@ def menuitems_children(parent, context=None):
         request = context['request']
         site = Site.find_for_request(request)
         if site.hostname in ['sphc.ch', 'public-health.ch']:
-            print("site is %s, add terms and conditions to footer" % site.hostname)
             # custom page here is the terms and conditions page for public-health.ch and sphc.ch (common)
             if request.__dict__.get('LANGUAGE_CODE', 'de').lower() == 'en':
                 custom_page_id = 1020
@@ -99,11 +98,7 @@ def menuitems_children(parent, context=None):
                 custom_page_id = 994
             custom_page = Page.objects.get(id=custom_page_id)
             menuitems_children = list(menuitems_children)
-            if custom_page not in menuitems_children:
-                #menuitems_children.append(custom_page)
-                print("custom_page == ")
             page_ids = [page.id for page in menuitems_children]
-            print("hostname is %s" % site.hostname)
             menuitems_children = Page.objects.filter(id__in=page_ids).specific()
             for menuitem in menuitems_children:
                 try:
@@ -117,15 +112,12 @@ def menuitems_children(parent, context=None):
 def add_item_to_page_queryset(queryset, custom_page):
     # Convert queryset to a list
     pages_list = list(queryset)
-    
     # Add the custom page to the list
     pages_list.append(custom_page)
-    
     # Create a new ordered queryset based on the list order
     page_ids = [page.id for page in pages_list]
     preserved_order = Case(*[When(pk=pk, then=pos) for pos, pk in enumerate(page_ids)])
     new_queryset = Page.objects.filter(id__in=page_ids).order_by(preserved_order).specific()
-    
     return new_queryset
 
 

From 2a6434e569af8f824372cf44f18827a1b3ceb99b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 20:01:32 +0530
Subject: [PATCH 075/122] Simplify

---
 publichealth/home/templatetags/navigation.py | 23 ++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 74018dd..f1f495b 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -97,16 +97,16 @@ def menuitems_children(parent, context=None):
             else:
                 custom_page_id = 994
             custom_page = Page.objects.get(id=custom_page_id)
-            menuitems_children = list(menuitems_children)
-            page_ids = [page.id for page in menuitems_children]
-            menuitems_children = Page.objects.filter(id__in=page_ids).specific()
-            for menuitem in menuitems_children:
-                try:
-                    menuitem.title = menuitem.trans_title
-                    print(menuitem.title)
-                except AttributeError as aee:
-                    pass
+            #menuitems_children = list(menuitems_children)
+            #page_ids = [page.id for page in menuitems_children]
+            #menuitems_children = Page.objects.filter(id__in=page_ids).specific()
             menuitems_children = add_item_to_page_queryset(menuitems_children, custom_page)
+            #for menuitem in menuitems_children:
+            #    try:
+            #        menuitem.title = menuitem.trans_title
+            #        print(menuitem.title)
+            #    except AttributeError as aee:
+            #        pass
     return menuitems_children
 
 def add_item_to_page_queryset(queryset, custom_page):
@@ -114,6 +114,11 @@ def add_item_to_page_queryset(queryset, custom_page):
     pages_list = list(queryset)
     # Add the custom page to the list
     pages_list.append(custom_page)
+    for menuitem in pages_list:
+        try:
+            menuitem.title = menuitem.trans_title
+        except AttributeError as aee:
+            pass
     # Create a new ordered queryset based on the list order
     page_ids = [page.id for page in pages_list]
     preserved_order = Case(*[When(pk=pk, then=pos) for pos, pk in enumerate(page_ids)])

From df467691b8c7bf1ffbce4bf1f4d14b65b5078291 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 20:09:23 +0530
Subject: [PATCH 076/122] More reorganize

---
 publichealth/home/templatetags/navigation.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index f1f495b..ce74ae3 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -97,16 +97,13 @@ def menuitems_children(parent, context=None):
             else:
                 custom_page_id = 994
             custom_page = Page.objects.get(id=custom_page_id)
-            #menuitems_children = list(menuitems_children)
-            #page_ids = [page.id for page in menuitems_children]
-            #menuitems_children = Page.objects.filter(id__in=page_ids).specific()
             menuitems_children = add_item_to_page_queryset(menuitems_children, custom_page)
-            #for menuitem in menuitems_children:
-            #    try:
-            #        menuitem.title = menuitem.trans_title
-            #        print(menuitem.title)
-            #    except AttributeError as aee:
-            #        pass
+            for menuitem in menuitems_children:
+                try:
+                    menuitem.title = menuitem.trans_title
+                    print(menuitem.title)
+                except AttributeError as aee:
+                    pass
     return menuitems_children
 
 def add_item_to_page_queryset(queryset, custom_page):
@@ -114,11 +111,6 @@ def add_item_to_page_queryset(queryset, custom_page):
     pages_list = list(queryset)
     # Add the custom page to the list
     pages_list.append(custom_page)
-    for menuitem in pages_list:
-        try:
-            menuitem.title = menuitem.trans_title
-        except AttributeError as aee:
-            pass
     # Create a new ordered queryset based on the list order
     page_ids = [page.id for page in pages_list]
     preserved_order = Case(*[When(pk=pk, then=pos) for pos, pk in enumerate(page_ids)])

From b3b2a73fc9eea362c59e743a684b1e587acbc257 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 19 Jul 2024 20:13:11 +0530
Subject: [PATCH 077/122] Cleanup

---
 publichealth/home/templatetags/navigation.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index ce74ae3..83d5c08 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -101,7 +101,6 @@ def menuitems_children(parent, context=None):
             for menuitem in menuitems_children:
                 try:
                     menuitem.title = menuitem.trans_title
-                    print(menuitem.title)
                 except AttributeError as aee:
                     pass
     return menuitems_children

From 493626336f6eafadf64e5998940853a58b4f9e3d Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sun, 25 Aug 2024 12:52:02 +0530
Subject: [PATCH 078/122] Translate sub menu item

---
 publichealth/home/templatetags/navigation.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 83d5c08..98d3908 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -83,6 +83,7 @@ def menuitems_children(parent, context=None):
                 items_to_remove.append(menuitem)
             elif 'mitglied werden' in menuitem.title.lower() and remove_mitglied:
                 items_to_remove.append(menuitem)
+            menuitem.title = menuitem.trans_title
         except AttributeError as ae:
             pass
     for item in items_to_remove:

From 59d1496808c342290becdfb347ffe65a65c79cd9 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 18 Apr 2025 13:33:20 +0530
Subject: [PATCH 079/122] Add linkedin image

---
 publichealth/static/images/social/linkedin.png | Bin 0 -> 27976 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 publichealth/static/images/social/linkedin.png

diff --git a/publichealth/static/images/social/linkedin.png b/publichealth/static/images/social/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..24ea31437b80a402fba2a2bce5170964e453b27b
GIT binary patch
literal 27976
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
P0{=naKM4H)2m=2HVL(MK

literal 0
HcmV?d00001


From 3c38fb25e1a3d51b1486737f266945f1831c7ef6 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 18 Apr 2025 13:34:56 +0530
Subject: [PATCH 080/122] Add code to handle linkedin social

---
 publichealth/home/models/snippets.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/publichealth/home/models/snippets.py b/publichealth/home/models/snippets.py
index 5d058fe..ee04eb3 100644
--- a/publichealth/home/models/snippets.py
+++ b/publichealth/home/models/snippets.py
@@ -17,6 +17,7 @@ from ..util import TranslatedField
 SOCIAL_NETWORK_SUPPORTED = (
     ('twitter', 'Twitter'),
     ('facebook', 'Facebook'),
+    ('linkedin', 'LinkedIn'),
 )
 
 @register_snippet
@@ -47,6 +48,8 @@ class SocialContact(models.Model):
             return "https://twitter.com/%s" % self.profile
         elif self.network == 'facebook':
             return "https://facebook.com/%s" % self.profile
+        elif self.network == 'linkedin':
+            return "https://www.linkedin.com/company/%s" % self.profile
         return "#"
     def __str__(self):
         return "%s" % self.network

From 430864fa68669796a52540685a1c1c3e52c6aad5 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 18 Apr 2025 14:06:54 +0530
Subject: [PATCH 081/122] Update linkedin

---
 .../static/images/social/linkedin.png         | Bin 27976 -> 28731 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/publichealth/static/images/social/linkedin.png b/publichealth/static/images/social/linkedin.png
index 24ea31437b80a402fba2a2bce5170964e453b27b..ae4b3ab547bb393774aef4878e06e1e60995a30d 100644
GIT binary patch
literal 28731
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%0AF`##ELG}
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
E2VsmMDF6Tf

literal 27976
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
P0{=naKM4H)2m=2HVL(MK


From 2f8dd0c1845acbd1eb2b9583fe69d6e1658d8a51 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Fri, 18 Apr 2025 14:15:16 +0530
Subject: [PATCH 082/122] Update linkedin image

---
 .../static/images/social/linkedin.png         | Bin 28731 -> 4371 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/publichealth/static/images/social/linkedin.png b/publichealth/static/images/social/linkedin.png
index ae4b3ab547bb393774aef4878e06e1e60995a30d..0c639c8104947f017019563af1d78e1d50bacd07 100644
GIT binary patch
literal 4371
zcmeHLe^8U>9e?seAt;dKjiMDo2rCI#Ezb2w4}qYeL5~Iy@9f?11Xs0kT_M_0CSqbh
zN$8H?+#PYm28%1>k5!mD*F%NiOVJyibK_c-Gtjra=&ewp;UXy!_kEr>DDunRcDKLw
z2k-kn-=ClFujlf`lB3gxhP)Jl5DML#so9DUSAqY67XxKej_)2q!n>O_>D$Wg4u5eZ
zv@3Bbat?L;>=k3<vV@8g?V_UO#}^P9AL5|=Ex$C2knj}~9|;rSQB|YlAPs&Tmv2Gn
zh&&4!TaNGAfMhvU0wmiCkGfDvEJETV%sC!9sUH1|W8Bs_-iOq2Ifr&38Kq2JgX#nl
zhXh^Y*JKNjnL_HuU<%2il&MijrVAK7)Ht3GI=Vv%NVZIwN})On<p@SX1v08damc9R
zAQjkJLg)Yv;$!$|g-DqiL`d8z66WmXb?-%p77(=sUly>tpa5$F!vM(_yfC5wu!UY~
zJHbBlRr1as6}}?K&wG}-V&A{;N4WSj*QknF^%MCbq?d1bW8G_rwkSpMz^k&TIcmFE
zd>jPQZDt8!DA9P@4@<i=XCSXt*TqWwB66}Ueh6YTwqTGGFq+0$45-RehJd@MGp#Qh
ztOL=Kn9fS8use!1GfkR?465z2EJz}wu@_`>XhE084)(zuA6c)cL<&HwHxaay9?*&u
ztla>EwTl_)tV4K%25T4I#4gdm46sWaKF0_*&oZJ;x6Nn721fWbtOjd67zfYIV67+O
zaB^ld1YLZn0q%N;6WUg&;AUV`LM6l*VDR-YAI})iH28RMgbF!mKmwGQVai;$8`6uL
z+f3mJgY-&raT?B;#lR@Ez*Dd>qYivzzVYGNCAa|r){p4JfXIK^j_-O341=p<bZC6@
z`}xj#tsRy8+#DPMzMFPwS|N1W{1!*gm1WW)485uQSoo>y!|M%s;si65rm!~n8ah@s
z#4`NwdhHGWje&QMhLD84wWsJWW@^LR(nL>^;oSRQ<EBuZRvC5<{3#YUOBL;}_*IgX
zw8u|9kGk)r5Vg$Sf%?)XL^x)>VdtGN(pgo#{))nOwwJ`7N4tl4MEF|o!1fCfPlfy5
zlj#m^qXj2@6TkQJ^h}dn2j;e)j|CiNsnm0`cOc?CbmN8^X%s$ud2Tfvej|;<hx&7`
z!l72W3LmzgTMvgi=}ScC>XR({;PJ6*Hp8CDE6bsA22YQ5l7j>v+Q$BB>rgpYnN*_(
zzHha4_$Iyxmgr566WVV7KRu6*;*LpEgxC1?x*vXv!#S*zN{Gw!Ml<ENZ-{d{PIjC%
zsYQzM*MFVayVE|n1J4F6IO~4+VL(BI6~653m+M9jd~YPq`K}1;rRS=@Ti}X-Ie~d`
zt)MNA6V+G!&Q+BpwVlb87}h(sG-z^*73Sd5Yq)OV$9y~t{{A;@iG~rEOb0lYyTi*4
z5O^V;pyDt{ahb9=dgMC-QtS?QMFpHlv6G-KKSwVob3fuG`a*X&8#p*gBh69i<GExQ
zWVI6zRbeEFwzR=eF^+UaZ}g>2q<EZ5n{bM(CLgXVj(l*<MmvZId!vO4QfgEzV(6RK
zD+?yS@%|%XOd5j$FLq}i4yxD(jWPQ7vZcL_A=gRcWwpI5A9MB(WYM)y#RMtWb8)X%
z5WqUI`|QwChK^-o5)DJki95f#HP8FEuo&G2sg&cnf7Xx?S7fCH(on0>*Z*?+u_u2}
zjTV&gd!y5+i9HTrEWwPJ<Z8&UG=vs-dt7(c&=zeMuVAvYr@ivASRoYv`Sb7YtfMVK
zg#7tLWeTNG?a-Sl+A2#!^-SRivUTimhTVN#Z>n~VHgu%4ReQtqOm2zaZH=x<IbY83
zt){P&3=@SBZ3c#}G^(6d=i0mJdQ%V<zc(T+4C=P@z|G<?Rh+LjQ`RFOUH;XZU2AKo
za1JDtm%J|;5OS-FCri2I`=YxAQV#fUtuGbp8Bxi&yEq!Yx7r8U@1ajlLB&zz6<`0N
zp-(PL6oKzz%DWZlLdCe?c6NEZuEZZU;2$<U612zbBGUk6$K&%3Gu89(!HofFnWNRg
z(4(=sk@5cQ35!bauXXu{Ii-DvYpBR8O#rY!JFH;nuaXaXF7j^YCMW1h#<7SoDFnWW
zNU|~NLKDNU#s<U6np&Gc91M>1=O!0vD;Cd1uTklV73A%!t)aA5mGf$G_OOznZ?S&z
zu%9vTb7SD6yLq&w>4PzM@#O8i@~7nFqbbW2wXRzY9ll>=54WhCSTo7+P~zQYR~>|+
zSCkiJ4>w!CeGqjSuDlOIKs7Q2qQ8=Iq1jAnF<5_F^K@y^9QMG-T;zZoZSkbr3icR2
zYwvR2?L0m6K%^)e8*WL-03cZ6;i;~V*dUuA$apr$B*Rb(jzFq6Y3GaazX^Q`b$N4Z
zGkAo0Jm}9WhrE-lMnhcPmL{!z@Ycm<uLLmTETwt-0BGc8D7$AK@*`a#R-C6CGlOx(
z54C_tnCc(Ev|PuU?t!?-Z9f~5fUW3Eqycgu7E)-Ey#@38d@D@lgKd`2YUY4sV#At=
zG(dhDi-+K!NqsKDK$hl7ugW>Q52hmd^YgtqIHP-CwY;#~NI%Y9a5jzew%dzF%JniC
zshcxF{SQa#f+O`)wn|US@m%8B)|xqh(?@jLTuvtkCU@o(%w5R;-zIb2Ch%ir-o~DF
z?@jePxf!3`#S6C9+_x)R#rp|!K$>g8e8G<Rqko&H^5BO*Sz;G{!O!xA1?E|Vk5vbD
z-_CZ}NT$|`PIDscW$Lv$So8vB6Xke$#D~KDRX6#ttsu1>7RdsQ4L)TN3hpA5c@!Jl
zS}4y!#<ww3wk!_TA|R_d=(n&PA>%f@e99u?K>FG=>3qDq%2o!*AiW<OQUC7DN)ZaC
zj&KoPaS>i=(Z}#GD({$bc}AHi0l{N6l4)uWa?#QTQP=Wg2KZ+O+MJ=&e7do~^luSN
Bazg+B

literal 28731
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%0AF`##ELG}
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
E2VsmMDF6Tf


From 20bf41652f30d4c585a1a0528e9a019b8f839cd0 Mon Sep 17 00:00:00 2001
From: app <app@publichealth.ch>
Date: Tue, 10 Jun 2025 18:03:07 +0000
Subject: [PATCH 083/122] Fix child menu translations

---
 publichealth/home/templates/tags/top_menu_children.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templates/tags/top_menu_children.html b/publichealth/home/templates/tags/top_menu_children.html
index ba5f63f..8dc3281 100644
--- a/publichealth/home/templates/tags/top_menu_children.html
+++ b/publichealth/home/templates/tags/top_menu_children.html
@@ -3,6 +3,6 @@
 <ul class="dropdown-menu">
     <!--<li><a href="{% pageurl parent %}">{{ parent.title }}</a></li>-->
     {% for child in menuitems_children %}
-        <li><a href="{% pageurl child %}">{{ child.title }}</a></li>
+        <li><a href="{% pageurl child %}">{{ child.trans_title }}</a></li>
     {% endfor %}
 </ul>

From 5a41ab3cc22db68319b025c22ebc703ead44f031 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 16:41:36 +0530
Subject: [PATCH 084/122] Changes

---
 feedler/admin.py              |  8 ++++----
 publichealth/home/routes.py   |  4 ++--
 publichealth/settings/base.py | 11 ++++++++---
 publichealth/urls.py          | 24 ++++++++++++------------
 requirements.txt              | 25 +++++++++++++------------
 5 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/feedler/admin.py b/feedler/admin.py
index 1c46d68..0b4c634 100644
--- a/feedler/admin.py
+++ b/feedler/admin.py
@@ -3,17 +3,17 @@
 from django.db import models
 from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
-from django.conf.urls import url
+from django.urls import re_path  # django.conf.urls.url removed in Django 4.0
 from django.urls import reverse
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _  # ugettext deprecated in Django 4.0
 from django.shortcuts import redirect
 
 from wagtail.admin import messages
 from wagtail.contrib.modeladmin.helpers import AdminURLHelper, ButtonHelper
 from wagtail.contrib.modeladmin.options import ModelAdmin
 from wagtail.contrib.modeladmin.views import IndexView
-from wagtail.core.models import Site
+from wagtail.models import Site  # wagtail.core.models moved to wagtail.models in 3.0
 
 from feedler.models import Entry
 from feedler.refresh import refresh_streams
@@ -86,7 +86,7 @@ class EntryModelAdminMixin(object):
     def get_admin_urls_for_registration(self):
         urls = super().get_admin_urls_for_registration()
         urls += (
-            url(
+            re_path(
                 self.url_helper.get_action_url_pattern('refresh'),
                 self.refresh_view,
                 name=self.url_helper.get_action_url_name('refresh')
diff --git a/publichealth/home/routes.py b/publichealth/home/routes.py
index 046884f..a813b16 100644
--- a/publichealth/home/routes.py
+++ b/publichealth/home/routes.py
@@ -4,9 +4,9 @@ from datetime import date
 
 from django.utils.dateformat import DateFormat
 from django.utils.formats import date_format
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _  # ugettext_lazy deprecated in Django 4.0
 
-from wagtail.core.models import Page
+from wagtail.models import Page  # wagtail.core.models moved to wagtail.models in 3.0
 from wagtail.search.models import Query
 from wagtail.contrib.routable_page.models import RoutablePageMixin, route
 
diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py
index f66b723..f729dbe 100644
--- a/publichealth/settings/base.py
+++ b/publichealth/settings/base.py
@@ -18,6 +18,9 @@ import os
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 BASE_DIR = os.path.dirname(PROJECT_DIR)
 
+# Django 4.0 requires DEFAULT_AUTO_FIELD
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
 # Project custom settings
 
 NEWS_ENTRIES_HOME_PAGE = 2
@@ -43,7 +46,7 @@ INSTALLED_APPS = [
     'wagtail.contrib.forms',
     'wagtail.contrib.redirects',
     'wagtail.contrib.search_promotions',
-    "wagtail.contrib.legacy.richtext",
+    # "wagtail.contrib.legacy.richtext",  # Removed in Wagtail 3.0
     'wagtail.contrib.table_block',
 
     'wagtail.embeds',
@@ -54,7 +57,8 @@ INSTALLED_APPS = [
     'wagtail.images',
     'wagtail.search',
     'wagtail.admin',
-    'wagtail.core',
+    # 'wagtail.core' renamed to 'wagtail' in Wagtail 3.0
+    'wagtail',
 
     'wagtail.api.v2',
     'rest_framework',
@@ -163,7 +167,8 @@ LANGUAGE_CODE = 'de' # default language
 TIME_ZONE = 'Europe/Zurich'
 
 USE_I18N = True
-USE_L10N = True
+# USE_L10N is deprecated in Django 4.0 and always True
+# USE_L10N = True
 USE_TZ = True
 
 
diff --git a/publichealth/urls.py b/publichealth/urls.py
index eb79f47..1c6b058 100644
--- a/publichealth/urls.py
+++ b/publichealth/urls.py
@@ -1,11 +1,11 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path, path
 from django.conf import settings
 from django.contrib import admin
 from django.conf.urls.i18n import i18n_patterns
 
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.documents import urls as wagtaildocs_urls
-from wagtail.core import urls as wagtail_urls
+from wagtail import urls as wagtail_urls  # wagtail.core renamed to wagtail in 3.0
 from wagtail.contrib.sitemaps.views import sitemap
 
 from puput import urls as puput_urls
@@ -14,17 +14,17 @@ from feedler import urls as feedler_urls
 from publichealth.search import views as search_views
 
 urlpatterns = [
-    url(r'', include(puput_urls)),
-    url(r'', include(feedler_urls)),
+    path('', include(puput_urls)),
+    path('', include(feedler_urls)),
 
-    url(r'^django-admin/', admin.site.urls),
+    path('django-admin/', admin.site.urls),
 
-    url(r'^admin/', include(wagtailadmin_urls)),
-    url(r'^documents/', include(wagtaildocs_urls)),
+    path('admin/', include(wagtailadmin_urls)),
+    path('documents/', include(wagtaildocs_urls)),
 
-    url(r'^search/$', search_views.search, name='search'),
+    path('search/', search_views.search, name='search'),
 
-    url('^sitemap\.xml$', sitemap),
+    re_path(r'^sitemap\.xml$', sitemap),
 ]
 
 
@@ -39,13 +39,13 @@ if settings.DEBUG:
 
     # Add views for testing 404 and 500 templates
     urlpatterns += [
-        url(r'^test404/$', TemplateView.as_view(template_name='404.html')),
-        url(r'^test500/$', TemplateView.as_view(template_name='500.html')),
+        path('test404/', TemplateView.as_view(template_name='404.html')),
+        path('test500/', TemplateView.as_view(template_name='500.html')),
     ]
 
 
 urlpatterns += i18n_patterns(
     # These URLs will have /<language_code>/ appended to the beginning
 
-    url(r'', include(wagtail_urls)),
+    path('', include(wagtail_urls)),
 )
diff --git a/requirements.txt b/requirements.txt
index 9f5f471..ac75031 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,30 +1,31 @@
-# Updated: 22.05.2024
+# Updated: 2025-09-18 - Django 4.0 Upgrade
 
 # Core
-wagtail==2.15.1
+Django==4.0.10  # Explicitly specify Django 4.0 (LTS)
+wagtail==3.0.3  # Wagtail 3.0 supports Django 4.0
 elasticsearch==5.5.3
 
 # Database
-psycopg2-binary==2.9.2
-dj-database-url==0.5.0
+psycopg2-binary==2.9.9  # Updated for better compatibility
+dj-database-url==1.2.0  # Updated for Django 4.0
 
 # Content
-puput==1.1.3
+puput==2.0.0  # Updated for Wagtail 3.0 compatibility
 guess-language-spirit==0.5.3
 
 # Caching
-django-redis==5.1.0
+django-redis==5.2.0  # Updated for Django 4.0
 
 # Frontend
-django-anymail==8.4
+django-anymail==9.0  # Updated for Django 4.0
 django-colorful==1.3
-django-contrib-comments==2.1.0
-django-crispy-forms==1.13.0
+django-contrib-comments==2.2.0  # Updated for Django 4.0
+django-crispy-forms==1.14.0  # Updated for Django 4.0
 django-el-pagination==3.3.0
 django-libsass==0.9
-django-social-share==2.2.1
-libsass==0.21.0
-Pillow==8.4.0
+django-social-share==2.3.0  # Updated for Django 4.0
+libsass==0.22.0  # Updated version
+Pillow==9.3.0  # Updated for better compatibility
 
 # Runtime dependencies
 gunicorn

From 69b2f3801d111dc3948f13b8da39d598e8ae1806 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 16:41:53 +0530
Subject: [PATCH 085/122] Add requirements-django4.txt

---
 requirements-django4.txt | 43 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 requirements-django4.txt

diff --git a/requirements-django4.txt b/requirements-django4.txt
new file mode 100644
index 0000000..7733301
--- /dev/null
+++ b/requirements-django4.txt
@@ -0,0 +1,43 @@
+# Django 4.0 Upgrade - Python 3.13 compatible versions
+
+# Core
+Django==4.0.10
+wagtail==3.0.3
+elasticsearch==5.5.3
+
+# Database
+psycopg2-binary
+dj-database-url==1.2.0
+
+# Content
+# Note: puput may need manual fixing for Wagtail 3.0
+# puput==2.0.0
+guess-language-spirit==0.5.3
+
+# Caching
+django-redis==5.2.0
+redis
+
+# Frontend
+django-anymail==9.0
+django-colorful==1.3
+django-contrib-comments==2.2.0
+django-crispy-forms==1.14.0
+django-el-pagination==3.3.0
+django-compressor
+django-libsass==0.9
+django-social-share==2.3.0
+libsass
+Pillow
+
+# Runtime dependencies
+gunicorn
+whitenoise
+python-dotenv
+unidecode
+
+# Additional Django 4.0 dependencies
+django-configurations
+django-taggit
+djangorestframework
+django-modelcluster
\ No newline at end of file

From a390a0218f96ac3a2a21994b3e4b7c3746309768 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 17:13:25 +0530
Subject: [PATCH 086/122] Upgrades for Django 4.2

---
 publichealth/settings/base.py       | 17 ++++++++---
 publichealth/settings/production.py |  4 +++
 requirements.txt                    | 44 +++++++++++++++++++----------
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py
index f729dbe..9c94366 100644
--- a/publichealth/settings/base.py
+++ b/publichealth/settings/base.py
@@ -41,7 +41,8 @@ INSTALLED_APPS = [
 
     'wagtail.contrib.routable_page',
     'wagtail.contrib.sitemaps',
-    'wagtail.contrib.modeladmin',
+    # 'wagtail.contrib.modeladmin',  # Deprecated in Wagtail 5, use snippets instead
+    'wagtail.snippets',
     'wagtail.contrib.settings',
     'wagtail.contrib.forms',
     'wagtail.contrib.redirects',
@@ -185,9 +186,16 @@ STATICFILES_DIRS = [
     os.path.join(PROJECT_DIR, 'static'),
 ]
 
-# Whitenoise compression and caching support
+# Django 4.2 uses STORAGES setting instead of STATICFILES_STORAGE
 # http://whitenoise.evans.io/en/stable/django.html
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+}
 
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 STATIC_URL = '/static/'
@@ -207,9 +215,10 @@ COMPRESS_PRECOMPILERS = [
 
 WAGTAIL_SITE_NAME = "Public Health Schweiz"
 
+# Wagtail 5 uses Draftail as default editor
 WAGTAILADMIN_RICH_TEXT_EDITORS = {
     'default': {
-        'WIDGET': 'wagtail.admin.rich_text.HalloRichTextArea'
+        'WIDGET': 'wagtail.admin.rich_text.DraftailRichTextArea'
     }
 }
 
diff --git a/publichealth/settings/production.py b/publichealth/settings/production.py
index 56096e0..58f1c19 100644
--- a/publichealth/settings/production.py
+++ b/publichealth/settings/production.py
@@ -43,9 +43,13 @@ if 'SECRET_KEY' in env:
 
 if 'ALLOWED_HOSTS' in env:
     ALLOWED_HOSTS = env['ALLOWED_HOSTS'].split(',')
+    # Django 4.1+ requires scheme in CSRF_TRUSTED_ORIGINS
+    CSRF_TRUSTED_ORIGINS = ['https://' + host for host in ALLOWED_HOSTS if host != '*']
 
 if 'PRIMARY_HOST' in env:
     BASE_URL = 'http://%s/' % env['PRIMARY_HOST']
+    # Also add PRIMARY_HOST to CSRF_TRUSTED_ORIGINS
+    CSRF_TRUSTED_ORIGINS = ['https://%s' % env['PRIMARY_HOST'], 'http://%s' % env['PRIMARY_HOST']]
 
 if 'SERVER_EMAIL' in env:
     SERVER_EMAIL = env['SERVER_EMAIL']
diff --git a/requirements.txt b/requirements.txt
index ac75031..63b3df6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,31 +1,33 @@
-# Updated: 2025-09-18 - Django 4.0 Upgrade
+# Updated: 2025-09-18 - Django 4.2 LTS Upgrade
 
 # Core
-Django==4.0.10  # Explicitly specify Django 4.0 (LTS)
-wagtail==3.0.3  # Wagtail 3.0 supports Django 4.0
-elasticsearch==5.5.3
+Django==4.2.16  # Django 4.2 LTS (latest stable)
+wagtail==5.2.6  # Wagtail 5.2 LTS supports Django 4.2
+elasticsearch==7.17.9  # Updated to v7 for better compatibility
 
 # Database
-psycopg2-binary==2.9.9  # Updated for better compatibility
-dj-database-url==1.2.0  # Updated for Django 4.0
+psycopg2-binary==2.9.9  # Compatible with Django 4.2
+dj-database-url==2.1.0  # Updated for Django 4.2
 
 # Content
-puput==2.0.0  # Updated for Wagtail 3.0 compatibility
+# Note: puput may need custom fixes for Wagtail 5.x
+# puput==2.0.0
 guess-language-spirit==0.5.3
 
 # Caching
-django-redis==5.2.0  # Updated for Django 4.0
+django-redis==5.4.0  # Updated for Django 4.2
+redis==5.0.1
 
 # Frontend
-django-anymail==9.0  # Updated for Django 4.0
+django-anymail==10.2  # Updated for Django 4.2
 django-colorful==1.3
-django-contrib-comments==2.2.0  # Updated for Django 4.0
-django-crispy-forms==1.14.0  # Updated for Django 4.0
+django-contrib-comments==2.2.0  # Compatible with Django 4.2
+django-crispy-forms==2.1  # Updated for Django 4.2
 django-el-pagination==3.3.0
-django-libsass==0.9
-django-social-share==2.3.0  # Updated for Django 4.0
-libsass==0.22.0  # Updated version
-Pillow==9.3.0  # Updated for better compatibility
+django-compressor==4.4  # Better than django-libsass for Django 4.2
+django-social-share==2.3.0  # Compatible with Django 4.2
+libsass==0.22.0
+Pillow==10.1.0  # Updated for Django 4.2 and Python 3.11+
 
 # Runtime dependencies
 gunicorn
@@ -34,4 +36,16 @@ python-dotenv
 #ConcurrentLogHandler
 unidecode
 
+# Additional dependencies for Django 4.2 and Wagtail 5
 django-configurations
+django-taggit>=3.0.0  # Required by Wagtail
+djangorestframework>=3.14.0  # Required by Wagtail API
+django-modelcluster>=6.0  # Required by Wagtail
+django-treebeard>=4.5.1  # Required by Wagtail
+django-filter>=23.2  # Required by Wagtail Admin
+Willow>=1.5  # Required by Wagtail for images
+beautifulsoup4>=4.8  # Required by Wagtail
+html5lib>=0.999  # Required by Wagtail
+openpyxl>=3.0.10  # For Excel export support
+l18n  # For Wagtail localization
+telepath>=0.2  # Required by Wagtail

From 0b66f91fb7eed8c6a593814ac9e0da1337491f72 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 17:30:36 +0530
Subject: [PATCH 087/122] Upgrade to Django 5.0

---
 feedler/admin.py                     | 14 +++++--
 feedler/models/models.py             |  6 +--
 publichealth/home/models/forms.py    |  4 +-
 publichealth/home/models/models.py   |  9 ++---
 publichealth/home/models/snippets.py |  5 +--
 requirements.txt                     | 56 ++++++++++++++--------------
 6 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/feedler/admin.py b/feedler/admin.py
index 0b4c634..70b8f65 100644
--- a/feedler/admin.py
+++ b/feedler/admin.py
@@ -10,9 +10,17 @@ from django.utils.translation import gettext as _  # ugettext deprecated in Djan
 from django.shortcuts import redirect
 
 from wagtail.admin import messages
-from wagtail.contrib.modeladmin.helpers import AdminURLHelper, ButtonHelper
-from wagtail.contrib.modeladmin.options import ModelAdmin
-from wagtail.contrib.modeladmin.views import IndexView
+# Wagtail 6 moved modeladmin to separate package
+try:
+    from wagtail.contrib.modeladmin.helpers import AdminURLHelper, ButtonHelper
+    from wagtail.contrib.modeladmin.options import ModelAdmin
+    from wagtail.contrib.modeladmin.views import IndexView
+except ImportError:
+    # For Wagtail 6+, modeladmin is deprecated - use SnippetViewSet instead
+    from wagtail.admin.views.generic import IndexView
+    from wagtail.snippets.views.snippets import SnippetViewSet as ModelAdmin
+    AdminURLHelper = object
+    ButtonHelper = object
 from wagtail.models import Site  # wagtail.core.models moved to wagtail.models in 3.0
 
 from feedler.models import Entry
diff --git a/feedler/models/models.py b/feedler/models/models.py
index 1444b93..70949d8 100644
--- a/feedler/models/models.py
+++ b/feedler/models/models.py
@@ -5,9 +5,9 @@ from django.db import models
 from django.utils import translation
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.utils.translation import gettext_lazy as _
-from wagtail.core.models import Page, Orderable
-from wagtail.admin.edit_handlers import FieldPanel
-from wagtail.core.fields import RichTextField
+from wagtail.models import Page, Orderable  # wagtail.core moved to wagtail in v3+
+from wagtail.admin.panels import FieldPanel  # edit_handlers renamed to panels in Wagtail 3+
+from wagtail.fields import RichTextField  # wagtail.core.fields moved to wagtail.fields
 
 class Stream(models.Model):
     title = models.CharField(max_length=255)
diff --git a/publichealth/home/models/forms.py b/publichealth/home/models/forms.py
index adc00aa..933b8e5 100644
--- a/publichealth/home/models/forms.py
+++ b/publichealth/home/models/forms.py
@@ -4,11 +4,11 @@ from modelcluster.fields import ParentalKey
 
 from django.db.models import CharField
 
-from wagtail.core.fields import RichTextField
+from wagtail.fields import RichTextField
 from wagtail.contrib.forms.models import (
     AbstractEmailForm, AbstractFormField
 )
-from wagtail.admin.edit_handlers import (
+from wagtail.admin.panels import (
     FieldPanel, FieldRowPanel,
     InlinePanel, MultiFieldPanel
 )
diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 5d04089..ebdcda2 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -10,12 +10,11 @@ from django.conf import settings
 
 from modelcluster.fields import ParentalKey
 
-from wagtail.core.blocks import StructBlock, CharBlock, URLBlock, RichTextBlock, ListBlock, TextBlock, ChoiceBlock
-from wagtail.core.models import Page, Orderable
-from wagtail.core.fields import StreamField, RichTextField
-from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel, InlinePanel, MultiFieldPanel
+from wagtail.blocks import StructBlock, CharBlock, URLBlock, RichTextBlock, ListBlock, TextBlock, ChoiceBlock
+from wagtail.models import Page, Orderable
+from wagtail.fields import StreamField, RichTextField
+from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
 from wagtail.images.blocks import ImageChooserBlock
-from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.search import index
 from wagtail.contrib.table_block.blocks import TableBlock
 
diff --git a/publichealth/home/models/snippets.py b/publichealth/home/models/snippets.py
index ee04eb3..ce4e3ad 100644
--- a/publichealth/home/models/snippets.py
+++ b/publichealth/home/models/snippets.py
@@ -6,9 +6,8 @@ from django.db import models
 
 from wagtail.snippets.models import register_snippet
 
-from wagtail.core.models import Page
-from wagtail.images.edit_handlers import ImageChooserPanel
-from wagtail.admin.edit_handlers import FieldPanel, PageChooserPanel
+from wagtail.models import Page
+from wagtail.admin.panels import FieldPanel
 
 from .forms import ContactForm
 from ..util import TranslatedField
diff --git a/requirements.txt b/requirements.txt
index 63b3df6..5945a3b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,33 +1,33 @@
-# Updated: 2025-09-18 - Django 4.2 LTS Upgrade
+# Updated: 2025-09-18 - Django 5.0 Upgrade
 
 # Core
-Django==4.2.16  # Django 4.2 LTS (latest stable)
-wagtail==5.2.6  # Wagtail 5.2 LTS supports Django 4.2
-elasticsearch==7.17.9  # Updated to v7 for better compatibility
+Django==5.0.9  # Django 5.0 (latest stable in 5.0 series)
+wagtail==6.0.6  # Wagtail 6.0 supports Django 5.0
+elasticsearch==7.17.9  # Compatible with Django 5.0
 
 # Database
-psycopg2-binary==2.9.9  # Compatible with Django 4.2
-dj-database-url==2.1.0  # Updated for Django 4.2
+psycopg2-binary==2.9.9  # Compatible with Django 5.0
+dj-database-url==2.2.0  # Updated for Django 5.0
 
 # Content
-# Note: puput may need custom fixes for Wagtail 5.x
+# Note: puput needs update or replacement for Wagtail 6.x
 # puput==2.0.0
 guess-language-spirit==0.5.3
 
 # Caching
-django-redis==5.4.0  # Updated for Django 4.2
-redis==5.0.1
+django-redis==5.4.0  # Compatible with Django 5.0
+redis==5.0.8
 
 # Frontend
-django-anymail==10.2  # Updated for Django 4.2
+django-anymail==11.0  # Updated for Django 5.0
 django-colorful==1.3
-django-contrib-comments==2.2.0  # Compatible with Django 4.2
-django-crispy-forms==2.1  # Updated for Django 4.2
+django-contrib-comments==2.2.0  # May need testing with Django 5.0
+django-crispy-forms==2.3  # Updated for Django 5.0
 django-el-pagination==3.3.0
-django-compressor==4.4  # Better than django-libsass for Django 4.2
-django-social-share==2.3.0  # Compatible with Django 4.2
-libsass==0.22.0
-Pillow==10.1.0  # Updated for Django 4.2 and Python 3.11+
+django-compressor==4.5.1  # Updated for Django 5.0
+django-social-share==2.3.0  # May need testing with Django 5.0
+libsass==0.23.0  # Updated version
+Pillow==10.4.0  # Updated for Django 5.0 and Python 3.12+
 
 # Runtime dependencies
 gunicorn
@@ -36,16 +36,18 @@ python-dotenv
 #ConcurrentLogHandler
 unidecode
 
-# Additional dependencies for Django 4.2 and Wagtail 5
+# Additional dependencies for Django 5.0 and Wagtail 6
 django-configurations
-django-taggit>=3.0.0  # Required by Wagtail
-djangorestframework>=3.14.0  # Required by Wagtail API
-django-modelcluster>=6.0  # Required by Wagtail
-django-treebeard>=4.5.1  # Required by Wagtail
-django-filter>=23.2  # Required by Wagtail Admin
-Willow>=1.5  # Required by Wagtail for images
-beautifulsoup4>=4.8  # Required by Wagtail
-html5lib>=0.999  # Required by Wagtail
-openpyxl>=3.0.10  # For Excel export support
+django-taggit>=5.0.0  # Required by Wagtail 6
+djangorestframework>=3.15.0  # Required by Wagtail API
+django-modelcluster>=6.3  # Required by Wagtail 6
+django-treebeard>=4.7  # Required by Wagtail 6
+django-filter>=24.2  # Required by Wagtail Admin
+Willow>=1.8.0  # Required by Wagtail for images
+beautifulsoup4>=4.12.0  # Required by Wagtail
+html5lib>=1.1  # Required by Wagtail
+openpyxl>=3.1.0  # For Excel export support
 l18n  # For Wagtail localization
-telepath>=0.2  # Required by Wagtail
+telepath>=0.3.1  # Required by Wagtail 6
+# Django 5.0 timezone support (replaces pytz)
+tzdata  # For timezone support in Django 5.0

From 8fd5ea553b6d6103a295c7a81ce43b495a1fece5 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 17:38:18 +0530
Subject: [PATCH 088/122] Fix django-filter version requirements

INFO: pip is looking at multiple versions of wagtail to determine which version is compatible with other requirements. This could take a while.
ERROR: Cannot install -r requirements.txt (line 5) and django-filter>=24.2 because these package versions have conflicting dependencies.

The conflict is caused by:
    The user requested django-filter>=24.2
    wagtail 6.0.6 depends on django-filter<24 and >=23.3

To fix this you could try to:
1. loosen the range of package versions you've specified
2. remove package versions to allow pip to attempt to solve the dependency conflict

[notice] A new release of pip is available: 25.1.1 -> 25.2
[notice] To update, run: pip install --upgrade pip
ERROR: ResolutionImpossible: for help visit https://pip.pypa.io/en/latest/topics/dependency-resolution/#dealing-with-dependency-conflicts
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5945a3b..95ef169 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,7 +42,7 @@ django-taggit>=5.0.0  # Required by Wagtail 6
 djangorestframework>=3.15.0  # Required by Wagtail API
 django-modelcluster>=6.3  # Required by Wagtail 6
 django-treebeard>=4.7  # Required by Wagtail 6
-django-filter>=24.2  # Required by Wagtail Admin
+django-filter>=23.3,<24  # Required by Wagtail 6.0.6 (must be <24)
 Willow>=1.8.0  # Required by Wagtail for images
 beautifulsoup4>=4.12.0  # Required by Wagtail
 html5lib>=1.1  # Required by Wagtail

From e58eaac2cabfc2d4e085024cc15cea7aa90b71f5 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 17:43:17 +0530
Subject: [PATCH 089/122] Fix psycopg2-binary version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 lo64)" -DPSYCOPG_DEBUG=1 -DPG_VERSION_NUM=170005 -DHAVE_LO64=1 -DPSYCOPG_DEBUG=1 -I/home/pcoder/projects/n/public-health-ch/venv/include -I/usr/include/python3.13 -I. -I/usr/include -I/usr/include/postgresql/server -I/usr/include/libxml2 -c psycopg/utils.c -o build/temp.linux-x86_64-cpython-313/psycopg/utils.o -Wdeclaration-after-statement
      psycopg/utils.c: In function ‘psyco_is_main_interp’:
      psycopg/utils.c:397:12: error: implicit declaration of function ‘_PyInterpreterState_Get’; did you mean ‘PyInterpreterState_Get’? [-Wimplicit-function-declaration]
        397 |     return _PyInterpreterState_Get() == PyInterpreterState_Main();
            |            ^~~~~~~~~~~~~~~~~~~~~~~
            |            PyInterpreterState_Get
      psycopg/utils.c:397:38: warning: comparison between pointer and integer
        397 |     return _PyInterpreterState_Get() == PyInterpreterState_Main();
            |                                      ^~
      error: command '/usr/bin/gcc' failed with exit code 1
      [end of output]

  note: This error originates from a subprocess, and is likely not a problem with pip.
  ERROR: Failed building wheel for psycopg2-binary
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 95ef169..0efa1b1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ wagtail==6.0.6  # Wagtail 6.0 supports Django 5.0
 elasticsearch==7.17.9  # Compatible with Django 5.0
 
 # Database
-psycopg2-binary==2.9.9  # Compatible with Django 5.0
+psycopg2-binary==2.9.10  # Compatible with Django 5.0 and Python 3.13
 dj-database-url==2.2.0  # Updated for Django 5.0
 
 # Content

From 12301b7c5e028a4a2877cd0cba99f881cee63859 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 17:57:27 +0530
Subject: [PATCH 090/122] Fix errors

Traceback (most recent call last):
  File "/usr/lib/python3.13/threading.py", line 1043, in _bootstrap_inner
    self.run()
    ~~~~~~~~^^
  File "/usr/lib/python3.13/threading.py", line 994, in run
    self._target(*self._args, **self._kwargs)
    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 64, in wrapper
    fn(*args, **kwargs)
    ~~^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/core/management/commands/runserver.py", line 125, in inner_run
    autoreload.raise_last_exception()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 87, in raise_last_exception
    raise _exception[1]
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/core/management/__init__.py", line 394, in execute
    autoreload.check_errors(django.setup)()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 64, in wrapper
    fn(*args, **kwargs)
    ~~^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/__init__.py", line 24, in setup
    apps.populate(settings.INSTALLED_APPS)
    ~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/apps/registry.py", line 116, in populate
    app_config.import_models()
    ~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/apps/config.py", line 269, in import_models
    self.models_module = import_module(models_module_name)
                         ~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.13/importlib/__init__.py", line 88, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
           ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "<frozen importlib._bootstrap>", line 1387, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 1026, in exec_module
  File "<frozen importlib._bootstrap>", line 488, in _call_with_frames_removed
  File "/home/pcoder/projects/n/public-health-ch/publichealth/home/models/__init__.py", line 2, in <module>
    from .models import *
  File "/home/pcoder/projects/n/public-health-ch/publichealth/home/models/models.py", line 34, in <module>
    class ArticleIndexPage(Page):
    ...<112 lines>...
            verbose_name = "Rubrik"
  File "/home/pcoder/projects/n/public-health-ch/publichealth/home/models/models.py", line 111, in ArticleIndexPage
    ImageChooserPanel('header_image'),
    ^^^^^^^^^^^^^^^^^
NameError: name 'ImageChooserPanel' is not defined. Did you mean: 'ImageChooserBlock'?
---
 feedler/models/admin.py            |  4 +++-
 publichealth/home/models/admin.py  |  6 ++++--
 publichealth/home/models/models.py | 20 +++++++++++---------
 publichealth/settings/base.py      |  3 +--
 publichealth/urls.py               |  4 ++--
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/feedler/models/admin.py b/feedler/models/admin.py
index 275ba31..93727e9 100644
--- a/feedler/models/admin.py
+++ b/feedler/models/admin.py
@@ -7,7 +7,9 @@ from django.db.models.signals import pre_save
 from django.dispatch import receiver
 from django.core.mail import send_mail
 
-from wagtail.contrib.settings.models import BaseSetting, register_setting
+# In Wagtail 3+, BaseSetting moved to wagtail.contrib.settings.models
+from wagtail.contrib.settings.models import BaseSiteSetting as BaseSetting
+from wagtail.contrib.settings.registry import register_setting
 
 from .models import Stream
 
diff --git a/publichealth/home/models/admin.py b/publichealth/home/models/admin.py
index 5c03da2..59ab03f 100644
--- a/publichealth/home/models/admin.py
+++ b/publichealth/home/models/admin.py
@@ -5,11 +5,13 @@ from django.db.models.signals import pre_save
 from django.dispatch import receiver
 from django.core.mail import send_mail
 
-from wagtail.contrib.settings.models import BaseSetting, register_setting
+# In Wagtail 3+, BaseSetting moved and register_setting changed
+from wagtail.contrib.settings.models import BaseSiteSetting as BaseSetting
+from wagtail.contrib.settings.registry import register_setting
 
 # A simple feedback module built into the site admin
 
-@register_setting(icon='', classnames='icon icon-help')
+@register_setting
 class DataletsSettings(BaseSetting):
     feedback_question = models.TextField(verbose_name='Name',
         help_text='Who should we reply to for questions?', blank=True)
diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index ebdcda2..17256bb 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -18,7 +18,7 @@ from wagtail.images.blocks import ImageChooserBlock
 from wagtail.search import index
 from wagtail.contrib.table_block.blocks import TableBlock
 
-from puput.models import EntryPage, BlogPage
+# from puput.models import EntryPage, BlogPage  # Commented: needs Wagtail 6 update
 from feedler.models import Entry, Stream
 from itertools import chain
 
@@ -352,14 +352,16 @@ class HomePage(Page):
     @property
     def blogentries(self):
         # Get list of latest news
-        curlang = translation.get_language()
-        if not curlang in ['de', 'fr', 'en', 'it']: curlang = 'de' # Default language
-        parent = BlogPage.objects.filter(slug='news-%s' % curlang)
-        if not parent: return []
-        posts = EntryPage.objects.live().descendant_of(parent[0])
-        # Order by most recent date first
-        posts = posts.order_by('-date')
-        return posts[:settings.BLOG_ENTRIES_HOME_PAGE]
+        # FIXME: Temporarily disabled - puput needs update for Wagtail 6
+        return []
+        # curlang = translation.get_language()
+        # if not curlang in ['de', 'fr', 'en', 'it']: curlang = 'de' # Default language
+        # parent = BlogPage.objects.filter(slug='news-%s' % curlang)
+        # if not parent: return []
+        # posts = EntryPage.objects.live().descendant_of(parent[0])
+        # # Order by most recent date first
+        # posts = posts.order_by('-date')
+        # return posts[:settings.BLOG_ENTRIES_HOME_PAGE]
 
     @property
     def newsentries(self):
diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py
index 9c94366..917109a 100644
--- a/publichealth/settings/base.py
+++ b/publichealth/settings/base.py
@@ -42,7 +42,6 @@ INSTALLED_APPS = [
     'wagtail.contrib.routable_page',
     'wagtail.contrib.sitemaps',
     # 'wagtail.contrib.modeladmin',  # Deprecated in Wagtail 5, use snippets instead
-    'wagtail.snippets',
     'wagtail.contrib.settings',
     'wagtail.contrib.forms',
     'wagtail.contrib.redirects',
@@ -68,7 +67,7 @@ INSTALLED_APPS = [
     'modelcluster',
     'compressor',
     'taggit',
-    'puput',
+    # 'puput',  # Needs update for Wagtail 6.x compatibility
     'anymail',
     'feedler',
     'colorful',
diff --git a/publichealth/urls.py b/publichealth/urls.py
index 1c6b058..ebb3fe6 100644
--- a/publichealth/urls.py
+++ b/publichealth/urls.py
@@ -8,13 +8,13 @@ from wagtail.documents import urls as wagtaildocs_urls
 from wagtail import urls as wagtail_urls  # wagtail.core renamed to wagtail in 3.0
 from wagtail.contrib.sitemaps.views import sitemap
 
-from puput import urls as puput_urls
+# from puput import urls as puput_urls  # Commented: needs Wagtail 6 update
 from feedler import urls as feedler_urls
 
 from publichealth.search import views as search_views
 
 urlpatterns = [
-    path('', include(puput_urls)),
+    # path('', include(puput_urls)),  # Commented: needs Wagtail 6 update
     path('', include(feedler_urls)),
 
     path('django-admin/', admin.site.urls),

From 1f15503074f7b9910eed91fd666b35d7171f3345 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 19:00:47 +0530
Subject: [PATCH 091/122] Replace PageChooserPanel with FieldPanel

  File "/usr/lib/python3.13/threading.py", line 1043, in _bootstrap_inner
    self.run()
    ~~~~~~~~^^
  File "/usr/lib/python3.13/threading.py", line 994, in run
    self._target(*self._args, **self._kwargs)
    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 64, in wrapper
    fn(*args, **kwargs)
    ~~^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/core/management/commands/runserver.py", line 125, in inner_run
    autoreload.raise_last_exception()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 87, in raise_last_exception
    raise _exception[1]
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/core/management/__init__.py", line 394, in execute
    autoreload.check_errors(django.setup)()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 64, in wrapper
    fn(*args, **kwargs)
    ~~^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/__init__.py", line 24, in setup
    apps.populate(settings.INSTALLED_APPS)
    ~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/apps/registry.py", line 116, in populate
    app_config.import_models()
    ~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/apps/config.py", line 269, in import_models
    self.models_module = import_module(models_module_name)
                         ~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.13/importlib/__init__.py", line 88, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
           ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "<frozen importlib._bootstrap>", line 1387, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 1026, in exec_module
  File "<frozen importlib._bootstrap>", line 488, in _call_with_frames_removed
  File "/home/pcoder/projects/n/public-health-ch/publichealth/home/models/__init__.py", line 3, in <module>
    from .snippets import *
  File "/home/pcoder/projects/n/public-health-ch/publichealth/home/models/snippets.py", line 57, in <module>
    class Contact(models.Model):
    ...<95 lines>...
            return self.trans_title
  File "/home/pcoder/projects/n/public-health-ch/publichealth/home/models/snippets.py", line 125, in Contact
    PageChooserPanel('contact_form', 'home.ContactForm'),
    ^^^^^^^^^^^^^^^^
NameError: name 'PageChooserPanel' is not defined
---
 publichealth/home/models/models.py   | 20 ++++++++++----------
 publichealth/home/models/snippets.py |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py
index 17256bb..cdd4674 100644
--- a/publichealth/home/models/models.py
+++ b/publichealth/home/models/models.py
@@ -108,11 +108,11 @@ class ArticleIndexPage(Page):
         FieldPanel('intro_fr'),
         FieldPanel('title_en'),
         FieldPanel('intro_en'),
-        ImageChooserPanel('header_image'),
+        FieldPanel('header_image'),  # ImageChooserPanel no longer needed in Wagtail 3+
         FieldPanel('table_en'),
         FieldPanel('table_fr'),
         FieldPanel('table_de'),
-        ImageChooserPanel('feed_image'),
+        FieldPanel('feed_image'),  # ImageChooserPanel no longer needed in Wagtail 3+
         MultiFieldPanel(
         [
             FieldPanel('subscribe_label_de'),
@@ -240,23 +240,23 @@ class ArticlePage(Page):
             FieldPanel('intro_de'),
         ], heading="Deutsch",
            classname="collapsible collapsed"),
-        StreamFieldPanel('body_de'),
+        FieldPanel('body_de'),  # StreamFieldPanel no longer needed in Wagtail 3+
         MultiFieldPanel([
             FieldPanel('title_fr'),
             FieldPanel('intro_fr'),
         ], heading="Français",
            classname="collapsible collapsed"),
-        StreamFieldPanel('body_fr'),
+        FieldPanel('body_fr'),  # StreamFieldPanel no longer needed in Wagtail 3+
         MultiFieldPanel([
             FieldPanel('title_en'),
             FieldPanel('intro_en'),
         ], heading="English",
            classname="collapsible collapsed"),
-        StreamFieldPanel('body_en'),
+        FieldPanel('body_en'),  # StreamFieldPanel no longer needed in Wagtail 3+
         MultiFieldPanel([
-            ImageChooserPanel('feed_image'),
+            FieldPanel('feed_image'),  # ImageChooserPanel no longer needed in Wagtail 3+
         ], heading="Images"),
-        StreamFieldPanel('gallery'),
+        FieldPanel('gallery'),  # StreamFieldPanel no longer needed in Wagtail 3+
     ]
     promote_panels = [
         InlinePanel('related_links', label="Links"),
@@ -322,19 +322,19 @@ class HomePage(Page):
         MultiFieldPanel([
             FieldPanel('intro_de', classname="full"),
             FieldPanel('body_de', classname="full"),
-            StreamFieldPanel('infos_de'),
+            FieldPanel('infos_de'),  # StreamFieldPanel no longer needed in Wagtail 3+
         ], heading="Deutsch",
            classname="collapsible collapsed"),
         MultiFieldPanel([
             FieldPanel('intro_fr', classname="full"),
             FieldPanel('body_fr', classname="full"),
-            StreamFieldPanel('infos_fr'),
+            FieldPanel('infos_fr'),  # StreamFieldPanel no longer needed in Wagtail 3+
         ], heading="Français",
            classname="collapsible collapsed"),
         MultiFieldPanel([
             FieldPanel('intro_en', classname="full"),
             FieldPanel('body_en', classname="full"),
-            StreamFieldPanel('infos_en'),
+            FieldPanel('infos_en'),  # StreamFieldPanel no longer needed in Wagtail 3+
         ], heading="English",
            classname="collapsible collapsed"),
     ]
diff --git a/publichealth/home/models/snippets.py b/publichealth/home/models/snippets.py
index ce4e3ad..3acdef4 100644
--- a/publichealth/home/models/snippets.py
+++ b/publichealth/home/models/snippets.py
@@ -117,12 +117,12 @@ class Contact(models.Model):
         FieldPanel('phone'),
         FieldPanel('email'),
         FieldPanel('www'),
-        ImageChooserPanel('logo'),
+        FieldPanel('logo'),  # ImageChooserPanel no longer needed in Wagtail 3+
         FieldPanel('color'),
         FieldPanel('style'),
         FieldPanel('map_url'),
         FieldPanel('analytics'),
-        PageChooserPanel('contact_form', 'home.ContactForm'),
+        FieldPanel('contact_form'),  # PageChooserPanel no longer needed in Wagtail 3+
     ]
 
     panels = panels + [

From 7c0b43c82b57a0540886c78d7dfd7d5b8e97fcef Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 18 Sep 2025 19:05:01 +0530
Subject: [PATCH 092/122] Fix model-admin

  File "/usr/lib/python3.13/threading.py", line 1043, in _bootstrap_inner
    self.run()
    ~~~~~~~~^^
  File "/usr/lib/python3.13/threading.py", line 994, in run
    self._target(*self._args, **self._kwargs)
    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 64, in wrapper
    fn(*args, **kwargs)
    ~~^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/core/management/commands/runserver.py", line 125, in inner_run
    autoreload.raise_last_exception()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 87, in raise_last_exception
    raise _exception[1]
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/core/management/__init__.py", line 394, in execute
    autoreload.check_errors(django.setup)()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/utils/autoreload.py", line 64, in wrapper
    fn(*args, **kwargs)
    ~~^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/__init__.py", line 24, in setup
    apps.populate(settings.INSTALLED_APPS)
    ~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/django/apps/registry.py", line 124, in populate
    app_config.ready()
    ~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/snippets/apps.py", line 17, in ready
    register_deferred_snippets()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/snippets/models.py", line 121, in register_deferred_snippets
    _register_snippet_immediately(registerable, viewset)
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/snippets/models.py", line 110, in _register_snippet_immediately
    viewsets.register(registerable)
    ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/admin/viewsets/__init__.py", line 30, in register
    viewset.on_register()
    ~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/snippets/views/snippets.py", line 1260, in on_register
    self.register_snippet_model()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/snippets/views/snippets.py", line 1245, in register_snippet_model
    snippet_models = get_snippet_models()
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/snippets/models.py", line 33, in get_snippet_models
    search_for_hooks()
    ~~~~~~~~~~~~~~~~^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/hooks.py", line 106, in search_for_hooks
    list(get_app_submodules("wagtail_hooks"))
    ~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/pcoder/projects/n/public-health-ch/venv/lib/python3.13/site-packages/wagtail/utils/apps.py", line 23, in get_app_submodules
    yield name, import_module(f"{name}.{submodule_name}")
                ~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.13/importlib/__init__.py", line 88, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
           ~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "<frozen importlib._bootstrap>", line 1387, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 1026, in exec_module
  File "<frozen importlib._bootstrap>", line 488, in _call_with_frames_removed
  File "/home/pcoder/projects/n/public-health-ch/feedler/wagtail_hooks.py", line 3, in <module>
    from wagtail.contrib.modeladmin.options import (
        ModelAdmin, modeladmin_register)
ModuleNotFoundError: No module named 'wagtail.contrib.modeladmin'
---
 feedler/wagtail_hooks.py      | 2 +-
 publichealth/settings/base.py | 2 +-
 requirements.txt              | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/feedler/wagtail_hooks.py b/feedler/wagtail_hooks.py
index 63f7c9b..8c63f86 100644
--- a/feedler/wagtail_hooks.py
+++ b/feedler/wagtail_hooks.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from wagtail.contrib.modeladmin.options import (
+from wagtail_modeladmin.options import (
     ModelAdmin, modeladmin_register)
 
 from .admin import EntryModelAdminMixin
diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py
index 917109a..dcd7c99 100644
--- a/publichealth/settings/base.py
+++ b/publichealth/settings/base.py
@@ -41,7 +41,7 @@ INSTALLED_APPS = [
 
     'wagtail.contrib.routable_page',
     'wagtail.contrib.sitemaps',
-    # 'wagtail.contrib.modeladmin',  # Deprecated in Wagtail 5, use snippets instead
+    'wagtail_modeladmin',  # Separate package for ModelAdmin in Wagtail 5+
     'wagtail.contrib.settings',
     'wagtail.contrib.forms',
     'wagtail.contrib.redirects',
diff --git a/requirements.txt b/requirements.txt
index 0efa1b1..02ebeb5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -39,6 +39,7 @@ unidecode
 # Additional dependencies for Django 5.0 and Wagtail 6
 django-configurations
 django-taggit>=5.0.0  # Required by Wagtail 6
+wagtail-modeladmin==2.0.0  # Separate package for ModelAdmin in Wagtail 5+
 djangorestframework>=3.15.0  # Required by Wagtail API
 django-modelcluster>=6.3  # Required by Wagtail 6
 django-treebeard>=4.7  # Required by Wagtail 6

From dd3f5068dd1c87139fb2b9438296b59076c7acca Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 15:50:45 +0530
Subject: [PATCH 093/122] Upgrades

---
 feedler/__init__.py                           |  4 ++--
 feedler/admin.py                              | 18 ++++++--------
 feedler/management/commands/invalidpage.py    |  2 +-
 feedler/migrations/0002_feedpage.py           |  4 ++--
 feedler/urls.py                               |  4 ++--
 .../migrations/0003_auto_20170223_0959.py     | 24 +++++++++----------
 .../migrations/0004_auto_20170308_2020.py     |  6 ++---
 .../migrations/0005_auto_20170308_2023.py     | 10 ++++----
 .../migrations/0006_auto_20170308_2025.py     |  6 ++---
 ...09_contact_contactform_contactformfield.py | 10 ++++----
 .../migrations/0010_auto_20170410_2307.py     | 16 ++++++-------
 .../migrations/0012_auto_20170419_1749.py     | 12 +++++-----
 .../migrations/0019_auto_20170908_1505.py     | 10 ++++----
 .../migrations/0020_auto_20170920_1204.py     |  8 +++----
 .../migrations/0022_auto_20180525_1520.py     | 16 ++++++-------
 .../migrations/0030_auto_20210928_1850.py     |  8 +++----
 .../migrations/0034_auto_20220714_1145.py     |  8 +++----
 .../migrations/0035_auto_20230515_1447.py     | 10 ++++----
 .../migrations/0036_auto_20230515_1556.py     | 12 +++++-----
 .../migrations/0037_auto_20230516_1241.py     | 10 ++++----
 publichealth/home/routes.py                   |  2 +-
 publichealth/home/templatetags/navigation.py  |  2 +-
 publichealth/search/views.py                  |  4 ++--
 23 files changed, 101 insertions(+), 105 deletions(-)

diff --git a/feedler/__init__.py b/feedler/__init__.py
index f332ff4..ebd4e4f 100644
--- a/feedler/__init__.py
+++ b/feedler/__init__.py
@@ -6,9 +6,9 @@ __version__ = '0.1'
 
 FEEDLER_APPS = (
     # Wagtail apps
-    'wagtail.core',
+    'wagtail',
     'wagtail.admin',
-    'wagtail.contrib.modeladmin',
+    'wagtail_modeladmin',  # Separate package for modeladmin in Wagtail 5+
     'wagtail.contrib.routable_page',
     'wagtail.api.v2',
 
diff --git a/feedler/admin.py b/feedler/admin.py
index 70b8f65..890804a 100644
--- a/feedler/admin.py
+++ b/feedler/admin.py
@@ -11,16 +11,9 @@ from django.shortcuts import redirect
 
 from wagtail.admin import messages
 # Wagtail 6 moved modeladmin to separate package
-try:
-    from wagtail.contrib.modeladmin.helpers import AdminURLHelper, ButtonHelper
-    from wagtail.contrib.modeladmin.options import ModelAdmin
-    from wagtail.contrib.modeladmin.views import IndexView
-except ImportError:
-    # For Wagtail 6+, modeladmin is deprecated - use SnippetViewSet instead
-    from wagtail.admin.views.generic import IndexView
-    from wagtail.snippets.views.snippets import SnippetViewSet as ModelAdmin
-    AdminURLHelper = object
-    ButtonHelper = object
+from wagtail_modeladmin.helpers import AdminURLHelper, ButtonHelper
+from wagtail_modeladmin.options import ModelAdmin
+from wagtail_modeladmin.views import IndexView
 from wagtail.models import Site  # wagtail.core.models moved to wagtail.models in 3.0
 
 from feedler.models import Entry
@@ -48,7 +41,10 @@ class RefreshAdminURLHelper(AdminURLHelper):
     This helper constructs the different urls, to overwrite the default behaviour
     and append the filters to the action.
     """
-    non_object_specific_actions = ('create', 'choose_parent', 'index', 'refresh')
+    def __init__(self, model, **kwargs):
+        super().__init__(model, **kwargs)
+        self.non_object_specific_actions = ('create', 'choose_parent', 'index', 'refresh')
+
     def get_action_url(self, action, *args, **kwargs):
         query_params = kwargs.pop('query_params', None)
         url_name = self.get_action_url_name(action)
diff --git a/feedler/management/commands/invalidpage.py b/feedler/management/commands/invalidpage.py
index 474df36..0c7d108 100644
--- a/feedler/management/commands/invalidpage.py
+++ b/feedler/management/commands/invalidpage.py
@@ -2,7 +2,7 @@ from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
 from django.test import Client
 
-from wagtail.core.models import Page
+from wagtail.models import Page
 from wagtail.admin.views.pages import edit
 
 # Scans for broken editors, via
diff --git a/feedler/migrations/0002_feedpage.py b/feedler/migrations/0002_feedpage.py
index 9dabb91..2a1847f 100644
--- a/feedler/migrations/0002_feedpage.py
+++ b/feedler/migrations/0002_feedpage.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
             name='FeedPage',
             fields=[
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
-                ('intro', wagtail.core.fields.RichTextField(blank=True, default='')),
+                ('intro', wagtail.fields.RichTextField(blank=True, default='')),
                 ('stream', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='feedler.Stream', verbose_name='Filter to stream (optional)')),
             ],
             options={
diff --git a/feedler/urls.py b/feedler/urls.py
index 5289b17..d395274 100644
--- a/feedler/urls.py
+++ b/feedler/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.conf import settings
 from django.contrib import admin
 from django.conf.urls.i18n import i18n_patterns
@@ -6,5 +6,5 @@ from django.conf.urls.i18n import i18n_patterns
 from .api import api_router
 
 urlpatterns = [
-    url(r'^api/v2/', api_router.urls),
+    re_path(r'^api/v2/', api_router.urls),
 ]
diff --git a/publichealth/home/migrations/0003_auto_20170223_0959.py b/publichealth/home/migrations/0003_auto_20170223_0959.py
index 486ad8c..5e35fc6 100644
--- a/publichealth/home/migrations/0003_auto_20170223_0959.py
+++ b/publichealth/home/migrations/0003_auto_20170223_0959.py
@@ -5,8 +5,8 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.images.blocks
 
 
@@ -36,10 +36,10 @@ class Migration(migrations.Migration):
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
                 ('title_fr', models.CharField(default='', max_length=255)),
                 ('date', models.DateField(verbose_name='Date')),
-                ('intro_de', wagtail.core.fields.RichTextField(default='')),
-                ('intro_fr', wagtail.core.fields.RichTextField(default='')),
-                ('body_de', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title'))], blank=True, null=True)),
-                ('body_fr', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title'))], blank=True, null=True)),
+                ('intro_de', wagtail.fields.RichTextField(default='')),
+                ('intro_fr', wagtail.fields.RichTextField(default='')),
+                ('body_de', wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.blocks.CharBlock(classname='full title'))], blank=True, null=True)),
+                ('body_fr', wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.blocks.CharBlock(classname='full title'))], blank=True, null=True)),
                 ('feed_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')),
             ],
             options={
@@ -64,31 +64,31 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='homepage',
             name='body_de',
-            field=wagtail.core.fields.RichTextField(default=''),
+            field=wagtail.fields.RichTextField(default=''),
         ),
         migrations.AddField(
             model_name='homepage',
             name='body_fr',
-            field=wagtail.core.fields.RichTextField(default=''),
+            field=wagtail.fields.RichTextField(default=''),
         ),
         migrations.AddField(
             model_name='homepage',
             name='infos_de',
-            field=wagtail.core.fields.StreamField([('info', wagtail.core.blocks.StructBlock([(b'title', wagtail.core.blocks.CharBlock(required=True)), (b'photo', wagtail.images.blocks.ImageChooserBlock()), (b'summary', wagtail.core.blocks.RichTextBlock(required=True)), (b'action', wagtail.core.blocks.CharBlock()), (b'url', wagtail.core.blocks.URLBlock())]))], blank=True, null=True),
+            field=wagtail.fields.StreamField([('info', wagtail.blocks.StructBlock([(b'title', wagtail.blocks.CharBlock(required=True)), (b'photo', wagtail.images.blocks.ImageChooserBlock()), (b'summary', wagtail.blocks.RichTextBlock(required=True)), (b'action', wagtail.blocks.CharBlock()), (b'url', wagtail.blocks.URLBlock())]))], blank=True, null=True),
         ),
         migrations.AddField(
             model_name='homepage',
             name='infos_fr',
-            field=wagtail.core.fields.StreamField([('info', wagtail.core.blocks.StructBlock([(b'title', wagtail.core.blocks.CharBlock(required=True)), (b'photo', wagtail.images.blocks.ImageChooserBlock()), (b'summary', wagtail.core.blocks.RichTextBlock(required=True)), (b'action', wagtail.core.blocks.CharBlock()), (b'url', wagtail.core.blocks.URLBlock())]))], blank=True, null=True),
+            field=wagtail.fields.StreamField([('info', wagtail.blocks.StructBlock([(b'title', wagtail.blocks.CharBlock(required=True)), (b'photo', wagtail.images.blocks.ImageChooserBlock()), (b'summary', wagtail.blocks.RichTextBlock(required=True)), (b'action', wagtail.blocks.CharBlock()), (b'url', wagtail.blocks.URLBlock())]))], blank=True, null=True),
         ),
         migrations.AddField(
             model_name='homepage',
             name='intro_de',
-            field=wagtail.core.fields.RichTextField(default=''),
+            field=wagtail.fields.RichTextField(default=''),
         ),
         migrations.AddField(
             model_name='homepage',
             name='intro_fr',
-            field=wagtail.core.fields.RichTextField(default=''),
+            field=wagtail.fields.RichTextField(default=''),
         ),
     ]
diff --git a/publichealth/home/migrations/0004_auto_20170308_2020.py b/publichealth/home/migrations/0004_auto_20170308_2020.py
index 957b629..05ae3a6 100644
--- a/publichealth/home/migrations/0004_auto_20170308_2020.py
+++ b/publichealth/home/migrations/0004_auto_20170308_2020.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -20,11 +20,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='articleindexpage',
             name='intro_de',
-            field=wagtail.core.fields.RichTextField(default=''),
+            field=wagtail.fields.RichTextField(default=''),
         ),
         migrations.AddField(
             model_name='articleindexpage',
             name='intro_fr',
-            field=wagtail.core.fields.RichTextField(default=''),
+            field=wagtail.fields.RichTextField(default=''),
         ),
     ]
diff --git a/publichealth/home/migrations/0005_auto_20170308_2023.py b/publichealth/home/migrations/0005_auto_20170308_2023.py
index a41acbb..9a16425 100644
--- a/publichealth/home/migrations/0005_auto_20170308_2023.py
+++ b/publichealth/home/migrations/0005_auto_20170308_2023.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -16,21 +16,21 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='articleindexpage',
             name='intro_de',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AlterField(
             model_name='articleindexpage',
             name='intro_fr',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='intro_de',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='intro_fr',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
     ]
diff --git a/publichealth/home/migrations/0006_auto_20170308_2025.py b/publichealth/home/migrations/0006_auto_20170308_2025.py
index 1c35ad0..d28c0e5 100644
--- a/publichealth/home/migrations/0006_auto_20170308_2025.py
+++ b/publichealth/home/migrations/0006_auto_20170308_2025.py
@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -16,11 +16,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='homepage',
             name='body_de',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AlterField(
             model_name='homepage',
             name='body_fr',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
     ]
diff --git a/publichealth/home/migrations/0009_contact_contactform_contactformfield.py b/publichealth/home/migrations/0009_contact_contactform_contactformfield.py
index 774347c..3789fd1 100644
--- a/publichealth/home/migrations/0009_contact_contactform_contactformfield.py
+++ b/publichealth/home/migrations/0009_contact_contactform_contactformfield.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -35,10 +35,10 @@ class Migration(migrations.Migration):
                 ('from_address', models.CharField(blank=True, max_length=255, verbose_name='from address')),
                 ('subject', models.CharField(blank=True, max_length=255, verbose_name='subject')),
                 ('title_fr', models.CharField(default=b'', max_length=255)),
-                ('intro_de', wagtail.core.fields.RichTextField(blank=True, default=b'')),
-                ('intro_fr', wagtail.core.fields.RichTextField(blank=True, default=b'')),
-                ('thanks_de', wagtail.core.fields.RichTextField(blank=True, default=b'')),
-                ('thanks_fr', wagtail.core.fields.RichTextField(blank=True, default=b'')),
+                ('intro_de', wagtail.fields.RichTextField(blank=True, default=b'')),
+                ('intro_fr', wagtail.fields.RichTextField(blank=True, default=b'')),
+                ('thanks_de', wagtail.fields.RichTextField(blank=True, default=b'')),
+                ('thanks_fr', wagtail.fields.RichTextField(blank=True, default=b'')),
             ],
             options={
                 'verbose_name': 'Formular',
diff --git a/publichealth/home/migrations/0010_auto_20170410_2307.py b/publichealth/home/migrations/0010_auto_20170410_2307.py
index 1a8b8ce..cfc7049 100644
--- a/publichealth/home/migrations/0010_auto_20170410_2307.py
+++ b/publichealth/home/migrations/0010_auto_20170410_2307.py
@@ -3,8 +3,8 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.images.blocks
 
 
@@ -23,22 +23,22 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='contactform',
             name='intro_de',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AlterField(
             model_name='contactform',
             name='intro_fr',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AlterField(
             model_name='contactform',
             name='thanks_de',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AlterField(
             model_name='contactform',
             name='thanks_fr',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AlterField(
             model_name='contactform',
@@ -48,11 +48,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='homepage',
             name='infos_de',
-            field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock()), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock()), ('url', wagtail.core.blocks.URLBlock())))),), blank=True, null=True),
+            field=wagtail.fields.StreamField((('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock()), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock()), ('url', wagtail.blocks.URLBlock())))),), blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='homepage',
             name='infos_fr',
-            field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock()), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock()), ('url', wagtail.core.blocks.URLBlock())))),), blank=True, null=True),
+            field=wagtail.fields.StreamField((('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock()), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock()), ('url', wagtail.blocks.URLBlock())))),), blank=True, null=True),
         ),
     ]
diff --git a/publichealth/home/migrations/0012_auto_20170419_1749.py b/publichealth/home/migrations/0012_auto_20170419_1749.py
index bc807f0..d8a68c0 100644
--- a/publichealth/home/migrations/0012_auto_20170419_1749.py
+++ b/publichealth/home/migrations/0012_auto_20170419_1749.py
@@ -3,8 +3,8 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.images.blocks
 
 
@@ -18,21 +18,21 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='articlepage',
             name='body_de',
-            field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False)))))), blank=True, null=True),
+            field=wagtail.fields.StreamField((('paragraph', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.blocks.CharBlock(classname='full title')), ('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False)))))), blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_fr',
-            field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False)))))), blank=True, null=True),
+            field=wagtail.fields.StreamField((('paragraph', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.blocks.CharBlock(classname='full title')), ('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False)))))), blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='homepage',
             name='infos_de',
-            field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))),), blank=True, null=True),
+            field=wagtail.fields.StreamField((('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))))),), blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='homepage',
             name='infos_fr',
-            field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))),), blank=True, null=True),
+            field=wagtail.fields.StreamField((('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))))),), blank=True, null=True),
         ),
     ]
diff --git a/publichealth/home/migrations/0019_auto_20170908_1505.py b/publichealth/home/migrations/0019_auto_20170908_1505.py
index d42430c..8c4884e 100644
--- a/publichealth/home/migrations/0019_auto_20170908_1505.py
+++ b/publichealth/home/migrations/0019_auto_20170908_1505.py
@@ -3,8 +3,8 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.images.blocks
 
 
@@ -22,17 +22,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='articlepage',
             name='gallery',
-            field=wagtail.core.fields.StreamField((('image', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.TextBlock(required=False)))), icon='image')),), blank=True),
+            field=wagtail.fields.StreamField((('image', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.blocks.TextBlock(required=False)))), icon='image')),), blank=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_de',
-            field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))), ('placer', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='user'))), blank=True, null=True),
+            field=wagtail.fields.StreamField((('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(classname='full title')), ('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))))), ('placer', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='user'))), blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_fr',
-            field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))), ('placer', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='user'))), blank=True, null=True),
+            field=wagtail.fields.StreamField((('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(classname='full title')), ('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))))), ('placer', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='user'))), blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='contactformfield',
diff --git a/publichealth/home/migrations/0020_auto_20170920_1204.py b/publichealth/home/migrations/0020_auto_20170920_1204.py
index 4c3c48a..c41cc05 100644
--- a/publichealth/home/migrations/0020_auto_20170920_1204.py
+++ b/publichealth/home/migrations/0020_auto_20170920_1204.py
@@ -3,8 +3,8 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.images.blocks
 
 
@@ -18,11 +18,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='articlepage',
             name='body_de',
-            field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True),
+            field=wagtail.fields.StreamField((('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(classname='full title')), ('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_fr',
-            field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True),
+            field=wagtail.fields.StreamField((('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(classname='full title')), ('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True),
         ),
     ]
diff --git a/publichealth/home/migrations/0022_auto_20180525_1520.py b/publichealth/home/migrations/0022_auto_20180525_1520.py
index e913ecb..ad125d1 100644
--- a/publichealth/home/migrations/0022_auto_20180525_1520.py
+++ b/publichealth/home/migrations/0022_auto_20180525_1520.py
@@ -3,8 +3,8 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.images.blocks
 
 
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='articleindexpage',
             name='intro_en',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AddField(
             model_name='articleindexpage',
@@ -28,12 +28,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='articlepage',
             name='body_en',
-            field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True),
+            field=wagtail.fields.StreamField((('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(classname='full title')), ('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True),
         ),
         migrations.AddField(
             model_name='articlepage',
             name='intro_en',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AddField(
             model_name='articlepage',
@@ -48,16 +48,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='homepage',
             name='body_en',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AddField(
             model_name='homepage',
             name='infos_en',
-            field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))),), blank=True, null=True),
+            field=wagtail.fields.StreamField((('info', wagtail.blocks.StructBlock((('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))))),), blank=True, null=True),
         ),
         migrations.AddField(
             model_name='homepage',
             name='intro_en',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
     ]
diff --git a/publichealth/home/migrations/0030_auto_20210928_1850.py b/publichealth/home/migrations/0030_auto_20210928_1850.py
index 45f7cf6..e9da07f 100644
--- a/publichealth/home/migrations/0030_auto_20210928_1850.py
+++ b/publichealth/home/migrations/0030_auto_20210928_1850.py
@@ -1,7 +1,7 @@
 # Generated by Django 3.0.14 on 2021-09-28 16:50
 
 from django.db import migrations
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -14,16 +14,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='articleindexpage',
             name='subscribe_label_de',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AddField(
             model_name='articleindexpage',
             name='subscribe_label_en',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
         migrations.AddField(
             model_name='articleindexpage',
             name='subscribe_label_fr',
-            field=wagtail.core.fields.RichTextField(blank=True, default=''),
+            field=wagtail.fields.RichTextField(blank=True, default=''),
         ),
     ]
diff --git a/publichealth/home/migrations/0034_auto_20220714_1145.py b/publichealth/home/migrations/0034_auto_20220714_1145.py
index 38d68f8..c5b4851 100644
--- a/publichealth/home/migrations/0034_auto_20220714_1145.py
+++ b/publichealth/home/migrations/0034_auto_20220714_1145.py
@@ -3,7 +3,7 @@
 from django.db import migrations, models
 import django.db.models.deletion
 import wagtail.contrib.table_block.blocks
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -22,16 +22,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='articleindexpage',
             name='table_de',
-            field=wagtail.core.fields.StreamField([('table_de', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
+            field=wagtail.fields.StreamField([('table_de', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
         ),
         migrations.AddField(
             model_name='articleindexpage',
             name='table_en',
-            field=wagtail.core.fields.StreamField([('table_en', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
+            field=wagtail.fields.StreamField([('table_en', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
         ),
         migrations.AddField(
             model_name='articleindexpage',
             name='table_fr',
-            field=wagtail.core.fields.StreamField([('table_fr', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
+            field=wagtail.fields.StreamField([('table_fr', wagtail.contrib.table_block.blocks.TableBlock(template='home/program_table.html'))], blank=True, null=True),
         ),
     ]
diff --git a/publichealth/home/migrations/0035_auto_20230515_1447.py b/publichealth/home/migrations/0035_auto_20230515_1447.py
index dd08cbe..39b96c2 100644
--- a/publichealth/home/migrations/0035_auto_20230515_1447.py
+++ b/publichealth/home/migrations/0035_auto_20230515_1447.py
@@ -1,8 +1,8 @@
 # Generated by Django 3.2.13 on 2023-05-15 12:47
 
 from django.db import migrations
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.embeds.blocks
 import wagtail.images.blocks
 
@@ -17,16 +17,16 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='articlepage',
             name='body_de',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_en',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_fr',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.embeds.blocks.EmbedBlock())], blank=True, null=True),
         ),
     ]
diff --git a/publichealth/home/migrations/0036_auto_20230515_1556.py b/publichealth/home/migrations/0036_auto_20230515_1556.py
index 0fe63ff..fa38c10 100644
--- a/publichealth/home/migrations/0036_auto_20230515_1556.py
+++ b/publichealth/home/migrations/0036_auto_20230515_1556.py
@@ -1,8 +1,8 @@
 # Generated by Django 3.2.13 on 2023-05-15 13:56
 
 from django.db import migrations
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.images.blocks
 
 
@@ -16,21 +16,21 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='articlepage',
             name='html_content',
-            field=wagtail.core.fields.RichTextField(blank=True),
+            field=wagtail.fields.RichTextField(blank=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_de',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_en',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_fr',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))], blank=True, null=True),
         ),
     ]
diff --git a/publichealth/home/migrations/0037_auto_20230516_1241.py b/publichealth/home/migrations/0037_auto_20230516_1241.py
index 03ad22e..b0afbe7 100644
--- a/publichealth/home/migrations/0037_auto_20230516_1241.py
+++ b/publichealth/home/migrations/0037_auto_20230516_1241.py
@@ -1,8 +1,8 @@
 # Generated by Django 3.2.13 on 2023-05-16 10:41
 
 from django.db import migrations
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtail.images.blocks
 
 
@@ -20,16 +20,16 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='articlepage',
             name='body_de',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.blocks.RichTextBlock())], blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_en',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.blocks.RichTextBlock())], blank=True, null=True),
         ),
         migrations.AlterField(
             model_name='articlepage',
             name='body_fr',
-            field=wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(form_classname='full title')), ('info', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.core.blocks.RichTextBlock())], blank=True, null=True),
+            field=wagtail.fields.StreamField([('paragraph', wagtail.blocks.RichTextBlock()), ('section', wagtail.blocks.CharBlock(form_classname='full title')), ('info', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.blocks.RichTextBlock(required=True)), ('action', wagtail.blocks.CharBlock(required=False)), ('url', wagtail.blocks.URLBlock(required=False))], icon='help')), ('media', wagtail.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media')), ('iframe', wagtail.blocks.RichTextBlock())], blank=True, null=True),
         ),
     ]
diff --git a/publichealth/home/routes.py b/publichealth/home/routes.py
index a813b16..b3d2685 100644
--- a/publichealth/home/routes.py
+++ b/publichealth/home/routes.py
@@ -7,7 +7,7 @@ from django.utils.formats import date_format
 from django.utils.translation import gettext_lazy as _  # ugettext_lazy deprecated in Django 4.0
 
 from wagtail.models import Page  # wagtail.core.models moved to wagtail.models in 3.0
-from wagtail.search.models import Query
+from wagtail.contrib.search_promotions.models import Query
 from wagtail.contrib.routable_page.models import RoutablePageMixin, route
 
 class HomePage(RoutablePageMixin, Page):
diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py
index 98d3908..558f2f8 100644
--- a/publichealth/home/templatetags/navigation.py
+++ b/publichealth/home/templatetags/navigation.py
@@ -3,7 +3,7 @@ from django import template
 from django.utils import translation
 from django.db.models import Case, When
 
-from wagtail.core.models import Site, Page
+from wagtail.models import Site, Page
 from ..models.forms import ContactForm
 register = template.Library()
 
diff --git a/publichealth/search/views.py b/publichealth/search/views.py
index 2ec12e5..d5e696a 100644
--- a/publichealth/search/views.py
+++ b/publichealth/search/views.py
@@ -1,8 +1,8 @@
 from django.shortcuts import render
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
-from wagtail.core.models import Page
-from wagtail.search.models import Query
+from wagtail.models import Page
+from wagtail.contrib.search_promotions.models import Query
 
 
 def search(request):

From 8d1b464d094fa83e4449a5bb0958b562a44a4bbe Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 16:16:44 +0530
Subject: [PATCH 094/122] Remove puput_tags momentarily because it does not
 work with Django 5

---
 publichealth/home/templates/news.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publichealth/home/templates/news.html b/publichealth/home/templates/news.html
index 255e8c8..1e5d6d0 100644
--- a/publichealth/home/templates/news.html
+++ b/publichealth/home/templates/news.html
@@ -1,4 +1,4 @@
-{% load wagtailcore_tags wagtailimages_tags puput_tags %}
+{% load wagtailcore_tags wagtailimages_tags %}
 
 <!-- Front page news -->
 <section id="news">

From 56d17649ac71126263c3e936adca31f93277e1d6 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 16:44:07 +0530
Subject: [PATCH 095/122] Update .Dockerignore

---
 .dockerignore | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index 76411d0..fa01bad 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,29 @@
 .git
+.gitignore
 .dockerignore
-media
+.env
+*.pyc
+__pycache__
+*.sqlite3
+*.db
+media/
+static/
+node_modules/
+env/
+venv/
+.venv/
+*.log
+.DS_Store
+.idea/
+.vscode/
+*.swp
+*.swo
+*~
+upgrade-logs/
+publichealth-dev.sqlite3
+CLAUDE.md
+README.md
+docs/
+*.backup
+requirements-*.txt
+fix_migrations.py
\ No newline at end of file

From 90e1e3c6abaae788fe955cc90546395189853f85 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 16:45:45 +0530
Subject: [PATCH 096/122] Updated Dockerfile

---
 Dockerfile | 131 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 81 insertions(+), 50 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ca4358a..4757ca1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-#FROM python:3.10-alpine
-FROM docker.io/python:3.10-slim AS base
+FROM docker.io/python:3.12-slim AS base
 
 ENV \
    LANG=C.UTF-8 \
@@ -10,30 +9,51 @@ ENV \
    PYTHONHASHSEED=random \
    PYTHONDONTWRITEBYTECODE=1
 
-RUN apt-get update
-
-RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpango-1.0-0 libpangoft2-1.0-0
-
-RUN apt-get update && \
-    apt-get install -y curl gnupg && \
-    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && \
-    apt-get install -y yarn && \
-    apt-get install -y --no-install-recommends build-essential gcc && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+RUN apt-get update \
+   && apt-get upgrade -y \
+   && apt-get install -y --no-install-recommends \
+      libpango-1.0-0 libpangoft2-1.0-0 \
+      libmagic-dev libglib2.0-dev \
+      gettext \
+      libpq-dev libfreetype-dev libjpeg-dev zlib1g-dev \
+      procps iproute2 curl \
+      postgresql-client \
+   && apt-get clean \
+   && rm -rf /var/lib/apt/lists/*
 
 ENV VIRTUAL_ENV=/venv
 
 # Use production configuration.
-ENV DJANGO_SETTINGS_MODULE=publichealth.settings
+ENV DJANGO_SETTINGS_MODULE=publichealth.settings.production
 ENV DJANGO_CONFIGURATION=production
 
 
-### builder image
 
-FROM base as build
+## Build frontend
+
+FROM docker.io/node:18-slim AS frontend-builder
+
+RUN mkdir -p /build
+WORKDIR /build
+
+# Install javascript dependencies.
+COPY package.json yarn.lock Gruntfile.js ./
+RUN npm install -g yarn grunt-cli
+RUN yarn install || npm install
+
+# Copy static assets and libs
+COPY publichealth/static/ ./publichealth/static/
+RUN mkdir -p publichealth/static/libs && \
+    cp -r node_modules/@bower_components/* publichealth/static/libs/
+
+# Build frontend assets (skip grunt if it fails, assets will be compiled at runtime)
+RUN grunt || echo "Grunt build skipped, will use django-compressor at runtime"
+
+
+
+## Build backend
+
+FROM base AS backend-builder
 
 ENV \
    # pip:
@@ -41,64 +61,75 @@ ENV \
    PIP_DISABLE_PIP_VERSION_CHECK=on \
    PIP_DEFAULT_TIMEOUT=100
 
+RUN apt-get update \
+   && apt-get upgrade -y \
+   && apt-get install -y --no-install-recommends \
+      build-essential gcc \
+   && apt-get clean \
+   && rm -rf /var/lib/apt/lists/*
+
+# Install python build tools.
+RUN pip install --upgrade pip wheel
 RUN python3 -m venv $VIRTUAL_ENV
 
-RUN mkdir -p /build/static
+RUN mkdir -p /build
 WORKDIR /build
 
 # Install python dependencies.
-COPY requirements.txt requirements.txt ./
+COPY requirements.txt .
 RUN . /venv/bin/activate && pip install -r requirements.txt
-
 # We will run dumb-init as pid 1.
 RUN . /venv/bin/activate && pip install dumb-init
-
 # We will run our app using gunicorn.
 RUN . /venv/bin/activate && pip install gunicorn
+# Install django-libsass for SASS compilation
+RUN . /venv/bin/activate && pip install django-libsass
 
-# Copy local code into to the build image.
-COPY . /build
+# Copy our own code into to the build image.
+# WARNING: use .dockerignore file to exclude unwanted files
+COPY . /build/
+
+# Copy javascript assets from frontend builder
+COPY --from=frontend-builder /build/publichealth/static /build/publichealth/static
+COPY --from=frontend-builder /build/assets /build/assets
 
 # Copy code required for runtime to the /app folder.
-RUN mkdir -p /app
-RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js setup_libs.sh /app/
-
-
-#RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x
-#RUN apt install -y nodejs
-#RUN npm install -g grunt-cli
+RUN mkdir /app
 
 # Collect static data into /app/static.
-#RUN . /venv/bin/activate && \
-#   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
+RUN . /venv/bin/activate && \
+   DJANGO_SECRET_KEY=dummy \
+   DJANGO_STATIC_ROOT=/app/static ./manage.py collectstatic --no-input
 
-#RUN mkdir -p /app/publichealth/static/libs
+# Compile messages if locale directory exists
+RUN if [ -d "locale" ]; then \
+   . /venv/bin/activate && \
+   DJANGO_SECRET_KEY=dummy \
+   ./manage.py compilemessages; \
+   fi
 
-#RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
+# Copy application code to /app
+RUN cp -r publichealth feedler manage.py /app/
+RUN if [ -d "locale" ]; then cp -r locale /app/; fi
+
+RUN ls -al /app/
 
 
-#RUN . /venv/bin/activate && \
-#   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py compress --force
-
-#RUN cp -r /build/static /app/static
 
 ### runtime image
 
 FROM base as runtime
 
-#RUN apt-get install -y --no-install-recommends libpango-1.0-0 libpangoft2-1.0-0
-#RUN apt-get install -y --no-install-recommends procps iproute2 curl
-
-COPY --from=build /venv /venv
-COPY --from=build /app /app
+COPY --from=backend-builder /venv /venv
+COPY --from=backend-builder /app /app
 
+RUN groupadd --gid 1001 app \
+   && useradd --home-dir /app --shell /bin/bash --gid app --uid 1001 app
+USER app
 WORKDIR /app
 
 # Ensure exectutables from virtualenv are prefered.
 ENV PATH="/venv/bin:$PATH"
-ENTRYPOINT ["/venv/bin/dumb-init", "--", "gunicorn", \
-   "-b [::]:8000", \
-   "--log-file=-", \
-   "--worker-tmp-dir", "/dev/shm", \
-   "--workers=2", "--threads=4", "--worker-class=gthread"]
-CMD ["publichealth.wsgi"]
+
+ADD entrypoint /entrypoint
+ENTRYPOINT ["/entrypoint"]
\ No newline at end of file

From 124db1f4f32580282d1ed4e88f0cf871f0922158 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 16:46:06 +0530
Subject: [PATCH 097/122] Add entrypoint

---
 entrypoint | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100755 entrypoint

diff --git a/entrypoint b/entrypoint
new file mode 100755
index 0000000..9f06774
--- /dev/null
+++ b/entrypoint
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if [ "${COLLECT_STATIC-}" ]; then
+   ./manage.py collectstatic --no-input
+fi
+
+exec /venv/bin/dumb-init -- gunicorn \
+   -b [::]:8000 \
+   --log-file=- \
+   --worker-tmp-dir /dev/shm \
+   --workers=2 \
+   --threads=4 \
+   --worker-class=gthread \
+   publichealth.wsgi
\ No newline at end of file

From 97ed1a0a709d3b86e676e6c0ea9c63d890f7fef1 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 16:46:54 +0530
Subject: [PATCH 098/122] Update yarn.lock

---
 yarn.lock | 2162 +++++++++++++++++++++++++++--------------------------
 1 file changed, 1102 insertions(+), 1060 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 76630fb..4d987fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,31 +5,36 @@
 "@bower_components/bootstrap-sass@twbs/bootstrap-sass#^3.3.7":
   version "3.4.1"
   resolved "https://codeload.github.com/twbs/bootstrap-sass/tar.gz/b34765d8a6aa775816c59012b2d6b30c4c66a8e9"
+  integrity sha512-2mSCGlz6J9F3pSsPhfSAOhnPhqaWD6fbRIL+pkm5x3TO4O8EICHoMkasL50/iUTldyW2ltA/JXPJCNKOOHga0g==
 
 "@bower_components/cookieconsent@silktide/cookieconsent2#^3.0.6":
   version "3.1.1"
   resolved "https://codeload.github.com/silktide/cookieconsent2/tar.gz/2b3191a39c7df4479a1f23053e3b31424089520e"
+  integrity sha512-TkMPTivoyxEa/LlhqqNc5YJlRysBnldCaxqBW4qWdNSuuxPgGmoprFsXQzVtknEVbtC3G0vF7qITUKxNQ6PEnQ==
 
 "@bower_components/jquery@jquery/jquery-dist#~1":
   version "1.12.4"
   resolved "https://codeload.github.com/jquery/jquery-dist/tar.gz/5e89585e0121e72ff47de177c5ef604f3089a53d"
+  integrity sha512-B7/Y6j3xashMTbnNokU2k9sAuMRhq5tZJKl6YZXyaZQEN1O5Dr/kCmEOwLuGkNzzIkx+2C2SyTcco2mdv+MxKg==
 
 "@bower_components/slick-carousel@kenwheeler/slick#~1.4.1":
   version "1.4.1"
   resolved "https://codeload.github.com/kenwheeler/slick/tar.gz/e3fc23908d647bb2471c00c316ad57b15667975d"
+  integrity sha512-lF5UkWugjyUMDYnDyHZnP8Q4Vdg/CnbKJHouhY2jTNhbdbSiVhJL2BpTtdlE3mqRwOAFibD+xbIP0rbkRS9eIg==
 
 "@bower_components/slick-lightbox@mreq/slick-lightbox#^0.2.10":
   version "0.2.12"
   resolved "https://codeload.github.com/mreq/slick-lightbox/tar.gz/30459914338d0a9ae6ab328c7e12166997da00a2"
+  integrity sha512-LG5+IZkBp+DatSLNdzPbJ7IP91sOxmZ9UMnKaVUilsSbaf8x/tObSl1WWCLSvfJm0bFYtYdirdQZtAunIXQOCQ==
 
 abbrev@1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 accepts@~1.3.4:
   version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"
   integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
   dependencies:
     mime-types "~2.1.24"
@@ -37,46 +42,53 @@ accepts@~1.3.4:
 
 after@0.8.2:
   version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+  resolved "https://registry.npmjs.org/after/-/after-0.8.2.tgz"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==
 
 ansi-gray@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
+  resolved "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"
+  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE= sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==
   dependencies:
     ansi-wrap "0.1.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.0.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
 ansi-wrap@0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
+  resolved "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
+  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==
 
 anymatch@~3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
@@ -84,145 +96,145 @@ anymatch@~3.1.2:
 
 archive-type@^3.0.0, archive-type@^3.0.1:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-3.2.0.tgz#9cd9c006957ebe95fadad5bd6098942a813737f6"
-  integrity sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=
+  resolved "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz"
+  integrity sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y= sha512-6cAWDM0lUYTbb7F436FAjbBYnsn5E3L2AgTOLzrFfLt7FVM6uJwKUvllE8VjLKTmKCU8PqtWlUAezEYjg5iGqA==
   dependencies:
     file-type "^3.1.0"
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
+  resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-flatten@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 array-differ@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
+  resolved "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE= sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==
 
 array-each@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
-  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
+  resolved "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"
+  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8= sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==
 
 array-find-index@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+  resolved "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==
 
 array-slice@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+  resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"
   integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
 array-union@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  resolved "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.0, array-uniq@^1.0.1, array-uniq@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+  resolved "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
 
 array-unique@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
+  resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  resolved "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"
   integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
-async-each-series@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
-  integrity sha1-dhfBkXQB/Yykooqtzj266Yr+tDI=
-
 async-each-series@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-1.1.0.tgz#f42fd8155d38f21a5b8ea07c28e063ed1700b138"
-  integrity sha1-9C/YFV048hpbjqB8KOBj7RcAsTg=
+  resolved "https://registry.npmjs.org/async-each-series/-/async-each-series-1.1.0.tgz"
+  integrity sha1-9C/YFV048hpbjqB8KOBj7RcAsTg= sha512-/VIpPVIJJlJObJiXkHBJ1RhjDtydBRG/3/dWpsXoVGOShNw5tameXnC7Yys+wpb0p/myItxGmSGgNi/dNlsIiA==
 
-async@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+async-each-series@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz"
+  integrity sha1-dhfBkXQB/Yykooqtzj266Yr+tDI= sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==
 
 async@^0.9.0:
   version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+  resolved "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==
 
 async@^2.6.0:
   version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  resolved "https://registry.npmjs.org/async/-/async-2.6.3.tgz"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
   dependencies:
     lodash "^4.17.14"
 
 async@~3.2.0:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd"
+  resolved "https://registry.npmjs.org/async/-/async-3.2.2.tgz"
   integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==
 
+async@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==
+
 axios@0.21.4:
   version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
     follow-redirects "^1.14.0"
 
 backo2@1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+  resolved "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==
 
 balanced-match@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-arraybuffer@0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
+  resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"
+  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==
 
 base64id@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz"
   integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
 
 batch@0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+  resolved "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
 beeper@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
+  resolved "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"
+  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak= sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==
 
 bin-build@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-2.2.0.tgz#11f8dd61f70ffcfa2bdcaa5b46f5e8fedd4221cc"
-  integrity sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw=
+  resolved "https://registry.npmjs.org/bin-build/-/bin-build-2.2.0.tgz"
+  integrity sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw= sha512-m8gaq/BdoePIT5RlHW3KNJZwNkg9YtPn2C89x85/0KYIExoHMm3D/RL/Wxrvum9CI6pbF2KUQa8a/WWFudVmng==
   dependencies:
     archive-type "^3.0.1"
     decompress "^3.0.0"
@@ -234,15 +246,15 @@ bin-build@^2.0.0:
 
 bin-check@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-2.0.0.tgz#86f8e6f4253893df60dc316957f5af02acb05930"
-  integrity sha1-hvjm9CU4k99g3DFpV/WvAqywWTA=
+  resolved "https://registry.npmjs.org/bin-check/-/bin-check-2.0.0.tgz"
+  integrity sha1-hvjm9CU4k99g3DFpV/WvAqywWTA= sha512-jf6fesAGnXBynRU3JLpo0qe8vw8JBPBJCKK0v8NV3iH1P2UkQ6UEcIy7uPw1OdWkPUtpmX1uqeyTGrpeKd2CwQ==
   dependencies:
     executable "^1.0.0"
 
 bin-version-check@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-2.1.0.tgz#e4e5df290b9069f7d111324031efc13fdd11a5b0"
-  integrity sha1-5OXfKQuQaffRETJAMe/BP90RpbA=
+  resolved "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz"
+  integrity sha1-5OXfKQuQaffRETJAMe/BP90RpbA= sha512-3lUeqGAbnWQG7OCfIiHXw1EmzzvAGlMYqqgRahkr7oDeY1Qra8r2DZH2bbfXZI4NA3aaD1Ap+xt8CeVO/fftrw==
   dependencies:
     bin-version "^1.0.0"
     minimist "^1.1.0"
@@ -251,15 +263,15 @@ bin-version-check@^2.1.0:
 
 bin-version@^1.0.0:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-1.0.4.tgz#9eb498ee6fd76f7ab9a7c160436f89579435d78e"
-  integrity sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144=
+  resolved "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz"
+  integrity sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144= sha512-o9u3aS7w6RqoH9BErxuilhQG2fn3srr3ZekEEGailMnj5F+0p+R3TXENvO+vGaLnKlmq8xhhh/Fvl1RRxx/FdQ==
   dependencies:
     find-versions "^1.0.0"
 
 bin-wrapper@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-3.0.2.tgz#67d3306262e4b1a5f2f88ee23464f6a655677aeb"
-  integrity sha1-Z9MwYmLksaXy+I7iNGT2plVneus=
+  resolved "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-3.0.2.tgz"
+  integrity sha1-Z9MwYmLksaXy+I7iNGT2plVneus= sha512-5QEiUnaE7hgRlQxaV2jpeTg0+IA3o4zZ2sduuSqyJCdOuJ1wDuEmM1ntGelDf4ueCOaOam4bOMtOU4W6lG+hUg==
   dependencies:
     bin-check "^2.0.0"
     bin-version-check "^2.1.0"
@@ -270,12 +282,12 @@ bin-wrapper@^3.0.0:
 
 binary-extensions@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
 bl@^1.0.0:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
+  resolved "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz"
   integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==
   dependencies:
     readable-stream "^2.3.5"
@@ -283,13 +295,13 @@ bl@^1.0.0:
 
 blob@0.0.5:
   version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  resolved "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
 body@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
-  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
+  resolved "https://registry.npmjs.org/body/-/body-5.1.0.tgz"
+  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk= sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==
   dependencies:
     continuable-cache "^0.3.1"
     error "^7.0.0"
@@ -298,7 +310,7 @@ body@^5.1.0:
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -306,8 +318,8 @@ brace-expansion@^1.1.7:
 
 braces@^1.8.2:
   version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
+  resolved "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -315,14 +327,14 @@ braces@^1.8.2:
 
 braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
 browser-sync-client@^2.27.7:
   version "2.27.7"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.27.7.tgz#e09dce1add876984cf8232de95d2332d29401a64"
+  resolved "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.7.tgz"
   integrity sha512-wKg9UP9a4sCIkBBAXUdbkdWFJzfSAQizGh+nC19W9y9zOo9s5jqeYRFUUbs7x5WKhjtspT+xetVp9AtBJ6BmWg==
   dependencies:
     etag "1.8.1"
@@ -332,7 +344,7 @@ browser-sync-client@^2.27.7:
 
 browser-sync-ui@^2.27.7:
   version "2.27.7"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.27.7.tgz#38cd65f7ba058544310591ad8ac2e7fdf29934f2"
+  resolved "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.7.tgz"
   integrity sha512-Bt4OQpx9p18OIzk0KKyu7jqlvmjacasUlk8ARY3uuIyiFWSBiRgr2i6XY8dEMF14DtbooaEBOpHEu9VCYvMcCw==
   dependencies:
     async-each-series "0.1.1"
@@ -344,7 +356,7 @@ browser-sync-ui@^2.27.7:
 
 browser-sync@^2.6.4:
   version "2.27.7"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.27.7.tgz#65ec55d6c6e33283e505e06e5113bc32d9d0a8f0"
+  resolved "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.7.tgz"
   integrity sha512-9ElnnA/u+s2Jd+IgY+2SImB+sAEIteHsMG0NR96m7Ph/wztpvJCUpyC2on1KqmG9iAp941j+5jfmd34tEguGbg==
   dependencies:
     browser-sync-client "^2.27.7"
@@ -380,22 +392,22 @@ browser-sync@^2.6.4:
 
 bs-recipes@1.3.4:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
-  integrity sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU=
+  resolved "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz"
+  integrity sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU= sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==
 
 bs-snippet-injector@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz#61b5393f11f52559ed120693100343b6edb04dd5"
-  integrity sha1-YbU5PxH1JVntEgaTEANDtu2wTdU=
+  resolved "https://registry.npmjs.org/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz"
+  integrity sha1-YbU5PxH1JVntEgaTEANDtu2wTdU= sha512-4u8IgB+L9L+S5hknOj3ddNSb42436gsnGm1AuM15B7CdbkpQTyVWgIM5/JUBiKiRwGOR86uo0Lu/OsX+SAlJmw==
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  resolved "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"
   integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
 
 buffer-alloc@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  resolved "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz"
   integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
   dependencies:
     buffer-alloc-unsafe "^1.1.0"
@@ -403,23 +415,23 @@ buffer-alloc@^1.2.0:
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+  resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
 buffer-fill@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+  resolved "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
 
 buffer-from@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer-to-vinyl@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz#00f15faee3ab7a1dda2cde6d9121bffdd07b2262"
-  integrity sha1-APFfruOreh3aLN5tkSG//dB7ImI=
+  resolved "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz"
+  integrity sha1-APFfruOreh3aLN5tkSG//dB7ImI= sha512-t6B4HXJ3YdJ/lXKhK3nlGW1aAvpQH2FMyHh25SmfdYkQAU3/R2MYo4VrY1DlQuZd8zLNOqWPxZFJILRuTkqaEQ==
   dependencies:
     file-type "^3.1.0"
     readable-stream "^2.0.2"
@@ -428,17 +440,17 @@ buffer-to-vinyl@^1.0.0:
 
 bytes@1:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
-  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
+  resolved "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
+  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g= sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==
 
 bytes@3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
+  resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"
   integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
 
 call-bind@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   dependencies:
     function-bind "^1.1.1"
@@ -446,31 +458,31 @@ call-bind@^1.0.0:
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
+  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
 camelcase@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==
 
 camelcase@^5.0.0:
   version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
+  resolved "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"
   integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
 caw@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/caw/-/caw-1.2.0.tgz#ffb226fe7efc547288dc62ee3e97073c212d1034"
-  integrity sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=
+  resolved "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz"
+  integrity sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ= sha512-GIAlMoessjWW8p0mkStU4kMvV35toVCAyOWhUajk7O0d7wJI8F9TDjfrkSoO26b0d1QsnDLmw5I3X+yd6OKorQ==
   dependencies:
     get-proxy "^1.0.1"
     is-obj "^1.0.0"
@@ -479,8 +491,8 @@ caw@^1.0.1:
 
 chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -490,15 +502,15 @@ chalk@^1.0.0, chalk@^1.1.3:
 
 chalk@~4.1.0:
   version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.1:
+chokidar@^3.5.1, "chokidar@>=3.0.0 <4.0.0":
   version "3.5.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"
   integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
   dependencies:
     anymatch "~3.1.2"
@@ -513,14 +525,14 @@ chalk@~4.1.0:
 
 clap@^1.0.9:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
+  resolved "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz"
   integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==
   dependencies:
     chalk "^1.1.3"
 
 cliui@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"
   integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
   dependencies:
     string-width "^4.2.0"
@@ -529,7 +541,7 @@ cliui@^6.0.0:
 
 cliui@^7.0.2:
   version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
   integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
     string-width "^4.2.0"
@@ -538,91 +550,91 @@ cliui@^7.0.2:
 
 clone-stats@^0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
+  resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
+  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==
 
 clone@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
+  resolved "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"
+  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8= sha512-g62n3Kb9cszeZvmvBUqP/dsEJD/+80pDA8u8KqHnAPrVnQ2Je9rVV6opxkhuWCd1kCn2gOibzDKxCtBvD3q5kA==
 
 clone@^1.0.0:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
 co@3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78"
-  integrity sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=
+  resolved "https://registry.npmjs.org/co/-/co-3.1.0.tgz"
+  integrity sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g= sha512-CQsjCRiNObI8AtTsNIBDRMQ4oMR83CzEswHYahClvul7gKk+lDQiOKv+5qh7LQWf5sh6jkZNispz/QlsZxyNgA==
 
 coa@~1.0.1:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
-  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=
+  resolved "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"
+  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0= sha512-KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ==
   dependencies:
     q "^1.1.2"
 
 coffeescript@^2.5.1:
   version "2.6.1"
-  resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.6.1.tgz#f9e5d4930e1b8a1c5cfba7f95eebd18694ce58fd"
+  resolved "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz"
   integrity sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg==
 
 color-convert@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
     color-name "~1.1.4"
 
 color-name@~1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-support@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
 colors@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
+  resolved "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==
 
 commander@^2.2.0, commander@^2.8.1:
   version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 component-bind@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+  resolved "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==
 
 component-emitter@~1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA==
+
 component-inherit@0.0.3:
   version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+  resolved "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^1.4.6, concat-stream@^1.4.7:
   version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
@@ -632,13 +644,13 @@ concat-stream@^1.4.6, concat-stream@^1.4.7:
 
 connect-history-api-fallback@^1:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  resolved "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
 connect@3.6.6:
   version "3.6.6"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
+  resolved "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"
+  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ= sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
@@ -647,49 +659,49 @@ connect@3.6.6:
 
 console-stream@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44"
-  integrity sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=
+  resolved "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz"
+  integrity sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ= sha512-QC/8l9e6ofi6nqZ5PawlDgzmMw3OxIXtvolBzap/F4UDBJlDaZRSNbL/lb41C29FcbSJncBFlJFj2WJoNyZRfQ==
 
 continuable-cache@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
-  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
+  resolved "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz"
+  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8= sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==
 
 convert-source-map@^1.1.1:
   version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
   dependencies:
     safe-buffer "~5.1.1"
 
 cookie@~0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+  resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
 core-util-is@~1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 create-error-class@^3.0.1:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
+  resolved "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"
+  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==
   dependencies:
     capture-stack-trace "^1.0.0"
 
 cross-spawn@^0.2.3:
   version "0.2.9"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-0.2.9.tgz#bd67f96c07efb6303b7fe94c1e979f88478e0a39"
-  integrity sha1-vWf5bAfvtjA7f+lMHpefiEeOCjk=
+  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.9.tgz"
+  integrity sha1-vWf5bAfvtjA7f+lMHpefiEeOCjk= sha512-jUNffe+x93R0/940d+JrdIl8SROZdUuvlw0HxjR/0GUKGvJEWiTK5rxtKNtP1lgMnoR8383q0orSA6k3eJ+y4A==
   dependencies:
     lru-cache "^2.5.0"
 
 cross-spawn@^5.0.1:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -697,80 +709,80 @@ cross-spawn@^5.0.1:
 
 csso@~2.3.1:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
-  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
+  resolved "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz"
+  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U= sha512-FmCI/hmqDeHHLaIQckMhMZneS84yzUZdrWDAvJVVxOwcKE1P1LF9FGmzr1ktIQSxOw6fl3PaQsmfg+GN+VvR3w==
   dependencies:
     clap "^1.0.9"
     source-map "^0.5.3"
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
+  resolved "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==
   dependencies:
     array-find-index "^1.0.1"
 
 dargs@^4.0.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
-  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
+  resolved "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"
+  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc= sha512-jyweV/k0rbv2WK4r9KLayuBrSh2Py0tNmV7LBoSMH4hMQyrG8OPyIOWB2VEx4DJKXWmK4lopYMVvORlDt2S8Aw==
   dependencies:
     number-is-nan "^1.0.0"
 
 dateformat@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
+  resolved "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"
+  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI= sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==
 
 dateformat@~3.0.3:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debug@2.6.9, debug@^2.2.0:
+debug@^2.2.0, debug@2.6.9:
   version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.1.0:
   version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
 debug@~3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@~4.1.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
+debug@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
 decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decompress-tar@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-3.1.0.tgz#217c789f9b94450efaadc5c5e537978fc333c466"
-  integrity sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=
+  resolved "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz"
+  integrity sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY= sha512-YuF7b9jA2bnBhf0/HQ/5UDgX5Ogzw1xJz6mWOFRctyOcmZPjJx3jjde9tCBjysvYscutRTPi35Q20mPDA74SKQ==
   dependencies:
     is-tar "^1.0.0"
     object-assign "^2.0.0"
@@ -781,8 +793,8 @@ decompress-tar@^3.0.0:
 
 decompress-tarbz2@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz#8b23935681355f9f189d87256a0f8bdd96d9666d"
-  integrity sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=
+  resolved "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz"
+  integrity sha1-iyOTVoE1X58YnYclag+L3ZbZZm0= sha512-UVCUT54LTEf8uqoytmEMVSwTVl/rZJ0o6bUJsJ7psRmICUzCsz9BJ31drbX0NtgwD9cFzIwKProa2yThmVBKvQ==
   dependencies:
     is-bzip2 "^1.0.0"
     object-assign "^2.0.0"
@@ -794,8 +806,8 @@ decompress-tarbz2@^3.0.0:
 
 decompress-targz@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-3.1.0.tgz#b2c13df98166268991b715d6447f642e9696f5a0"
-  integrity sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=
+  resolved "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz"
+  integrity sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA= sha512-umeSWvrmd9/qcmGaf0oAc+Gx7La0B4Uxo+HXoo0HqrjEbCzn7SMiWvmE5sS56B+GqaoJ8z64ORZCRaOzKCYi/w==
   dependencies:
     is-gzip "^1.0.0"
     object-assign "^2.0.0"
@@ -806,8 +818,8 @@ decompress-targz@^3.0.0:
 
 decompress-unzip@^3.0.0:
   version "3.4.0"
-  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-3.4.0.tgz#61475b4152066bbe3fee12f9d629d15fe6478eeb"
-  integrity sha1-YUdbQVIGa74/7hL51inRX+ZHjus=
+  resolved "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz"
+  integrity sha1-YUdbQVIGa74/7hL51inRX+ZHjus= sha512-rclee6Q/+aChW77vbHmtGNZi3ko1Qhsp9Brs5mVyhBSeg+K4n+6MHo47y/+7GsmYZuEqVJ46LjwT3/N8N50jZQ==
   dependencies:
     is-zip "^1.0.0"
     read-all-stream "^3.0.0"
@@ -819,8 +831,8 @@ decompress-unzip@^3.0.0:
 
 decompress@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/decompress/-/decompress-3.0.0.tgz#af1dd50d06e3bfc432461d37de11b38c0d991bed"
-  integrity sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=
+  resolved "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz"
+  integrity sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0= sha512-QCl8WTT4FSft5F+0M0InHKO6UYFfYhw5++vktTKpmUsQ6YUMPcBwMu7Sp3P0lMGk00hTNHohdhfdi9+OswLJuQ==
   dependencies:
     buffer-to-vinyl "^1.0.0"
     concat-stream "^1.4.6"
@@ -834,38 +846,38 @@ decompress@^3.0.0:
 
 deep-extend@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 depd@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 destroy@~1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+  resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
 
 detect-file@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+  resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
 
 dev-ip@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
-  integrity sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=
+  resolved "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz"
+  integrity sha1-p2o+0YVb56ASu4rBbLgPPADcKPA= sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==
 
 dlv@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
+  resolved "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
 download@^4.0.0, download@^4.1.2:
   version "4.4.3"
-  resolved "https://registry.yarnpkg.com/download/-/download-4.4.3.tgz#aa55fdad392d95d4b68e8c2be03e0c2aa21ba9ac"
-  integrity sha1-qlX9rTktldS2jowr4D4MKqIbqaw=
+  resolved "https://registry.npmjs.org/download/-/download-4.4.3.tgz"
+  integrity sha1-qlX9rTktldS2jowr4D4MKqIbqaw= sha512-yOTsksXxUQ9b/p/HA3g9L97JZThcAKq8v3+Afwhf/kIoV0spu6pOvj+OKQbyGKYAwBGqSPbO+x1pCFSg5ce9OA==
   dependencies:
     caw "^1.0.1"
     concat-stream "^1.4.7"
@@ -883,23 +895,23 @@ download@^4.0.0, download@^4.1.2:
     vinyl-fs "^2.2.0"
     ware "^1.2.0"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
 duplexer2@^0.1.4, duplexer2@~0.1.0:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+  resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==
   dependencies:
     readable-stream "^2.0.2"
 
+duplexer2@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
+  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==
+  dependencies:
+    readable-stream "~1.1.9"
+
 duplexify@^3.2.0:
   version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"
   integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
@@ -909,51 +921,51 @@ duplexify@^3.2.0:
 
 each-async@^1.0.0, each-async@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/each-async/-/each-async-1.1.1.tgz#dee5229bdf0ab6ba2012a395e1b869abf8813473"
-  integrity sha1-3uUim98KtrogEqOV4bhpq/iBNHM=
+  resolved "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz"
+  integrity sha1-3uUim98KtrogEqOV4bhpq/iBNHM= sha512-0hJGub96skwr+sUojv7zQ0kc9i4jn3SwLiLk8Jr7KDz7aaaMzkN5UX3a/9ZhzC0OfZVyXHhlHcjC0KVOiKZ+HQ==
   dependencies:
     onetime "^1.0.0"
     set-immediate-shim "^1.0.0"
 
 easy-extender@^2.3.4:
   version "2.3.4"
-  resolved "https://registry.yarnpkg.com/easy-extender/-/easy-extender-2.3.4.tgz#298789b64f9aaba62169c77a2b3b64b4c9589b8f"
+  resolved "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz"
   integrity sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==
   dependencies:
     lodash "^4.17.10"
 
 eazy-logger@3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-3.1.0.tgz#b169eb56df714608fa114f164c8a2956bec9f0f3"
+  resolved "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.1.0.tgz"
   integrity sha512-/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ==
   dependencies:
     tfunk "^4.0.0"
 
 ee-first@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
 end-of-stream@^1.0.0:
   version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
 engine.io-client@~3.5.0:
   version "3.5.2"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa"
+  resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz"
   integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==
   dependencies:
     component-emitter "~1.3.0"
@@ -970,7 +982,7 @@ engine.io-client@~3.5.0:
 
 engine.io-parser@~2.2.0:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
+  resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz"
   integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
   dependencies:
     after "0.8.2"
@@ -981,7 +993,7 @@ engine.io-parser@~2.2.0:
 
 engine.io@~3.5.0:
   version "3.5.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
+  resolved "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz"
   integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
   dependencies:
     accepts "~1.3.4"
@@ -993,61 +1005,61 @@ engine.io@~3.5.0:
 
 error-ex@^1.2.0:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 error@^7.0.0:
   version "7.2.1"
-  resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894"
+  resolved "https://registry.npmjs.org/error/-/error-7.2.1.tgz"
   integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==
   dependencies:
     string-template "~0.2.1"
 
 escalade@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-html@~1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 esprima@^2.6.0:
   version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
+  resolved "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==
 
 esprima@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-etag@1.8.1, etag@^1.8.1, etag@~1.8.1:
+etag@^1.8.1, etag@~1.8.1, etag@1.8.1:
   version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 eventemitter2@~0.4.13:
   version "0.4.14"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab"
-  integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=
+  resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
+  integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas= sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 exec-buffer@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/exec-buffer/-/exec-buffer-3.2.0.tgz#b1686dbd904c7cf982e652c1f5a79b1e5573082b"
+  resolved "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz"
   integrity sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==
   dependencies:
     execa "^0.7.0"
@@ -1058,16 +1070,16 @@ exec-buffer@^3.0.0:
 
 exec-series@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/exec-series/-/exec-series-1.0.3.tgz#6d257a9beac482a872c7783bc8615839fc77143a"
-  integrity sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo=
+  resolved "https://registry.npmjs.org/exec-series/-/exec-series-1.0.3.tgz"
+  integrity sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo= sha512-VkmGmKa4oWkVBcPPfSzOEmry9ELWKk4oodvXpmtYmvGD82k/TnT0CGNw9VoxQLYGwNJR6fIaXpHUhBm4tNTSMQ==
   dependencies:
     async-each-series "^1.1.0"
     object-assign "^4.1.0"
 
 execa@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
+  resolved "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -1079,59 +1091,59 @@ execa@^0.7.0:
 
 executable@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-1.1.0.tgz#877980e9112f3391066da37265de7ad8434ab4d9"
-  integrity sha1-h3mA6REvM5EGbaNyZd562ENKtNk=
+  resolved "https://registry.npmjs.org/executable/-/executable-1.1.0.tgz"
+  integrity sha1-h3mA6REvM5EGbaNyZd562ENKtNk= sha512-qZLuUgqTqYRLdF8Gl56y/JhT+X15uPX6y0Vpmj0cF4SCwbswBPc6yxzr1nClQa+SwRQ5Sk9+Mxa3ZBX9t6aWzg==
   dependencies:
     meow "^3.1.0"
 
 exit@~0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
 expand-brackets@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
+  resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-range@^1.8.1:
   version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
+  resolved "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==
   dependencies:
     fill-range "^2.1.0"
 
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
   dependencies:
     is-extendable "^0.1.0"
 
 extend@^3.0.0, extend@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 extglob@^0.3.1:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
+  resolved "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==
   dependencies:
     is-extglob "^1.0.0"
 
 fancy-log@^1.1.0:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  resolved "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz"
   integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
   dependencies:
     ansi-gray "^0.1.1"
@@ -1141,50 +1153,50 @@ fancy-log@^1.1.0:
 
 faye-websocket@~0.10.0:
   version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==
   dependencies:
     websocket-driver ">=0.5.1"
 
 fd-slicer@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
+  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
   dependencies:
     pend "~1.2.0"
 
 figures@^1.3.5:
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+  resolved "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"
+  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==
   dependencies:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
 file-type@^3.1.0:
   version "3.9.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
-  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
+  resolved "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"
+  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek= sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==
 
 file-type@^4.1.0:
   version "4.4.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-4.4.0.tgz#1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5"
-  integrity sha1-G2AOX8ofvcboDApwxxyNul95BsU=
+  resolved "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz"
+  integrity sha1-G2AOX8ofvcboDApwxxyNul95BsU= sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==
 
 filename-regex@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
+  resolved "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==
 
 filename-reserved-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
-  integrity sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=
+  resolved "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz"
+  integrity sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q= sha512-UZArj7+U+2reBBVCvVmRlyq9D7EYQdUtuNN+1iz7pF1jGcJ2L0TjiRCxsTZfj2xFbM4c25uGCUDpKTHA7L2TKg==
 
 filenamify@^1.0.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5"
-  integrity sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=
+  resolved "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz"
+  integrity sha1-qfL/0RxQO+0wABUCknI3jx8TZaU= sha512-DKVP0WQcB7WaIMSwDETqImRej2fepPqvXQjaVib7LRZn9Rxn5UbvK2tYTqGf1A1DkIprQQkG4XSQXSOZp7Q3GQ==
   dependencies:
     filename-reserved-regex "^1.0.0"
     strip-outer "^1.0.0"
@@ -1192,7 +1204,7 @@ filenamify@^1.0.1:
 
 fill-range@^2.1.0:
   version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz"
   integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
@@ -1203,15 +1215,15 @@ fill-range@^2.1.0:
 
 fill-range@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
   integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
   dependencies:
     to-regex-range "^5.0.1"
 
 finalhandler@1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
+  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U= sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -1223,15 +1235,15 @@ finalhandler@1.1.0:
 
 find-up@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+  resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
 find-up@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
     locate-path "^5.0.0"
@@ -1239,8 +1251,8 @@ find-up@^4.1.0:
 
 find-versions@^1.0.0:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-1.2.1.tgz#cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"
-  integrity sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I=
+  resolved "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz"
+  integrity sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I= sha512-t0ciYD8XnoFVirFJN2niUJAQ/kyZU5UDSJobyekmiMPCBsYsWd4nd75e7HU2Xf4m+1Y7iLEo3fovNRNIV5MaDQ==
   dependencies:
     array-uniq "^1.0.0"
     get-stdin "^4.0.1"
@@ -1249,7 +1261,7 @@ find-versions@^1.0.0:
 
 findup-sync@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
+  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz"
   integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
   dependencies:
     detect-file "^1.0.0"
@@ -1259,14 +1271,14 @@ findup-sync@^4.0.0:
 
 findup-sync@~0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16"
-  integrity sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=
+  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"
+  integrity sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY= sha512-z8Nrwhi6wzxNMIbxlrTzuUW6KWuKkogZ/7OdDVq+0+kxn77KUH1nipx8iU6suqkHqc4y6n7a9A8IpmxY/pTjWg==
   dependencies:
     glob "~5.0.0"
 
 fined@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+  resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"
   integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
   dependencies:
     expand-tilde "^2.0.2"
@@ -1277,52 +1289,52 @@ fined@^1.2.0:
 
 first-chunk-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
+  resolved "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
+  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04= sha512-ArRi5axuv66gEsyl3UuK80CzW7t56hem73YGNYxNWTGNKFJUadSb9Gu9SHijYEUi8ulQMf1bJomYNwSCPHhtTQ==
 
 flagged-respawn@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
+  resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0:
   version "1.14.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd"
+  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz"
   integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==
 
 for-in@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+  resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
 for-own@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
+  resolved "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==
   dependencies:
     for-in "^1.0.1"
 
 for-own@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
+  resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==
   dependencies:
     for-in "^1.0.1"
 
-fresh@0.5.2, fresh@^0.5.2:
+fresh@^0.5.2, fresh@0.5.2:
   version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 fs-constants@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
 fs-extra@3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
-  integrity sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"
+  integrity sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE= sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^3.0.0"
@@ -1330,34 +1342,34 @@ fs-extra@3.0.1:
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 function-bind@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gaze@^1.1.0:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  resolved "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz"
   integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
 get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-intrinsic@^1.0.2:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"
   integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
   dependencies:
     function-bind "^1.1.1"
@@ -1366,30 +1378,30 @@ get-intrinsic@^1.0.2:
 
 get-proxy@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-1.1.0.tgz#894854491bc591b0f147d7ae570f5c678b7256eb"
-  integrity sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=
+  resolved "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz"
+  integrity sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus= sha512-3cJ+77wC52qD2PqWNXtB2HkU6tQXc/X3hSMtSN0Y8c8nbYMMxF7vpsjH4H0iSt+28l/NK13DKl8iKAVGkqDFnA==
   dependencies:
     rc "^1.1.2"
 
 get-stdin@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==
 
 get-stream@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+  resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==
 
 getobject@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.2.tgz#25ec87a50370f6dcc3c6ba7ef43c4c16215c4c89"
+  resolved "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz"
   integrity sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==
 
 gifsicle@^3.0.0:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-3.0.4.tgz#f45cb5ed10165b665dc929e0e9328b6c821dfa3b"
-  integrity sha1-9Fy17RAWW2ZdySng6TKLbIId+js=
+  resolved "https://registry.npmjs.org/gifsicle/-/gifsicle-3.0.4.tgz"
+  integrity sha1-9Fy17RAWW2ZdySng6TKLbIId+js= sha512-bfwYZooxxqCHpu3qUMn3En9xij/rrQd1fD9TNr+f7r5y/Inqj0WGkL7AeqQffBe/Sd6M/MIHzRKeD9hgI6Xavg==
   dependencies:
     bin-build "^2.0.0"
     bin-wrapper "^3.0.0"
@@ -1397,38 +1409,38 @@ gifsicle@^3.0.0:
 
 glob-base@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
+  resolved "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
 
 glob-parent@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
 glob-parent@~5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
 glob-stream@^5.3.2:
   version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=
+  resolved "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"
+  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI= sha512-piN8XVAO2sNxwVLokL4PswgJvK/uQ6+awwXUVRTGF+rRfgCZpn4hOqxiRuTEbU/k3qgKl0DACYQ/0Sge54UMQg==
   dependencies:
     extend "^3.0.0"
     glob "^5.0.3"
@@ -1439,10 +1451,10 @@ glob-stream@^5.3.2:
     to-absolute-glob "^0.1.1"
     unique-stream "^2.0.2"
 
-glob@^5.0.3, glob@~5.0.0:
+glob@^5.0.3:
   version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  resolved "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -1450,21 +1462,9 @@ glob@^5.0.3, glob@~5.0.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.1.3:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@~7.1.1, glob@~7.1.6:
+glob@^7.0.3, glob@^7.1.3, glob@~7.1.1, glob@~7.1.6:
   version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
   integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
@@ -1474,9 +1474,20 @@ glob@~7.1.1, glob@~7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@~5.0.0:
+  version "5.0.15"
+  resolved "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-modules@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"
   integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
   dependencies:
     global-prefix "^1.0.1"
@@ -1485,8 +1496,8 @@ global-modules@^1.0.0:
 
 global-prefix@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
   dependencies:
     expand-tilde "^2.0.2"
     homedir-polyfill "^1.0.1"
@@ -1496,8 +1507,8 @@ global-prefix@^1.0.1:
 
 globby@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  resolved "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw= sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -1507,7 +1518,7 @@ globby@^6.1.0:
 
 globule@^1.0.0:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.3.tgz#811919eeac1ab7344e905f2e3be80a13447973c2"
+  resolved "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz"
   integrity sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==
   dependencies:
     glob "~7.1.1"
@@ -1516,15 +1527,15 @@ globule@^1.0.0:
 
 glogg@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
+  resolved "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz"
   integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
   dependencies:
     sparkles "^1.0.0"
 
 got@^5.0.0:
   version "5.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35"
-  integrity sha1-X4FjWmHkplifGAVp6k44FoClHzU=
+  resolved "https://registry.npmjs.org/got/-/got-5.7.1.tgz"
+  integrity sha1-X4FjWmHkplifGAVp6k44FoClHzU= sha512-1qd54GLxvVgzuidFmw9ze9umxS3rzhdBH6Wt6BTYrTQUXTN01vGGYXwzLzYLowNx8HBH3/c7kRyvx90fh13i7Q==
   dependencies:
     create-error-class "^3.0.1"
     duplexer2 "^0.1.4"
@@ -1544,24 +1555,24 @@ got@^5.0.0:
 
 graceful-fs@^4.0.0, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.2.8"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
 grunt-bg-shell@^2.3.3:
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/grunt-bg-shell/-/grunt-bg-shell-2.3.3.tgz#139ae8f9c76f68a0db4ee9dbbd4ec825b9227fff"
-  integrity sha1-E5ro+cdvaKDbTunbvU7IJbkif/8=
+  resolved "https://registry.npmjs.org/grunt-bg-shell/-/grunt-bg-shell-2.3.3.tgz"
+  integrity sha1-E5ro+cdvaKDbTunbvU7IJbkif/8= sha512-v8i5Lu7flMRzIfIvu6fhncI0P0d51+rkV2Nh7lDAPVXcyeJOqVq4lWQNDHS72oxc/4dN2yYyzKYWZIKNpxnZQw==
 
 grunt-browser-sync@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/grunt-browser-sync/-/grunt-browser-sync-2.2.0.tgz#a0e9c1fd1ccb5c454c25ec5170113ffff06a4772"
-  integrity sha1-oOnB/RzLXEVMJexRcBE///BqR3I=
+  resolved "https://registry.npmjs.org/grunt-browser-sync/-/grunt-browser-sync-2.2.0.tgz"
+  integrity sha1-oOnB/RzLXEVMJexRcBE///BqR3I= sha512-OegFSHazLMa9Qb4RoZo8EN7vnZTBGCpLVwmrsWj3gCEVrLDea2WZ+rxaQdfmBmV98PvhfZCSX3YYFBfO6zK+RQ==
   dependencies:
     browser-sync "^2.6.4"
 
 grunt-cli@~1.4.2:
   version "1.4.3"
-  resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz#22c9f1a3d2780bf9b0d206e832e40f8f499175ff"
+  resolved "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz"
   integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==
   dependencies:
     grunt-known-options "~2.0.0"
@@ -1572,7 +1583,7 @@ grunt-cli@~1.4.2:
 
 grunt-contrib-imagemin@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-imagemin/-/grunt-contrib-imagemin-2.0.1.tgz#e91e490ad8187dd8e57b09ce2a7ac3d2d2ab7208"
+  resolved "https://registry.npmjs.org/grunt-contrib-imagemin/-/grunt-contrib-imagemin-2.0.1.tgz"
   integrity sha512-91zBrvh350QSpsxyCTXni0djMXavF3elBmvFgnbp/2CgIx53QYe+Cvf2+wZmrcb8U0qp+MjHl0Ahjct4+R6PLQ==
   dependencies:
     chalk "^1.0.0"
@@ -1588,8 +1599,8 @@ grunt-contrib-imagemin@^2.0.1:
 
 grunt-contrib-sass@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-sass/-/grunt-contrib-sass-1.0.0.tgz#806838251cbc0e1a94d64d515cdd34cf674d701b"
-  integrity sha1-gGg4JRy8DhqU1k1RXN00z2dNcBs=
+  resolved "https://registry.npmjs.org/grunt-contrib-sass/-/grunt-contrib-sass-1.0.0.tgz"
+  integrity sha1-gGg4JRy8DhqU1k1RXN00z2dNcBs= sha512-nYQW+vRDQi90//owyCi/9riDjx/lnNAKEhZu3i+i200jSk67U+RmdilGLWUJsYEwsohOCsvKOuFPtdOJGvEI4w==
   dependencies:
     async "^0.9.0"
     chalk "^1.0.0"
@@ -1599,7 +1610,7 @@ grunt-contrib-sass@^1.0.0:
 
 grunt-contrib-watch@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz#c143ca5b824b288a024b856639a5345aedb78ed4"
+  resolved "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz"
   integrity sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==
   dependencies:
     async "^2.6.0"
@@ -1609,12 +1620,12 @@ grunt-contrib-watch@^1.1.0:
 
 grunt-known-options@~2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-2.0.0.tgz#cac641e897f9a0a680b8c9839803d35f3325103c"
+  resolved "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz"
   integrity sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==
 
 grunt-legacy-log-utils@~2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz#49a8c7dc74051476dcc116c32faf9db8646856ef"
+  resolved "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz"
   integrity sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==
   dependencies:
     chalk "~4.1.0"
@@ -1622,7 +1633,7 @@ grunt-legacy-log-utils@~2.1.0:
 
 grunt-legacy-log@~3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz#1c6eaf92371ea415af31ea84ce50d434ef6d39c4"
+  resolved "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz"
   integrity sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==
   dependencies:
     colors "~1.1.2"
@@ -1632,7 +1643,7 @@ grunt-legacy-log@~3.0.0:
 
 grunt-legacy-util@~2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz#0f929d13a2faf9988c9917c82bff609e2d9ba255"
+  resolved "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz"
   integrity sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==
   dependencies:
     async "~3.2.0"
@@ -1645,12 +1656,12 @@ grunt-legacy-util@~2.0.1:
 
 grunt-sass@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/grunt-sass/-/grunt-sass-3.1.0.tgz#a5936cc2a80ec08092d9f31c101dc307d1e4f71c"
+  resolved "https://registry.npmjs.org/grunt-sass/-/grunt-sass-3.1.0.tgz"
   integrity sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A==
 
-grunt@^1.0.2:
+grunt@^1.0.2, grunt@>=0.4.0, grunt@>=1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.4.1.tgz#7d1e17db1f9c8108777f7273d6b9359755576f50"
+  resolved "https://registry.npmjs.org/grunt/-/grunt-1.4.1.tgz"
   integrity sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA==
   dependencies:
     dateformat "~3.0.3"
@@ -1671,8 +1682,8 @@ grunt@^1.0.2:
 
 gulp-decompress@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-decompress/-/gulp-decompress-1.2.0.tgz#8eeb65a5e015f8ed8532cafe28454960626f0dc7"
-  integrity sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=
+  resolved "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz"
+  integrity sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc= sha512-ChTv+4/4BwAdQLUgQoAvLFjYFvxYF6p9Mmf/b19/Lp7yNCvb8+KRkdXV8Gd7XErxtrEh8XDCCVon3DgqW4TgfA==
   dependencies:
     archive-type "^3.0.0"
     decompress "^3.0.0"
@@ -1681,13 +1692,13 @@ gulp-decompress@^1.2.0:
 
 gulp-rename@^1.2.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd"
+  resolved "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz"
   integrity sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==
 
 gulp-sourcemaps@1.6.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=
+  resolved "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz"
+  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw= sha512-NjRy6+Qb5K1xbwOvPviD3uA4KSq2zsalPL+4vxPQPuL+kKzHjXJL10/kLaESic3LmBto8VIBHr3gIN3F9AjnhA==
   dependencies:
     convert-source-map "^1.1.1"
     graceful-fs "^4.1.2"
@@ -1697,8 +1708,8 @@ gulp-sourcemaps@1.6.0:
 
 gulp-util@^3.0.1:
   version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
+  resolved "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"
+  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08= sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==
   dependencies:
     array-differ "^1.0.0"
     array-uniq "^1.0.2"
@@ -1721,79 +1732,89 @@ gulp-util@^3.0.1:
 
 gulplog@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
+  resolved "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"
+  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U= sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==
   dependencies:
     glogg "^1.0.0"
 
 has-ansi@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  resolved "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz"
   integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+  resolved "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==
 
 has-flag@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-gulplog@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
+  resolved "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"
+  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4= sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==
   dependencies:
     sparkles "^1.0.0"
 
 has-symbols@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
 has@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
   integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
 hooker@~0.2.3:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959"
-  integrity sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=
+  resolved "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
+  integrity sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk= sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 html-comment-regex@^1.1.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
+  resolved "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"
   integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-errors@1.8.1:
   version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"
   integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
   dependencies:
     depd "~1.1.2"
@@ -1802,40 +1823,30 @@ http-errors@1.8.1:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.1"
 
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
 http-parser-js@>=0.5.1:
   version "0.5.5"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
+  resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz"
   integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
 http-proxy@^1.18.1:
   version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
     eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-iconv-lite@0.4.24, iconv-lite@~0.4.13:
+iconv-lite@~0.4.13, iconv-lite@0.4.24:
   version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 imagemin-gifsicle@^5.0.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/imagemin-gifsicle/-/imagemin-gifsicle-5.2.0.tgz#3781524c457612ef04916af34241a2b42bfcb40a"
+  resolved "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-5.2.0.tgz"
   integrity sha512-K01m5QuPK+0en8oVhiOOAicF7KjrHlCZxS++mfLI2mV/Ksfq/Y9nCXCWDz6jRv13wwlqe5T7hXT+ji2DnLc2yQ==
   dependencies:
     exec-buffer "^3.0.0"
@@ -1844,8 +1855,8 @@ imagemin-gifsicle@^5.0.0:
 
 imagemin-jpegtran@^5.0.0:
   version "5.0.2"
-  resolved "https://registry.yarnpkg.com/imagemin-jpegtran/-/imagemin-jpegtran-5.0.2.tgz#e6882263b8f7916fddb800640cf75d2e970d2ad6"
-  integrity sha1-5ogiY7j3kW/duABkDPddLpcNKtY=
+  resolved "https://registry.npmjs.org/imagemin-jpegtran/-/imagemin-jpegtran-5.0.2.tgz"
+  integrity sha1-5ogiY7j3kW/duABkDPddLpcNKtY= sha512-LHnxBbloOm+CSFWgk1Srn189JXt7qFNRxAx0y/InrKxO9ViUygIh2GZub4TsaMBygmfqdvZ0XAeA5Sw7eDhX7Q==
   dependencies:
     exec-buffer "^3.0.0"
     is-jpg "^1.0.0"
@@ -1853,8 +1864,8 @@ imagemin-jpegtran@^5.0.0:
 
 imagemin-optipng@^5.1.0:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz#d22da412c09f5ff00a4339960b98a88b1dbe8695"
-  integrity sha1-0i2kEsCfX/AKQzmWC5ioix2+hpU=
+  resolved "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz"
+  integrity sha1-0i2kEsCfX/AKQzmWC5ioix2+hpU= sha512-QQ2GB2C7LZTXfU4tp7zhHIbmyF0N+ZlRgD6ro/czKox6ufBOcRu8Pmz4gbr69PQBAeKpy+5YJa2063xYz5qvvw==
   dependencies:
     exec-buffer "^3.0.0"
     is-png "^1.0.0"
@@ -1862,7 +1873,7 @@ imagemin-optipng@^5.1.0:
 
 imagemin-svgo@^5.1.0:
   version "5.2.4"
-  resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-5.2.4.tgz#6cd5d342cae4bcd8b483594e5315695df02b9e9b"
+  resolved "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-5.2.4.tgz"
   integrity sha512-1bNZdlWVKdfxzu0xDD1pWjwK/G8FLcztUh/GWaI7xLgCFrn0j35o+uBbY7VcdY2AmKgiLYTXhrzrbkQk6xj8aA==
   dependencies:
     is-svg "^2.0.0"
@@ -1870,8 +1881,8 @@ imagemin-svgo@^5.1.0:
 
 imagemin@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-5.3.1.tgz#f19c2eee1e71ba6c6558c515f9fc96680189a6d4"
-  integrity sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ=
+  resolved "https://registry.npmjs.org/imagemin/-/imagemin-5.3.1.tgz"
+  integrity sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ= sha512-JE4+2XKYOkISRfGapB/pq7LNYWc+0a+VBrNJgyki082PgnbVQ2qEfzNMRgNj/IrQckpzhxZsU8MYf1wGsy2/lw==
   dependencies:
     file-type "^4.1.0"
     globby "^6.1.0"
@@ -1882,74 +1893,74 @@ imagemin@^5.3.1:
 
 immutable@^3:
   version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
+  resolved "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz"
+  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM= sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==
 
 immutable@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
+  resolved "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz"
   integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
 
 indent-string@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
+  resolved "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==
   dependencies:
     repeating "^2.0.0"
 
 indexof@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+  resolved "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3, inherits@2, inherits@2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 interpret@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
+  resolved "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"
+  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==
 
 ip-regex@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
-  integrity sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=
+  resolved "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz"
+  integrity sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0= sha512-HjpCHTuxbR/6jWJroc/VN+npo5j0T4Vv2TAI5qdEHQx7hsL767MeccGFSsLtF694EiZKTSEqgoeU6DtGFCcuqQ==
 
 irregular-plurals@^1.0.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
-  integrity sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=
+  resolved "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz"
+  integrity sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y= sha512-kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q==
 
 is-absolute@^0.1.5:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.1.7.tgz#847491119fccb5fb436217cc737f7faad50f603f"
-  integrity sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=
+  resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"
+  integrity sha1-hHSREZ/MtftDYhfMc39/qtUPYD8= sha512-Xi9/ZSn4NFapG8RP98iNPMOeaV3mXPisxKxzKtHVqr3g56j/fBn+yZmnxSVAA8lmZbl2J9b/a4kJvfU3hqQYgA==
   dependencies:
     is-relative "^0.1.0"
 
 is-absolute@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"
   integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
@@ -1957,274 +1968,281 @@ is-absolute@^1.0.0:
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-binary-path@~2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
   integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
   dependencies:
     binary-extensions "^2.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-bzip2@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-bzip2/-/is-bzip2-1.0.0.tgz#5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"
-  integrity sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=
+  resolved "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz"
+  integrity sha1-XuWOqlounIDiFAe+3yOuWsCRs/w= sha512-v5DA9z/rmk4UdJtb3N1jYqjvCA5roRVf5Q6vprHOcF6U/98TmAJ/AvbPeRMEOYWDW4eMr/pJj5Fnfe0T2wL1Bg==
 
 is-core-module@^2.2.0:
   version "2.8.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"
   integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
   dependencies:
     has "^1.0.3"
 
 is-dotfile@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
+  resolved "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
+  resolved "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
 is-extglob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-finite@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+  resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"
   integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-gif@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-gif/-/is-gif-1.0.0.tgz#a6d2ae98893007bffa97a1d8c01d63205832097e"
-  integrity sha1-ptKumIkwB7/6l6HYwB1jIFgyCX4=
+  resolved "https://registry.npmjs.org/is-gif/-/is-gif-1.0.0.tgz"
+  integrity sha1-ptKumIkwB7/6l6HYwB1jIFgyCX4= sha512-WDzHvXD3xfQ5einLRHRH7iReMuPwuXImHikxQeTWP09kGIv2mf2ZM63e9YHVSq9kEgjJuxRSp5AzH8Hga0+lNw==
 
-is-glob@^2.0.0, is-glob@^2.0.1:
+is-glob@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
 is-gzip@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
-  integrity sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=
+  resolved "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"
+  integrity sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM= sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==
 
 is-jpg@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-1.0.1.tgz#296d57fdd99ce010434a7283e346ab9a1035e975"
-  integrity sha1-KW1X/dmc4BBDSnKD40armhA16XU=
+  resolved "https://registry.npmjs.org/is-jpg/-/is-jpg-1.0.1.tgz"
+  integrity sha1-KW1X/dmc4BBDSnKD40armhA16XU= sha512-X5PVpLMBH/OaeTN8quzbcLTlwXCb/6n3tcfYTtEDzp0ZwAlgAOtIAIBHN4mS5OcscMgO8etZ5Ol1mNrXSqwBVQ==
 
 is-natural-number@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-2.1.1.tgz#7d4c5728377ef386c3e194a9911bf57c6dc335e7"
-  integrity sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=
+  resolved "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz"
+  integrity sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec= sha512-88gG/Fur5/8RkhB6UonqOuwQfNJvuaDStW/+r6oIB/hOQPUQe7DiiDQq0fitGOnARt+mQl/S6rg6Vku+i0sA4w==
 
 is-number-like@^1.0.3:
   version "1.0.8"
-  resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3"
+  resolved "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz"
   integrity sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==
   dependencies:
     lodash.isfinite "^3.3.2"
 
 is-number@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
+  resolved "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-number@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+  resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==
 
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-png@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-png/-/is-png-1.1.0.tgz#d574b12bf275c0350455570b0e5b57ab062077ce"
-  integrity sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=
+  resolved "https://registry.npmjs.org/is-png/-/is-png-1.1.0.tgz"
+  integrity sha1-1XSxK/J1wDUEVVcLDltXqwYgd84= sha512-23Rmps8UEx3Bzqr0JqAtQo0tYP6sDfIfMt1rL9rzlla/zbteftI9LSJoqsIoGgL06sJboDGdVns4RTakAW/WTw==
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
+  resolved "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==
 
 is-primitive@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
+  resolved "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==
 
 is-redirect@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
+  resolved "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"
+  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==
 
 is-relative@^0.1.0:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
-  integrity sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=
+  resolved "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
+  integrity sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI= sha512-wBOr+rNM4gkAZqoLRJI4myw5WzzIdQosFAAbnvfXP5z1LyzgAI3ivOKehC5KfqlQJZoihVhirgtCBj378Eg8GA==
 
 is-relative@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"
   integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
 is-retry-allowed@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
+  resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"
   integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
 
 is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+  resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
 
 is-svg@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
-  integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=
+  resolved "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz"
+  integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk= sha512-Ya1giYJUkcL/94quj0+XGcmts6cETPBW1MiFz1ReJrnDJ680F52qpAEGAEGU0nq96FRGIGPx6Yo1CyPXcOoyGw==
   dependencies:
     html-comment-regex "^1.1.0"
 
 is-tar@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-tar/-/is-tar-1.0.0.tgz#2f6b2e1792c1f5bb36519acaa9d65c0d26fe853d"
-  integrity sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=
+  resolved "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz"
+  integrity sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0= sha512-8sR603bS6APKxcdkQ1e5rAC9JDCxM3OlbGJDWv5ajhHqIh6cTaqcpeOTch1iIeHYY4nHEFTgmCiGSLfvmODH4w==
 
 is-unc-path@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"
   integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-url@^1.2.0:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
+  resolved "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"
   integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
 
 is-utf8@^0.2.0:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+  resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==
 
 is-valid-glob@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=
+  resolved "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz"
+  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4= sha512-CvG8EtJZ8FyzVOGPzrDorzyN65W1Ld8BVnqshRCah6pFIsprGx3dKgFtjLn/Vw9kGqR4OlR84U7yhT9ZVTyWIQ==
 
 is-windows@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
 
 is-zip@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-zip/-/is-zip-1.0.0.tgz#47b0a8ff4d38a76431ccfd99a8e15a4c86ba2325"
-  integrity sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=
+  resolved "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz"
+  integrity sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU= sha512-aym/dLqHZVMW/+bbNrA/eTeWTyW4fE6koLSoFSsM2GF3/pho7aPCcmHFWFLvzHu7MDuf67domYn36GDwU/cJkQ==
+
+isarray@~1.0.0, isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isarray@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isarray@2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+  resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 jpegtran-bin@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jpegtran-bin/-/jpegtran-bin-3.2.0.tgz#f60ecf4ae999c0bdad2e9fbcdf2b6f0981e7a29b"
-  integrity sha1-9g7PSumZwL2tLp+83ytvCYHnops=
+  resolved "https://registry.npmjs.org/jpegtran-bin/-/jpegtran-bin-3.2.0.tgz"
+  integrity sha1-9g7PSumZwL2tLp+83ytvCYHnops= sha512-XdDj5m/ssa1Anieqd8/JVQLrIsBZ6A9rYzASfpNI0/o/rfsmQx1TP3zZ1GvkMMW5sVlqM2RcMjy8bg428UE9fQ==
   dependencies:
     bin-build "^2.0.0"
     bin-wrapper "^3.0.0"
@@ -2232,7 +2250,7 @@ jpegtran-bin@^3.0.0:
 
 js-yaml@~3.14.0:
   version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
@@ -2240,51 +2258,51 @@ js-yaml@~3.14.0:
 
 js-yaml@~3.7.0:
   version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"
+  integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A= sha512-eIlkGty7HGmntbV6P/ZlAsoncFLGsNoM27lkTzS+oneY/EiNhj+geqD9ezg/ip+SW6Var0BJU2JtV0vEUZpWVQ==
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 jsonfile@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
-  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=
+  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"
+  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY= sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 kind-of@^3.0.2:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 lazy-req@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-1.1.0.tgz#bdaebead30f8d824039ce0ce149d4daa07ba1fac"
-  integrity sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=
+  resolved "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz"
+  integrity sha1-va6+rTD42CQDnODOFJ1Nqge6H6w= sha512-Vn/JuGaYykbelAVNAhfVJxuwHQCOSNE6mqMtD+gnd+QORlAHwWVmVFqQga3yWt84G5vAwEwpT6sAsZ+tgJ88/Q==
 
 lazystream@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
+  resolved "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"
   integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
   dependencies:
     readable-stream "^2.0.5"
 
 liftup@~3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/liftup/-/liftup-3.0.1.tgz#1cb81aff0f368464ed3a5f1a7286372d6b1a60ce"
+  resolved "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz"
   integrity sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==
   dependencies:
     extend "^3.0.2"
@@ -2298,18 +2316,18 @@ liftup@~3.0.1:
 
 limiter@^1.0.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
+  resolved "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz"
   integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
 
 livereload-js@^2.3.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
+  resolved "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz"
   integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -2319,7 +2337,7 @@ load-json-file@^1.0.0:
 
 localtunnel@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-2.0.2.tgz#528d50087151c4790f89c2db374fe7b0a48501f0"
+  resolved "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"
   integrity sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==
   dependencies:
     axios "0.21.4"
@@ -2329,87 +2347,87 @@ localtunnel@^2.0.1:
 
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
   integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
     p-locate "^4.1.0"
 
 lodash._basecopy@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+  resolved "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
+  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY= sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==
 
 lodash._basetostring@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
+  resolved "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
+  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U= sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==
 
 lodash._basevalues@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
+  resolved "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
+  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc= sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==
 
 lodash._getnative@^3.0.0:
   version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+  resolved "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
+  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==
 
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+  resolved "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
+  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw= sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==
 
 lodash._reescape@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
+  resolved "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
+  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo= sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==
 
 lodash._reevaluate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
+  resolved "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
+  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0= sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==
 
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
 
 lodash._root@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
+  resolved "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"
+  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI= sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==
 
 lodash.escape@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
+  resolved "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"
+  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg= sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==
   dependencies:
     lodash._root "^3.0.0"
 
 lodash.isarguments@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+  resolved "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"
+  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+  resolved "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
+  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==
 
 lodash.isequal@^4.0.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+  resolved "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
 lodash.isfinite@^3.3.2:
   version "3.3.2"
-  resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
-  integrity sha1-+4m2WpqAKBgz8LdHizpRBPiY67M=
+  resolved "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz"
+  integrity sha1-+4m2WpqAKBgz8LdHizpRBPiY67M= sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==
 
 lodash.keys@^3.0.0:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  resolved "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
+  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
@@ -2417,13 +2435,13 @@ lodash.keys@^3.0.0:
 
 lodash.restparam@^3.0.0:
   version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+  resolved "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==
 
 lodash.template@^3.0.0:
   version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
+  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"
+  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8= sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash._basetostring "^3.0.0"
@@ -2437,47 +2455,47 @@ lodash.template@^3.0.0:
 
 lodash.templatesettings@^3.0.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
+  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"
+  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU= sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==
   dependencies:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
 lodash@^4.17.10, lodash@^4.17.14, lodash@~4.17.10, lodash@~4.17.19, lodash@~4.17.21:
   version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 logalot@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552"
-  integrity sha1-X46MkNME7fElMJUaVVSruMXj9VI=
+  resolved "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz"
+  integrity sha1-X46MkNME7fElMJUaVVSruMXj9VI= sha512-Ah4CgdSRfeCJagxQhcVNMi9BfGYyEKLa6d7OA6xSbld/Hg3Cf2QiOa1mDpmG7Ve8LOH6DN3mdttzjQAvWTyVkw==
   dependencies:
     figures "^1.3.5"
     squeak "^1.0.0"
 
 longest@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+  resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==
 
 loud-rejection@^1.0.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
+  resolved "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
 lowercase-keys@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lpad-align@^1.0.1:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/lpad-align/-/lpad-align-1.1.2.tgz#21f600ac1c3095c3c6e497ee67271ee08481fe9e"
-  integrity sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=
+  resolved "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz"
+  integrity sha1-IfYArBwwlcPG5JfuZyce4ISB/p4= sha512-MMIcFmmR9zlGZtBcFOows6c2COMekHCIFJz3ew/rRpKZ1wR4mXDPzvcVqLarux8M33X4TPSq2Jdw8WJj0q0KbQ==
   dependencies:
     get-stdin "^4.0.1"
     indent-string "^2.1.0"
@@ -2486,12 +2504,12 @@ lpad-align@^1.0.1:
 
 lru-cache@^2.5.0:
   version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
+  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI= sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==
 
 lru-cache@^4.0.1:
   version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
@@ -2499,37 +2517,37 @@ lru-cache@^4.0.1:
 
 make-dir@^1.0.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"
   integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
 make-iterator@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+  resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"
   integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
   dependencies:
     kind-of "^6.0.2"
 
 map-cache@^0.2.0:
   version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+  resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+  resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
 math-random@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
+  resolved "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
 meow@^3.1.0, meow@^3.3.0, meow@^3.5.0:
   version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
+  resolved "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -2544,15 +2562,15 @@ meow@^3.1.0, meow@^3.3.0, meow@^3.5.0:
 
 merge-stream@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE= sha512-e6RM36aegd4f+r8BZCcYXlO2P3H6xbUM6ktL2Xmf45GAOit9bI4z6/3VU7JwllVO1L7u0UDSg/EhzQ5lmMLolA==
   dependencies:
     readable-stream "^2.0.1"
 
 micromatch@^2.3.7:
   version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -2570,7 +2588,7 @@ micromatch@^2.3.7:
 
 micromatch@^4.0.2:
   version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"
   integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
   dependencies:
     braces "^3.0.1"
@@ -2578,92 +2596,99 @@ micromatch@^4.0.2:
 
 mime-db@1.51.0:
   version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"
   integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
 mime-types@~2.1.17, mime-types@~2.1.24:
   version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"
   integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
   dependencies:
     mime-db "1.51.0"
 
 mime@1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  resolved "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2, minimatch@~3.0.4:
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2, minimatch@~3.0.4, "minimatch@2 || 3":
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 mitt@^1.1.3:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d"
+  resolved "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz"
   integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
 
-mkdirp@^0.5.0, mkdirp@~0.5.1:
+mkdirp@^0.5.0:
   version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mkdirp@~0.5.1:
+  version "0.5.5"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
 mkdirp@~1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 ms@^2.1.1:
   version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 multipipe@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
+  resolved "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"
+  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s= sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==
   dependencies:
     duplexer2 "0.0.2"
 
 negotiator@0.6.2:
   version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 node-status-codes@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
-  integrity sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=
+  resolved "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"
+  integrity sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8= sha512-1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ==
 
 nopt@~3.0.6:
   version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  resolved "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==
   dependencies:
     abbrev "1"
 
 nopt@~4.0.1:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"
   integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
   dependencies:
     abbrev "1"
@@ -2671,7 +2696,7 @@ nopt@~4.0.1:
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -2681,52 +2706,52 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
 
 normalize-path@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 npm-run-path@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
   dependencies:
     path-key "^2.0.0"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
 object-assign@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
-  integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=
+  resolved "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
+  integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo= sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==
 
 object-assign@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
+  resolved "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
+  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==
 
 object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.9.0:
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz"
   integrity sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==
 
 object.defaults@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
-  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
+  resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"
+  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==
   dependencies:
     array-each "^1.0.1"
     array-slice "^1.0.0"
@@ -2735,62 +2760,62 @@ object.defaults@^1.1.0:
 
 object.map@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
-  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
+  resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"
+  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==
   dependencies:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
 
 object.omit@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
+  resolved "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
 object.pick@^1.2.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
   dependencies:
     isobject "^3.0.1"
 
 on-finished@~2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
   dependencies:
     ee-first "1.1.1"
 
 once@^1.3.0, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
+  resolved "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"
+  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==
 
 openurl@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
-  integrity sha1-OHW0sO96UsFW8NtB1GCduw+Us4c=
+  resolved "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"
+  integrity sha1-OHW0sO96UsFW8NtB1GCduw+Us4c= sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==
 
 opn@5.3.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  resolved "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"
   integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
   dependencies:
     is-wsl "^1.1.0"
 
 optipng-bin@^3.0.0:
   version "3.1.4"
-  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-3.1.4.tgz#95d34f2c488704f6fd70606bfea0c659f1d95d84"
-  integrity sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ=
+  resolved "https://registry.npmjs.org/optipng-bin/-/optipng-bin-3.1.4.tgz"
+  integrity sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ= sha512-gsHt71VXDuI7ymHq5pBdzKS5Q1dcHLW6V6j13gnutO1mS8ezulK5Q+Xj/9/e6AwtjOResu2/UOBO/AiGrBo6+A==
   dependencies:
     bin-build "^2.0.0"
     bin-wrapper "^3.0.0"
@@ -2798,30 +2823,30 @@ optipng-bin@^3.0.0:
 
 ordered-read-streams@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s=
+  resolved "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz"
+  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s= sha512-xQvd8qvx9U1iYY9aVqPpoF5V9uaWJKV6ZGljkh/jkiNX0DiQsjbWvRumbh10QTMDE8DheaOEU8xi0szbrgjzcw==
   dependencies:
     is-stream "^1.0.1"
     readable-stream "^2.0.1"
 
 os-filter-obj@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-1.0.3.tgz#5915330d90eced557d2d938a31c6dd214d9c63ad"
-  integrity sha1-WRUzDZDs7VV9LZOKMcbdIU2cY60=
+  resolved "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-1.0.3.tgz"
+  integrity sha1-WRUzDZDs7VV9LZOKMcbdIU2cY60= sha512-rohpWX8f46ASEOR77j8ZlJ2j5Rzg0j7gxC73ceZaDeMyE6H3nXnwgEjgg5ySlcT0bDuPUw7qcdWtd8Pzp/FJxg==
 
 os-homedir@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+  resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
 
 os-tmpdir@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
 osenv@^0.1.4:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
@@ -2829,42 +2854,42 @@ osenv@^0.1.4:
 
 p-finally@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+  resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
   integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
     p-limit "^2.2.0"
 
 p-map@^1.1.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  resolved "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
 p-pipe@^1.1.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
-  integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
+  resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz"
+  integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k= sha512-IA8SqjIGA8l9qOksXJvsvkeQ+VGb0TAzNCzvKvz9wt5wWLqfWbV6fXy43gpR2L4Te8sOq3S+Ql9biAaMKPdbtw==
 
 p-try@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parse-filepath@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
+  resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"
+  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
   dependencies:
     is-absolute "^1.0.0"
     map-cache "^0.2.0"
@@ -2872,8 +2897,8 @@ parse-filepath@^1.0.1:
 
 parse-glob@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
+  resolved "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -2882,84 +2907,84 @@ parse-glob@^3.0.4:
 
 parse-json@^2.1.0, parse-json@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==
   dependencies:
     error-ex "^1.2.0"
 
 parse-node-version@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  resolved "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
 parseqs@0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
+  resolved "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz"
   integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
 
 parseuri@0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
+  resolved "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz"
   integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
 
 parseurl@~1.3.2:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
 path-dirname@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+  resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-parse@^1.0.6:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+  resolved "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"
+  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
 
 path-root@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+  resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"
+  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
   dependencies:
     path-root-regex "^0.1.0"
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
+  resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -2967,96 +2992,96 @@ path-type@^1.0.0:
 
 pend@~1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+  resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
+  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"
   integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+  resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+  resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
 plur@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
-  integrity sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=
+  resolved "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz"
+  integrity sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo= sha512-WhcHk576xg9y/iv6RWOuroZgsqvCbJN+XGvAypCJwLAYs2iWDp5LUmvaCdV6JR2O0SMBf8l6p7A94AyLCFVMlQ==
   dependencies:
     irregular-plurals "^1.0.0"
 
 portscanner@2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
-  integrity sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y=
+  resolved "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz"
+  integrity sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y= sha512-CUxI7PHXrWJTIPmQs1YJFyD4uesS3om2jVcgS3T1eYPyd60s1l0m7tf35Fn5KRAtV51SAD7BmImaOGf6vwhiFQ==
   dependencies:
     async "1.5.2"
     is-number-like "^1.0.3"
 
 prepend-http@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+  resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==
 
 preserve@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
+  resolved "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==
 
 pretty-bytes@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
-  integrity sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=
+  resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz"
+  integrity sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk= sha512-yJAF+AjbHKlxQ8eezMd/34Mnj/YTQ3i6kLzvVsH4l/BfIFtp444n0wVbnsn66JimZ9uBofv815aRp1zCppxlWw==
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 pseudomap@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+  resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
 q@^1.1.2:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-
-qs@6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
-  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
+  resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
 qs@^6.4.0:
   version "6.10.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz"
   integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==
   dependencies:
     side-channel "^1.0.4"
 
+qs@6.2.3:
+  version "6.2.3"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"
+  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4= sha512-AY4g8t3LMboim0t6XWFdz6J5OuJ1ZNYu54SXihS/OMpgyCqYmcAJnWqkNSOjSjWmq3xxy+GF9uWQI2lI/7tKIA==
+
 randomatic@^3.0.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
+  resolved "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz"
   integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
   dependencies:
     is-number "^4.0.0"
@@ -3065,12 +3090,12 @@ randomatic@^3.0.0:
 
 range-parser@~1.2.0:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
 raw-body@^2.3.2:
   version "2.4.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"
   integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
   dependencies:
     bytes "3.1.1"
@@ -3080,15 +3105,15 @@ raw-body@^2.3.2:
 
 raw-body@~1.1.0:
   version "1.1.7"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
-  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz"
+  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU= sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==
   dependencies:
     bytes "1"
     string_decoder "0.10"
 
 rc@^1.1.2:
   version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
@@ -3098,42 +3123,32 @@ rc@^1.1.2:
 
 read-all-stream@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
-  integrity sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=
+  resolved "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"
+  integrity sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po= sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==
   dependencies:
     pinkie-promise "^2.0.0"
     readable-stream "^2.0.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6:
   version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
@@ -3144,10 +3159,20 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+"readable-stream@>=1.0.33-1 <1.1.0-0":
+  version "1.0.34"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
+  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@~1.1.9:
   version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -3156,91 +3181,91 @@ readable-stream@~1.1.9:
 
 readdirp@~3.6.0:
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
   integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
 rechoir@^0.7.0:
   version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"
   integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
   dependencies:
     resolve "^1.9.0"
 
 redent@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
+  resolved "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
 regex-cache@^0.4.2:
   version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  resolved "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"
   integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+  resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
 repeat-element@^1.1.2:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"
   integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.5.2:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+  resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 repeating@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+  resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==
   dependencies:
     is-finite "^1.0.0"
 
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
 replace-ext@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
+  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"
   integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
+replace-ext@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
+  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==
+
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-main-filename@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
 requires-port@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+  resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
   dependencies:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
 resolve@^1.10.0, resolve@^1.19.0, resolve@^1.9.0:
   version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
   dependencies:
     is-core-module "^2.2.0"
@@ -3248,61 +3273,63 @@ resolve@^1.10.0, resolve@^1.19.0, resolve@^1.9.0:
 
 resp-modifier@6.0.2:
   version "6.0.2"
-  resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
-  integrity sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=
+  resolved "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz"
+  integrity sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08= sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==
   dependencies:
     debug "^2.2.0"
     minimatch "^3.0.2"
 
-rimraf@^2.2.6, rimraf@^2.5.4:
+rimraf@^2.2.6:
   version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^2.5.4:
+  version "2.7.1"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"
 
 rimraf@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
 rx@4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
+  resolved "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"
+  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==
 
 rxjs@^5.5.6:
   version "5.5.12"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz"
   integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==
   dependencies:
     symbol-observable "1.0.1"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.1.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.1.1, safe-buffer@>=5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-json-parse@~1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
-  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
+  resolved "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz"
+  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c= sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==
 
 "safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sass@^1.45.0:
   version "1.45.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.45.0.tgz#192ede1908324bb293a3e403d1841dbcaafdd323"
+  resolved "https://registry.npmjs.org/sass/-/sass-1.45.0.tgz"
   integrity sha512-ONy5bjppoohtNkFJRqdz1gscXamMzN3wQy1YH9qO2FiNpgjLhpz/IPRGg0PpCjyz/pWfCOaNEaiEGCcjOFAjqw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
@@ -3311,41 +3338,41 @@ sass@^1.45.0:
 
 sax@~1.2.1:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 seek-bzip@^1.0.3:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4"
+  resolved "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz"
   integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==
   dependencies:
     commander "^2.8.1"
 
 semver-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
-  integrity sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk=
+  resolved "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"
+  integrity sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk= sha512-1vZcoRC+LPtHFkLUPyrabsATDSHerxW+hJBN8h04HZOZBuewbXaNROtUVdEPrTdZsWNq6sfsXDhd48GB2xTG4g==
 
 semver-truncate@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8"
-  integrity sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=
+  resolved "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz"
+  integrity sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g= sha512-V1fGg9i4CL3qesB6U0L6XAm4xOJiHmt4QAacazumuasc03BvtFGIMCduv01JWQ69Nv+JST9TqhSCiJoxoY031w==
   dependencies:
     semver "^5.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@^4.0.3:
+semver@^4.0.3, "semver@2 || 3 || 4 || 5":
   version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
+  resolved "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==
+
+semver@^5.3.0:
+  version "5.7.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 send@0.16.2:
   version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  resolved "https://registry.npmjs.org/send/-/send-0.16.2.tgz"
   integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
@@ -3364,8 +3391,8 @@ send@0.16.2:
 
 serve-index@1.9.1:
   version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  resolved "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -3377,7 +3404,7 @@ serve-index@1.9.1:
 
 serve-static@1.13.2:
   version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"
   integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
@@ -3387,44 +3414,44 @@ serve-static@1.13.2:
 
 server-destroy@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
-  integrity sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=
+  resolved "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"
+  integrity sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0= sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==
 
 set-blocking@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 set-immediate-shim@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+  resolved "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= sha512-Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ==
 
 setprototypeof@1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 setprototypeof@1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 shebang-command@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
 side-channel@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
   integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
   dependencies:
     call-bind "^1.0.0"
@@ -3433,17 +3460,17 @@ side-channel@^1.0.4:
 
 signal-exit@^3.0.0:
   version "3.0.6"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
+  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"
   integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
 
 socket.io-adapter@~1.1.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  resolved "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz"
   integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
 
-socket.io-client@2.4.0, socket.io-client@^2.4.0:
+socket.io-client@^2.4.0, socket.io-client@2.4.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
+  resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz"
   integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
   dependencies:
     backo2 "1.0.2"
@@ -3460,7 +3487,7 @@ socket.io-client@2.4.0, socket.io-client@^2.4.0:
 
 socket.io-parser@~3.3.0:
   version "3.3.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6"
+  resolved "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz"
   integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==
   dependencies:
     component-emitter "~1.3.0"
@@ -3469,7 +3496,7 @@ socket.io-parser@~3.3.0:
 
 socket.io-parser@~3.4.0:
   version "3.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
+  resolved "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz"
   integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
   dependencies:
     component-emitter "1.2.1"
@@ -3478,7 +3505,7 @@ socket.io-parser@~3.4.0:
 
 socket.io@2.4.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.0.tgz#01030a2727bd8eb2e85ea96d69f03692ee53d47e"
+  resolved "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz"
   integrity sha512-9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ==
   dependencies:
     debug "~4.1.0"
@@ -3490,22 +3517,22 @@ socket.io@2.4.0:
 
 "source-map-js@>=0.6.2 <2.0.0":
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf"
+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz"
   integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==
 
 source-map@^0.5.3:
   version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 sparkles@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
+  resolved "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz"
   integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 spdx-correct@^3.0.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"
   integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
@@ -3513,12 +3540,12 @@ spdx-correct@^3.0.0:
 
 spdx-exceptions@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
   integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
@@ -3526,23 +3553,18 @@ spdx-expression-parse@^3.0.0:
 
 spdx-license-ids@^3.0.0:
   version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
+  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"
   integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
 
-sprintf-js@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
-
-sprintf-js@~1.0.2:
+sprintf-js@^1.0.3, sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 squeak@^1.0.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/squeak/-/squeak-1.3.0.tgz#33045037b64388b567674b84322a6521073916c3"
-  integrity sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=
+  resolved "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz"
+  integrity sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM= sha512-YQL1ulInM+ev8nXX7vfXsCsDh6IqXlrremc1hzi77776BtpWgYJUMto3UM05GSAaGzJgWekszjoKDrVNB5XG+A==
   dependencies:
     chalk "^1.0.0"
     console-stream "^0.1.1"
@@ -3550,104 +3572,116 @@ squeak@^1.0.0:
 
 stat-mode@^0.2.0:
   version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
+  resolved "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"
+  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI= sha512-o+7DC0OM5Jt3+gratXXqfXf62V/CBoqQbT7Kp7jCxTYW2PLOB2/ZSGIfm9T5/QZe1Vw1MCbu6DoB6JnhVtxcJw==
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2":
+"statuses@>= 1.4.0 < 2", statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+
+"statuses@>= 1.5.0 < 2":
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
 statuses@~1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
-
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4= sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
 
 stream-combiner2@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
-  integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4=
+  resolved "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"
+  integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4= sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==
   dependencies:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
 stream-shift@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
 stream-throttle@^0.1.3:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
-  integrity sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=
+  resolved "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz"
+  integrity sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM= sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==
   dependencies:
     commander "^2.2.0"
     limiter "^1.0.5"
 
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+string_decoder@0.10:
+  version "0.10.31"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+
 string-template@~0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
+  resolved "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"
+  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
 
 string-width@^4.1.0, string-width@^4.2.0:
   version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string_decoder@0.10, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 strip-ansi@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+strip-ansi@^6.0.0:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
 strip-bom-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=
+  resolved "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz"
+  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4= sha512-7jfJB9YpI2Z0aH3wu10ZqitvYJaE0s5IzFuWE+0pbb4Q/armTloEUShymkDO47YSLnjAW52mlXT//hs9wXNNJQ==
   dependencies:
     first-chunk-stream "^1.0.0"
     strip-bom "^2.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-dirs@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-1.1.1.tgz#960bbd1287844f3975a4558aa103a8255e2456a0"
-  integrity sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=
+  resolved "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz"
+  integrity sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA= sha512-+0QvOUTIs3xMridKraQAUSIp/kq7FRt/QjevB40+U6qJfeuPpTDQENFVfAbfZp59GpJkxY+yMdjR5cgKZyR2vg==
   dependencies:
     chalk "^1.0.0"
     get-stdin "^4.0.1"
@@ -3658,51 +3692,51 @@ strip-dirs@^1.0.0:
 
 strip-eof@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+  resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
 
 strip-indent@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
+  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==
   dependencies:
     get-stdin "^4.0.1"
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
 strip-outer@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
+  resolved "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz"
   integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
   dependencies:
     escape-string-regexp "^1.0.2"
 
 sum-up@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
-  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
+  resolved "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz"
+  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4= sha512-zw5P8gnhiqokJUWRdR6F4kIIIke0+ubQSGyYUY506GCbJWtV7F6Xuy0j6S125eSX2oF+a8KdivsZ8PlVEH0Mcw==
   dependencies:
     chalk "^1.0.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
 supports-color@^7.1.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
 svgo@^0.7.0:
   version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=
+  resolved "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz"
+  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U= sha512-jT/g9FFMoe9lu2IT6HtAxTA7RR2XOrmcrmCtGnyB/+GQnV6ZjNn+KOHZbZ35yL81+1F/aB6OeEsJztzBQ2EEwA==
   dependencies:
     coa "~1.0.1"
     colors "~1.1.2"
@@ -3714,12 +3748,12 @@ svgo@^0.7.0:
 
 symbol-observable@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
+  resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz"
+  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==
 
 tar-stream@^1.1.1:
   version "1.6.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz"
   integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
   dependencies:
     bl "^1.0.0"
@@ -3732,28 +3766,28 @@ tar-stream@^1.1.1:
 
 temp-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
-  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
+  resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"
+  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==
 
 tempfile@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
-  integrity sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=
+  resolved "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"
+  integrity sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I= sha512-NjT12fW6pSEKz1eVcADgaKfeM+XZ4+zSaqVz46XH7+CiEwcelnwtGWRRjF1p+xyW2PVgKKKS2UUw1LzRelntxg==
   dependencies:
     os-tmpdir "^1.0.0"
     uuid "^2.0.1"
 
 tempfile@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
-  integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU=
+  resolved "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz"
+  integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= sha512-ZOn6nJUgvgC09+doCEF3oB+r3ag7kUvlsXEGX069QRD60p+P3uP7XG9N2/at+EyIRGSN//ZY3LyEotA1YpmjuA==
   dependencies:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
 tfunk@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tfunk/-/tfunk-4.0.0.tgz#de9399feaf2060901d590b7faad80fcd5443077e"
+  resolved "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz"
   integrity sha512-eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ==
   dependencies:
     chalk "^1.1.3"
@@ -3761,15 +3795,15 @@ tfunk@^4.0.0:
 
 through2-filter@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=
+  resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz"
+  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw= sha512-miwWajb1B80NvIVKXFPN/o7+vJc4jYUvnZCwvhicRAoTxdD9wbcjri70j+BenCrN/JXEPKDjhpw4iY7yiNsCGg==
   dependencies:
     through2 "~2.0.0"
     xtend "~4.0.0"
 
 through2-filter@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz"
   integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
   dependencies:
     through2 "~2.0.0"
@@ -3777,15 +3811,23 @@ through2-filter@^3.0.0:
 
 through2@^0.6.0, through2@^0.6.1:
   version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
+  resolved "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
+  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==
   dependencies:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-through2@^2.0.0, through2@~2.0.0:
+through2@^2.0.0:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through2@~2.0.0:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
     readable-stream "~2.3.6"
@@ -3793,17 +3835,17 @@ through2@^2.0.0, through2@~2.0.0:
 
 time-stamp@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
+  resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"
+  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM= sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==
 
 timed-out@^3.0.0:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
-  integrity sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=
+  resolved "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"
+  integrity sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc= sha512-3RB4qgvPkxF/FGPnrzaWLhW1rxNK2sdH0mFjbhxkfTR6QXvcM3EtYm9L44UrhODZrZ+yhDXeMncLqi8QXn2MJg==
 
 tiny-lr@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
+  resolved "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz"
   integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
   dependencies:
     body "^5.1.0"
@@ -3815,68 +3857,68 @@ tiny-lr@^1.1.1:
 
 to-absolute-glob@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38=
+  resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz"
+  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38= sha512-Vvl5x6zNf9iVG1QTWeknmWrKzZxaeKfIDRibrZCR3b2V/2NlFJuD2HV7P7AVjaKLZNqLPHqyr0jGrW0fTcxCPQ==
   dependencies:
     extend-shallow "^2.0.1"
 
 to-array@0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+  resolved "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==
 
 to-buffer@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+  resolved "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"
   integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
     is-number "^7.0.0"
 
 toidentifier@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
 trim-newlines@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
+  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==
 
 trim-repeated@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
-  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
+  resolved "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz"
+  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE= sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==
   dependencies:
     escape-string-regexp "^1.0.2"
 
 tunnel-agent@^0.4.0:
   version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
+  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
+  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us= sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==
 
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
 ua-parser-js@1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.2.tgz#e2976c34dbfb30b15d2c300b2a53eac87c57a775"
+  resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.2.tgz"
   integrity sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
+  resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"
+  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
 
 underscore.string@~3.3.5:
   version "3.3.5"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
+  resolved "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz"
   integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
   dependencies:
     sprintf-js "^1.0.3"
@@ -3884,7 +3926,7 @@ underscore.string@~3.3.5:
 
 unique-stream@^2.0.2:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
+  resolved "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz"
   integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
   dependencies:
     json-stable-stringify-without-jsonify "^1.0.1"
@@ -3892,68 +3934,68 @@ unique-stream@^2.0.2:
 
 universalify@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0, unpipe@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+  resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
 unzip-response@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
-  integrity sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=
+  resolved "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"
+  integrity sha1-uYTwh3/AqJwsdzzB73tbIytbBv4= sha512-pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q==
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
+  resolved "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==
   dependencies:
     prepend-http "^1.0.1"
 
 url-regex@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz#dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"
-  integrity sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=
+  resolved "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz"
+  integrity sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ= sha512-dQ9cJzMou5OKr6ZzfvwJkCq3rC72PNXhqz0v3EIhF4a3Np+ujr100AhUx2cKx5ei3iymoJpJrPB3sVSEMdqAeg==
   dependencies:
     ip-regex "^1.0.1"
 
 util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 utils-merge@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+  resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
 uuid@^2.0.1:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-  integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
+  resolved "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"
+  integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg==
 
 uuid@^3.0.1:
   version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 v8flags@~3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
+  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz"
   integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 vali-date@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
+  resolved "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz"
+  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY= sha512-sgECfZthyaCKW10N0fm27cg8HYTFK5qMWgypqkXMQ4Wbl/zZKx7xZICgcoxIIE+WFAP/MBL2EFwC/YvLxw3Zeg==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
@@ -3961,16 +4003,16 @@ validate-npm-package-license@^3.0.1:
 
 vinyl-assign@^1.0.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl-assign/-/vinyl-assign-1.2.1.tgz#4d198891b5515911d771a8cd9c5480a46a074a45"
-  integrity sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=
+  resolved "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz"
+  integrity sha1-TRmIkbVRWRHXcajNnFSApGoHSkU= sha512-jUVK1MkXgsZDdyUAy0rnrcmPeuR/ZLwsaS377zaaciz9SoDRVPIjHlUcYVcUAzLD+AolsLxMMwSe/VP77lAvow==
   dependencies:
     object-assign "^4.0.1"
     readable-stream "^2.0.0"
 
 vinyl-fs@^2.2.0:
   version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=
+  resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz"
+  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk= sha512-lxMlQW/Wxk/pwhooY3Ut0Q11OH5ZvZfV0Gg1c306fBNWznQ6ZeQaCdE7XX0O/PpGSqgAsHMBxwFgcGxiYW3hZg==
   dependencies:
     duplexify "^3.2.0"
     glob-stream "^5.3.2"
@@ -3992,16 +4034,16 @@ vinyl-fs@^2.2.0:
 
 vinyl@^0.4.3:
   version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
+  resolved "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"
+  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc= sha512-pmza4M5VA15HOImIQYWhoXGlGNafCm0QK5BpBUXkzzEwrRxKqBsbAhTfkT2zMcJhUX1G1Gkid0xaV8WjOl7DsA==
   dependencies:
     clone "^0.2.0"
     clone-stats "^0.0.1"
 
 vinyl@^0.5.0:
   version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
+  resolved "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"
+  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4= sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==
   dependencies:
     clone "^1.0.0"
     clone-stats "^0.0.1"
@@ -4009,8 +4051,8 @@ vinyl@^0.5.0:
 
 vinyl@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
+  resolved "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz"
+  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= sha512-Ci3wnR2uuSAWFMSglZuB8Z2apBdtOyz8CV7dC6/U1XbltXBC+IuutUkXQISz01P+US2ouBuesSbV6zILZ6BuzQ==
   dependencies:
     clone "^1.0.0"
     clone-stats "^0.0.1"
@@ -4018,14 +4060,14 @@ vinyl@^1.0.0:
 
 ware@^1.2.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ware/-/ware-1.3.0.tgz#d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"
-  integrity sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=
+  resolved "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"
+  integrity sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q= sha512-Y2HUDMktriUm+SR2gZWxlrszcgtXExlhQYZ8QJNYbl22jum00KIUcHJ/h/sdAXhWTJcbSkiMYN9Z2tWbWYSrrw==
   dependencies:
     wrap-fn "^0.1.0"
 
 websocket-driver@>=0.5.1:
   version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
   integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
   dependencies:
     http-parser-js ">=0.5.1"
@@ -4034,36 +4076,36 @@ websocket-driver@>=0.5.1:
 
 websocket-extensions@>=0.1.1:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 whet.extend@~0.9.9:
   version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=
+  resolved "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"
+  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE= sha512-mmIPAft2vTgEILgPeZFqE/wWh24SEsR/k+N9fJ3Jxrz44iDFy9aemCxdksfURSHYFCLmvs/d/7Iso5XjPpNfrA==
 
 which-module@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+  resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
 which@^1.0.5, which@^1.2.14, which@^1.2.9:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 which@~2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
 wrap-ansi@^6.2.0:
   version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
   integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
   dependencies:
     ansi-styles "^4.0.0"
@@ -4072,7 +4114,7 @@ wrap-ansi@^6.2.0:
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
@@ -4081,49 +4123,49 @@ wrap-ansi@^7.0.0:
 
 wrap-fn@^0.1.0:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/wrap-fn/-/wrap-fn-0.1.5.tgz#f21b6e41016ff4a7e31720dbc63a09016bdf9845"
-  integrity sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=
+  resolved "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz"
+  integrity sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU= sha512-xDLdGx0M8JQw9QDAC9s5NUxtg9MI09F6Vbxa2LYoSoCvzJnx2n81YMIfykmXEGsUvuLaxnblJTzhSOjUOX37ag==
   dependencies:
     co "3.1.0"
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@~7.4.2:
   version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
 xmlhttprequest-ssl@~1.6.2:
   version "1.6.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6"
+  resolved "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz"
   integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^4.0.0:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
 y18n@^5.0.5:
   version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+  resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
 
 yargs-parser@^18.1.2:
   version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
   dependencies:
     camelcase "^5.0.0"
@@ -4131,25 +4173,12 @@ yargs-parser@^18.1.2:
 
 yargs-parser@^20.2.2:
   version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@17.1.1:
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"
-  integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
 yargs@^15.4.1:
   version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
   integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
   dependencies:
     cliui "^6.0.0"
@@ -4164,15 +4193,28 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@17.1.1:
+  version "17.1.1"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"
+  integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yauzl@^2.2.1:
   version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
+  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
 yeast@0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+  resolved "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==

From c80a2d3afc4f62469eab612023aa3415da2c2b4b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 16:55:43 +0530
Subject: [PATCH 099/122] Don't install yarn explicitly

---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4757ca1..cb5f8e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,9 +36,11 @@ FROM docker.io/node:18-slim AS frontend-builder
 RUN mkdir -p /build
 WORKDIR /build
 
-# Install javascript dependencies.
+# Install grunt-cli (yarn is already included in node:18)
+RUN npm install -g grunt-cli
+
+# Copy and install javascript dependencies.
 COPY package.json yarn.lock Gruntfile.js ./
-RUN npm install -g yarn grunt-cli
 RUN yarn install || npm install
 
 # Copy static assets and libs

From ed65968cc6242b7a2bb9f2eafd386d32ed2b7a92 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 18:36:36 +0530
Subject: [PATCH 100/122] Fixes to Dockerfile for building

---
 .dockerignore |  2 +-
 Dockerfile    | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index fa01bad..75e68ff 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,7 +8,7 @@ __pycache__
 *.db
 media/
 static/
-node_modules/
+# node_modules/ - keeping this to avoid npm install issues in Docker
 env/
 venv/
 .venv/
diff --git a/Dockerfile b/Dockerfile
index cb5f8e1..80f66ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,12 +36,13 @@ FROM docker.io/node:18-slim AS frontend-builder
 RUN mkdir -p /build
 WORKDIR /build
 
-# Install grunt-cli (yarn is already included in node:18)
+# Install grunt-cli
 RUN npm install -g grunt-cli
 
-# Copy and install javascript dependencies.
-COPY package.json yarn.lock Gruntfile.js ./
-RUN yarn install || npm install
+# Copy package files and pre-installed node_modules
+COPY package.json package-lock.json Gruntfile.js ./
+# Copy node_modules if they exist locally (avoids git clone issues)
+COPY node_modules ./node_modules
 
 # Copy static assets and libs
 COPY publichealth/static/ ./publichealth/static/
@@ -93,7 +94,9 @@ COPY . /build/
 
 # Copy javascript assets from frontend builder
 COPY --from=frontend-builder /build/publichealth/static /build/publichealth/static
-COPY --from=frontend-builder /build/assets /build/assets
+
+# Remove problematic gh-pages folder from slick-lightbox
+RUN rm -rf /build/publichealth/static/libs/slick-lightbox/gh-pages
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir /app

From 8532dd43c74a97f007834265037eb10f64fd7100 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 20:39:19 +0530
Subject: [PATCH 101/122] Add k8s files

---
 k8s/cert-manager.yaml    | 34 +++++++++++++++
 k8s/deployment.yaml      | 93 ++++++++++++++++++++++++++++++++++++++++
 k8s/ingress-nginx.yaml   | 43 +++++++++++++++++++
 k8s/postgres.yaml        | 67 +++++++++++++++++++++++++++++
 k8s/redis.yaml           | 38 ++++++++++++++++
 k8s/secrets-example.yaml | 15 +++++++
 k8s/storage.yaml         | 21 +++++++++
 7 files changed, 311 insertions(+)
 create mode 100644 k8s/cert-manager.yaml
 create mode 100644 k8s/deployment.yaml
 create mode 100644 k8s/ingress-nginx.yaml
 create mode 100644 k8s/postgres.yaml
 create mode 100644 k8s/redis.yaml
 create mode 100644 k8s/secrets-example.yaml
 create mode 100644 k8s/storage.yaml

diff --git a/k8s/cert-manager.yaml b/k8s/cert-manager.yaml
new file mode 100644
index 0000000..5cb0b93
--- /dev/null
+++ b/k8s/cert-manager.yaml
@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: letsencrypt-prod
+spec:
+  acme:
+    server: https://acme-v02.api.letsencrypt.org/directory
+    email: admin@django-hosting.ch  # Change this to your email
+    privateKeySecretRef:
+      name: letsencrypt-prod
+    solvers:
+    - http01:
+        ingress:
+          class: nginx
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: letsencrypt-staging
+spec:
+  acme:
+    server: https://acme-staging-v02.api.letsencrypt.org/directory
+    email: admin@django-hosting.ch  # Change this to your email
+    privateKeySecretRef:
+      name: letsencrypt-staging
+    solvers:
+    - http01:
+        ingress:
+          class: nginx
\ No newline at end of file
diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
new file mode 100644
index 0000000..dcd1700
--- /dev/null
+++ b/k8s/deployment.yaml
@@ -0,0 +1,93 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: publichealth
+  labels:
+    app: publichealth
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: publichealth
+  template:
+    metadata:
+      labels:
+        app: publichealth
+    spec:
+      containers:
+      - name: publichealth
+        image: publichealth:latest
+        imagePullPolicy: IfNotPresent  # For local Minikube images
+        ports:
+        - containerPort: 8000
+        env:
+        - name: DJANGO_SETTINGS_MODULE
+          value: "publichealth.settings.production"
+        - name: DJANGO_SECRET_KEY
+          valueFrom:
+            secretKeyRef:
+              name: publichealth-secrets
+              key: django-secret-key
+        - name: DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+              name: publichealth-secrets
+              key: database-url
+        - name: REDIS_URL
+          value: "redis://redis-service:6379/0"
+        - name: WAGTAILADMIN_BASE_URL
+          value: "http://localhost:30080"
+        - name: LOG_DIR
+          value: "/var/log/wagtail"
+        - name: ALLOWED_HOSTS
+          valueFrom:
+            secretKeyRef:
+              name: publichealth-secrets
+              key: allowed-hosts
+        - name: COLLECT_STATIC
+          value: "1"
+        volumeMounts:
+        - name: media-storage
+          mountPath: /app/media
+        - name: static-storage
+          mountPath: /app/static
+        resources:
+          requests:
+            memory: "512Mi"
+            cpu: "250m"
+          limits:
+            memory: "1Gi"
+            cpu: "500m"
+        livenessProbe:
+          httpGet:
+            path: /en/
+            port: 8000
+          initialDelaySeconds: 30
+          periodSeconds: 30
+        readinessProbe:
+          httpGet:
+            path: /en/
+            port: 8000
+          initialDelaySeconds: 10
+          periodSeconds: 10
+      volumes:
+      - name: media-storage
+        persistentVolumeClaim:
+          claimName: media-pvc
+      - name: static-storage
+        persistentVolumeClaim:
+          claimName: static-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: publichealth-service
+spec:
+  selector:
+    app: publichealth
+  ports:
+    - protocol: TCP
+      port: 8000
+      targetPort: 8000
+      nodePort: 30080
+  type: NodePort
diff --git a/k8s/ingress-nginx.yaml b/k8s/ingress-nginx.yaml
new file mode 100644
index 0000000..77e5357
--- /dev/null
+++ b/k8s/ingress-nginx.yaml
@@ -0,0 +1,43 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ingress-nginx
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: publichealth-ingress
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/proxy-body-size: "100m"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+spec:
+  tls:
+  - hosts:
+    - ph.django-hosting.ch
+    - www.ph.django-hosting.ch
+    secretName: publichealth-tls
+  rules:
+  - host: ph.django-hosting.ch
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: publichealth-service
+            port:
+              number: 8000
+  - host: www.ph.django-hosting.ch
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: publichealth-service
+            port:
+              number: 8000
\ No newline at end of file
diff --git a/k8s/postgres.yaml b/k8s/postgres.yaml
new file mode 100644
index 0000000..4951cc4
--- /dev/null
+++ b/k8s/postgres.yaml
@@ -0,0 +1,67 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: postgres-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: postgres
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: postgres
+  template:
+    metadata:
+      labels:
+        app: postgres
+    spec:
+      containers:
+      - name: postgres
+        image: postgres:15-alpine
+        ports:
+        - containerPort: 5432
+        env:
+        - name: POSTGRES_DB
+          value: publichealth
+        - name: POSTGRES_USER
+          value: publichealth
+        - name: POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: publichealth-secrets
+              key: postgres-password
+        volumeMounts:
+        - mountPath: /var/lib/postgresql/data
+          name: postgres-storage
+          subPath: postgres
+        resources:
+          requests:
+            memory: "256Mi"
+            cpu: "100m"
+          limits:
+            memory: "512Mi"
+            cpu: "200m"
+      volumes:
+      - name: postgres-storage
+        persistentVolumeClaim:
+          claimName: postgres-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres-service
+spec:
+  selector:
+    app: postgres
+  ports:
+    - protocol: TCP
+      port: 5432
+      targetPort: 5432
\ No newline at end of file
diff --git a/k8s/redis.yaml b/k8s/redis.yaml
new file mode 100644
index 0000000..c33d4b9
--- /dev/null
+++ b/k8s/redis.yaml
@@ -0,0 +1,38 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+      - name: redis
+        image: redis:7-alpine
+        ports:
+        - containerPort: 6379
+        resources:
+          requests:
+            memory: "128Mi"
+            cpu: "50m"
+          limits:
+            memory: "256Mi"
+            cpu: "100m"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-service
+spec:
+  selector:
+    app: redis
+  ports:
+    - protocol: TCP
+      port: 6379
+      targetPort: 6379
\ No newline at end of file
diff --git a/k8s/secrets-example.yaml b/k8s/secrets-example.yaml
new file mode 100644
index 0000000..86472b7
--- /dev/null
+++ b/k8s/secrets-example.yaml
@@ -0,0 +1,15 @@
+# Example secrets file - DO NOT commit actual secrets to git!
+# Create real secrets with: kubectl create secret generic publichealth-secrets \
+#   --from-literal=django-secret-key='your-secret-key' \
+#   --from-literal=database-url='postgres://user:pass@postgres-service:5432/dbname' \
+#   --from-literal=postgres-password='your-postgres-password'
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: publichealth-secrets
+type: Opaque
+stringData:
+  django-secret-key: "change-me-to-a-real-secret-key"
+  database-url: "postgres://publichealth:changeme@postgres-service:5432/publichealth"
+  postgres-password: "changeme"
\ No newline at end of file
diff --git a/k8s/storage.yaml b/k8s/storage.yaml
new file mode 100644
index 0000000..9bf4bba
--- /dev/null
+++ b/k8s/storage.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: media-pvc
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: static-pvc
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
\ No newline at end of file

From ec0b23153e3e0b3c327566152855d72ff2aeafcd Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 20:40:10 +0530
Subject: [PATCH 102/122] Add deploy-minikube.sh

---
 deploy-minikube.sh | 136 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100755 deploy-minikube.sh

diff --git a/deploy-minikube.sh b/deploy-minikube.sh
new file mode 100755
index 0000000..0bfc333
--- /dev/null
+++ b/deploy-minikube.sh
@@ -0,0 +1,136 @@
+#!/bin/bash
+
+# Deployment script for publichealth on Minikube
+# Usage: ./deploy-minikube.sh
+
+set -e
+
+echo "🚀 Starting deployment to Minikube..."
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Configuration
+IMAGE_NAME="publichealthch"
+IMAGE_TAG="latest"
+NAMESPACE="default"
+
+# Function to check if command exists
+command_exists() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+# Check prerequisites
+echo "📋 Checking prerequisites..."
+if ! command_exists minikube; then
+    echo -e "${RED}❌ Minikube is not installed${NC}"
+    echo "Install it from: https://minikube.sigs.k8s.io/docs/start/"
+    exit 1
+fi
+
+if ! command_exists kubectl; then
+    echo -e "${RED}❌ kubectl is not installed${NC}"
+    exit 1
+fi
+
+if ! command_exists docker; then
+    echo -e "${RED}❌ Docker is not installed${NC}"
+    exit 1
+fi
+
+# Start Minikube if not running
+if ! minikube status | grep -q "Running"; then
+    echo "🔧 Starting Minikube..."
+    # Check if running as root and use appropriate driver
+    if [ "$EUID" -eq 0 ]; then
+        echo "Running as root, using none driver..."
+        minikube start --driver=none --cpus=2 --memory=4096
+    else
+        minikube start --driver=docker --cpus=2 --memory=4096
+    fi
+else
+    echo -e "${GREEN}✓ Minikube is running${NC}"
+fi
+
+# Configure Docker to use Minikube's Docker daemon
+echo "🔧 Configuring Docker to use Minikube's daemon..."
+eval $(minikube docker-env)
+
+# Build the Docker image
+echo "🏗️  Building Docker image..."
+docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .
+echo -e "${GREEN}✓ Docker image built successfully${NC}"
+
+# Create namespace if it doesn't exist
+kubectl create namespace ${NAMESPACE} 2>/dev/null || true
+
+# Apply storage configurations
+echo "💾 Setting up storage..."
+kubectl apply -f k8s/storage.yaml
+
+# Create secrets if they don't exist
+if ! kubectl get secret publichealth-secrets >/dev/null 2>&1; then
+    echo -e "${YELLOW}⚠️  Creating default secrets (CHANGE THESE IN PRODUCTION!)${NC}"
+    kubectl create secret generic publichealth-secrets \
+        --from-literal=django-secret-key='change-me-$(openssl rand -hex 32)' \
+        --from-literal=database-url='postgres://publichealth:changeme@postgres-service:5432/publichealth' \
+        --from-literal=postgres-password='changeme'
+else
+    echo -e "${GREEN}✓ Secrets already exist${NC}"
+fi
+
+# Deploy PostgreSQL
+echo "🐘 Deploying PostgreSQL..."
+kubectl apply -f k8s/postgres.yaml
+
+# Deploy Redis
+echo "🔴 Deploying Redis..."
+kubectl apply -f k8s/redis.yaml
+
+# Wait for database to be ready
+echo "⏳ Waiting for PostgreSQL to be ready..."
+kubectl wait --for=condition=ready pod -l app=postgres --timeout=120s
+
+# Deploy the application
+echo "🚀 Deploying application..."
+kubectl apply -f k8s/deployment.yaml
+
+# Wait for deployment to be ready
+echo "⏳ Waiting for application to be ready..."
+kubectl wait --for=condition=available --timeout=300s deployment/publichealth
+
+# Run migrations
+echo "🔄 Running database migrations..."
+POD=$(kubectl get pod -l app=publichealth -o jsonpath="{.items[0].metadata.name}")
+kubectl exec -it ${POD} -- python manage.py migrate
+
+# Create superuser (optional)
+echo -e "${YELLOW}Do you want to create a superuser? (y/n)${NC}"
+read -r response
+if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
+    kubectl exec -it ${POD} -- python manage.py createsuperuser
+fi
+
+# Get the service URL
+MINIKUBE_IP=$(minikube ip)
+NODE_PORT=$(kubectl get svc publichealth-service -o jsonpath='{.spec.ports[0].nodePort}')
+
+echo ""
+echo "✅ Deployment complete!"
+echo ""
+echo "📌 Application URL: http://${MINIKUBE_IP}:${NODE_PORT}"
+echo "📌 Admin URL: http://${MINIKUBE_IP}:${NODE_PORT}/admin/"
+echo ""
+echo "🔍 Useful commands:"
+echo "  - View logs: kubectl logs -f deployment/publichealth"
+echo "  - Scale deployment: kubectl scale deployment publichealth --replicas=3"
+echo "  - Access pod shell: kubectl exec -it ${POD} -- /bin/bash"
+echo "  - Port forward: kubectl port-forward service/publichealth-service 8000:8000"
+echo "  - Stop Minikube: minikube stop"
+echo "  - Delete deployment: kubectl delete -f k8s/"
+echo ""
+echo "🌐 To access from your browser, you can also run:"
+echo "  minikube service publichealth-service"

From 7e712f9ed9957f23aeb54617d8eb5adc694be26a Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 20:40:29 +0530
Subject: [PATCH 103/122] Add package-lock.json

---
 package-lock.json | 7839 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 7839 insertions(+)
 create mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..6d01ec4
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,7839 @@
+{
+  "name": "public-health-ch",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "public-health-ch",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@bower_components/bootstrap-sass": "twbs/bootstrap-sass#^3.3.7",
+        "@bower_components/cookieconsent": "silktide/cookieconsent2#^3.0.6",
+        "@bower_components/jquery": "jquery/jquery-dist#~1",
+        "@bower_components/slick-carousel": "kenwheeler/slick#~1.4.1",
+        "@bower_components/slick-lightbox": "mreq/slick-lightbox#^0.2.10"
+      },
+      "devDependencies": {
+        "coffeescript": "^2.5.1",
+        "grunt": "^1.0.2",
+        "grunt-bg-shell": "^2.3.3",
+        "grunt-browser-sync": "^2.2.0",
+        "grunt-contrib-imagemin": "^2.0.1",
+        "grunt-contrib-sass": "^1.0.0",
+        "grunt-contrib-watch": "^1.1.0",
+        "grunt-sass": "^3.0.2",
+        "sass": "^1.45.0"
+      },
+      "engines": {
+        "yarn": ">= 1.0.0"
+      }
+    },
+    "node_modules/@bower_components/bootstrap-sass": {
+      "name": "bootstrap-sass",
+      "version": "3.4.1",
+      "resolved": "https://codeload.github.com/twbs/bootstrap-sass/tar.gz/b34765d8a6aa775816c59012b2d6b30c4c66a8e9",
+      "integrity": "sha512-2mSCGlz6J9F3pSsPhfSAOhnPhqaWD6fbRIL+pkm5x3TO4O8EICHoMkasL50/iUTldyW2ltA/JXPJCNKOOHga0g==",
+      "license": "MIT"
+    },
+    "node_modules/@bower_components/cookieconsent": {
+      "name": "cookieconsent",
+      "version": "3.1.1",
+      "resolved": "https://codeload.github.com/silktide/cookieconsent2/tar.gz/2b3191a39c7df4479a1f23053e3b31424089520e",
+      "integrity": "sha512-TkMPTivoyxEa/LlhqqNc5YJlRysBnldCaxqBW4qWdNSuuxPgGmoprFsXQzVtknEVbtC3G0vF7qITUKxNQ6PEnQ==",
+      "license": "MIT"
+    },
+    "node_modules/@bower_components/jquery": {
+      "name": "jquery",
+      "version": "1.12.4",
+      "resolved": "https://codeload.github.com/jquery/jquery-dist/tar.gz/5e89585e0121e72ff47de177c5ef604f3089a53d",
+      "integrity": "sha512-B7/Y6j3xashMTbnNokU2k9sAuMRhq5tZJKl6YZXyaZQEN1O5Dr/kCmEOwLuGkNzzIkx+2C2SyTcco2mdv+MxKg==",
+      "license": "MIT"
+    },
+    "node_modules/@bower_components/slick-carousel": {
+      "name": "slick-carousel",
+      "version": "1.4.1",
+      "resolved": "https://codeload.github.com/kenwheeler/slick/tar.gz/e3fc23908d647bb2471c00c316ad57b15667975d",
+      "integrity": "sha512-lF5UkWugjyUMDYnDyHZnP8Q4Vdg/CnbKJHouhY2jTNhbdbSiVhJL2BpTtdlE3mqRwOAFibD+xbIP0rbkRS9eIg==",
+      "license": "MIT"
+    },
+    "node_modules/@bower_components/slick-lightbox": {
+      "name": "slick-lightbox",
+      "version": "0.2.12",
+      "resolved": "https://codeload.github.com/mreq/slick-lightbox/tar.gz/30459914338d0a9ae6ab328c7e12166997da00a2",
+      "integrity": "sha512-LG5+IZkBp+DatSLNdzPbJ7IP91sOxmZ9UMnKaVUilsSbaf8x/tObSl1WWCLSvfJm0bFYtYdirdQZtAunIXQOCQ=="
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ansi-gray": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
+      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE= sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "ansi-wrap": "0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8= sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ansi-wrap": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768= sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/archive-type": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz",
+      "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y= sha512-6cAWDM0lUYTbb7F436FAjbBYnsn5E3L2AgTOLzrFfLt7FVM6uJwKUvllE8VjLKTmKCU8PqtWlUAezEYjg5iGqA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "file-type": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/archive-type/node_modules/file-type": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+      "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek= sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "arr-flatten": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-differ": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE= sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8= sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arraybuffer.slice": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/async": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/async-each-series": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz",
+      "integrity": "sha1-dhfBkXQB/Yykooqtzj266Yr+tDI= sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
+    "node_modules/backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc= sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/base64-arraybuffer": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
+      "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/beeper": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak= sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/bin-build": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-2.2.0.tgz",
+      "integrity": "sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw= sha512-m8gaq/BdoePIT5RlHW3KNJZwNkg9YtPn2C89x85/0KYIExoHMm3D/RL/Wxrvum9CI6pbF2KUQa8a/WWFudVmng==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "archive-type": "^3.0.1",
+        "decompress": "^3.0.0",
+        "download": "^4.1.2",
+        "exec-series": "^1.0.0",
+        "rimraf": "^2.2.6",
+        "tempfile": "^1.0.0",
+        "url-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/bin-build/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/bin-build/node_modules/tempfile": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz",
+      "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I= sha512-NjT12fW6pSEKz1eVcADgaKfeM+XZ4+zSaqVz46XH7+CiEwcelnwtGWRRjF1p+xyW2PVgKKKS2UUw1LzRelntxg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "os-tmpdir": "^1.0.0",
+        "uuid": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/bin-check": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-2.0.0.tgz",
+      "integrity": "sha1-hvjm9CU4k99g3DFpV/WvAqywWTA= sha512-jf6fesAGnXBynRU3JLpo0qe8vw8JBPBJCKK0v8NV3iH1P2UkQ6UEcIy7uPw1OdWkPUtpmX1uqeyTGrpeKd2CwQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "executable": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/bin-version": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz",
+      "integrity": "sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144= sha512-o9u3aS7w6RqoH9BErxuilhQG2fn3srr3ZekEEGailMnj5F+0p+R3TXENvO+vGaLnKlmq8xhhh/Fvl1RRxx/FdQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "find-versions": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/bin-version-check": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz",
+      "integrity": "sha1-5OXfKQuQaffRETJAMe/BP90RpbA= sha512-3lUeqGAbnWQG7OCfIiHXw1EmzzvAGlMYqqgRahkr7oDeY1Qra8r2DZH2bbfXZI4NA3aaD1Ap+xt8CeVO/fftrw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "bin-version": "^1.0.0",
+        "minimist": "^1.1.0",
+        "semver": "^4.0.3",
+        "semver-truncate": "^1.0.0"
+      },
+      "bin": {
+        "bin-version-check": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/bin-wrapper": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-3.0.2.tgz",
+      "integrity": "sha1-Z9MwYmLksaXy+I7iNGT2plVneus= sha512-5QEiUnaE7hgRlQxaV2jpeTg0+IA3o4zZ2sduuSqyJCdOuJ1wDuEmM1ntGelDf4ueCOaOam4bOMtOU4W6lG+hUg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "bin-check": "^2.0.0",
+        "bin-version-check": "^2.1.0",
+        "download": "^4.0.0",
+        "each-async": "^1.1.1",
+        "lazy-req": "^1.0.0",
+        "os-filter-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bl": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
+      "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/blob": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/body": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+      "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk= sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==",
+      "dev": true,
+      "dependencies": {
+        "continuable-cache": "^0.3.1",
+        "error": "^7.0.0",
+        "raw-body": "~1.1.0",
+        "safe-json-parse": "~1.0.1"
+      }
+    },
+    "node_modules/body/node_modules/bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+      "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g= sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==",
+      "dev": true
+    },
+    "node_modules/body/node_modules/raw-body": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+      "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU= sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "1",
+        "string_decoder": "0.10"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/body/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-sync": {
+      "version": "2.27.7",
+      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.7.tgz",
+      "integrity": "sha512-9ElnnA/u+s2Jd+IgY+2SImB+sAEIteHsMG0NR96m7Ph/wztpvJCUpyC2on1KqmG9iAp941j+5jfmd34tEguGbg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "browser-sync-client": "^2.27.7",
+        "browser-sync-ui": "^2.27.7",
+        "bs-recipes": "1.3.4",
+        "bs-snippet-injector": "^2.0.1",
+        "chokidar": "^3.5.1",
+        "connect": "3.6.6",
+        "connect-history-api-fallback": "^1",
+        "dev-ip": "^1.0.1",
+        "easy-extender": "^2.3.4",
+        "eazy-logger": "3.1.0",
+        "etag": "^1.8.1",
+        "fresh": "^0.5.2",
+        "fs-extra": "3.0.1",
+        "http-proxy": "^1.18.1",
+        "immutable": "^3",
+        "localtunnel": "^2.0.1",
+        "micromatch": "^4.0.2",
+        "opn": "5.3.0",
+        "portscanner": "2.1.1",
+        "qs": "6.2.3",
+        "raw-body": "^2.3.2",
+        "resp-modifier": "6.0.2",
+        "rx": "4.1.0",
+        "send": "0.16.2",
+        "serve-index": "1.9.1",
+        "serve-static": "1.13.2",
+        "server-destroy": "1.0.1",
+        "socket.io": "2.4.0",
+        "ua-parser-js": "1.0.2",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "browser-sync": "dist/bin.js"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/browser-sync-client": {
+      "version": "2.27.7",
+      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.7.tgz",
+      "integrity": "sha512-wKg9UP9a4sCIkBBAXUdbkdWFJzfSAQizGh+nC19W9y9zOo9s5jqeYRFUUbs7x5WKhjtspT+xetVp9AtBJ6BmWg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "etag": "1.8.1",
+        "fresh": "0.5.2",
+        "mitt": "^1.1.3",
+        "rxjs": "^5.5.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/browser-sync-ui": {
+      "version": "2.27.7",
+      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.7.tgz",
+      "integrity": "sha512-Bt4OQpx9p18OIzk0KKyu7jqlvmjacasUlk8ARY3uuIyiFWSBiRgr2i6XY8dEMF14DtbooaEBOpHEu9VCYvMcCw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "async-each-series": "0.1.1",
+        "connect-history-api-fallback": "^1",
+        "immutable": "^3",
+        "server-destroy": "1.0.1",
+        "socket.io-client": "^2.4.0",
+        "stream-throttle": "^0.1.3"
+      }
+    },
+    "node_modules/bs-recipes": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz",
+      "integrity": "sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU= sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/bs-snippet-injector": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz",
+      "integrity": "sha1-YbU5PxH1JVntEgaTEANDtu2wTdU= sha512-4u8IgB+L9L+S5hknOj3ddNSb42436gsnGm1AuM15B7CdbkpQTyVWgIM5/JUBiKiRwGOR86uo0Lu/OsX+SAlJmw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw= sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/buffer-to-vinyl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz",
+      "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI= sha512-t6B4HXJ3YdJ/lXKhK3nlGW1aAvpQH2FMyHh25SmfdYkQAU3/R2MYo4VrY1DlQuZd8zLNOqWPxZFJILRuTkqaEQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "file-type": "^3.1.0",
+        "readable-stream": "^2.0.2",
+        "uuid": "^2.0.1",
+        "vinyl": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/buffer-to-vinyl/node_modules/file-type": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+      "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek= sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz",
+      "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc= sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/capture-stack-trace": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/caw": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
+      "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ= sha512-GIAlMoessjWW8p0mkStU4kMvV35toVCAyOWhUajk7O0d7wJI8F9TDjfrkSoO26b0d1QsnDLmw5I3X+yd6OKorQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "get-proxy": "^1.0.1",
+        "is-obj": "^1.0.0",
+        "object-assign": "^3.0.0",
+        "tunnel-agent": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/caw/node_modules/object-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/clap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
+      "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "chalk": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4= sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/co": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
+      "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g= sha512-CQsjCRiNObI8AtTsNIBDRMQ4oMR83CzEswHYahClvul7gKk+lDQiOKv+5qh7LQWf5sh6jkZNispz/QlsZxyNgA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/coa": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
+      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0= sha512-KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "q": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/coffeescript": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.6.1.tgz",
+      "integrity": "sha512-GG5nkF93qII8HmHqnnibkgpp/SV7PSnSPiWsbinwya7nNOe95aE/x2xrKZJFks8Qpko3TNrC+/LahaKgrz5YCg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "cake": "bin/cake",
+        "coffee": "bin/coffee"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM= sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==",
+      "dev": true
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/connect": {
+      "version": "3.6.6",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+      "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ= sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.0",
+        "parseurl": "~1.3.2",
+        "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/console-stream": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz",
+      "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ= sha512-QC/8l9e6ofi6nqZ5PawlDgzmMw3OxIXtvolBzap/F4UDBJlDaZRSNbL/lb41C29FcbSJncBFlJFj2WJoNyZRfQ==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/continuable-cache": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8= sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "capture-stack-trace": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.9.tgz",
+      "integrity": "sha1-vWf5bAfvtjA7f+lMHpefiEeOCjk= sha512-jUNffe+x93R0/940d+JrdIl8SROZdUuvlw0HxjR/0GUKGvJEWiTK5rxtKNtP1lgMnoR8383q0orSA6k3eJ+y4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lru-cache": "^2.5.0"
+      }
+    },
+    "node_modules/csso": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
+      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U= sha512-FmCI/hmqDeHHLaIQckMhMZneS84yzUZdrWDAvJVVxOwcKE1P1LF9FGmzr1ktIQSxOw6fl3PaQsmfg+GN+VvR3w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "clap": "^1.0.9",
+        "source-map": "^0.5.3"
+      },
+      "bin": {
+        "csso": "bin/csso"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o= sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "array-find-index": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/dargs": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
+      "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc= sha512-jyweV/k0rbv2WK4r9KLayuBrSh2Py0tNmV7LBoSMH4hMQyrG8OPyIOWB2VEx4DJKXWmK4lopYMVvORlDt2S8Aw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "number-is-nan": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/dateformat": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
+      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
+      "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0= sha512-QCl8WTT4FSft5F+0M0InHKO6UYFfYhw5++vktTKpmUsQ6YUMPcBwMu7Sp3P0lMGk00hTNHohdhfdi9+OswLJuQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "buffer-to-vinyl": "^1.0.0",
+        "concat-stream": "^1.4.6",
+        "decompress-tar": "^3.0.0",
+        "decompress-tarbz2": "^3.0.0",
+        "decompress-targz": "^3.0.0",
+        "decompress-unzip": "^3.0.0",
+        "stream-combiner2": "^1.1.1",
+        "vinyl-assign": "^1.0.1",
+        "vinyl-fs": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress-tar": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
+      "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY= sha512-YuF7b9jA2bnBhf0/HQ/5UDgX5Ogzw1xJz6mWOFRctyOcmZPjJx3jjde9tCBjysvYscutRTPi35Q20mPDA74SKQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-tar": "^1.0.0",
+        "object-assign": "^2.0.0",
+        "strip-dirs": "^1.0.0",
+        "tar-stream": "^1.1.1",
+        "through2": "^0.6.1",
+        "vinyl": "^0.4.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress-tar/node_modules/clone": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+      "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8= sha512-g62n3Kb9cszeZvmvBUqP/dsEJD/+80pDA8u8KqHnAPrVnQ2Je9rVV6opxkhuWCd1kCn2gOibzDKxCtBvD3q5kA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/decompress-tar/node_modules/object-assign": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+      "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo= sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress-tar/node_modules/vinyl": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+      "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc= sha512-pmza4M5VA15HOImIQYWhoXGlGNafCm0QK5BpBUXkzzEwrRxKqBsbAhTfkT2zMcJhUX1G1Gkid0xaV8WjOl7DsA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "clone": "^0.2.0",
+        "clone-stats": "^0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/decompress-tarbz2": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
+      "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0= sha512-UVCUT54LTEf8uqoytmEMVSwTVl/rZJ0o6bUJsJ7psRmICUzCsz9BJ31drbX0NtgwD9cFzIwKProa2yThmVBKvQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-bzip2": "^1.0.0",
+        "object-assign": "^2.0.0",
+        "seek-bzip": "^1.0.3",
+        "strip-dirs": "^1.0.0",
+        "tar-stream": "^1.1.1",
+        "through2": "^0.6.1",
+        "vinyl": "^0.4.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress-tarbz2/node_modules/clone": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+      "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8= sha512-g62n3Kb9cszeZvmvBUqP/dsEJD/+80pDA8u8KqHnAPrVnQ2Je9rVV6opxkhuWCd1kCn2gOibzDKxCtBvD3q5kA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/decompress-tarbz2/node_modules/object-assign": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+      "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo= sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress-tarbz2/node_modules/vinyl": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+      "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc= sha512-pmza4M5VA15HOImIQYWhoXGlGNafCm0QK5BpBUXkzzEwrRxKqBsbAhTfkT2zMcJhUX1G1Gkid0xaV8WjOl7DsA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "clone": "^0.2.0",
+        "clone-stats": "^0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/decompress-targz": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
+      "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA= sha512-umeSWvrmd9/qcmGaf0oAc+Gx7La0B4Uxo+HXoo0HqrjEbCzn7SMiWvmE5sS56B+GqaoJ8z64ORZCRaOzKCYi/w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-gzip": "^1.0.0",
+        "object-assign": "^2.0.0",
+        "strip-dirs": "^1.0.0",
+        "tar-stream": "^1.1.1",
+        "through2": "^0.6.1",
+        "vinyl": "^0.4.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress-targz/node_modules/clone": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+      "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8= sha512-g62n3Kb9cszeZvmvBUqP/dsEJD/+80pDA8u8KqHnAPrVnQ2Je9rVV6opxkhuWCd1kCn2gOibzDKxCtBvD3q5kA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/decompress-targz/node_modules/object-assign": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+      "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo= sha512-CdsOUYIh5wIiozhJ3rLQgmUTgcyzFwZZrqhkKhODMoGtPKM+wt0h0CNIoauJWMsS9822EdzPsF/6mb4nLvPN5g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress-targz/node_modules/vinyl": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+      "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc= sha512-pmza4M5VA15HOImIQYWhoXGlGNafCm0QK5BpBUXkzzEwrRxKqBsbAhTfkT2zMcJhUX1G1Gkid0xaV8WjOl7DsA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "clone": "^0.2.0",
+        "clone-stats": "^0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/decompress-unzip": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
+      "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus= sha512-rclee6Q/+aChW77vbHmtGNZi3ko1Qhsp9Brs5mVyhBSeg+K4n+6MHo47y/+7GsmYZuEqVJ46LjwT3/N8N50jZQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-zip": "^1.0.0",
+        "read-all-stream": "^3.0.0",
+        "stat-mode": "^0.2.0",
+        "strip-dirs": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^1.0.0",
+        "yauzl": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decompress-unzip/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/dev-ip": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz",
+      "integrity": "sha1-p2o+0YVb56ASu4rBbLgPPADcKPA= sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==",
+      "dev": true,
+      "bin": {
+        "dev-ip": "lib/dev-ip.js"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/download": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
+      "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw= sha512-yOTsksXxUQ9b/p/HA3g9L97JZThcAKq8v3+Afwhf/kIoV0spu6pOvj+OKQbyGKYAwBGqSPbO+x1pCFSg5ce9OA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "caw": "^1.0.1",
+        "concat-stream": "^1.4.7",
+        "each-async": "^1.0.0",
+        "filenamify": "^1.0.1",
+        "got": "^5.0.0",
+        "gulp-decompress": "^1.2.0",
+        "gulp-rename": "^1.2.0",
+        "is-url": "^1.2.0",
+        "object-assign": "^4.0.1",
+        "read-all-stream": "^3.0.0",
+        "readable-stream": "^2.0.2",
+        "stream-combiner2": "^1.1.1",
+        "vinyl": "^1.0.0",
+        "vinyl-fs": "^2.2.0",
+        "ware": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "node_modules/each-async": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
+      "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM= sha512-0hJGub96skwr+sUojv7zQ0kc9i4jn3SwLiLk8Jr7KDz7aaaMzkN5UX3a/9ZhzC0OfZVyXHhlHcjC0KVOiKZ+HQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "onetime": "^1.0.0",
+        "set-immediate-shim": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/easy-extender": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz",
+      "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.10"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/eazy-logger": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.1.0.tgz",
+      "integrity": "sha512-/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ==",
+      "dev": true,
+      "dependencies": {
+        "tfunk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/engine.io": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz",
+      "integrity": "sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "debug": "~4.1.0",
+        "engine.io-parser": "~2.2.0",
+        "ws": "~7.4.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/engine.io-client": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz",
+      "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "component-emitter": "~1.3.0",
+        "component-inherit": "0.0.3",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.2.0",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.6",
+        "parseuri": "0.0.6",
+        "ws": "~7.4.2",
+        "xmlhttprequest-ssl": "~1.6.2",
+        "yeast": "0.1.2"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz",
+      "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "~0.0.7",
+        "base64-arraybuffer": "0.1.4",
+        "blob": "0.0.5",
+        "has-binary2": "~1.0.2"
+      }
+    },
+    "node_modules/engine.io/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/engine.io/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/error": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
+      "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
+      "dev": true,
+      "dependencies": {
+        "string-template": "~0.2.1"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter2": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
+      "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas= sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/exec-buffer": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
+      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "execa": "^0.7.0",
+        "p-finally": "^1.0.0",
+        "pify": "^3.0.0",
+        "rimraf": "^2.5.4",
+        "tempfile": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/exec-buffer/node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/exec-buffer/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/exec-series": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/exec-series/-/exec-series-1.0.3.tgz",
+      "integrity": "sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo= sha512-VkmGmKa4oWkVBcPPfSzOEmry9ELWKk4oodvXpmtYmvGD82k/TnT0CGNw9VoxQLYGwNJR6fIaXpHUhBm4tNTSMQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "async-each-series": "^1.1.0",
+        "object-assign": "^4.1.0"
+      }
+    },
+    "node_modules/exec-series/node_modules/async-each-series": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-1.1.0.tgz",
+      "integrity": "sha1-9C/YFV048hpbjqB8KOBj7RcAsTg= sha512-/VIpPVIJJlJObJiXkHBJ1RhjDtydBRG/3/dWpsXoVGOShNw5tameXnC7Yys+wpb0p/myItxGmSGgNi/dNlsIiA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= sha512-RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/execa/node_modules/cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "node_modules/execa/node_modules/lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "node_modules/executable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-1.1.0.tgz",
+      "integrity": "sha1-h3mA6REvM5EGbaNyZd562ENKtNk= sha512-qZLuUgqTqYRLdF8Gl56y/JhT+X15uPX6y0Vpmj0cF4SCwbswBPc6yxzr1nClQa+SwRQ5Sk9+Mxa3ZBX9t6aWzg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "meow": "^3.1.0"
+      },
+      "bin": {
+        "executable": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-posix-bracket": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "fill-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-range/node_modules/fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-range/node_modules/is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-range/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-range/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fancy-log": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/figures": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5",
+        "object-assign": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/file-type": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
+      "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU= sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/filename-reserved-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
+      "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q= sha512-UZArj7+U+2reBBVCvVmRlyq9D7EYQdUtuNN+1iz7pF1jGcJ2L0TjiRCxsTZfj2xFbM4c25uGCUDpKTHA7L2TKg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/filenamify": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
+      "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU= sha512-DKVP0WQcB7WaIMSwDETqImRej2fepPqvXQjaVib7LRZn9Rxn5UbvK2tYTqGf1A1DkIprQQkG4XSQXSOZp7Q3GQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "filename-reserved-regex": "^1.0.0",
+        "strip-outer": "^1.0.0",
+        "trim-repeated": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U= sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.1",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.3.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/find-versions": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz",
+      "integrity": "sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I= sha512-t0ciYD8XnoFVirFJN2niUJAQ/kyZU5UDSJobyekmiMPCBsYsWd4nd75e7HU2Xf4m+1Y7iLEo3fovNRNIV5MaDQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "array-uniq": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "meow": "^3.5.0",
+        "semver-regex": "^1.0.0"
+      },
+      "bin": {
+        "find-versions": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/findup-sync": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+      "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY= sha512-z8Nrwhi6wzxNMIbxlrTzuUW6KWuKkogZ/7OdDVq+0+kxn77KUH1nipx8iU6suqkHqc4y6n7a9A8IpmxY/pTjWg==",
+      "dev": true,
+      "dependencies": {
+        "glob": "~5.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/findup-sync/node_modules/glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/first-chunk-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+      "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04= sha512-ArRi5axuv66gEsyl3UuK80CzW7t56hem73YGNYxNWTGNKFJUadSb9Gu9SHijYEUi8ulQMf1bJomYNwSCPHhtTQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.14.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
+      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs= sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/fs-extra": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE= sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^3.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "globule": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-proxy": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
+      "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus= sha512-3cJ+77wC52qD2PqWNXtB2HkU6tQXc/X3hSMtSN0Y8c8nbYMMxF7vpsjH4H0iSt+28l/NK13DKl8iKAVGkqDFnA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "rc": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/getobject": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz",
+      "integrity": "sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/gifsicle": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-3.0.4.tgz",
+      "integrity": "sha1-9Fy17RAWW2ZdySng6TKLbIId+js= sha512-bfwYZooxxqCHpu3qUMn3En9xij/rrQd1fD9TNr+f7r5y/Inqj0WGkL7AeqQffBe/Sd6M/MIHzRKeD9hgI6Xavg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "bin-build": "^2.0.0",
+        "bin-wrapper": "^3.0.0",
+        "logalot": "^2.0.0"
+      },
+      "bin": {
+        "gifsicle": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-base/node_modules/glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "is-glob": "^2.0.0"
+      }
+    },
+    "node_modules/glob-base/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-base/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-stream": {
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
+      "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI= sha512-piN8XVAO2sNxwVLokL4PswgJvK/uQ6+awwXUVRTGF+rRfgCZpn4hOqxiRuTEbU/k3qgKl0DACYQ/0Sge54UMQg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "extend": "^3.0.0",
+        "glob": "^5.0.3",
+        "glob-parent": "^3.0.0",
+        "micromatch": "^2.3.7",
+        "ordered-read-streams": "^0.3.0",
+        "through2": "^0.6.0",
+        "to-absolute-glob": "^0.1.1",
+        "unique-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glob-stream/node_modules/braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-stream/node_modules/glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/is-glob": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-extglob": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "arr-diff": "^2.0.0",
+        "array-unique": "^0.2.1",
+        "braces": "^1.8.2",
+        "expand-brackets": "^0.1.4",
+        "extglob": "^0.3.1",
+        "filename-regex": "^2.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "normalize-path": "^2.0.1",
+        "object.omit": "^2.0.0",
+        "parse-glob": "^3.0.4",
+        "regex-cache": "^0.4.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/micromatch/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/micromatch/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob-stream/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw= sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/globule": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.3.tgz",
+      "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/got": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
+      "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU= sha512-1qd54GLxvVgzuidFmw9ze9umxS3rzhdBH6Wt6BTYrTQUXTN01vGGYXwzLzYLowNx8HBH3/c7kRyvx90fh13i7Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "create-error-class": "^3.0.1",
+        "duplexer2": "^0.1.4",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "node-status-codes": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "parse-json": "^2.1.0",
+        "pinkie-promise": "^2.0.0",
+        "read-all-stream": "^3.0.0",
+        "readable-stream": "^2.0.5",
+        "timed-out": "^3.0.0",
+        "unzip-response": "^1.0.2",
+        "url-parse-lax": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0 <7"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/grunt": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.4.1.tgz",
+      "integrity": "sha512-ZXIYXTsAVrA7sM+jZxjQdrBOAg7DyMUplOMhTaspMRExei+fD0BTwdWXnn0W5SXqhb/Q/nlkzXclSi3IH55PIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dateformat": "~3.0.3",
+        "eventemitter2": "~0.4.13",
+        "exit": "~0.1.2",
+        "findup-sync": "~0.3.0",
+        "glob": "~7.1.6",
+        "grunt-cli": "~1.4.2",
+        "grunt-known-options": "~2.0.0",
+        "grunt-legacy-log": "~3.0.0",
+        "grunt-legacy-util": "~2.0.1",
+        "iconv-lite": "~0.4.13",
+        "js-yaml": "~3.14.0",
+        "minimatch": "~3.0.4",
+        "mkdirp": "~1.0.4",
+        "nopt": "~3.0.6",
+        "rimraf": "~3.0.2"
+      },
+      "bin": {
+        "grunt": "bin/grunt"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/grunt-bg-shell": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/grunt-bg-shell/-/grunt-bg-shell-2.3.3.tgz",
+      "integrity": "sha1-E5ro+cdvaKDbTunbvU7IJbkif/8= sha512-v8i5Lu7flMRzIfIvu6fhncI0P0d51+rkV2Nh7lDAPVXcyeJOqVq4lWQNDHS72oxc/4dN2yYyzKYWZIKNpxnZQw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      },
+      "peerDependencies": {
+        "grunt": ">=0.4.0"
+      }
+    },
+    "node_modules/grunt-browser-sync": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/grunt-browser-sync/-/grunt-browser-sync-2.2.0.tgz",
+      "integrity": "sha1-oOnB/RzLXEVMJexRcBE///BqR3I= sha512-OegFSHazLMa9Qb4RoZo8EN7vnZTBGCpLVwmrsWj3gCEVrLDea2WZ+rxaQdfmBmV98PvhfZCSX3YYFBfO6zK+RQ==",
+      "dev": true,
+      "dependencies": {
+        "browser-sync": "^2.6.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/grunt-cli": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
+      "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "grunt-known-options": "~2.0.0",
+        "interpret": "~1.1.0",
+        "liftup": "~3.0.1",
+        "nopt": "~4.0.1",
+        "v8flags": "~3.2.0"
+      },
+      "bin": {
+        "grunt": "bin/grunt"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/grunt-cli/node_modules/nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/grunt-contrib-imagemin": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-imagemin/-/grunt-contrib-imagemin-2.0.1.tgz",
+      "integrity": "sha512-91zBrvh350QSpsxyCTXni0djMXavF3elBmvFgnbp/2CgIx53QYe+Cvf2+wZmrcb8U0qp+MjHl0Ahjct4+R6PLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^1.0.0",
+        "imagemin": "^5.3.1",
+        "p-map": "^1.1.1",
+        "plur": "^2.1.2",
+        "pretty-bytes": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "optionalDependencies": {
+        "imagemin-gifsicle": "^5.0.0",
+        "imagemin-jpegtran": "^5.0.0",
+        "imagemin-optipng": "^5.1.0",
+        "imagemin-svgo": "^5.1.0"
+      }
+    },
+    "node_modules/grunt-contrib-sass": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-sass/-/grunt-contrib-sass-1.0.0.tgz",
+      "integrity": "sha1-gGg4JRy8DhqU1k1RXN00z2dNcBs= sha512-nYQW+vRDQi90//owyCi/9riDjx/lnNAKEhZu3i+i200jSk67U+RmdilGLWUJsYEwsohOCsvKOuFPtdOJGvEI4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async": "^0.9.0",
+        "chalk": "^1.0.0",
+        "cross-spawn": "^0.2.3",
+        "dargs": "^4.0.0",
+        "which": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "grunt": ">=0.4.0"
+      }
+    },
+    "node_modules/grunt-contrib-watch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz",
+      "integrity": "sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async": "^2.6.0",
+        "gaze": "^1.1.0",
+        "lodash": "^4.17.10",
+        "tiny-lr": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/grunt-contrib-watch/node_modules/async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/grunt-known-options": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
+      "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/grunt-legacy-log": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
+      "integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "colors": "~1.1.2",
+        "grunt-legacy-log-utils": "~2.1.0",
+        "hooker": "~0.2.3",
+        "lodash": "~4.17.19"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/grunt-legacy-log-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
+      "integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "~4.1.0",
+        "lodash": "~4.17.19"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/grunt-legacy-log-utils/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/grunt-legacy-log-utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/grunt-legacy-log-utils/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/grunt-legacy-util": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
+      "integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async": "~3.2.0",
+        "exit": "~0.1.2",
+        "getobject": "~1.0.0",
+        "hooker": "~0.2.3",
+        "lodash": "~4.17.21",
+        "underscore.string": "~3.3.5",
+        "which": "~2.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/grunt-legacy-util/node_modules/async": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
+      "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/grunt-legacy-util/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/grunt-sass": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-sass/-/grunt-sass-3.1.0.tgz",
+      "integrity": "sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "grunt": ">=1"
+      }
+    },
+    "node_modules/gulp-decompress": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
+      "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc= sha512-ChTv+4/4BwAdQLUgQoAvLFjYFvxYF6p9Mmf/b19/Lp7yNCvb8+KRkdXV8Gd7XErxtrEh8XDCCVon3DgqW4TgfA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "archive-type": "^3.0.0",
+        "decompress": "^3.0.0",
+        "gulp-util": "^3.0.1",
+        "readable-stream": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-rename": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
+      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/gulp-sourcemaps": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
+      "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw= sha512-NjRy6+Qb5K1xbwOvPviD3uA4KSq2zsalPL+4vxPQPuL+kKzHjXJL10/kLaESic3LmBto8VIBHr3gIN3F9AjnhA==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "convert-source-map": "^1.1.1",
+        "graceful-fs": "^4.1.2",
+        "strip-bom": "^2.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^1.0.0"
+      }
+    },
+    "node_modules/gulp-sourcemaps/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-util": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
+      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08= sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==",
+      "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "array-differ": "^1.0.0",
+        "array-uniq": "^1.0.2",
+        "beeper": "^1.0.0",
+        "chalk": "^1.0.0",
+        "dateformat": "^2.0.0",
+        "fancy-log": "^1.1.0",
+        "gulplog": "^1.0.0",
+        "has-gulplog": "^0.1.0",
+        "lodash._reescape": "^3.0.0",
+        "lodash._reevaluate": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.template": "^3.0.0",
+        "minimist": "^1.1.0",
+        "multipipe": "^0.1.2",
+        "object-assign": "^3.0.0",
+        "replace-ext": "0.0.1",
+        "through2": "^2.0.0",
+        "vinyl": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/gulp-util/node_modules/dateformat": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
+      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI= sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/gulp-util/node_modules/object-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+      "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-util/node_modules/replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/gulp-util/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/gulp-util/node_modules/vinyl": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4= sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U= sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "glogg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isarray": "2.0.1"
+      }
+    },
+    "node_modules/has-binary2/node_modules/isarray": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+      "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4= sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "sparkles": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hooker": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+      "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk= sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/http-errors": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz",
+      "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/imagemin": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-5.3.1.tgz",
+      "integrity": "sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ= sha512-JE4+2XKYOkISRfGapB/pq7LNYWc+0a+VBrNJgyki082PgnbVQ2qEfzNMRgNj/IrQckpzhxZsU8MYf1wGsy2/lw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "file-type": "^4.1.0",
+        "globby": "^6.1.0",
+        "make-dir": "^1.0.0",
+        "p-pipe": "^1.1.0",
+        "pify": "^2.3.0",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/imagemin-gifsicle": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-5.2.0.tgz",
+      "integrity": "sha512-K01m5QuPK+0en8oVhiOOAicF7KjrHlCZxS++mfLI2mV/Ksfq/Y9nCXCWDz6jRv13wwlqe5T7hXT+ji2DnLc2yQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "exec-buffer": "^3.0.0",
+        "gifsicle": "^3.0.0",
+        "is-gif": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/imagemin-jpegtran": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/imagemin-jpegtran/-/imagemin-jpegtran-5.0.2.tgz",
+      "integrity": "sha1-5ogiY7j3kW/duABkDPddLpcNKtY= sha512-LHnxBbloOm+CSFWgk1Srn189JXt7qFNRxAx0y/InrKxO9ViUygIh2GZub4TsaMBygmfqdvZ0XAeA5Sw7eDhX7Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "exec-buffer": "^3.0.0",
+        "is-jpg": "^1.0.0",
+        "jpegtran-bin": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/imagemin-optipng": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz",
+      "integrity": "sha1-0i2kEsCfX/AKQzmWC5ioix2+hpU= sha512-QQ2GB2C7LZTXfU4tp7zhHIbmyF0N+ZlRgD6ro/czKox6ufBOcRu8Pmz4gbr69PQBAeKpy+5YJa2063xYz5qvvw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "exec-buffer": "^3.0.0",
+        "is-png": "^1.0.0",
+        "optipng-bin": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/imagemin-svgo": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-5.2.4.tgz",
+      "integrity": "sha512-1bNZdlWVKdfxzu0xDD1pWjwK/G8FLcztUh/GWaI7xLgCFrn0j35o+uBbY7VcdY2AmKgiLYTXhrzrbkQk6xj8aA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-svg": "^2.0.0",
+        "svgo": "^0.7.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
+      "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM= sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "repeating": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/interpret": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ip-regex": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
+      "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0= sha512-HjpCHTuxbR/6jWJroc/VN+npo5j0T4Vv2TAI5qdEHQx7hsL767MeccGFSsLtF694EiZKTSEqgoeU6DtGFCcuqQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/irregular-plurals": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz",
+      "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y= sha512-kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/is-bzip2": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
+      "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w= sha512-v5DA9z/rmk4UdJtb3N1jYqjvCA5roRVf5Q6vprHOcF6U/98TmAJ/AvbPeRMEOYWDW4eMr/pJj5Fnfe0T2wL1Bg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-primitive": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-finite": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-gif": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-1.0.0.tgz",
+      "integrity": "sha1-ptKumIkwB7/6l6HYwB1jIFgyCX4= sha512-WDzHvXD3xfQ5einLRHRH7iReMuPwuXImHikxQeTWP09kGIv2mf2ZM63e9YHVSq9kEgjJuxRSp5AzH8Hga0+lNw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-gzip": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
+      "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM= sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-jpg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-1.0.1.tgz",
+      "integrity": "sha1-KW1X/dmc4BBDSnKD40armhA16XU= sha512-X5PVpLMBH/OaeTN8quzbcLTlwXCb/6n3tcfYTtEDzp0ZwAlgAOtIAIBHN4mS5OcscMgO8etZ5Ol1mNrXSqwBVQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-natural-number": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
+      "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec= sha512-88gG/Fur5/8RkhB6UonqOuwQfNJvuaDStW/+r6oIB/hOQPUQe7DiiDQq0fitGOnARt+mQl/S6rg6Vku+i0sA4w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-like": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz",
+      "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lodash.isfinite": "^3.3.2"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8= sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-png": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-png/-/is-png-1.1.0.tgz",
+      "integrity": "sha1-1XSxK/J1wDUEVVcLDltXqwYgd84= sha512-23Rmps8UEx3Bzqr0JqAtQo0tYP6sDfIfMt1rL9rzlla/zbteftI9LSJoqsIoGgL06sJboDGdVns4RTakAW/WTw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU= sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ= sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-svg": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
+      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk= sha512-Ya1giYJUkcL/94quj0+XGcmts6cETPBW1MiFz1ReJrnDJ680F52qpAEGAEGU0nq96FRGIGPx6Yo1CyPXcOoyGw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "html-comment-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-tar": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
+      "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0= sha512-8sR603bS6APKxcdkQ1e5rAC9JDCxM3OlbGJDWv5ajhHqIh6cTaqcpeOTch1iIeHYY4nHEFTgmCiGSLfvmODH4w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-url": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
+      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/is-valid-glob": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
+      "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4= sha512-CvG8EtJZ8FyzVOGPzrDorzyN65W1Ld8BVnqshRCah6pFIsprGx3dKgFtjLn/Vw9kGqR4OlR84U7yhT9ZVTyWIQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-zip": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
+      "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU= sha512-aym/dLqHZVMW/+bbNrA/eTeWTyW4fE6koLSoFSsM2GF3/pho7aPCcmHFWFLvzHu7MDuf67domYn36GDwU/cJkQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8= sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jpegtran-bin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jpegtran-bin/-/jpegtran-bin-3.2.0.tgz",
+      "integrity": "sha1-9g7PSumZwL2tLp+83ytvCYHnops= sha512-XdDj5m/ssa1Anieqd8/JVQLrIsBZ6A9rYzASfpNI0/o/rfsmQx1TP3zZ1GvkMMW5sVlqM2RcMjy8bg428UE9fQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "bin-build": "^2.0.0",
+        "bin-wrapper": "^3.0.0",
+        "logalot": "^2.0.0"
+      },
+      "bin": {
+        "jpegtran": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/jsonfile": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY= sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==",
+      "dev": true,
+      "license": "MIT",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lazy-req": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz",
+      "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w= sha512-Vn/JuGaYykbelAVNAhfVJxuwHQCOSNE6mqMtD+gnd+QORlAHwWVmVFqQga3yWt84G5vAwEwpT6sAsZ+tgJ88/Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lazystream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/liftup": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
+      "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend": "^3.0.2",
+        "findup-sync": "^4.0.0",
+        "fined": "^1.2.0",
+        "flagged-respawn": "^1.0.1",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.1",
+        "rechoir": "^0.7.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/liftup/node_modules/findup-sync": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
+      "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^4.0.2",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/limiter": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
+      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
+      "dev": true
+    },
+    "node_modules/livereload-js": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
+      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/localtunnel": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz",
+      "integrity": "sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "axios": "0.21.4",
+        "debug": "4.3.2",
+        "openurl": "1.1.1",
+        "yargs": "17.1.1"
+      },
+      "bin": {
+        "lt": "bin/lt.js"
+      },
+      "engines": {
+        "node": ">=8.3.0"
+      }
+    },
+    "node_modules/localtunnel/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/localtunnel/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/localtunnel/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/localtunnel/node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/localtunnel/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/localtunnel/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/localtunnel/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/localtunnel/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/localtunnel/node_modules/yargs": {
+      "version": "17.1.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz",
+      "integrity": "sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/localtunnel/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY= sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U= sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc= sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw= sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo= sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0= sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI= sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg= sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "lodash._root": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA= sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+      "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash.isfinite": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz",
+      "integrity": "sha1-+4m2WpqAKBgz8LdHizpRBPiY67M= sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/lodash.template": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8= sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
+      "deprecated": "This package is deprecated. Use https://socket.dev/npm/package/eta instead.",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash._basetostring": "^3.0.0",
+        "lodash._basevalues": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0",
+        "lodash.keys": "^3.0.0",
+        "lodash.restparam": "^3.0.0",
+        "lodash.templatesettings": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.templatesettings": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU= sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0"
+      }
+    },
+    "node_modules/logalot": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
+      "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI= sha512-Ah4CgdSRfeCJagxQhcVNMi9BfGYyEKLa6d7OA6xSbld/Hg3Cf2QiOa1mDpmG7Ve8LOH6DN3mdttzjQAvWTyVkw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "figures": "^1.3.5",
+        "squeak": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lpad-align": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz",
+      "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4= sha512-MMIcFmmR9zlGZtBcFOows6c2COMekHCIFJz3ew/rRpKZ1wR4mXDPzvcVqLarux8M33X4TPSq2Jdw8WJj0q0KbQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "get-stdin": "^4.0.1",
+        "indent-string": "^2.1.0",
+        "longest": "^1.0.0",
+        "meow": "^3.3.0"
+      },
+      "bin": {
+        "lpad-align": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI= sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/make-dir/node_modules/pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/math-random": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE= sha512-e6RM36aegd4f+r8BZCcYXlO2P3H6xbUM6ktL2Xmf45GAOit9bI4z6/3VU7JwllVO1L7u0UDSg/EhzQ5lmMLolA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.51.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/mitt": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
+      "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s= sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "duplexer2": "0.0.2"
+      }
+    },
+    "node_modules/multipipe/node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds= sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "license": "BSD",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/multipipe/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/multipipe/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk= sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/multipipe/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-status-codes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
+      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8= sha512-1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k= sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8= sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.omit/node_modules/for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/openurl": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz",
+      "integrity": "sha1-OHW0sO96UsFW8NtB1GCduw+Us4c= sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/opn": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
+      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/optipng-bin": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-3.1.4.tgz",
+      "integrity": "sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ= sha512-gsHt71VXDuI7ymHq5pBdzKS5Q1dcHLW6V6j13gnutO1mS8ezulK5Q+Xj/9/e6AwtjOResu2/UOBO/AiGrBo6+A==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "bin-build": "^2.0.0",
+        "bin-wrapper": "^3.0.0",
+        "logalot": "^2.0.0"
+      },
+      "bin": {
+        "optipng": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ordered-read-streams": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
+      "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s= sha512-xQvd8qvx9U1iYY9aVqPpoF5V9uaWJKV6ZGljkh/jkiNX0DiQsjbWvRumbh10QTMDE8DheaOEU8xi0szbrgjzcw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-stream": "^1.0.1",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/os-filter-obj": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-1.0.3.tgz",
+      "integrity": "sha1-WRUzDZDs7VV9LZOKMcbdIU2cY60= sha512-rohpWX8f46ASEOR77j8ZlJ2j5Rzg0j7gxC73ceZaDeMyE6H3nXnwgEjgg5ySlcT0bDuPUw7qcdWtd8Pzp/FJxg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M= sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "deprecated": "This package is no longer supported.",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-pipe": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz",
+      "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k= sha512-IA8SqjIGA8l9qOksXJvsvkeQ+VGb0TAzNCzvKvz9wt5wWLqfWbV6fXy43gpR2L4Te8sOq3S+Ql9biAaMKPdbtw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE= sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw= sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-glob/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-glob/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parseqs": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz",
+      "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/parseuri": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz",
+      "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc= sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0= sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw= sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o= sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/plur": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz",
+      "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo= sha512-WhcHk576xg9y/iv6RWOuroZgsqvCbJN+XGvAypCJwLAYs2iWDp5LUmvaCdV6JR2O0SMBf8l6p7A94AyLCFVMlQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "irregular-plurals": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/portscanner": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz",
+      "integrity": "sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y= sha512-CUxI7PHXrWJTIPmQs1YJFyD4uesS3om2jVcgS3T1eYPyd60s1l0m7tf35Fn5KRAtV51SAD7BmImaOGf6vwhiFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async": "1.5.2",
+        "is-number-like": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.0.0"
+      }
+    },
+    "node_modules/portscanner/node_modules/async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pretty-bytes": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
+      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk= sha512-yJAF+AjbHKlxQ8eezMd/34Mnj/YTQ3i6kLzvVsH4l/BfIFtp444n0wVbnsn66JimZ9uBofv815aRp1zCppxlWw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM= sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
+      "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.6.0",
+        "teleport": ">=0.2.0"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+      "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4= sha512-AY4g8t3LMboim0t6XWFdz6J5OuJ1ZNYu54SXihS/OMpgyCqYmcAJnWqkNSOjSjWmq3xxy+GF9uWQI2lI/7tKIA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/randomatic": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/randomatic/node_modules/is-number": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz",
+      "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.1",
+        "http-errors": "1.8.1",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "optional": true,
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/read-all-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
+      "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po= sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "pinkie-promise": "^2.0.0",
+        "readable-stream": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve": "^1.9.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-equal-shallow": "^0.1.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8= sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc= sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-finite": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resp-modifier": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz",
+      "integrity": "sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08= sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.2.0",
+        "minimatch": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rx": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/rxjs": {
+      "version": "5.5.12",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+      "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "symbol-observable": "1.0.1"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/safe-json-parse": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
+      "integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c= sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==",
+      "dev": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/sass": {
+      "version": "1.45.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.0.tgz",
+      "integrity": "sha512-ONy5bjppoohtNkFJRqdz1gscXamMzN3wQy1YH9qO2FiNpgjLhpz/IPRGg0PpCjyz/pWfCOaNEaiEGCcjOFAjqw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/sass/node_modules/immutable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/seek-bzip": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz",
+      "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "commander": "^2.8.1"
+      },
+      "bin": {
+        "seek-bunzip": "bin/seek-bunzip",
+        "seek-table": "bin/seek-bzip-table"
+      }
+    },
+    "node_modules/semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto= sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/semver-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz",
+      "integrity": "sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk= sha512-1vZcoRC+LPtHFkLUPyrabsATDSHerxW+hJBN8h04HZOZBuewbXaNROtUVdEPrTdZsWNq6sfsXDhd48GB2xTG4g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/semver-truncate": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz",
+      "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g= sha512-V1fGg9i4CL3qesB6U0L6XAm4xOJiHmt4QAacazumuasc03BvtFGIMCduv01JWQ69Nv+JST9TqhSCiJoxoY031w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "semver": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/semver-truncate/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/send/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/send/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/server-destroy": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
+      "integrity": "sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0= sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc= sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E= sha512-Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz",
+      "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/socket.io": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz",
+      "integrity": "sha512-9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "~4.1.0",
+        "engine.io": "~3.5.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
+        "socket.io-client": "2.4.0",
+        "socket.io-parser": "~3.4.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz",
+      "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/socket.io-client": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz",
+      "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "backo2": "1.0.2",
+        "component-bind": "1.0.0",
+        "component-emitter": "~1.3.0",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.5.0",
+        "has-binary2": "~1.0.2",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.6",
+        "parseuri": "0.0.6",
+        "socket.io-parser": "~3.3.0",
+        "to-array": "0.1.4"
+      }
+    },
+    "node_modules/socket.io-client/node_modules/debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/socket.io-client/node_modules/isarray": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+      "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/socket.io-client/node_modules/socket.io-parser": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz",
+      "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "component-emitter": "~1.3.0",
+        "debug": "~3.1.0",
+        "isarray": "2.0.1"
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz",
+      "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "component-emitter": "1.2.1",
+        "debug": "~4.1.0",
+        "isarray": "2.0.1"
+      }
+    },
+    "node_modules/socket.io-parser/node_modules/component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/socket.io-parser/node_modules/isarray": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+      "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/socket.io-parser/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/socket.io/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/socket.io/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
+      "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sparkles": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true,
+      "license": "CC-BY-3.0",
+      "optional": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "dev": true,
+      "license": "CC0-1.0",
+      "optional": true
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/squeak": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz",
+      "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM= sha512-YQL1ulInM+ev8nXX7vfXsCsDh6IqXlrremc1hzi77776BtpWgYJUMto3UM05GSAaGzJgWekszjoKDrVNB5XG+A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "chalk": "^1.0.0",
+        "console-stream": "^0.1.1",
+        "lpad-align": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stat-mode": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
+      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI= sha512-o+7DC0OM5Jt3+gratXXqfXf62V/CBoqQbT7Kp7jCxTYW2PLOB2/ZSGIfm9T5/QZe1Vw1MCbu6DoB6JnhVtxcJw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/statuses": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4= sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/stream-combiner2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4= sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/stream-throttle": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz",
+      "integrity": "sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM= sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "commander": "^2.2.0",
+        "limiter": "^1.0.5"
+      },
+      "bin": {
+        "throttleproxy": "bin/throttleproxy.js"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==",
+      "dev": true
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-bom-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
+      "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4= sha512-7jfJB9YpI2Z0aH3wu10ZqitvYJaE0s5IzFuWE+0pbb4Q/armTloEUShymkDO47YSLnjAW52mlXT//hs9wXNNJQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "first-chunk-stream": "^1.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-dirs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
+      "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA= sha512-+0QvOUTIs3xMridKraQAUSIp/kq7FRt/QjevB40+U6qJfeuPpTDQENFVfAbfZp59GpJkxY+yMdjR5cgKZyR2vg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "chalk": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "is-absolute": "^0.1.5",
+        "is-natural-number": "^2.0.0",
+        "minimist": "^1.1.0",
+        "sum-up": "^1.0.1"
+      },
+      "bin": {
+        "strip-dirs": "cli.js"
+      }
+    },
+    "node_modules/strip-dirs/node_modules/is-absolute": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+      "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8= sha512-Xi9/ZSn4NFapG8RP98iNPMOeaV3mXPisxKxzKtHVqr3g56j/fBn+yZmnxSVAA8lmZbl2J9b/a4kJvfU3hqQYgA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-relative": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-dirs/node_modules/is-relative": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
+      "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI= sha512-wBOr+rNM4gkAZqoLRJI4myw5WzzIdQosFAAbnvfXP5z1LyzgAI3ivOKehC5KfqlQJZoihVhirgtCBj378Eg8GA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "get-stdin": "^4.0.1"
+      },
+      "bin": {
+        "strip-indent": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-outer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sum-up": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz",
+      "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4= sha512-zw5P8gnhiqokJUWRdR6F4kIIIke0+ubQSGyYUY506GCbJWtV7F6Xuy0j6S125eSX2oF+a8KdivsZ8PlVEH0Mcw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "chalk": "^1.0.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/svgo": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
+      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U= sha512-jT/g9FFMoe9lu2IT6HtAxTA7RR2XOrmcrmCtGnyB/+GQnV6ZjNn+KOHZbZ35yL81+1F/aB6OeEsJztzBQ2EEwA==",
+      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "coa": "~1.0.1",
+        "colors": "~1.1.2",
+        "csso": "~2.3.1",
+        "js-yaml": "~3.7.0",
+        "mkdirp": "~0.5.1",
+        "sax": "~1.2.1",
+        "whet.extend": "~0.9.9"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svgo/node_modules/esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/svgo/node_modules/js-yaml": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
+      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A= sha512-eIlkGty7HGmntbV6P/ZlAsoncFLGsNoM27lkTzS+oneY/EiNhj+geqD9ezg/ip+SW6Var0BJU2JtV0vEUZpWVQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^2.6.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/svgo/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/symbol-observable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
+      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "bl": "^1.0.0",
+        "buffer-alloc": "^1.2.0",
+        "end-of-stream": "^1.0.0",
+        "fs-constants": "^1.0.0",
+        "readable-stream": "^2.3.0",
+        "to-buffer": "^1.1.1",
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/temp-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
+      "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tempfile": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz",
+      "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU= sha512-ZOn6nJUgvgC09+doCEF3oB+r3ag7kUvlsXEGX069QRD60p+P3uP7XG9N2/at+EyIRGSN//ZY3LyEotA1YpmjuA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "temp-dir": "^1.0.0",
+        "uuid": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tempfile/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/tfunk": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz",
+      "integrity": "sha512-eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^1.1.3",
+        "dlv": "^1.1.3"
+      }
+    },
+    "node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg= sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/through2-filter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+      "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw= sha512-miwWajb1B80NvIVKXFPN/o7+vJc4jYUvnZCwvhicRAoTxdD9wbcjri70j+BenCrN/JXEPKDjhpw4iY7yiNsCGg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/through2-filter/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/through2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/through2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/time-stamp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM= sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/timed-out": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
+      "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc= sha512-3RB4qgvPkxF/FGPnrzaWLhW1rxNK2sdH0mFjbhxkfTR6QXvcM3EtYm9L44UrhODZrZ+yhDXeMncLqi8QXn2MJg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tiny-lr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
+      "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "body": "^5.1.0",
+        "debug": "^3.1.0",
+        "faye-websocket": "~0.10.0",
+        "livereload-js": "^2.3.0",
+        "object-assign": "^4.1.0",
+        "qs": "^6.4.0"
+      }
+    },
+    "node_modules/tiny-lr/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/tiny-lr/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tiny-lr/node_modules/qs": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.2.tgz",
+      "integrity": "sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/to-absolute-glob": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
+      "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38= sha512-Vvl5x6zNf9iVG1QTWeknmWrKzZxaeKfIDRibrZCR3b2V/2NlFJuD2HV7P7AVjaKLZNqLPHqyr0jGrW0fTcxCPQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA= sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==",
+      "dev": true
+    },
+    "node_modules/to-buffer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM= sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE= sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us= sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/ua-parser-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.2.tgz",
+      "integrity": "sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==",
+      "deprecated": "You are using an outdated version of ua-parser-js. Please update to ua-parser-js v0.7.33 / v1.0.33 / v2.0.0 (or later) to avoid ReDoS vulnerability [CVE-2022-25927](https://github.com/advisories/GHSA-fhg7-m89q-25r3)",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo= sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/underscore.string": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
+      "integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "^1.0.3",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/unique-stream": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
+      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "through2-filter": "^3.0.0"
+      }
+    },
+    "node_modules/unique-stream/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/unique-stream/node_modules/through2-filter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
+      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "through2": "~2.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/unzip-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4= sha512-pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "prepend-http": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/url-regex": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz",
+      "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ= sha512-dQ9cJzMou5OKr6ZzfvwJkCq3rC72PNXhqz0v3EIhF4a3Np+ujr100AhUx2cKx5ei3iymoJpJrPB3sVSEMdqAeg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "ip-regex": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+      "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/v8flags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vali-date": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
+      "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY= sha512-sgECfZthyaCKW10N0fm27cg8HYTFK5qMWgypqkXMQ4Wbl/zZKx7xZICgcoxIIE+WFAP/MBL2EFwC/YvLxw3Zeg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/vinyl": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
+      "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= sha512-Ci3wnR2uuSAWFMSglZuB8Z2apBdtOyz8CV7dC6/U1XbltXBC+IuutUkXQISz01P+US2ouBuesSbV6zILZ6BuzQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "clone": "^1.0.0",
+        "clone-stats": "^0.0.1",
+        "replace-ext": "0.0.1"
+      },
+      "engines": {
+        "node": ">= 0.9"
+      }
+    },
+    "node_modules/vinyl-assign": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz",
+      "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU= sha512-jUVK1MkXgsZDdyUAy0rnrcmPeuR/ZLwsaS377zaaciz9SoDRVPIjHlUcYVcUAzLD+AolsLxMMwSe/VP77lAvow==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "object-assign": "^4.0.1",
+        "readable-stream": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/vinyl-fs": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
+      "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk= sha512-lxMlQW/Wxk/pwhooY3Ut0Q11OH5ZvZfV0Gg1c306fBNWznQ6ZeQaCdE7XX0O/PpGSqgAsHMBxwFgcGxiYW3hZg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "duplexify": "^3.2.0",
+        "glob-stream": "^5.3.2",
+        "graceful-fs": "^4.0.0",
+        "gulp-sourcemaps": "1.6.0",
+        "is-valid-glob": "^0.3.0",
+        "lazystream": "^1.0.0",
+        "lodash.isequal": "^4.0.0",
+        "merge-stream": "^1.0.0",
+        "mkdirp": "^0.5.0",
+        "object-assign": "^4.0.0",
+        "readable-stream": "^2.0.4",
+        "strip-bom": "^2.0.0",
+        "strip-bom-stream": "^1.0.0",
+        "through2": "^2.0.0",
+        "through2-filter": "^2.0.0",
+        "vali-date": "^1.0.0",
+        "vinyl": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/vinyl-fs/node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/vinyl/node_modules/replace-ext": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ware": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz",
+      "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q= sha512-Y2HUDMktriUm+SR2gZWxlrszcgtXExlhQYZ8QJNYbl22jum00KIUcHJ/h/sdAXhWTJcbSkiMYN9Z2tWbWYSrrw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "wrap-fn": "^0.1.0"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whet.extend": {
+      "version": "0.9.9",
+      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
+      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE= sha512-mmIPAft2vTgEILgPeZFqE/wWh24SEsR/k+N9fJ3Jxrz44iDFy9aemCxdksfURSHYFCLmvs/d/7Iso5XjPpNfrA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-fn": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz",
+      "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU= sha512-xDLdGx0M8JQw9QDAC9s5NUxtg9MI09F6Vbxa2LYoSoCvzJnx2n81YMIfykmXEGsUvuLaxnblJTzhSOjUOX37ag==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "co": "3.1.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/ws": {
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz",
+      "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs-parser/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "node_modules/yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk= sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==",
+      "dev": true,
+      "license": "MIT"
+    }
+  }
+}

From cb7a5a02bec854e1c8ee9ef1bf413d912fc5f30f Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 20:44:06 +0530
Subject: [PATCH 104/122] Deploy to ns

---
 deploy-minikube.sh | 64 ++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/deploy-minikube.sh b/deploy-minikube.sh
index 0bfc333..796e49f 100755
--- a/deploy-minikube.sh
+++ b/deploy-minikube.sh
@@ -16,7 +16,7 @@ NC='\033[0m' # No Color
 # Configuration
 IMAGE_NAME="publichealthch"
 IMAGE_TAG="latest"
-NAMESPACE="default"
+NAMESPACE="ph"
 
 # Function to check if command exists
 command_exists() {
@@ -65,72 +65,74 @@ docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .
 echo -e "${GREEN}✓ Docker image built successfully${NC}"
 
 # Create namespace if it doesn't exist
-kubectl create namespace ${NAMESPACE} 2>/dev/null || true
+echo "📁 Creating namespace '${NAMESPACE}'..."
+kubectl create namespace ${NAMESPACE} 2>/dev/null && echo -e "${GREEN}✓ Namespace '${NAMESPACE}' created${NC}" || echo -e "${GREEN}✓ Namespace '${NAMESPACE}' already exists${NC}"
 
 # Apply storage configurations
-echo "💾 Setting up storage..."
-kubectl apply -f k8s/storage.yaml
+echo "💾 Setting up storage in namespace '${NAMESPACE}'..."
+kubectl apply -f k8s/storage.yaml -n ${NAMESPACE}
 
 # Create secrets if they don't exist
-if ! kubectl get secret publichealth-secrets >/dev/null 2>&1; then
-    echo -e "${YELLOW}⚠️  Creating default secrets (CHANGE THESE IN PRODUCTION!)${NC}"
-    kubectl create secret generic publichealth-secrets \
+if ! kubectl get secret publichealth-secrets -n ${NAMESPACE} >/dev/null 2>&1; then
+    echo -e "${YELLOW}⚠️  Creating default secrets in namespace '${NAMESPACE}' (CHANGE THESE IN PRODUCTION!)${NC}"
+    kubectl create secret generic publichealth-secrets -n ${NAMESPACE} \
         --from-literal=django-secret-key='change-me-$(openssl rand -hex 32)' \
         --from-literal=database-url='postgres://publichealth:changeme@postgres-service:5432/publichealth' \
         --from-literal=postgres-password='changeme'
 else
-    echo -e "${GREEN}✓ Secrets already exist${NC}"
+    echo -e "${GREEN}✓ Secrets already exist in namespace '${NAMESPACE}'${NC}"
 fi
 
 # Deploy PostgreSQL
-echo "🐘 Deploying PostgreSQL..."
-kubectl apply -f k8s/postgres.yaml
+echo "🐘 Deploying PostgreSQL to namespace '${NAMESPACE}'..."
+kubectl apply -f k8s/postgres.yaml -n ${NAMESPACE}
 
 # Deploy Redis
-echo "🔴 Deploying Redis..."
-kubectl apply -f k8s/redis.yaml
+echo "🔴 Deploying Redis to namespace '${NAMESPACE}'..."
+kubectl apply -f k8s/redis.yaml -n ${NAMESPACE}
 
 # Wait for database to be ready
-echo "⏳ Waiting for PostgreSQL to be ready..."
-kubectl wait --for=condition=ready pod -l app=postgres --timeout=120s
+echo "⏳ Waiting for PostgreSQL to be ready in namespace '${NAMESPACE}'..."
+kubectl wait --for=condition=ready pod -l app=postgres --timeout=120s -n ${NAMESPACE}
 
 # Deploy the application
-echo "🚀 Deploying application..."
-kubectl apply -f k8s/deployment.yaml
+echo "🚀 Deploying application to namespace '${NAMESPACE}'..."
+kubectl apply -f k8s/deployment.yaml -n ${NAMESPACE}
 
 # Wait for deployment to be ready
-echo "⏳ Waiting for application to be ready..."
-kubectl wait --for=condition=available --timeout=300s deployment/publichealth
+echo "⏳ Waiting for application to be ready in namespace '${NAMESPACE}'..."
+kubectl wait --for=condition=available --timeout=300s deployment/publichealth -n ${NAMESPACE}
 
 # Run migrations
-echo "🔄 Running database migrations..."
-POD=$(kubectl get pod -l app=publichealth -o jsonpath="{.items[0].metadata.name}")
-kubectl exec -it ${POD} -- python manage.py migrate
+echo "🔄 Running database migrations in namespace '${NAMESPACE}'..."
+POD=$(kubectl get pod -l app=publichealth -n ${NAMESPACE} -o jsonpath="{.items[0].metadata.name}")
+kubectl exec -it ${POD} -n ${NAMESPACE} -- python manage.py migrate
 
 # Create superuser (optional)
 echo -e "${YELLOW}Do you want to create a superuser? (y/n)${NC}"
 read -r response
 if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-    kubectl exec -it ${POD} -- python manage.py createsuperuser
+    kubectl exec -it ${POD} -n ${NAMESPACE} -- python manage.py createsuperuser
 fi
 
 # Get the service URL
 MINIKUBE_IP=$(minikube ip)
-NODE_PORT=$(kubectl get svc publichealth-service -o jsonpath='{.spec.ports[0].nodePort}')
+NODE_PORT=$(kubectl get svc publichealth-service -n ${NAMESPACE} -o jsonpath='{.spec.ports[0].nodePort}')
 
 echo ""
-echo "✅ Deployment complete!"
+echo "✅ Deployment complete in namespace '${NAMESPACE}'!"
 echo ""
 echo "📌 Application URL: http://${MINIKUBE_IP}:${NODE_PORT}"
 echo "📌 Admin URL: http://${MINIKUBE_IP}:${NODE_PORT}/admin/"
 echo ""
-echo "🔍 Useful commands:"
-echo "  - View logs: kubectl logs -f deployment/publichealth"
-echo "  - Scale deployment: kubectl scale deployment publichealth --replicas=3"
-echo "  - Access pod shell: kubectl exec -it ${POD} -- /bin/bash"
-echo "  - Port forward: kubectl port-forward service/publichealth-service 8000:8000"
+echo "🔍 Useful commands (namespace: ${NAMESPACE}):"
+echo "  - View logs: kubectl logs -f deployment/publichealth -n ${NAMESPACE}"
+echo "  - Scale deployment: kubectl scale deployment publichealth --replicas=3 -n ${NAMESPACE}"
+echo "  - Access pod shell: kubectl exec -it ${POD} -n ${NAMESPACE} -- /bin/bash"
+echo "  - Port forward: kubectl port-forward service/publichealth-service 8000:8000 -n ${NAMESPACE}"
+echo "  - List resources: kubectl get all -n ${NAMESPACE}"
+echo "  - Delete namespace: kubectl delete namespace ${NAMESPACE}"
 echo "  - Stop Minikube: minikube stop"
-echo "  - Delete deployment: kubectl delete -f k8s/"
 echo ""
 echo "🌐 To access from your browser, you can also run:"
-echo "  minikube service publichealth-service"
+echo "  minikube service publichealth-service -n ${NAMESPACE}"

From b1a97da02cfa27e1a0d708fe9202584d971c6e2c Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 21:14:56 +0530
Subject: [PATCH 105/122] Fix package names for Debian python slim

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 80f66ca..c807fa5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,10 @@ ENV \
 RUN apt-get update \
    && apt-get upgrade -y \
    && apt-get install -y --no-install-recommends \
-      libpango-1.0-0 libpangoft2-1.0-0 \
+      libpango1.0-0 libpangoft2-1.0-0 \
       libmagic-dev libglib2.0-dev \
       gettext \
-      libpq-dev libfreetype-dev libjpeg-dev zlib1g-dev \
+      libpq-dev libfreetype6-dev libjpeg-dev zlib1g-dev \
       procps iproute2 curl \
       postgresql-client \
    && apt-get clean \
@@ -123,7 +123,7 @@ RUN ls -al /app/
 
 ### runtime image
 
-FROM base as runtime
+FROM base AS runtime
 
 COPY --from=backend-builder /venv /venv
 COPY --from=backend-builder /app /app

From d265e7fac0baa4b9ffcc74d68fd85edd9fdc9717 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 21:20:17 +0530
Subject: [PATCH 106/122] More package changes

---
 Dockerfile | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c807fa5..e5aea31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,17 +9,18 @@ ENV \
    PYTHONHASHSEED=random \
    PYTHONDONTWRITEBYTECODE=1
 
-RUN apt-get update \
-   && apt-get upgrade -y \
-   && apt-get install -y --no-install-recommends \
-      libpango1.0-0 libpangoft2-1.0-0 \
-      libmagic-dev libglib2.0-dev \
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+      libmagic1 \
+      libpq5 \
+      libjpeg62-turbo \
+      libfreetype6 \
+      zlib1g \
       gettext \
-      libpq-dev libfreetype6-dev libjpeg-dev zlib1g-dev \
-      procps iproute2 curl \
+      procps \
+      curl \
       postgresql-client \
-   && apt-get clean \
-   && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 
 ENV VIRTUAL_ENV=/venv
 
@@ -64,12 +65,16 @@ ENV \
    PIP_DISABLE_PIP_VERSION_CHECK=on \
    PIP_DEFAULT_TIMEOUT=100
 
-RUN apt-get update \
-   && apt-get upgrade -y \
-   && apt-get install -y --no-install-recommends \
-      build-essential gcc \
-   && apt-get clean \
-   && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+      build-essential \
+      gcc \
+      libmagic-dev \
+      libpq-dev \
+      libjpeg-dev \
+      libfreetype6-dev \
+      zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install python build tools.
 RUN pip install --upgrade pip wheel

From 0c947da845866d32aa982ba2a7187682876d578a Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 22:17:39 +0530
Subject: [PATCH 107/122] Fix image name

---
 k8s/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
index dcd1700..7303d87 100644
--- a/k8s/deployment.yaml
+++ b/k8s/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: publichealth
-        image: publichealth:latest
+        image: publichealth/publichealth:3.0.0
         imagePullPolicy: IfNotPresent  # For local Minikube images
         ports:
         - containerPort: 8000

From 4394b66386802208bcef2119a1c46d9b4b54a156 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 23:06:05 +0530
Subject: [PATCH 108/122] Changes for 3.0.0-7-g0c947da

---
 deploy-minikube.sh  | 2 +-
 k8s/deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy-minikube.sh b/deploy-minikube.sh
index 796e49f..8dc0125 100755
--- a/deploy-minikube.sh
+++ b/deploy-minikube.sh
@@ -14,7 +14,7 @@ YELLOW='\033[1;33m'
 NC='\033[0m' # No Color
 
 # Configuration
-IMAGE_NAME="publichealthch"
+IMAGE_NAME="publichealth"
 IMAGE_TAG="latest"
 NAMESPACE="ph"
 
diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
index 7303d87..8f6ec7d 100644
--- a/k8s/deployment.yaml
+++ b/k8s/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: publichealth
-        image: publichealth/publichealth:3.0.0
+        image: publichealth/publichealth:3.0.0-7-g0c947da
         imagePullPolicy: IfNotPresent  # For local Minikube images
         ports:
         - containerPort: 8000

From 157639babd0f4006c7980b8560054e954b0ef827 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 23:19:03 +0530
Subject: [PATCH 109/122] Fix LOG_DIR

---
 k8s/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
index 8f6ec7d..b6b668c 100644
--- a/k8s/deployment.yaml
+++ b/k8s/deployment.yaml
@@ -38,7 +38,7 @@ spec:
         - name: WAGTAILADMIN_BASE_URL
           value: "http://localhost:30080"
         - name: LOG_DIR
-          value: "/var/log/wagtail"
+          value: "/tmp"
         - name: ALLOWED_HOSTS
           valueFrom:
             secretKeyRef:

From dbf19fb8ae106c6087c7373e408e8022be7725b5 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 23:22:06 +0530
Subject: [PATCH 110/122] Update image version

---
 k8s/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
index b6b668c..43d1c57 100644
--- a/k8s/deployment.yaml
+++ b/k8s/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: publichealth
-        image: publichealth/publichealth:3.0.0-7-g0c947da
+        image: publichealth/publichealth:3.0.1
         imagePullPolicy: IfNotPresent  # For local Minikube images
         ports:
         - containerPort: 8000

From e90793cb8d6d8244ae85e2ad799fcc6f76461bd1 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 24 Sep 2025 23:32:26 +0530
Subject: [PATCH 111/122] Fix image url

---
 k8s/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
index 43d1c57..15419b4 100644
--- a/k8s/deployment.yaml
+++ b/k8s/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: publichealth
-        image: publichealth/publichealth:3.0.1
+        image: https://harbor.k8s.ungleich.ch/publichealth/publichealth:3.0.1
         imagePullPolicy: IfNotPresent  # For local Minikube images
         ports:
         - containerPort: 8000

From 8e7dcf24c0b1309e219ea39a254b44984c01d783 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 25 Sep 2025 00:06:20 +0530
Subject: [PATCH 112/122] Fix image url, tls, secret_key name

---
 k8s/deployment.yaml    | 4 ++--
 k8s/ingress-nginx.yaml | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
index 15419b4..5d76060 100644
--- a/k8s/deployment.yaml
+++ b/k8s/deployment.yaml
@@ -16,14 +16,14 @@ spec:
     spec:
       containers:
       - name: publichealth
-        image: https://harbor.k8s.ungleich.ch/publichealth/publichealth:3.0.1
+        image: harbor.k8s.ungleich.ch/publichealth/publichealth:3.0.1
         imagePullPolicy: IfNotPresent  # For local Minikube images
         ports:
         - containerPort: 8000
         env:
         - name: DJANGO_SETTINGS_MODULE
           value: "publichealth.settings.production"
-        - name: DJANGO_SECRET_KEY
+        - name: SECRET_KEY
           valueFrom:
             secretKeyRef:
               name: publichealth-secrets
diff --git a/k8s/ingress-nginx.yaml b/k8s/ingress-nginx.yaml
index 77e5357..5000605 100644
--- a/k8s/ingress-nginx.yaml
+++ b/k8s/ingress-nginx.yaml
@@ -15,11 +15,6 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
-  tls:
-  - hosts:
-    - ph.django-hosting.ch
-    - www.ph.django-hosting.ch
-    secretName: publichealth-tls
   rules:
   - host: ph.django-hosting.ch
     http:

From 41cc7eeaf188cac0691c23737414b5510116b224 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 3 Nov 2025 17:38:01 +0530
Subject: [PATCH 113/122] Use standard POSTGRES* constants for the database

---
 publichealth/settings/production.py | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/publichealth/settings/production.py b/publichealth/settings/production.py
index 58f1c19..c701ca0 100644
--- a/publichealth/settings/production.py
+++ b/publichealth/settings/production.py
@@ -76,23 +76,16 @@ if 'MEDIA_DIR' in env:
     MEDIA_ROOT = env['MEDIA_DIR']
 
 
-# Database
-
-if 'DATABASE_URL' in os.environ:
-    DATABASES = {'default': dj_database_url.config()}
-
-else:
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.postgresql_psycopg2',
-            'NAME': env.get('PGDATABASE', APP_NAME),
-            'CONN_MAX_AGE': 600,  # number of seconds database connections should persist for
-
-            # User, host and port can be configured by the PGUSER, PGHOST and
-            # PGPORT environment variables (these get picked up by libpq).
-        }
+DATABASES = {
+    'default': {
+        'ENGINE': os.environ.get('SQL_ENGINE', 'django.db.backends.postgresql'),
+        'NAME': os.environ.get('POSTGRES_DB', 'app'),
+        'USER': os.environ.get('POSTGRES_USER', 'app'),
+        'PASSWORD': os.environ.get('POSTGRES_PASSWORD', ''),
+        'HOST': os.environ.get('POSTGRES_HOST', 'localhost'),
+        'PORT': os.environ.get('POSTGRES_PORT', 5432),
     }
-
+}
 
 # Email via ESP
 

From fbe3ad5f3c4bf49fe3b0c77e768c5eb016d3de00 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 3 Nov 2025 18:53:07 +0530
Subject: [PATCH 114/122] Fix SECRET_KEY & STATIC_ROOT

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e5aea31..40f9b22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -108,13 +108,13 @@ RUN mkdir /app
 
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \
-   DJANGO_SECRET_KEY=dummy \
-   DJANGO_STATIC_ROOT=/app/static ./manage.py collectstatic --no-input
+   SECRET_KEY=dummy \
+   STATIC_ROOT=/app/static ./manage.py collectstatic --no-input
 
 # Compile messages if locale directory exists
 RUN if [ -d "locale" ]; then \
    . /venv/bin/activate && \
-   DJANGO_SECRET_KEY=dummy \
+   SECRET_KEY=dummy \
    ./manage.py compilemessages; \
    fi
 
@@ -142,4 +142,4 @@ WORKDIR /app
 ENV PATH="/venv/bin:$PATH"
 
 ADD entrypoint /entrypoint
-ENTRYPOINT ["/entrypoint"]
\ No newline at end of file
+ENTRYPOINT ["/entrypoint"]

From a1f87613bba18f725c65d886d2cb4468bbe88f78 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sat, 6 Dec 2025 00:18:24 +0530
Subject: [PATCH 115/122] Fix permissions

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 40f9b22..64c8c5f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -134,7 +134,8 @@ COPY --from=backend-builder /venv /venv
 COPY --from=backend-builder /app /app
 
 RUN groupadd --gid 1001 app \
-   && useradd --home-dir /app --shell /bin/bash --gid app --uid 1001 app
+   && useradd --home-dir /app --shell /bin/bash --gid app --uid 1001 app \
+   && chown -R app:app /app
 USER app
 WORKDIR /app
 

From 770fc1873d724c39074f210f438c1b8eb907814b Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sat, 7 Mar 2026 09:04:47 +0530
Subject: [PATCH 116/122] Fix Static dir

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 64c8c5f..75334e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -109,7 +109,7 @@ RUN mkdir /app
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \
    SECRET_KEY=dummy \
-   STATIC_ROOT=/app/static ./manage.py collectstatic --no-input
+   STATIC_DIR=/app/static ./manage.py collectstatic --no-input
 
 # Compile messages if locale directory exists
 RUN if [ -d "locale" ]; then \

From 50acf681ee4a892acc316b5196c4acaee6c0bfb3 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sat, 7 Mar 2026 09:53:57 +0530
Subject: [PATCH 117/122] Fix error handlers and compress issue

---
 Dockerfile                          |  6 ++++++
 publichealth/settings/production.py | 21 ++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 75334e0..2042730 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -111,6 +111,12 @@ RUN . /venv/bin/activate && \
    SECRET_KEY=dummy \
    STATIC_DIR=/app/static ./manage.py collectstatic --no-input
 
+# Compress static files offline (required for COMPRESS_OFFLINE=True in production).
+RUN . /venv/bin/activate && \
+   SECRET_KEY=dummy \
+   STATIC_DIR=/app/static \
+   ./manage.py compress --force
+
 # Compile messages if locale directory exists
 RUN if [ -d "locale" ]; then \
    . /venv/bin/activate && \
diff --git a/publichealth/settings/production.py b/publichealth/settings/production.py
index c701ca0..c8f0294 100644
--- a/publichealth/settings/production.py
+++ b/publichealth/settings/production.py
@@ -158,42 +158,37 @@ LOGGING = {
     },
     'formatters': {
         'default': {
-            'verbose': '[%(asctime)s] (%(process)d/%(thread)d) %(name)s %(levelname)s: %(message)s'
+            'format': '[%(asctime)s] (%(process)d/%(thread)d) %(name)s %(levelname)s: %(message)s'
         },
         'simple': {
-            'verbose': '[%(asctime)s] (%(process)d/%(thread)d) %(name)s %(levelname)s: %(message)s'
+            'format': '[%(asctime)s] (%(process)d/%(thread)d) %(name)s %(levelname)s: %(message)s'
         }
     },
     'loggers': {
         'feedler': {
-            'handlers':     [],
+            'handlers':     ['console'],
             'level':        'INFO',
             'propagate':    False,
-            'formatter':    'verbose',
         },
         'publichealth': {
-            'handlers':     [],
+            'handlers':     ['console'],
             'level':        'INFO',
             'propagate':    False,
-            'formatter':    'verbose',
         },
         'wagtail': {
-            'handlers':     [],
+            'handlers':     ['console'],
             'level':        'WARNING',
             'propagate':    False,
-            'formatter':    'verbose',
         },
         'django.request': {
-            'handlers':     ['mail_admins'],
-            'level':        'ERROR',
+            'handlers':     ['console', 'mail_admins'],
+            'level':        'WARNING',
             'propagate':    False,
-            'formatter':    'verbose',
         },
         'django.security': {
-            'handlers':     ['mail_admins'],
+            'handlers':     ['console', 'mail_admins'],
             'level':        'ERROR',
             'propagate':    False,
-            'formatter':    'verbose',
         },
     },
 }

From de2145f6a741fa3cf936fd18c67a41b4b098f5a6 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 18 Mar 2026 23:23:27 +0530
Subject: [PATCH 118/122] Fix non-responsive images after Wagtail 4.0 upgrade

Wagtail 4.0+ removed the .rich-text wrapper div from richtext output,
so the .rich-text img CSS selector no longer matched images in article
content. Add .article-body img and .lead img selectors to restore
max-width: 100% responsive behavior.
---
 publichealth/static/css/modules/_articles.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/publichealth/static/css/modules/_articles.scss b/publichealth/static/css/modules/_articles.scss
index 0324ebc..c54a9a3 100644
--- a/publichealth/static/css/modules/_articles.scss
+++ b/publichealth/static/css/modules/_articles.scss
@@ -58,7 +58,11 @@ section {
 }
 
 // Responsive image/video classes
-.rich-text img {
+// Note: Wagtail 4.0+ removed the .rich-text wrapper div,
+// so we target container elements directly.
+.rich-text img,
+.article-body img,
+.lead img {
     max-width: 100%;
     height: auto;
 }

From fc955b6d671e705c1548a3806491932a9f490183 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 7 May 2026 14:02:27 +0530
Subject: [PATCH 119/122] Add fix_rich_text management command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Repairs Wagtail rich-text content with inline/entity tags wrapping
block-level elements that crashes the Draftail editor's HTML->ContentState
converter on the page edit form. Detects broken blocks by feeding them
through the same converter that fails, then either inverts the nesting
(<a><p>X</p></a> -> <p><a>X</a></p> — preserves links/styling) or
unwraps the offending tag, and verifies the result before saving as a new
page revision. Defaults to dry-run; --apply writes, --publish publishes,
--diff-file logs full before/after HTML.
---
 publichealth/home/management/__init__.py      |   0
 .../home/management/commands/__init__.py      |   0
 .../home/management/commands/fix_rich_text.py | 275 ++++++++++++++++++
 3 files changed, 275 insertions(+)
 create mode 100644 publichealth/home/management/__init__.py
 create mode 100644 publichealth/home/management/commands/__init__.py
 create mode 100644 publichealth/home/management/commands/fix_rich_text.py

diff --git a/publichealth/home/management/__init__.py b/publichealth/home/management/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/publichealth/home/management/commands/__init__.py b/publichealth/home/management/commands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/publichealth/home/management/commands/fix_rich_text.py b/publichealth/home/management/commands/fix_rich_text.py
new file mode 100644
index 0000000..b558333
--- /dev/null
+++ b/publichealth/home/management/commands/fix_rich_text.py
@@ -0,0 +1,275 @@
+"""
+Find and repair Wagtail rich-text content with unbalanced inline-style or
+entity tags that crashes the Draftail editor's HTML->ContentState converter
+with `AssertionError: End of block reached without closing inline style /
+entity elements`.
+
+The Draftail converter is strict about tag balance; older Wagtail editors
+or Word/Outlook paste sometimes left tags unclosed. The fix re-serializes
+through BeautifulSoup (Python's stdlib html.parser) which auto-closes
+inline tags, then verifies the output by feeding it back through the same
+converter — only saves if the result is accepted.
+
+Defaults to dry-run. Pass --apply to write changes; add --publish to
+publish the new revision (otherwise it's saved as a draft for editor
+review). --page-id limits to a single page.
+"""
+
+from django.core.management.base import BaseCommand
+from bs4 import BeautifulSoup
+
+from wagtail.models import Page
+from wagtail.fields import RichTextField, StreamField
+from wagtail.blocks import RichTextBlock
+from wagtail.admin.rich_text.converters.contentstate import ContentstateConverter
+from wagtail.rich_text import features as feature_registry
+
+
+def _build_converter():
+    feature_registry.get_default_features()
+    plugins_by_editor = getattr(feature_registry, "plugins_by_editor", {})
+    draftail_plugins = list(plugins_by_editor.get("draftail", {}).keys())
+    default_features = feature_registry.get_default_features()
+    all_features = sorted(set(draftail_plugins) | set(default_features))
+    return ContentstateConverter(features=all_features), all_features
+
+
+def _is_broken(converter, html):
+    if not html:
+        return False
+    try:
+        converter.from_database_format(html)
+    except AssertionError:
+        return True
+    except Exception:
+        return True
+    return False
+
+
+# Tags that the Draftail converter tracks per-block. If any of these wrap
+# a block-level element, the inline/entity span crosses block boundaries
+# and trips the converter's end-of-block assertion.
+_INLINE_TAGS = {"b", "i", "em", "strong", "code", "s", "sub", "sup", "u"}
+_ENTITY_TAGS = {"a"}
+_PROBLEM_WRAPPERS = list(_INLINE_TAGS | _ENTITY_TAGS)
+_BLOCK_TAGS = ["p", "h1", "h2", "h3", "h4", "h5", "h6", "hr",
+               "ul", "ol", "li", "blockquote", "div"]
+
+
+def _has_significant_other_content(tag, block_child):
+    """Return True if `tag` has children besides `block_child` that aren't whitespace."""
+    from bs4 import NavigableString
+    for c in tag.children:
+        if c is block_child:
+            continue
+        if isinstance(c, NavigableString):
+            if c.strip():
+                return True
+        else:  # another Tag
+            return True
+    return False
+
+
+def _repair(html):
+    soup = BeautifulSoup(html, "html.parser")
+    # Iteratively fix inline/entity tags that contain a block-level descendant.
+    # If the tag has exactly one block child and nothing else significant
+    # (e.g. <a><p>...</p></a>), invert the nesting to preserve the styling/link:
+    #   <a><p>X</p></a>  ->  <p><a>X</a></p>
+    # Otherwise, unwrap the offending tag (drop the styling, keep the content).
+    while True:
+        offender = None
+        for tag in soup.find_all(_PROBLEM_WRAPPERS):
+            if tag.find(_BLOCK_TAGS):
+                offender = tag
+                break
+        if offender is None:
+            break
+
+        block_children = [c for c in offender.children if getattr(c, "name", None) in _BLOCK_TAGS]
+        if len(block_children) == 1 and not _has_significant_other_content(offender, block_children[0]):
+            block = block_children[0]
+            new_wrapper = soup.new_tag(offender.name, attrs=dict(offender.attrs))
+            for child in list(block.contents):
+                new_wrapper.append(child.extract())
+            block.append(new_wrapper)
+            offender.unwrap()
+        else:
+            offender.unwrap()
+    return str(soup)
+
+
+class Command(BaseCommand):
+    help = "Find and fix Wagtail rich-text fields with unbalanced tags."
+
+    def add_arguments(self, parser):
+        parser.add_argument("--apply", action="store_true",
+                            help="Save changes (default: dry-run, report only).")
+        parser.add_argument("--publish", action="store_true",
+                            help="Publish the cleaned revision (otherwise save as draft).")
+        parser.add_argument("--page-id", type=int, default=None,
+                            help="Limit to a single page id.")
+        parser.add_argument("--diff-file", type=str, default=None,
+                            help="Write full before/after HTML and a unified diff per block to this path.")
+
+    def handle(self, *args, **options):
+        import difflib
+        apply_changes = options["apply"]
+        publish = options["publish"]
+        page_id = options["page_id"]
+        diff_path = options["diff_file"]
+        diff_fp = open(diff_path, "w", encoding="utf-8") if diff_path else None
+
+        def emit_diff(page, field_name, sub_path, old, new):
+            if diff_fp is None:
+                return
+            diff_fp.write("=" * 78 + "\n")
+            diff_fp.write(f"Page {page.id}: {page.title}\n")
+            diff_fp.write(f"  url_path: {page.url_path}\n")
+            diff_fp.write(f"  field:    {field_name}{sub_path}\n")
+            diff_fp.write("-" * 78 + "\n")
+            diff_fp.write("OLD:\n")
+            diff_fp.write(old + "\n")
+            diff_fp.write("-" * 78 + "\n")
+            diff_fp.write("NEW:\n")
+            diff_fp.write(new + "\n")
+            diff_fp.write("-" * 78 + "\n")
+            diff_fp.write("UNIFIED DIFF:\n")
+            old_lines = old.splitlines(keepends=True) or [""]
+            new_lines = new.splitlines(keepends=True) or [""]
+            for line in difflib.unified_diff(old_lines, new_lines,
+                                             fromfile="old", tofile="new", n=1):
+                diff_fp.write(line if line.endswith("\n") else line + "\n")
+            diff_fp.write("\n")
+
+        converter, features = _build_converter()
+        self.stdout.write(f"Detector using {len(features)} features.")
+        self.stdout.write(f"Mode: {'APPLY' + (' + PUBLISH' if publish else ' (draft)') if apply_changes else 'DRY RUN'}")
+        if diff_fp:
+            self.stdout.write(f"Writing full diffs to: {diff_path}")
+
+        qs = Page.objects.all()
+        if page_id is not None:
+            qs = qs.filter(id=page_id)
+
+        total = qs.count()
+        self.stdout.write(f"Scanning {total} page(s)...")
+
+        pages_with_issues = 0
+        pages_fixed = 0
+        pages_partial = 0
+        blocks_fixed = 0
+        blocks_unfixable = 0
+
+        for page in qs.iterator(chunk_size=50):
+            specific = page.specific
+            changes = []          # successful: (field, sub_path, old, new)
+            unfixable = []        # broken but repair didn't help: (field, sub_path)
+            stream_replacements = {}  # field_name -> {index: new_html}
+            rich_text_field_updates = {}  # field_name -> new_html
+
+            for field in specific._meta.get_fields():
+                if isinstance(field, RichTextField):
+                    html = getattr(specific, field.name, "") or ""
+                    if not _is_broken(converter, html):
+                        continue
+                    fixed = _repair(html)
+                    if _is_broken(converter, fixed):
+                        unfixable.append((field.name, ""))
+                        continue
+                    changes.append((field.name, "", html, fixed))
+                    rich_text_field_updates[field.name] = fixed
+
+                elif isinstance(field, StreamField):
+                    stream_value = getattr(specific, field.name, None)
+                    if stream_value is None:
+                        continue
+                    try:
+                        children = list(stream_value)
+                    except Exception:
+                        continue
+                    field_replacements = {}
+                    for i, child in enumerate(children):
+                        if not isinstance(child.block, RichTextBlock):
+                            continue
+                        v = child.value
+                        html = v.source if hasattr(v, "source") else str(v)
+                        if not _is_broken(converter, html):
+                            continue
+                        fixed = _repair(html)
+                        if _is_broken(converter, fixed):
+                            unfixable.append((field.name, f"[{i}]"))
+                            continue
+                        changes.append((field.name, f"[{i}]({child.block_type})", html, fixed))
+                        field_replacements[i] = fixed
+                    if field_replacements:
+                        stream_replacements[field.name] = (children, field_replacements)
+
+            if not changes and not unfixable:
+                continue
+
+            pages_with_issues += 1
+            if changes and not unfixable:
+                pages_fixed += 1
+            elif changes and unfixable:
+                pages_partial += 1
+            blocks_fixed += len(changes)
+            blocks_unfixable += len(unfixable)
+
+            self.stdout.write("")
+            self.stdout.write(f"Page {page.id}: {page.title!r}  [{specific.__class__.__name__}]")
+            self.stdout.write(f"  url_path: {page.url_path}")
+            for field_name, sub_path, old, new in changes:
+                self.stdout.write(f"  FIX  {field_name}{sub_path}")
+                self.stdout.write(f"       old: {old[:160]!r}{'...' if len(old) > 160 else ''}")
+                self.stdout.write(f"       new: {new[:160]!r}{'...' if len(new) > 160 else ''}")
+                emit_diff(page, field_name, sub_path, old, new)
+            for field_name, sub_path in unfixable:
+                self.stdout.write(f"  SKIP {field_name}{sub_path}  (auto-repair did not produce valid output)")
+
+            if not apply_changes:
+                continue
+
+            # Apply
+            for field_name, new_value in rich_text_field_updates.items():
+                setattr(specific, field_name, new_value)
+
+            for field_name, (children, replacements) in stream_replacements.items():
+                # Rebuild the StreamField as a list of raw {type, value} dicts.
+                # Using `get_prep_value` for unchanged children gives the
+                # JSON-serializable raw form Wagtail expects on assign;
+                # replacements are already raw HTML strings (correct form for
+                # RichTextBlock).
+                new_list = []
+                for i, child in enumerate(children):
+                    if i in replacements:
+                        new_list.append({"type": child.block_type, "value": replacements[i]})
+                    else:
+                        raw = child.block.get_prep_value(child.value)
+                        new_list.append({"type": child.block_type, "value": raw})
+                setattr(specific, field_name, new_list)
+
+            try:
+                revision = specific.save_revision()
+                if publish:
+                    revision.publish()
+                self.stdout.write(self.style.SUCCESS(
+                    f"  -> revision {revision.id} saved{' & published' if publish else ' (draft)'}"
+                ))
+            except Exception as e:
+                self.stdout.write(self.style.ERROR(f"  -> SAVE FAILED: {type(e).__name__}: {e}"))
+
+        self.stdout.write("")
+        self.stdout.write("=" * 70)
+        self.stdout.write(f"Pages with issues:    {pages_with_issues}")
+        self.stdout.write(f"Pages fully fixable:  {pages_fixed}")
+        self.stdout.write(f"Pages partial:        {pages_partial}  (some blocks unfixable)")
+        self.stdout.write(f"Blocks fixed:         {blocks_fixed}")
+        self.stdout.write(f"Blocks unfixable:     {blocks_unfixable}")
+        if not apply_changes:
+            self.stdout.write("")
+            self.stdout.write("DRY RUN — no changes saved. Re-run with --apply to write.")
+
+        if diff_fp:
+            diff_fp.close()
+            self.stdout.write(f"Diff log: {diff_path}")

From 9b728e4e8670b690656708e3ddef585c57ee6903 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 7 May 2026 14:09:44 +0530
Subject: [PATCH 120/122] Sanitize rich-text on save to prevent Draftail editor
 500s
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a pre-save signal handler on Wagtail's Revision model (and a
belt-and-braces handler on Page) that runs the same repair logic as the
fix_rich_text management command before content is persisted. Catches
inline/entity tags wrapping block-level elements — typically introduced
by Word/Outlook paste — that crash the Draftail editor on the next page
edit.

Refactors the repair core into a reusable module
(publichealth/home/rich_text_sanitizer.py) shared between the signal and
the management command. The fast path (is_broken converter check) makes
the signal a near no-op for clean content.
---
 publichealth/home/apps.py                     |   8 +
 .../home/management/commands/fix_rich_text.py |  81 ++--------
 publichealth/home/rich_text_sanitizer.py      | 112 ++++++++++++++
 publichealth/home/signals.py                  | 140 ++++++++++++++++++
 4 files changed, 270 insertions(+), 71 deletions(-)
 create mode 100644 publichealth/home/apps.py
 create mode 100644 publichealth/home/rich_text_sanitizer.py
 create mode 100644 publichealth/home/signals.py

diff --git a/publichealth/home/apps.py b/publichealth/home/apps.py
new file mode 100644
index 0000000..044cbf2
--- /dev/null
+++ b/publichealth/home/apps.py
@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class HomeConfig(AppConfig):
+    name = "publichealth.home"
+
+    def ready(self):
+        from . import signals  # noqa: F401
diff --git a/publichealth/home/management/commands/fix_rich_text.py b/publichealth/home/management/commands/fix_rich_text.py
index b558333..e4e027d 100644
--- a/publichealth/home/management/commands/fix_rich_text.py
+++ b/publichealth/home/management/commands/fix_rich_text.py
@@ -16,87 +16,26 @@ review). --page-id limits to a single page.
 """
 
 from django.core.management.base import BaseCommand
-from bs4 import BeautifulSoup
 
 from wagtail.models import Page
 from wagtail.fields import RichTextField, StreamField
 from wagtail.blocks import RichTextBlock
-from wagtail.admin.rich_text.converters.contentstate import ContentstateConverter
-from wagtail.rich_text import features as feature_registry
+
+from publichealth.home.rich_text_sanitizer import (
+    get_converter, is_broken, repair as _repair,
+)
 
 
 def _build_converter():
-    feature_registry.get_default_features()
-    plugins_by_editor = getattr(feature_registry, "plugins_by_editor", {})
-    draftail_plugins = list(plugins_by_editor.get("draftail", {}).keys())
-    default_features = feature_registry.get_default_features()
-    all_features = sorted(set(draftail_plugins) | set(default_features))
-    return ContentstateConverter(features=all_features), all_features
+    converter = get_converter()
+    # Best-effort: list the features the converter was built with for the
+    # mode banner. Falls back gracefully if the converter doesn't expose them.
+    features = sorted(getattr(converter, "features", []))
+    return converter, features
 
 
 def _is_broken(converter, html):
-    if not html:
-        return False
-    try:
-        converter.from_database_format(html)
-    except AssertionError:
-        return True
-    except Exception:
-        return True
-    return False
-
-
-# Tags that the Draftail converter tracks per-block. If any of these wrap
-# a block-level element, the inline/entity span crosses block boundaries
-# and trips the converter's end-of-block assertion.
-_INLINE_TAGS = {"b", "i", "em", "strong", "code", "s", "sub", "sup", "u"}
-_ENTITY_TAGS = {"a"}
-_PROBLEM_WRAPPERS = list(_INLINE_TAGS | _ENTITY_TAGS)
-_BLOCK_TAGS = ["p", "h1", "h2", "h3", "h4", "h5", "h6", "hr",
-               "ul", "ol", "li", "blockquote", "div"]
-
-
-def _has_significant_other_content(tag, block_child):
-    """Return True if `tag` has children besides `block_child` that aren't whitespace."""
-    from bs4 import NavigableString
-    for c in tag.children:
-        if c is block_child:
-            continue
-        if isinstance(c, NavigableString):
-            if c.strip():
-                return True
-        else:  # another Tag
-            return True
-    return False
-
-
-def _repair(html):
-    soup = BeautifulSoup(html, "html.parser")
-    # Iteratively fix inline/entity tags that contain a block-level descendant.
-    # If the tag has exactly one block child and nothing else significant
-    # (e.g. <a><p>...</p></a>), invert the nesting to preserve the styling/link:
-    #   <a><p>X</p></a>  ->  <p><a>X</a></p>
-    # Otherwise, unwrap the offending tag (drop the styling, keep the content).
-    while True:
-        offender = None
-        for tag in soup.find_all(_PROBLEM_WRAPPERS):
-            if tag.find(_BLOCK_TAGS):
-                offender = tag
-                break
-        if offender is None:
-            break
-
-        block_children = [c for c in offender.children if getattr(c, "name", None) in _BLOCK_TAGS]
-        if len(block_children) == 1 and not _has_significant_other_content(offender, block_children[0]):
-            block = block_children[0]
-            new_wrapper = soup.new_tag(offender.name, attrs=dict(offender.attrs))
-            for child in list(block.contents):
-                new_wrapper.append(child.extract())
-            block.append(new_wrapper)
-            offender.unwrap()
-        else:
-            offender.unwrap()
-    return str(soup)
+    return is_broken(html)
 
 
 class Command(BaseCommand):
diff --git a/publichealth/home/rich_text_sanitizer.py b/publichealth/home/rich_text_sanitizer.py
new file mode 100644
index 0000000..b037366
--- /dev/null
+++ b/publichealth/home/rich_text_sanitizer.py
@@ -0,0 +1,112 @@
+"""
+Detect and repair Wagtail rich-text content with inline/entity tags wrapping
+block-level elements — a pattern that crashes the Draftail editor's
+HTML->ContentState converter (`AssertionError: End of block reached without
+closing inline style/entity elements`).
+
+Used by:
+- the `fix_rich_text` management command, for one-off cleanup of legacy data
+- the pre-save signal handlers in `signals.py`, to prevent future paste-from-Word
+  content from re-introducing the same patterns
+"""
+from bs4 import BeautifulSoup, NavigableString
+
+from wagtail.admin.rich_text.converters.contentstate import ContentstateConverter
+from wagtail.rich_text import features as feature_registry
+
+
+_INLINE_TAGS = {"b", "i", "em", "strong", "code", "s", "sub", "sup", "u"}
+_ENTITY_TAGS = {"a"}
+_PROBLEM_WRAPPERS = list(_INLINE_TAGS | _ENTITY_TAGS)
+_BLOCK_TAGS = ["p", "h1", "h2", "h3", "h4", "h5", "h6", "hr",
+               "ul", "ol", "li", "blockquote", "div"]
+
+
+_converter = None
+
+
+def get_converter():
+    """Return a ContentstateConverter loaded with every Draftail-registered feature.
+
+    Lazy-built once per process — the converter init walks the feature registry
+    which isn't ready at import time.
+    """
+    global _converter
+    if _converter is None:
+        feature_registry.get_default_features()
+        plugins_by_editor = getattr(feature_registry, "plugins_by_editor", {})
+        draftail_plugins = list(plugins_by_editor.get("draftail", {}).keys())
+        default_features = feature_registry.get_default_features()
+        all_features = sorted(set(draftail_plugins) | set(default_features))
+        _converter = ContentstateConverter(features=all_features)
+    return _converter
+
+
+def is_broken(html):
+    """Return True if running `html` through the Draftail converter would crash."""
+    if not html:
+        return False
+    try:
+        get_converter().from_database_format(html)
+    except Exception:
+        return True
+    return False
+
+
+def _has_significant_other_content(tag, block_child):
+    for c in tag.children:
+        if c is block_child:
+            continue
+        if isinstance(c, NavigableString):
+            if c.strip():
+                return True
+        else:
+            return True
+    return False
+
+
+def repair(html):
+    """Return repaired HTML by lifting block-wrapping inline/entity tags.
+
+    For every inline (b/i/em/strong/code/s/sub/sup/u) or entity (a) tag that
+    contains a block descendant:
+    - If it has exactly one block child and nothing else significant, invert
+      the nesting: `<a><p>X</p></a>` -> `<p><a>X</a></p>` (preserves link/style).
+    - Otherwise, unwrap the offending tag (drops the styling, keeps content).
+    """
+    soup = BeautifulSoup(html, "html.parser")
+    while True:
+        offender = None
+        for tag in soup.find_all(_PROBLEM_WRAPPERS):
+            if tag.find(_BLOCK_TAGS):
+                offender = tag
+                break
+        if offender is None:
+            break
+
+        block_children = [c for c in offender.children if getattr(c, "name", None) in _BLOCK_TAGS]
+        if len(block_children) == 1 and not _has_significant_other_content(offender, block_children[0]):
+            block = block_children[0]
+            new_wrapper = soup.new_tag(offender.name, attrs=dict(offender.attrs))
+            for child in list(block.contents):
+                new_wrapper.append(child.extract())
+            block.append(new_wrapper)
+            offender.unwrap()
+        else:
+            offender.unwrap()
+    return str(soup)
+
+
+def sanitize_if_needed(html):
+    """Return repaired HTML if the input would crash the editor, else the input unchanged.
+
+    Fast path: if the converter accepts the HTML, return it untouched (no parsing).
+    Repair path: if the cleaned HTML still wouldn't load, return the original to
+    avoid making things worse.
+    """
+    if not is_broken(html):
+        return html
+    cleaned = repair(html)
+    if is_broken(cleaned):
+        return html
+    return cleaned
diff --git a/publichealth/home/signals.py b/publichealth/home/signals.py
new file mode 100644
index 0000000..95b26b4
--- /dev/null
+++ b/publichealth/home/signals.py
@@ -0,0 +1,140 @@
+"""
+Pre-save signal handlers that sanitize rich-text content before it lands
+in the database.
+
+The Draftail editor renders the *latest revision* of a page (not the page
+row), so the most important hook is `Revision.pre_save` — that catches every
+admin draft-save and publish flow. `Page.pre_save` is a belt-and-braces
+catch for direct model writes (shell, migrations, etc).
+"""
+import json
+
+from django.db.models.signals import pre_save
+from django.dispatch import receiver
+
+from wagtail.models import Page
+from wagtail.fields import RichTextField, StreamField
+from wagtail.blocks import RichTextBlock
+
+from .rich_text_sanitizer import sanitize_if_needed
+
+try:
+    from wagtail.models import Revision
+except ImportError:  # pragma: no cover — fallback for older Wagtail layouts
+    Revision = None
+
+
+def _sanitize_stream_items(items, stream_block):
+    """Sanitize a list of {type, value, id} dicts in place. Return True if any changed."""
+    changed = False
+    child_blocks = getattr(stream_block, "child_blocks", {})
+    for item in items:
+        if not isinstance(item, dict):
+            continue
+        block_def = child_blocks.get(item.get("type"))
+        if isinstance(block_def, RichTextBlock):
+            value = item.get("value")
+            if isinstance(value, str):
+                cleaned = sanitize_if_needed(value)
+                if cleaned != value:
+                    item["value"] = cleaned
+                    changed = True
+    return changed
+
+
+@receiver(pre_save)
+def sanitize_revision_content(sender, instance, **kwargs):
+    """Sanitize rich-text values inside Revision.content before it's persisted."""
+    if Revision is None or sender is not Revision:
+        return
+    ct = getattr(instance, "content_type", None)
+    if ct is None:
+        return
+    model_class = ct.model_class()
+    if model_class is None or not issubclass(model_class, Page):
+        return
+
+    raw = instance.content
+    # Wagtail 4+ stores Revision.content as a JSONField (dict). Older Wagtail
+    # versions and any string-cast paths may give a JSON-encoded string.
+    if isinstance(raw, dict):
+        content_dict = raw
+        was_string = False
+    elif isinstance(raw, str):
+        try:
+            content_dict = json.loads(raw)
+        except (TypeError, ValueError):
+            return
+        was_string = True
+    else:
+        return
+    if not isinstance(content_dict, dict):
+        return
+
+    changed = False
+    for field in model_class._meta.get_fields():
+        if isinstance(field, RichTextField):
+            value = content_dict.get(field.name)
+            if isinstance(value, str):
+                cleaned = sanitize_if_needed(value)
+                if cleaned != value:
+                    content_dict[field.name] = cleaned
+                    changed = True
+        elif isinstance(field, StreamField):
+            value = content_dict.get(field.name)
+            stream_block = field.stream_block
+            if isinstance(value, list):
+                if _sanitize_stream_items(value, stream_block):
+                    changed = True
+            elif isinstance(value, str):
+                try:
+                    items = json.loads(value)
+                except (TypeError, ValueError):
+                    continue
+                if isinstance(items, list) and _sanitize_stream_items(items, stream_block):
+                    content_dict[field.name] = json.dumps(items)
+                    changed = True
+
+    if changed:
+        instance.content = json.dumps(content_dict) if was_string else content_dict
+
+
+@receiver(pre_save)
+def sanitize_page_fields(sender, instance, **kwargs):
+    """Sanitize rich-text fields on the Page model itself, for direct writes."""
+    if not isinstance(instance, Page):
+        return
+
+    for field in instance._meta.get_fields():
+        if isinstance(field, RichTextField):
+            value = getattr(instance, field.name, "") or ""
+            cleaned = sanitize_if_needed(value)
+            if cleaned != value:
+                setattr(instance, field.name, cleaned)
+        elif isinstance(field, StreamField):
+            stream_value = getattr(instance, field.name, None)
+            if stream_value is None:
+                continue
+            try:
+                children = list(stream_value)
+            except Exception:
+                continue
+            replacements = {}
+            for i, child in enumerate(children):
+                if not isinstance(child.block, RichTextBlock):
+                    continue
+                v = child.value
+                html = v.source if hasattr(v, "source") else str(v)
+                cleaned = sanitize_if_needed(html)
+                if cleaned != html:
+                    replacements[i] = cleaned
+            if not replacements:
+                continue
+            new_list = []
+            for i, child in enumerate(children):
+                if i in replacements:
+                    new_list.append({"type": child.block_type, "value": replacements[i]})
+                else:
+                    raw = child.block.get_prep_value(child.value)
+                    new_list.append({"type": child.block_type, "value": raw})
+            setattr(instance, field.name, new_list)

From 460c5bcfbc1784c4df6423830c64717dab99b3b6 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 3 Jun 2026 15:35:00 +0530
Subject: [PATCH 121/122] Stack rich-text logos vertically after Wagtail 4.0
 upgrade

Wagtail 4.0+ no longer wraps embedded rich-text images in a <p> block, so
consecutive float-aligned images (supporter/sponsor logos) collapsed next to
each other instead of stacking. Add clear:both to .richtext-image.left/.right
so each aligned image drops below the previous float, restoring the
pre-upgrade vertical stacking while still allowing text to wrap beside a
single aligned image.
---
 publichealth/static/css/modules/_articles.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/publichealth/static/css/modules/_articles.scss b/publichealth/static/css/modules/_articles.scss
index c54a9a3..120ddcf 100644
--- a/publichealth/static/css/modules/_articles.scss
+++ b/publichealth/static/css/modules/_articles.scss
@@ -66,11 +66,18 @@ section {
     max-width: 100%;
     height: auto;
 }
+// Wagtail 4.0+ no longer wraps embedded rich-text images in a <p> block, so
+// consecutive float-aligned images (e.g. supporter/sponsor logos) collapse
+// next to each other instead of stacking. `clear: both` makes each aligned
+// image drop below the previous float, restoring the pre-upgrade vertical
+// stacking while still letting text wrap beside a single aligned image.
 .richtext-image.left{
     float:left;
+    clear:both;
 }
 .richtext-image.right{
     float:right;
+    clear:both;
 }
 .responsive-object {
     position: relative;

From a398a3c20d9e771d6c5dbb7957b842edcfa35457 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 3 Jun 2026 18:56:54 +0530
Subject: [PATCH 122/122] Stack rich-text logos as blocks so trailing text sits
 below them

The previous clear:both fix stacked the logos but, because the images were
still float:left, trailing text (captions, contact block) wrapped beside the
last logo. Render rich-text images as block elements (display:block;float:none)
so following text drops below the logos. Right-aligned images keep their
position via margin-left:auto.
---
 publichealth/static/css/modules/_articles.scss | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/publichealth/static/css/modules/_articles.scss b/publichealth/static/css/modules/_articles.scss
index 120ddcf..3948829 100644
--- a/publichealth/static/css/modules/_articles.scss
+++ b/publichealth/static/css/modules/_articles.scss
@@ -67,17 +67,19 @@ section {
     height: auto;
 }
 // Wagtail 4.0+ no longer wraps embedded rich-text images in a <p> block, so
-// consecutive float-aligned images (e.g. supporter/sponsor logos) collapse
-// next to each other instead of stacking. `clear: both` makes each aligned
-// image drop below the previous float, restoring the pre-upgrade vertical
-// stacking while still letting text wrap beside a single aligned image.
-.richtext-image.left{
-    float:left;
+// floating them made supporter/sponsor logos collapse side by side and let
+// trailing text (captions, contact blocks) wrap beside the last logo. Render
+// rich-text images as stacked block elements instead: logos sit one under the
+// other and any following text drops below them. The left/right alignment
+// classes now position the block via auto margins rather than floating.
+.richtext-image.left,
+.richtext-image.right{
+    display:block;
+    float:none;
     clear:both;
 }
 .richtext-image.right{
-    float:right;
-    clear:both;
+    margin-left:auto;
 }
 .responsive-object {
     position: relative;