From 59e1ef5074f14b17c444efeac0a4dba2009c063d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 16 Nov 2019 12:03:35 +0100
Subject: [PATCH 01/88] Bump react-dom from 16.11.0 to 16.12.0 in /website
 (#6958)

Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.11.0 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/website/package.json b/website/package.json
index 09f458bbe..9e585883c 100644
--- a/website/package.json
+++ b/website/package.json
@@ -16,7 +16,7 @@
     "lz-string": "1.4.4",
     "prop-types": "15.7.2",
     "react": "16.11.0",
-    "react-dom": "16.11.0"
+    "react-dom": "16.12.0"
   },
   "devDependencies": {
     "@babel/preset-env": "7.7.1",
diff --git a/website/yarn.lock b/website/yarn.lock
index 9ef7c3ed8..af30d31a5 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -6392,15 +6392,15 @@ react-dev-utils@^9.0.1:
     strip-ansi "5.2.0"
     text-table "0.2.0"
 
-react-dom@16.11.0, react-dom@^16.2.0, react-dom@^16.8.4:
-  version "16.11.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.11.0.tgz#7e7c4a5a85a569d565c2462f5d345da2dd849af5"
-  integrity sha512-nrRyIUE1e7j8PaXSPtyRKtz+2y9ubW/ghNgqKFHHAHaeP0fpF5uXR+sq8IMRHC+ZUxw7W9NyCDTBtwWxvkb0iA==
+react-dom@16.12.0, react-dom@^16.2.0, react-dom@^16.8.4:
+  version "16.12.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11"
+  integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.17.0"
+    scheduler "^0.18.0"
 
 react-error-overlay@^6.0.2:
   version "6.0.2"
@@ -6771,10 +6771,10 @@ sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-scheduler@^0.17.0:
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe"
-  integrity sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA==
+scheduler@^0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"
+  integrity sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"

From b2c3baf0082086876c2b2a3b5976151865fa9b9a Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sat, 16 Nov 2019 19:27:31 +0800
Subject: [PATCH 02/88] Fix a code example in docs (#6890)

---
 docs/rationale.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/rationale.md b/docs/rationale.md
index 67115f679..1994a4047 100644
--- a/docs/rationale.md
+++ b/docs/rationale.md
@@ -130,13 +130,11 @@ class OrderLine {
 
 One final thing: TC39 has [not yet decided if decorators come before or after `export`](https://github.com/tc39/proposal-decorators/issues/69). In the meantime, Prettier supports both:
 
+<!-- prettier-ignore -->
 ```js
-@decorator
-export class Foo {}
+@decorator export class Foo {}
 
-export
-@decorator
-class Foo {}
+export @decorator class Foo {}
 ```
 
 ### Semicolons

From 992e410aa742e7ee0156fcaa8ea6fe30e3f37b3f Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Sat, 16 Nov 2019 12:29:06 +0100
Subject: [PATCH 03/88] Update stable docs

---
 website/versioned_docs/version-stable/plugins.md   | 1 +
 website/versioned_docs/version-stable/rationale.md | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/website/versioned_docs/version-stable/plugins.md b/website/versioned_docs/version-stable/plugins.md
index 7e6e16d04..578754017 100644
--- a/website/versioned_docs/version-stable/plugins.md
+++ b/website/versioned_docs/version-stable/plugins.md
@@ -46,6 +46,7 @@ Providing at least one path to `--plugin-search-dir`/`pluginSearchDirs` turns of
 - [`@prettier/plugin-pug`](https://github.com/prettier/plugin-pug) by [**@Shinigami92**](https://github.com/Shinigami92)
 - [`@prettier/plugin-ruby`](https://github.com/prettier/plugin-ruby)
 - [`@prettier/plugin-swift`](https://github.com/prettier/plugin-swift)
+- [`@prettier/plugin-xml`](https://github.com/prettier/plugin-xml)
 
 ## Community Plugins
 
diff --git a/website/versioned_docs/version-stable/rationale.md b/website/versioned_docs/version-stable/rationale.md
index 292931df8..0d1174455 100644
--- a/website/versioned_docs/version-stable/rationale.md
+++ b/website/versioned_docs/version-stable/rationale.md
@@ -131,13 +131,11 @@ class OrderLine {
 
 One final thing: TC39 has [not yet decided if decorators come before or after `export`](https://github.com/tc39/proposal-decorators/issues/69). In the meantime, Prettier supports both:
 
+<!-- prettier-ignore -->
 ```js
-@decorator
-export class Foo {}
+@decorator export class Foo {}
 
-export
-@decorator
-class Foo {}
+export @decorator class Foo {}
 ```
 
 ### Semicolons

From 21ad05d3c83d12ff15391125787ed22c3c85c95f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 16 Nov 2019 12:49:42 +0100
Subject: [PATCH 04/88] Bump react from 16.11.0 to 16.12.0 in /website (#6959)

Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.11.0 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index 9e585883c..e9b466cc9 100644
--- a/website/package.json
+++ b/website/package.json
@@ -15,7 +15,7 @@
     "lodash.groupby": "4.6.0",
     "lz-string": "1.4.4",
     "prop-types": "15.7.2",
-    "react": "16.11.0",
+    "react": "16.12.0",
     "react-dom": "16.12.0"
   },
   "devDependencies": {
diff --git a/website/yarn.lock b/website/yarn.lock
index af30d31a5..bff083f9c 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -6412,10 +6412,10 @@ react-is@^16.8.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.1.tgz#0612786bf19df406502d935494f0450b40b8294f"
   integrity sha512-BXUMf9sIOPXXZWqr7+c5SeOKJykyVr2u0UDzEf4LNGc6taGkQe1A9DFD07umCIXz45RLr9oAAwZbAJ0Pkknfaw==
 
-react@16.11.0, react@^16.2.0, react@^16.8.4:
-  version "16.11.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.11.0.tgz#d294545fe62299ccee83363599bf904e4a07fdbb"
-  integrity sha512-M5Y8yITaLmU0ynd0r1Yvfq98Rmll6q8AxaEe88c8e7LxO8fZ2cNgmFt0aGAS9wzf1Ao32NKXtCl+/tVVtkxq6g==
+react@16.12.0, react@^16.2.0, react@^16.8.4:
+  version "16.12.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
+  integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"

From cf78341e98e5ee9ba64a4c003092e8e8a7307d0d Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sun, 17 Nov 2019 02:28:04 +0800
Subject: [PATCH 05/88] Remove `prettylint` (#6978)

---
 package.json |   3 +-
 yarn.lock    | 143 +++------------------------------------------------
 2 files changed, 7 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index 7536c355f..fa7493177 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,6 @@
     "jest-watch-typeahead": "0.4.2",
     "mkdirp": "0.5.1",
     "prettier": "1.19.1",
-    "prettylint": "1.0.0",
     "rimraf": "3.0.0",
     "rollup": "1.26.3",
     "rollup-plugin-babel": "4.3.3",
@@ -125,7 +124,7 @@
     "perf-benchmark": "yarn && yarn build && cross-env NODE_ENV=production node ./dist/bin-prettier.js --debug-benchmark --loglevel debug ${PERF_FILE:-./index.js} > /dev/null",
     "check-types": "tsc",
     "lint": "cross-env EFF_NO_LINK_RULES=true eslint . --format friendly",
-    "lint-docs": "prettylint {.,docs,website,website/blog}/*.md",
+    "lint-docs": "prettier {.,docs,website,website/blog}/*.md --check",
     "lint-dist": "eslint --no-eslintrc --no-ignore --env=browser \"dist/!(bin-prettier|index|third-party).js\"",
     "build": "node --max-old-space-size=3072 ./scripts/build/build.js",
     "build-docs": "node ./scripts/build-docs.js",
diff --git a/yarn.lock b/yarn.lock
index 5641f7017..ada104c0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1069,10 +1069,6 @@ angular-html-parser@1.3.0:
   dependencies:
     tslib "^1.9.3"
 
-ansi-escapes@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
-
 ansi-escapes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
@@ -1164,10 +1160,6 @@ array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
 
-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"
-
 array-includes@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
@@ -1701,22 +1693,11 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
 camelcase@5.3.1, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -2102,12 +2083,6 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  dependencies:
-    array-find-index "^1.0.1"
-
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
@@ -2163,7 +2138,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
@@ -2447,16 +2422,6 @@ eslint-formatter-friendly@7.0.0:
     strip-ansi "5.2.0"
     text-table "0.2.0"
 
-eslint-formatter-pretty@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-1.3.0.tgz#985d9e41c1f8475f4a090c5dbd2dfcf2821d607e"
-  dependencies:
-    ansi-escapes "^2.0.0"
-    chalk "^2.1.0"
-    log-symbols "^2.0.0"
-    plur "^2.1.2"
-    string-width "^2.0.0"
-
 eslint-import-resolver-node@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
@@ -2497,13 +2462,6 @@ eslint-plugin-prettier@3.1.1:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-prettier@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz#33e4e228bdb06142d03c560ce04ec23f6c767dd7"
-  dependencies:
-    fast-diff "^1.1.1"
-    jest-docblock "^21.0.0"
-
 eslint-plugin-react@7.16.0:
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz#9928e4f3e2122ed3ba6a5b56d0303ba3e41d8c09"
@@ -2786,7 +2744,7 @@ fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
 
-fast-diff@^1.1.1, fast-diff@^1.1.2:
+fast-diff@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
@@ -3035,10 +2993,6 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-
 get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
@@ -3120,7 +3074,7 @@ globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
-globby@6.1.0, globby@^6.1.0:
+globby@6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
   dependencies:
@@ -3337,10 +3291,6 @@ ignore@4.0.6, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
 
-ignore@^3.3.5:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
-
 import-fresh@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
@@ -3367,12 +3317,6 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  dependencies:
-    repeating "^2.0.0"
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -3444,10 +3388,6 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-irregular-plurals@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -3907,10 +3847,6 @@ jest-docblock@24.9.0:
   dependencies:
     detect-newline "^2.1.0"
 
-jest-docblock@^21.0.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
-
 jest-docblock@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
@@ -4507,12 +4443,6 @@ lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.1
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-log-symbols@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.1.0.tgz#f35fa60e278832b538dc4dddcbb478a45d3e3be6"
-  dependencies:
-    chalk "^2.0.1"
-
 loose-envify@^1.0.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -4520,13 +4450,6 @@ loose-envify@^1.0.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
 lru-cache@^4.0.1, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -4593,10 +4516,6 @@ map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
-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"
-
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -4630,21 +4549,6 @@ memory-fs@^0.4.0, memory-fs@^0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  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"
-
 merge-stream@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
@@ -4741,7 +4645,7 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -4968,7 +4872,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -5427,12 +5331,6 @@ platform@^1.3.3:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
 
-plur@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
-  dependencies:
-    irregular-plurals "^1.0.0"
-
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@@ -5528,18 +5426,6 @@ pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-prettylint@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/prettylint/-/prettylint-1.0.0.tgz#b71720ad9733e098fdd8ebea90c61cda33371aa1"
-  dependencies:
-    eslint-formatter-pretty "^1.3.0"
-    eslint-plugin-prettier "^2.2.0"
-    globby "^6.1.0"
-    ignore "^3.3.5"
-    lines-and-columns "^1.1.6"
-    meow "^3.7.0"
-    tslib "^1.8.0"
-
 private@^0.1.6, private@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
@@ -5743,13 +5629,6 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
 regenerate-unicode-properties@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
@@ -6561,12 +6440,6 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  dependencies:
-    get-stdin "^4.0.1"
-
 strip-json-comments@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
@@ -6788,10 +6661,6 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@@ -6809,7 +6678,7 @@ trough@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.1.tgz#a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"
 
-tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==

From dd16afd1e794a798c4172b81201c35edcc558d84 Mon Sep 17 00:00:00 2001
From: Ryan Tsao <ryan.j.tsao@gmail.com>
Date: Sun, 17 Nov 2019 01:45:55 -0800
Subject: [PATCH 06/88] Fix redundant parens around JSX inside NewExpressions
 (#6980)

---
 src/language-js/needs-parens.js            |  1 +
 tests/jsx/__snapshots__/jsfmt.spec.js.snap | 24 ++++++++++++++++++++++
 tests/jsx/parens.js                        |  3 +++
 3 files changed, 28 insertions(+)

diff --git a/src/language-js/needs-parens.js b/src/language-js/needs-parens.js
index 6e92bda88..48bc74b2f 100644
--- a/src/language-js/needs-parens.js
+++ b/src/language-js/needs-parens.js
@@ -745,6 +745,7 @@ function needsParens(path, options) {
           parent.type !== "AssignmentPattern" &&
           parent.type !== "BinaryExpression" &&
           parent.type !== "CallExpression" &&
+          parent.type !== "NewExpression" &&
           parent.type !== "ConditionalExpression" &&
           parent.type !== "ExpressionStatement" &&
           parent.type !== "JsExpressionRoot" &&
diff --git a/tests/jsx/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/__snapshots__/jsfmt.spec.js.snap
index 31cb9d86f..bb0fb27bf 100644
--- a/tests/jsx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx/__snapshots__/jsfmt.spec.js.snap
@@ -4097,6 +4097,9 @@ f?.(<div/>);
 (<div/>)();
 (<div/>)?.();
 
+new Foo(<Component/>);
+new Foo((<Component/>))
+
 =====================================output=====================================
 a = [
   <path
@@ -4115,6 +4118,9 @@ f?.(<div />);
 (<div />)();
 (<div />)?.();
 
+new Foo(<Component />);
+new Foo(<Component />);
+
 ================================================================================
 `;
 
@@ -4143,6 +4149,9 @@ f?.(<div/>);
 (<div/>)();
 (<div/>)?.();
 
+new Foo(<Component/>);
+new Foo((<Component/>))
+
 =====================================output=====================================
 a = [
   <path
@@ -4161,6 +4170,9 @@ f?.(<div />);
 (<div />)();
 (<div />)?.();
 
+new Foo(<Component />);
+new Foo(<Component />);
+
 ================================================================================
 `;
 
@@ -4189,6 +4201,9 @@ f?.(<div/>);
 (<div/>)();
 (<div/>)?.();
 
+new Foo(<Component/>);
+new Foo((<Component/>))
+
 =====================================output=====================================
 a = [
   <path
@@ -4207,6 +4222,9 @@ f?.(<div />);
 (<div />)();
 (<div />)?.();
 
+new Foo(<Component />);
+new Foo(<Component />);
+
 ================================================================================
 `;
 
@@ -4235,6 +4253,9 @@ f?.(<div/>);
 (<div/>)();
 (<div/>)?.();
 
+new Foo(<Component/>);
+new Foo((<Component/>))
+
 =====================================output=====================================
 a = [
   <path
@@ -4253,6 +4274,9 @@ f?.(<div />);
 (<div />)();
 (<div />)?.();
 
+new Foo(<Component />);
+new Foo(<Component />);
+
 ================================================================================
 `;
 
diff --git a/tests/jsx/parens.js b/tests/jsx/parens.js
index aacd73797..b5b4a5bc4 100644
--- a/tests/jsx/parens.js
+++ b/tests/jsx/parens.js
@@ -14,3 +14,6 @@ a = [
 f?.(<div/>);
 (<div/>)();
 (<div/>)?.();
+
+new Foo(<Component/>);
+new Foo((<Component/>))

From b7bcffbfd096f06a0569f2cac7cb0403abe725bc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 17 Nov 2019 11:02:55 +0100
Subject: [PATCH 07/88] Bump postcss-values-parser from 1.5.0 to 2.0.1 (#6804)

Bumps [postcss-values-parser](https://github.com/shellscape/postcss-values-parser) from 1.5.0 to 2.0.1.
- [Release notes](https://github.com/shellscape/postcss-values-parser/releases)
- [Commits](https://github.com/shellscape/postcss-values-parser/compare/v1.5.0...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index fa7493177..0fc1e0ccc 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "postcss-media-query-parser": "0.2.3",
     "postcss-scss": "2.0.0",
     "postcss-selector-parser": "2.2.3",
-    "postcss-values-parser": "1.5.0",
+    "postcss-values-parser": "2.0.1",
     "regexp-util": "1.2.2",
     "remark-math": "1.0.6",
     "remark-parse": "5.0.0",
diff --git a/yarn.lock b/yarn.lock
index ada104c0d..9df29de08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5364,9 +5364,10 @@ postcss-selector-parser@2.2.3:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-values-parser@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz#5d9fa63e2bcb0179ce48f3235303765eb89f3047"
+postcss-values-parser@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
+  integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==
   dependencies:
     flatten "^1.0.2"
     indexes-of "^1.0.1"

From 56b4ce349f8141e87a5e2e3d25462577f323fc8f Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sun, 17 Nov 2019 19:05:19 +0800
Subject: [PATCH 08/88] Enable `replace-array-includes-with-indexof` for all
 bundles (#6982)

---
 scripts/build/bundler.js |  3 +++
 scripts/build/config.js  | 10 ++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/build/bundler.js b/scripts/build/bundler.js
index 7cdc86387..8d85bb8bb 100644
--- a/scripts/build/bundler.js
+++ b/scripts/build/bundler.js
@@ -42,6 +42,9 @@ function getBabelConfig(bundle) {
     plugins: bundle.babelPlugins || [],
     compact: bundle.type === "plugin" ? false : "auto"
   };
+  config.plugins.push(
+    require.resolve("./babel-plugins/replace-array-includes-with-indexof")
+  );
   if (bundle.type === "core") {
     config.plugins.push(
       require.resolve("./babel-plugins/transform-custom-require")
diff --git a/scripts/build/config.js b/scripts/build/config.js
index 1a00fd073..acfc0ef22 100644
--- a/scripts/build/config.js
+++ b/scripts/build/config.js
@@ -2,9 +2,6 @@
 
 const path = require("path");
 const PROJECT_ROOT = path.resolve(__dirname, "../..");
-const babelReplaceArrayIncludesWithIndexof = require.resolve(
-  "./babel-plugins/replace-array-includes-with-indexof"
-);
 
 /**
  * @typedef {Object} Bundle
@@ -29,8 +26,7 @@ const babelReplaceArrayIncludesWithIndexof = require.resolve(
 const parsers = [
   {
     input: "src/language-js/parser-babylon.js",
-    target: "universal",
-    babelPlugins: [babelReplaceArrayIncludesWithIndexof]
+    target: "universal"
   },
   {
     input: "src/language-js/parser-flow.js",
@@ -40,7 +36,6 @@ const parsers = [
   {
     input: "src/language-js/parser-typescript.js",
     target: "universal",
-    babelPlugins: [babelReplaceArrayIncludesWithIndexof],
     replace: {
       'require("@microsoft/typescript-etw")': "undefined"
     }
@@ -130,8 +125,7 @@ const parsers = [
           replacement: require.resolve("lines-and-columns")
         }
       ]
-    },
-    babelPlugins: [babelReplaceArrayIncludesWithIndexof]
+    }
   }
 ].map(parser => {
   const name = getFileOutput(parser)

From ce9f4a4a2c70f97f4557f2307ad92ea3b15f88b3 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sun, 17 Nov 2019 22:01:17 +0800
Subject: [PATCH 09/88] Fix babel includes plugin (#6985)

---
 .../replace-array-includes-with-indexof.js        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/scripts/build/babel-plugins/replace-array-includes-with-indexof.js b/scripts/build/babel-plugins/replace-array-includes-with-indexof.js
index 18514344b..bc3700156 100644
--- a/scripts/build/babel-plugins/replace-array-includes-with-indexof.js
+++ b/scripts/build/babel-plugins/replace-array-includes-with-indexof.js
@@ -2,14 +2,16 @@
 
 //
 // BEFORE:
-//   [__something__].includes(__something__)
-//   CONSTANT_CASE.includes(__something__)
+//   foo.includes(bar)
 //
 // AFTER:
-//   [__something__].indexOf(__something__) !== -1
-//   CONSTANT_CASE.indexOf(__something__) !== -1
+//   foo.indexOf(bar) !== -1
 //
 
+// this plugin also replace `string.includes`,
+// filename is not changed
+// because it's temporary use for node@4 support
+
 module.exports = ({ types: t }) => ({
   visitor: {
     CallExpression(path) {
@@ -17,11 +19,6 @@ module.exports = ({ types: t }) => ({
       const callee = node.callee;
       if (
         t.isMemberExpression(callee, { computed: false }) &&
-        (t.isArrayExpression(callee.object) ||
-          (t.isIdentifier(callee.object) &&
-            (/^[A-Z_]+$/.test(callee.object.name) ||
-              // https://github.com/eemeli/yaml/blob/1005d01/src/Anchors.js#L45
-              callee.object.name === "names"))) &&
         t.isIdentifier(callee.property, { name: "includes" })
       ) {
         callee.property.name = "indexOf";

From a1423e05b4eaba37764f4c3592be0e3515ac20f8 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 18 Nov 2019 00:29:11 +0800
Subject: [PATCH 10/88] Switch `rollup-plugin-json` to `@rollup/plugin-json`
 (#6987)

---
 package.json             |  2 +-
 scripts/build/bundler.js |  2 +-
 yarn.lock                | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 0fc1e0ccc..f9d921f45 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
     "@babel/core": "7.7.2",
     "@babel/preset-env": "7.7.1",
     "@rollup/plugin-alias": "2.2.0",
+    "@rollup/plugin-json": "4.0.0",
     "@rollup/plugin-replace": "2.2.1",
     "babel-loader": "8.0.6",
     "benchmark": "2.1.4",
@@ -101,7 +102,6 @@
     "rollup": "1.26.3",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.1.0",
-    "rollup-plugin-json": "4.0.0",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-terser": "5.1.2",
diff --git a/scripts/build/bundler.js b/scripts/build/bundler.js
index 8d85bb8bb..b7a98e210 100644
--- a/scripts/build/bundler.js
+++ b/scripts/build/bundler.js
@@ -8,7 +8,7 @@ const resolve = require("rollup-plugin-node-resolve");
 const alias = require("@rollup/plugin-alias");
 const commonjs = require("rollup-plugin-commonjs");
 const nodeGlobals = require("rollup-plugin-node-globals");
-const json = require("rollup-plugin-json");
+const json = require("@rollup/plugin-json");
 const replace = require("@rollup/plugin-replace");
 const { terser } = require("rollup-plugin-terser");
 const babel = require("rollup-plugin-babel");
diff --git a/yarn.lock b/yarn.lock
index 9df29de08..fb3c3a622 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -743,6 +743,13 @@
   dependencies:
     slash "^3.0.0"
 
+"@rollup/plugin-json@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.0.0.tgz#4462e83c7ad5544bef4a601a6e8450daedc4b69b"
+  integrity sha512-Z65CtEVWv40+ri4CvmswyhtuUtki9yP5p0UJN/GyCKKyU4jRuDS9CG0ZuV7/XuS7zGkoajyE7E4XBEaC4GW62A==
+  dependencies:
+    rollup-pluginutils "^2.5.0"
+
 "@rollup/plugin-replace@2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.2.1.tgz#94af20cb3d70cccdcec991d1f97dd373936ec544"
@@ -5891,13 +5898,6 @@ rollup-plugin-commonjs@10.1.0:
     resolve "^1.11.0"
     rollup-pluginutils "^2.8.1"
 
-rollup-plugin-json@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
-  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
-  dependencies:
-    rollup-pluginutils "^2.5.0"
-
 rollup-plugin-node-globals@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-globals/-/rollup-plugin-node-globals-1.4.0.tgz#5e1f24a9bb97c0ef51249f625e16c7e61b7c020b"

From 262f27bc6177b22cf78dd0292072ef0a9d71bef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Dessoude?= <clement.dessoude@gmail.com>
Date: Mon, 18 Nov 2019 06:41:44 +0100
Subject: [PATCH 11/88] Fix handling comments in labeled statements (#6984)

---
 changelog_unreleased/javascript/pr-6984.md   | 23 ++++++++++++++++++++
 src/language-js/comments.js                  |  3 ++-
 tests/label/__snapshots__/jsfmt.spec.js.snap |  9 ++++++++
 tests/label/comment.js                       |  5 +++++
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/javascript/pr-6984.md

diff --git a/changelog_unreleased/javascript/pr-6984.md b/changelog_unreleased/javascript/pr-6984.md
new file mode 100644
index 000000000..854baa2d8
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-6984.md
@@ -0,0 +1,23 @@
+#### Fix formatting of labeled statements with comments ([#6994](https://github.com/prettier/prettier/pull/6984) by [@clement26695](https://github.com/clement26695))
+
+Formatting of comments in labeled statements was not stable
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+loop1:
+//test
+const i = 3;
+
+// Prettier stable (first output)
+loop1: //test
+const i = 3;
+
+// Prettier stable (second output)
+//test
+loop1: const i = 3;
+
+// Prettier master (first output)
+//test
+loop1: const i = 3;
+```
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 5447b7f7a..f5cefb375 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -66,7 +66,8 @@ function handleOwnLineComment(comment, text, options, ast, isLastComment) {
       precedingNode,
       comment,
       options
-    )
+    ) ||
+    handleLabeledStatementComments(enclosingNode, comment)
   ) {
     return true;
   }
diff --git a/tests/label/__snapshots__/jsfmt.spec.js.snap b/tests/label/__snapshots__/jsfmt.spec.js.snap
index 556522ec8..e83d3fee3 100644
--- a/tests/label/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/label/__snapshots__/jsfmt.spec.js.snap
@@ -10,12 +10,21 @@ printWidth: 80
   inf_leave: // goto emulation
   for (;;) {}
 }
+{
+  inf_leave:
+  // goto emulation
+  for (; ;) { }
+}
 
 =====================================output=====================================
 {
   // goto emulation
   inf_leave: for (;;) {}
 }
+{
+  // goto emulation
+  inf_leave: for (;;) {}
+}
 
 ================================================================================
 `;
diff --git a/tests/label/comment.js b/tests/label/comment.js
index 45e9363f1..2659e3978 100644
--- a/tests/label/comment.js
+++ b/tests/label/comment.js
@@ -2,3 +2,8 @@
   inf_leave: // goto emulation
   for (;;) {}
 }
+{
+  inf_leave:
+  // goto emulation
+  for (; ;) { }
+}

From f49b18e7c31467a1d7c73eaa7a511bc7b6708032 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2019 12:46:08 +0200
Subject: [PATCH 12/88] Bump @typescript-eslint/typescript-estree from 2.6.1 to
 2.7.0 (#6989)

Bumps [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-estree) from 2.6.1 to 2.7.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/typescript-estree/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v2.7.0/packages/typescript-estree)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index f9d921f45..d91a8118d 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@babel/parser": "7.7.3",
     "@glimmer/syntax": "0.41.0",
     "@iarna/toml": "2.2.3",
-    "@typescript-eslint/typescript-estree": "2.6.1",
+    "@typescript-eslint/typescript-estree": "2.7.0",
     "angular-estree-parser": "1.1.5",
     "angular-html-parser": "1.3.0",
     "camelcase": "5.3.1",
diff --git a/yarn.lock b/yarn.lock
index fb3c3a622..e8e01b009 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -817,10 +817,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/typescript-estree@2.6.1":
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.1.tgz#fb363dd4ca23384745c5ea4b7f4c867432b00d31"
-  integrity sha512-+sTnssW6bcbDZKE8Ce7VV6LdzkQz2Bxk7jzk1J8H1rovoTxnm6iXvYIyncvNsaB/kBCOM63j/LNJfm27bNdUoA==
+"@typescript-eslint/typescript-estree@2.7.0":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.7.0.tgz#34fd98c77a07b40d04d5b4203eddd3abeab909f4"
+  integrity sha512-vVCE/DY72N4RiJ/2f10PTyYekX2OLaltuSIBqeHYI44GQ940VCYioInIb8jKMrK9u855OEJdFC+HmWAZTnC+Ag==
   dependencies:
     debug "^4.1.1"
     glob "^7.1.4"
@@ -2125,13 +2125,7 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.2.6:
+debug@^3.1.0, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==

From 257fba9b30147f316f5ed236b29c8aeaf62f1c06 Mon Sep 17 00:00:00 2001
From: JounQin <admin@1stg.me>
Date: Mon, 18 Nov 2019 19:06:48 +0800
Subject: [PATCH 13/88] fix: format JSX Fragment correctly, consider Fragment
 as block (#6398)

---
 changelog_unreleased/mdx/pr-6398.md        | 21 +++++++++++++++++++
 src/language-markdown/mdx.js               |  2 +-
 tests/mdx/__snapshots__/jsfmt.spec.js.snap | 24 ++++++++++++++++++++++
 tests/mdx/jsx.mdx                          |  6 ++++++
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/mdx/pr-6398.md

diff --git a/changelog_unreleased/mdx/pr-6398.md b/changelog_unreleased/mdx/pr-6398.md
new file mode 100644
index 000000000..8d04c8294
--- /dev/null
+++ b/changelog_unreleased/mdx/pr-6398.md
@@ -0,0 +1,21 @@
+#### MDX: fix JSX Fragment format incorrectly ([#6398](https://github.com/prettier/prettier/pull/6398) by [@JounQin](https://github.com/JounQin))
+
+Previous versions format JSX Fragment incorrectly in mdx, this has been fixed in this version.
+
+<!-- prettier-ignore -->
+```md
+<!-- Input -->
+<>
+    test   <World        />   test
+</>       123
+
+<!-- Output (Prettier stable) -->
+<>
+test <World        /> test
+</> 123
+
+<!-- Output (Prettier master) -->
+<>
+  test <World /> test
+</> 123
+```
diff --git a/src/language-markdown/mdx.js b/src/language-markdown/mdx.js
index a72597777..f8bab299d 100644
--- a/src/language-markdown/mdx.js
+++ b/src/language-markdown/mdx.js
@@ -26,7 +26,7 @@
 
 const IMPORT_REGEX = /^import\s/;
 const EXPORT_REGEX = /^export\s/;
-const BLOCKS_REGEX = "[a-z\\.]*(\\.){0,1}[a-z][a-z0-9\\.]*";
+const BLOCKS_REGEX = "[a-z][a-z0-9]*(\\.[a-z][a-z0-9]*)*|";
 const COMMENT_REGEX = "<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->";
 const EMPTY_NEWLINE = "\n\n";
 
diff --git a/tests/mdx/__snapshots__/jsfmt.spec.js.snap b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
index f5dc83bc8..d15f9aed2 100644
--- a/tests/mdx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
@@ -265,6 +265,12 @@ printWidth: 80
 
 ---
 
+<>
+    test   <World        />   test
+</>       123
+
+---
+
 | Column 1 | Column 2 |
 |---|---|
 | Text | <Hello>Text</Hello> |
@@ -299,6 +305,12 @@ printWidth: 80
 
 ---
 
+<>
+  test <World /> test
+</> 123
+
+---
+
 | Column 1 | Column 2            |
 | -------- | ------------------- |
 | Text     | <Hello>Text</Hello> |
@@ -342,6 +354,12 @@ semi: false
 
 ---
 
+<>
+    test   <World        />   test
+</>       123
+
+---
+
 | Column 1 | Column 2 |
 |---|---|
 | Text | <Hello>Text</Hello> |
@@ -376,6 +394,12 @@ semi: false
 
 ---
 
+<>
+  test <World /> test
+</> 123
+
+---
+
 | Column 1 | Column 2            |
 | -------- | ------------------- |
 | Text     | <Hello>Text</Hello> |
diff --git a/tests/mdx/jsx.mdx b/tests/mdx/jsx.mdx
index 47b911be6..85961c373 100644
--- a/tests/mdx/jsx.mdx
+++ b/tests/mdx/jsx.mdx
@@ -27,6 +27,12 @@
 
 ---
 
+<>
+    test   <World        />   test
+</>       123
+
+---
+
 | Column 1 | Column 2 |
 |---|---|
 | Text | <Hello>Text</Hello> |

From 20c1dde1a8f64ed2cb4ee055ea057c0c4911ac62 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2019 14:08:41 +0200
Subject: [PATCH 14/88] Bump flow-parser from 0.111.3 to 0.112.0 (#6990)

* Bump flow-parser from 0.111.3 to 0.112.0

Bumps [flow-parser](https://github.com/facebook/flow) from 0.111.3 to 0.112.0.
- [Release notes](https://github.com/facebook/flow/releases)
- [Changelog](https://github.com/facebook/flow/blob/master/Changelog.md)
- [Commits](https://github.com/facebook/flow/compare/v0.111.3...v0.112.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* remove workaround for fixed issue
---
 package.json                    | 2 +-
 src/language-js/needs-parens.js | 6 ++----
 yarn.lock                       | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index d91a8118d..4dada2063 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "esutils": "2.0.3",
     "find-parent-dir": "0.3.0",
     "find-project-root": "1.1.1",
-    "flow-parser": "0.111.3",
+    "flow-parser": "0.112.0",
     "get-stream": "4.1.0",
     "globby": "6.1.0",
     "graphql": "14.5.8",
diff --git a/src/language-js/needs-parens.js b/src/language-js/needs-parens.js
index 48bc74b2f..e45ff2972 100644
--- a/src/language-js/needs-parens.js
+++ b/src/language-js/needs-parens.js
@@ -668,10 +668,8 @@ function needsParens(path, options) {
     case "OptionalMemberExpression":
     case "OptionalCallExpression":
       if (
-        ((parent.type === "MemberExpression" && name === "object") ||
-          (parent.type === "CallExpression" && name === "callee")) &&
-        // workaround for https://github.com/facebook/flow/issues/8159
-        !(options.parser === "flow" && parent.range[0] === node.range[0])
+        (parent.type === "MemberExpression" && name === "object") ||
+        (parent.type === "CallExpression" && name === "callee")
       ) {
         return true;
       }
diff --git a/yarn.lock b/yarn.lock
index e8e01b009..9cd7dcf11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2885,10 +2885,10 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
-flow-parser@0.111.3:
-  version "0.111.3"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.111.3.tgz#4c256aa21a5dbb53d5305e3512cc120659ca08f3"
-  integrity sha512-iEjGZ94OBMcESxnLorXNjJmtd/JtQYXUVrQpfwvtAKkuyawRmv+2LM6nqyOsOJkISEYbyY6ziudRE0u4VyPSVA==
+flow-parser@0.112.0:
+  version "0.112.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.112.0.tgz#938d7949068f147a196ebc2bd982ea066b024df5"
+  integrity sha512-sxjnwhR76B/fUN6n/XerYzn8R1HvtVo3SM8Il3WiZ4nkAlb2BBzKe1TSVKGSyZgD6FW9Bsxom/57ktkqrqmXGA==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"

From e66ed64001db84fdeeb68ce8f75bda79b828bfc6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2019 18:22:12 +0100
Subject: [PATCH 15/88] Bump eslint-config-prettier from 6.5.0 to 6.6.0 (#6991)

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.5.0 to 6.6.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.5.0...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4dada2063..0d7fac847 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "codecov": "3.6.1",
     "cross-env": "6.0.3",
     "eslint": "6.6.0",
-    "eslint-config-prettier": "6.5.0",
+    "eslint-config-prettier": "6.6.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-prettier": "3.1.1",
diff --git a/yarn.lock b/yarn.lock
index 9cd7dcf11..3cf5cde5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2405,10 +2405,10 @@ escodegen@^1.9.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@6.5.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.5.0.tgz#aaf9a495e2a816865e541bfdbb73a65cc162b3eb"
-  integrity sha512-cjXp8SbO9VFGW/Z7mbTydqS9to8Z58E5aYhj3e1+Hx7lS9s6gL5ILKNpCqZAFOVYRcSkWPFYljHrEh8QFEK5EQ==
+eslint-config-prettier@6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.6.0.tgz#4e039f65af8245e32d8fba4a2f5b83ed7186852e"
+  integrity sha512-6RGaj7jD+HeuSVHoIT6A0WkBhVEk0ULg74kp2FAWIwkYrOERae0TjIO09Cw33oN//gJWmt7aFhVJErEVta7uvA==
   dependencies:
     get-stdin "^6.0.0"
 

From 9fff8bd9b6f33dd3f2c8c360c09b0f4e42c21535 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2019 18:22:37 +0100
Subject: [PATCH 16/88] Bump execa from 3.2.0 to 3.3.0 (#6992)

Bumps [execa](https://github.com/sindresorhus/execa) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/sindresorhus/execa/releases)
- [Commits](https://github.com/sindresorhus/execa/compare/v3.2.0...v3.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0d7fac847..d00fe7583 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-prettier": "3.1.1",
     "eslint-plugin-react": "7.16.0",
-    "execa": "3.2.0",
+    "execa": "3.3.0",
     "jest": "23.3.0",
     "jest-junit": "9.0.0",
     "jest-snapshot-serializer-ansi": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 3cf5cde5b..8f0b76c33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2620,10 +2620,10 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.1.3"
 
-execa@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-3.2.0.tgz#18326b79c7ab7fbd6610fd900c1b9e95fa48f90a"
-  integrity sha512-kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw==
+execa@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-3.3.0.tgz#7e348eef129a1937f21ecbbd53390942653522c1"
+  integrity sha512-j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg==
   dependencies:
     cross-spawn "^7.0.0"
     get-stream "^5.0.0"

From 3d15edc8ebbfe6f61d6b0230983b2c041e8259cc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2019 21:15:14 +0100
Subject: [PATCH 17/88] [Security] Bump https-proxy-agent from 2.2.1 to 2.2.4
 (#6999)

Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. **This update includes security fixes.**
- [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
- [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8f0b76c33..0c1be0baa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1019,9 +1019,10 @@ acorn@^7.1.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
   integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
 
-agent-base@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -2381,12 +2382,14 @@ es-to-primitive@^1.2.0:
     is-symbol "^1.0.2"
 
 es6-promise@^4.0.3:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
@@ -3251,10 +3254,11 @@ https-browserify@^1.0.0:
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 human-signals@^1.1.1:
@@ -4742,8 +4746,9 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
 ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 mute-stream@0.0.8:
   version "0.0.8"

From 7a2e9b6215301f82bd74acefd3687307e87040c9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2019 09:10:54 +0100
Subject: [PATCH 18/88] Bump eslint-config-prettier from 6.6.0 to 6.7.0 (#7003)

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.6.0 to 6.7.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d00fe7583..a276bfaec 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "codecov": "3.6.1",
     "cross-env": "6.0.3",
     "eslint": "6.6.0",
-    "eslint-config-prettier": "6.6.0",
+    "eslint-config-prettier": "6.7.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-prettier": "3.1.1",
diff --git a/yarn.lock b/yarn.lock
index 0c1be0baa..2e0157de0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2408,10 +2408,10 @@ escodegen@^1.9.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.6.0.tgz#4e039f65af8245e32d8fba4a2f5b83ed7186852e"
-  integrity sha512-6RGaj7jD+HeuSVHoIT6A0WkBhVEk0ULg74kp2FAWIwkYrOERae0TjIO09Cw33oN//gJWmt7aFhVJErEVta7uvA==
+eslint-config-prettier@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.7.0.tgz#9a876952e12df2b284adbd3440994bf1f39dfbb9"
+  integrity sha512-FamQVKM3jjUVwhG4hEMnbtsq7xOIDm+SY5iBPfR8gKsJoAB2IQnNF+bk1+8Fy44Nq7PPJaLvkRxILYdJWoguKQ==
   dependencies:
     get-stdin "^6.0.0"
 

From 53a30f3597febc1609593e10bdd12d7eb3dab087 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2019 09:12:50 +0100
Subject: [PATCH 19/88] Bump @angular/compiler from 8.2.13 to 8.2.14 (#7004)

Bumps [@angular/compiler](https://github.com/angular/angular) from 8.2.13 to 8.2.14.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/compare/8.2.13...8.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a276bfaec..92f50b0fb 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "node": ">=8"
   },
   "dependencies": {
-    "@angular/compiler": "8.2.13",
+    "@angular/compiler": "8.2.14",
     "@babel/code-frame": "7.5.5",
     "@babel/parser": "7.7.3",
     "@glimmer/syntax": "0.41.0",
diff --git a/yarn.lock b/yarn.lock
index 2e0157de0..322df8a39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/compiler@8.2.13":
-  version "8.2.13"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.13.tgz#76d35761918df8cadeb1624418377712d259347f"
-  integrity sha512-u2NWCvEn4SjbMvn2PG6sYcf+rR5u3aYMv3/mNQ9k+2UmCIu3yJrcuCzebjo5SdlDVqKD2vzbyMZnr8VB9OcceQ==
+"@angular/compiler@8.2.14":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.14.tgz#46db7a9d1c17f236126518ff26480c160d5a6183"
+  integrity sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==
   dependencies:
     tslib "^1.9.0"
 

From 61f4cbcf418f8268a0c4ce03b72ef9877dc5ed2a Mon Sep 17 00:00:00 2001
From: Cyrille David <dcyriller@users.noreply.github.com>
Date: Tue, 19 Nov 2019 09:57:47 +0100
Subject: [PATCH 20/88] tests(handlebars): Move a test to handlebars folder
 (#6962)

This looks like a file left behind during a rebase. Let's move it to a
more logical location.
---
 .../__snapshots__/jsfmt.spec.js.snap          | 92 +++++++++++++++++++
 .../preserved-spaces-and-breaks.hbs           |  0
 2 files changed, 92 insertions(+)
 rename tests/{glimmer => handlebars-whitespace}/preserved-spaces-and-breaks.hbs (100%)

diff --git a/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap
index 3ebddb6cc..7f21fe231 100644
--- a/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap
@@ -355,6 +355,98 @@ printWidth: 40
 ================================================================================
 `;
 
+exports[`preserved-spaces-and-breaks.hbs 1`] = `
+====================================options=====================================
+parsers: ["glimmer"]
+printWidth: 40
+                                        | printWidth
+=====================================input======================================
+<SomeComponent />
+{{name}}
+
+
+
+Some sentence with  {{dynamic}}  expressions.
+
+sometimes{{nogaps}}areimportant<Hello></Hello>
+
+
+{{name}}  is your name
+
+
+{{#block}}
+{{/block}}
+
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+{{#block}}
+
+  some {{text}}
+{{/block}}
+
+<HelloWorld>
+</HelloWorld>
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<HelloWorld>
+
+  some {{text}}
+</HelloWorld>
+
+<div class="a list of classes">
+</div>
+
+<div class="a list of classes">
+
+</div>
+
+=====================================output=====================================
+<SomeComponent />
+{{name}}
+
+Some sentence with {{dynamic
+}} expressions.
+
+sometimes{{nogaps
+}}areimportant
+<Hello />
+
+{{name}} is your name
+
+{{#block}}{{/block}}
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+<HelloWorld />
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<div class="a list of classes">
+</div>
+
+<div class="a list of classes">
+</div>
+================================================================================
+`;
+
 exports[`punctuation.hbs 1`] = `
 ====================================options=====================================
 parsers: ["glimmer"]
diff --git a/tests/glimmer/preserved-spaces-and-breaks.hbs b/tests/handlebars-whitespace/preserved-spaces-and-breaks.hbs
similarity index 100%
rename from tests/glimmer/preserved-spaces-and-breaks.hbs
rename to tests/handlebars-whitespace/preserved-spaces-and-breaks.hbs

From 5a94039d1bfa2ff2cc4ae4f291a12dbf43ca43ba Mon Sep 17 00:00:00 2001
From: Evilebot Tnawi <evilebottnawi@users.noreply.github.com>
Date: Tue, 19 Nov 2019 14:58:32 +0300
Subject: [PATCH 21/88] test: css-in-js (#7005)

---
 .../__snapshots__/jsfmt.spec.js.snap          | 182 ++++++++++++++++++
 tests/multiparser_js_css/styled-components.js |  90 +++++++++
 2 files changed, 272 insertions(+)

diff --git a/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap
index e21296a28..a2ac62276 100644
--- a/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/multiparser_js_css/__snapshots__/jsfmt.spec.js.snap
@@ -165,6 +165,96 @@ const StyledComponent2 = styled.div\`
   }
 \`;
 
+const Direction = styled.span\`
+  \${({ up }) => up && \`color: \${color.positive};\`}
+  \${({ down }) => down && \`color: \${color.negative};\`}
+\`;
+
+const Direction2 = styled.span\`
+  \${({ up }) => up && \`color: \${color.positive}\`};
+  \${({ down }) => down && \`color: \${color.negative}\`};
+\`;
+
+const mixin = css\`
+  color: \${props => props.color};
+  \${props => props.otherProperty}: \${props => props.otherValue};
+\`;
+
+const foo = styled.div\`
+  display: flex;
+  \${props => props.useMixin && mixin}
+\`;
+
+const Single1 = styled.div\`
+  color: red
+\`;
+
+const Single2 = styled.div\`
+  color: red;
+\`;
+
+const Dropdown = styled.div\`
+  /* A comment to avoid the prettier issue: https://github.com/prettier/prettier/issues/2291 */
+  position: relative;
+\`;
+
+const bar = styled.div\`
+  border-radius: 50%;
+  border: 5px solid rgba(var(--green-rgb), 0);
+  display: inline-block;
+  height: 40px;
+  width: 40px;
+
+  \${props =>
+    (props.complete || props.inProgress) &&
+    css\`
+      border-color: rgba(var(--green-rgb), 0.15);
+    \`}
+  
+  div {
+    background-color: var(--purpleTT);
+    border-radius: 50%;
+    border: 4px solid rgba(var(--purple-rgb), 0.2);
+    color: var(--purpleTT);
+    display: inline-flex;
+
+    \${props =>
+    props.complete &&
+    css\`
+        background-color: var(--green);
+        border-width: 7px;
+      \`}
+      
+    \${props =>
+    (props.complete || props.inProgress) &&
+    css\`
+        border-color: var(--green);
+      \`}
+  }
+\`;
+
+const A = styled.a\`
+  display: inline-block;
+  color: #fff;  
+  \${props => props.a &&css\`
+    display: none;
+  \`}
+   height: 30px;
+\`;
+
+const Foo = styled.p\`
+  max-width: 980px;
+  \${mediaBreakpointOnlyXs\`
+    && {
+      font-size: 0.8rem;
+    }
+  \`}
+
+  &.bottom {
+    margin-top: 3rem;
+  }
+\`;
+
 =====================================output=====================================
 const ListItem1 = styled.li\`\`;
 
@@ -326,5 +416,97 @@ const StyledComponent2 = styled.div\`
   }
 \`;
 
+const Direction = styled.span\`
+  \${({ up }) => up && \`color: \${color.positive};\`}
+  \${({ down }) => down && \`color: \${color.negative};\`}
+\`;
+
+const Direction2 = styled.span\`
+  \${({ up }) => up && \`color: \${color.positive}\`};
+  \${({ down }) => down && \`color: \${color.negative}\`};
+\`;
+
+const mixin = css\`
+  color: \${props => props.color};
+  \${props => props.otherProperty}: \${props => props.otherValue};
+\`;
+
+const foo = styled.div\`
+  display: flex;
+  \${props => props.useMixin && mixin}
+\`;
+
+const Single1 = styled.div\`
+  color: red;
+\`;
+
+const Single2 = styled.div\`
+  color: red;
+\`;
+
+const Dropdown = styled.div\`
+  /* A comment to avoid the prettier issue: https://github.com/prettier/prettier/issues/2291 */
+  position: relative;
+\`;
+
+const bar = styled.div\`
+  border-radius: 50%;
+  border: 5px solid rgba(var(--green-rgb), 0);
+  display: inline-block;
+  height: 40px;
+  width: 40px;
+
+  \${props =>
+    (props.complete || props.inProgress) &&
+    css\`
+      border-color: rgba(var(--green-rgb), 0.15);
+    \`}
+
+  div {
+    background-color: var(--purpleTT);
+    border-radius: 50%;
+    border: 4px solid rgba(var(--purple-rgb), 0.2);
+    color: var(--purpleTT);
+    display: inline-flex;
+
+    \${props =>
+      props.complete &&
+      css\`
+        background-color: var(--green);
+        border-width: 7px;
+      \`}
+
+    \${props =>
+      (props.complete || props.inProgress) &&
+      css\`
+        border-color: var(--green);
+      \`}
+  }
+\`;
+
+const A = styled.a\`
+  display: inline-block;
+  color: #fff;
+  \${props =>
+    props.a &&
+    css\`
+      display: none;
+    \`}
+  height: 30px;
+\`;
+
+const Foo = styled.p\`
+  max-width: 980px;
+  \${mediaBreakpointOnlyXs\`
+    && {
+      font-size: 0.8rem;
+    }
+  \`}
+
+  &.bottom {
+    margin-top: 3rem;
+  }
+\`;
+
 ================================================================================
 `;
diff --git a/tests/multiparser_js_css/styled-components.js b/tests/multiparser_js_css/styled-components.js
index 8c07ef487..4d804f8f0 100644
--- a/tests/multiparser_js_css/styled-components.js
+++ b/tests/multiparser_js_css/styled-components.js
@@ -156,3 +156,93 @@ const StyledComponent2 = styled.div`
     color: red
   }
 `;
+
+const Direction = styled.span`
+  ${({ up }) => up && `color: ${color.positive};`}
+  ${({ down }) => down && `color: ${color.negative};`}
+`;
+
+const Direction2 = styled.span`
+  ${({ up }) => up && `color: ${color.positive}`};
+  ${({ down }) => down && `color: ${color.negative}`};
+`;
+
+const mixin = css`
+  color: ${props => props.color};
+  ${props => props.otherProperty}: ${props => props.otherValue};
+`;
+
+const foo = styled.div`
+  display: flex;
+  ${props => props.useMixin && mixin}
+`;
+
+const Single1 = styled.div`
+  color: red
+`;
+
+const Single2 = styled.div`
+  color: red;
+`;
+
+const Dropdown = styled.div`
+  /* A comment to avoid the prettier issue: https://github.com/prettier/prettier/issues/2291 */
+  position: relative;
+`;
+
+const bar = styled.div`
+  border-radius: 50%;
+  border: 5px solid rgba(var(--green-rgb), 0);
+  display: inline-block;
+  height: 40px;
+  width: 40px;
+
+  ${props =>
+    (props.complete || props.inProgress) &&
+    css`
+      border-color: rgba(var(--green-rgb), 0.15);
+    `}
+  
+  div {
+    background-color: var(--purpleTT);
+    border-radius: 50%;
+    border: 4px solid rgba(var(--purple-rgb), 0.2);
+    color: var(--purpleTT);
+    display: inline-flex;
+
+    ${props =>
+    props.complete &&
+    css`
+        background-color: var(--green);
+        border-width: 7px;
+      `}
+      
+    ${props =>
+    (props.complete || props.inProgress) &&
+    css`
+        border-color: var(--green);
+      `}
+  }
+`;
+
+const A = styled.a`
+  display: inline-block;
+  color: #fff;  
+  ${props => props.a &&css`
+    display: none;
+  `}
+   height: 30px;
+`;
+
+const Foo = styled.p`
+  max-width: 980px;
+  ${mediaBreakpointOnlyXs`
+    && {
+      font-size: 0.8rem;
+    }
+  `}
+
+  &.bottom {
+    margin-top: 3rem;
+  }
+`;

From d52b6a8a1ea78e3a50e25e947450eeb10186a0a3 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Tue, 19 Nov 2019 14:49:44 +0200
Subject: [PATCH 22/88] refactoring: tokens requested from TS parser were
 immediately dismissed (#7008)

---
 src/language-js/parser-typescript.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/language-js/parser-typescript.js b/src/language-js/parser-typescript.js
index 35401525d..21bda1fa8 100644
--- a/src/language-js/parser-typescript.js
+++ b/src/language-js/parser-typescript.js
@@ -30,7 +30,6 @@ function parse(text, parsers, opts) {
     }
   }
 
-  delete ast.tokens;
   includeShebang(text, ast);
   return postprocess(ast, Object.assign({}, opts, { originalText: text }));
 }
@@ -40,7 +39,6 @@ function tryParseTypeScript(text, jsx) {
   return parser.parse(text, {
     loc: true,
     range: true,
-    tokens: true,
     comment: true,
     useJSXTextNode: true,
     jsx

From 3d85a3e76ef49dbb83ac3eb2dcf5dbd93da6e8e4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2019 12:39:33 +0200
Subject: [PATCH 23/88] Bump @typescript-eslint/typescript-estree from 2.7.0 to
 2.8.0 (#7017)

Bumps [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-estree) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/typescript-estree/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v2.8.0/packages/typescript-estree)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 92f50b0fb..b6af95577 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@babel/parser": "7.7.3",
     "@glimmer/syntax": "0.41.0",
     "@iarna/toml": "2.2.3",
-    "@typescript-eslint/typescript-estree": "2.7.0",
+    "@typescript-eslint/typescript-estree": "2.8.0",
     "angular-estree-parser": "1.1.5",
     "angular-html-parser": "1.3.0",
     "camelcase": "5.3.1",
diff --git a/yarn.lock b/yarn.lock
index 322df8a39..b5413d06e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -817,13 +817,14 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/typescript-estree@2.7.0":
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.7.0.tgz#34fd98c77a07b40d04d5b4203eddd3abeab909f4"
-  integrity sha512-vVCE/DY72N4RiJ/2f10PTyYekX2OLaltuSIBqeHYI44GQ940VCYioInIb8jKMrK9u855OEJdFC+HmWAZTnC+Ag==
+"@typescript-eslint/typescript-estree@2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.8.0.tgz#fcc3fe6532840085d29b75432c8a59895876aeca"
+  integrity sha512-ksvjBDTdbAQ04cR5JyFSDX113k66FxH1tAXmi+dj6hufsl/G0eMc/f1GgLjEVPkYClDbRKv+rnBFuE5EusomUw==
   dependencies:
     debug "^4.1.1"
-    glob "^7.1.4"
+    eslint-visitor-keys "^1.1.0"
+    glob "^7.1.6"
     is-glob "^4.0.1"
     lodash.unescape "4.0.1"
     semver "^6.3.0"
@@ -3057,10 +3058,10 @@ glob-parent@^5.0.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"

From 5402f9942251afa36b9d417afa6e121d765a98cd Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 20 Nov 2019 19:48:08 +0900
Subject: [PATCH 24/88] Ignore test files (#7018)

---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e2a526086..460258fde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,7 @@
 /scripts/release/node_modules
 *.log
 /errors
-/test.js
-/test.ts
-/test.css
+/test.*
 /.vscode
 /dist
 /website/node_modules

From c9892675b3c18d561ab642349ce947a4f02a56f3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2019 17:52:42 +0100
Subject: [PATCH 25/88] Bump rollup from 1.26.3 to 1.27.2 (#7016)

Bumps [rollup](https://github.com/rollup/rollup) from 1.26.3 to 1.27.2.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v1.26.3...v1.27.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b6af95577..73164b18d 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "mkdirp": "0.5.1",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
-    "rollup": "1.26.3",
+    "rollup": "1.27.2",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index b5413d06e..718f780f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5939,10 +5939,10 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0,
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@1.26.3:
-  version "1.26.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.26.3.tgz#3e71b8120a4ccc745a856e926cab0efbe0eead90"
-  integrity sha512-8MhY/M8gnv3Q/pQQSWYWzbeJ5J1C5anCNY5BK1kV8Yzw9RFS0FF4lbLt+uyPO3wLKWXSXrhAL5pWL85TZAh+Sw==
+rollup@1.27.2:
+  version "1.27.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.2.tgz#caf54a93df228bf7864f13dddcdb363d3e958509"
+  integrity sha512-sD3iyd0zlvgK1S3MmICi6F/Y+R/QWY5XxzsTGN4pAd+nCasDUizmAhgq2hdh1t2eLux974NHU2TW41fhuGPv+Q==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"

From 90eed411d4c02c0084be6e2c618057a8c934723e Mon Sep 17 00:00:00 2001
From: Evilebot Tnawi <evilebottnawi@users.noreply.github.com>
Date: Wed, 20 Nov 2019 20:59:25 +0300
Subject: [PATCH 26/88] =?UTF-8?q?preserve=20parentheses=20for=20JSDoc=20ty?=
 =?UTF-8?q?pe=20casting=20with=20extra=20spaces=20a=E2=80=A6=20(#7011)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog_unreleased/javascript/pr-7011.md    | 18 ++++++++++++
 src/language-js/needs-parens.js               |  2 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 28 +++++++++++++++++++
 .../extra-spaces-and-asterisks.js             |  8 ++++++
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/javascript/pr-7011.md
 create mode 100644 tests/comments_closure_typecast/extra-spaces-and-asterisks.js

diff --git a/changelog_unreleased/javascript/pr-7011.md b/changelog_unreleased/javascript/pr-7011.md
new file mode 100644
index 000000000..f86a2699d
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-7011.md
@@ -0,0 +1,18 @@
+#### Preserve parentheses for JSDoc type casting with extra spaces and asterisk at end ([#7011](https://github.com/prettier/prettier/pull/7011) by [@evilebottnawi](https://github.com/evilebottnawi))
+
+Formatting of comments in labeled statements was not stable
+
+<!-- prettier-ignore -->
+```javascript
+// Input
+const foo = /** @type {!Foo} **/ (baz);
+const bar = /** @type {!Foo}  * * */(baz);
+
+// Prettier stable
+const foo = /** @type {!Foo} **/ baz;
+const bar = /** @type {!Foo}  * * */ baz;
+
+// Prettier master
+const foo = /** @type {!Foo} **/ (baz);
+const bar = /** @type {!Foo}  * * */ (baz);
+```
diff --git a/src/language-js/needs-parens.js b/src/language-js/needs-parens.js
index e45ff2972..e6b5aa0e2 100644
--- a/src/language-js/needs-parens.js
+++ b/src/language-js/needs-parens.js
@@ -53,7 +53,7 @@ function hasClosureCompilerTypeCastComment(text, path) {
     const cleaned = comment
       .trim()
       .split("\n")
-      .map(line => line.replace(/^[\s*]+/, ""))
+      .map(line => line.replace(/^[\s*]+/, "").replace(/[\s*]+$/, ""))
       .join(" ")
       .trim();
     if (!/^@type\s*\{[^]+\}$/.test(cleaned)) {
diff --git a/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap b/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
index 109e446fe..e0650b287 100644
--- a/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
@@ -156,3 +156,31 @@ const v8 = /**@type{string} */ (value);
 
 ================================================================================
 `;
+
+exports[`extra-spaces-and-asterisks.js 1`] = `
+====================================options=====================================
+parsers: ["babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+const foo1 = /** @type {!Foo} */(bar);
+const foo2 = /** @type {!Foo} **/(bar);
+const foo3 = /** @type {!Foo} * */(bar);
+const foo4 = /** @type {!Foo} ***/(bar);
+const foo5 = /** @type {!Foo} * * */(bar);
+const foo6 = /** @type {!Foo} *****/(bar);
+const foo7 = /** @type {!Foo} *   *   *   *   */(bar);
+const foo8 = /** @type {!Foo}    ** *   *   */(bar);
+
+=====================================output=====================================
+const foo1 = /** @type {!Foo} */ (bar);
+const foo2 = /** @type {!Foo} **/ (bar);
+const foo3 = /** @type {!Foo} * */ (bar);
+const foo4 = /** @type {!Foo} ***/ (bar);
+const foo5 = /** @type {!Foo} * * */ (bar);
+const foo6 = /** @type {!Foo} *****/ (bar);
+const foo7 = /** @type {!Foo} *   *   *   *   */ (bar);
+const foo8 = /** @type {!Foo}    ** *   *   */ (bar);
+
+================================================================================
+`;
diff --git a/tests/comments_closure_typecast/extra-spaces-and-asterisks.js b/tests/comments_closure_typecast/extra-spaces-and-asterisks.js
new file mode 100644
index 000000000..45572417a
--- /dev/null
+++ b/tests/comments_closure_typecast/extra-spaces-and-asterisks.js
@@ -0,0 +1,8 @@
+const foo1 = /** @type {!Foo} */(bar);
+const foo2 = /** @type {!Foo} **/(bar);
+const foo3 = /** @type {!Foo} * */(bar);
+const foo4 = /** @type {!Foo} ***/(bar);
+const foo5 = /** @type {!Foo} * * */(bar);
+const foo6 = /** @type {!Foo} *****/(bar);
+const foo7 = /** @type {!Foo} *   *   *   *   */(bar);
+const foo8 = /** @type {!Foo}    ** *   *   */(bar);

From 31842ec068be4bc03bf70615d43d6109bb74ea2f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2019 08:23:56 +0100
Subject: [PATCH 27/88] Bump docusaurus from 1.14.0 to 1.14.1 in /website
 (#7023)

Bumps [docusaurus](https://github.com/facebook/docusaurus) from 1.14.0 to 1.14.1.
- [Release notes](https://github.com/facebook/docusaurus/releases)
- [Changelog](https://github.com/facebook/docusaurus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/docusaurus/compare/v1.14.0...v1.14.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json |   2 +-
 website/yarn.lock    | 521 ++++++++++++++++++++-----------------------
 2 files changed, 238 insertions(+), 285 deletions(-)

diff --git a/website/package.json b/website/package.json
index e9b466cc9..c74613027 100644
--- a/website/package.json
+++ b/website/package.json
@@ -24,7 +24,7 @@
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
     "concurrently": "5.0.0",
-    "docusaurus": "1.14.0",
+    "docusaurus": "1.14.1",
     "js-yaml": "3.13.1",
     "svgo": "1.3.2",
     "webpack": "4.41.2",
diff --git a/website/yarn.lock b/website/yarn.lock
index bff083f9c..8cdbe90aa 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -16,19 +16,19 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.6.2":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff"
-  integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==
+"@babel/core@^7.7.2":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.2.tgz#ea5b99693bcfc058116f42fa1dd54da412b29d91"
+  integrity sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.4"
-    "@babel/helpers" "^7.6.2"
-    "@babel/parser" "^7.6.4"
-    "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.3"
-    "@babel/types" "^7.6.3"
-    convert-source-map "^1.1.0"
+    "@babel/generator" "^7.7.2"
+    "@babel/helpers" "^7.7.0"
+    "@babel/parser" "^7.7.2"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.7.2"
+    convert-source-map "^1.7.0"
     debug "^4.1.0"
     json5 "^2.1.0"
     lodash "^4.17.13"
@@ -36,16 +36,6 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.6.3", "@babel/generator@^7.6.4":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671"
-  integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w==
-  dependencies:
-    "@babel/types" "^7.6.3"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af"
@@ -95,17 +85,17 @@
     "@babel/traverse" "^7.4.4"
     "@babel/types" "^7.4.4"
 
-"@babel/helper-create-class-features-plugin@^7.5.5":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f"
-  integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng==
+"@babel/helper-create-class-features-plugin@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz#bcdc223abbfdd386f94196ae2544987f8df775e8"
+  integrity sha512-MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA==
   dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-member-expression-to-functions" "^7.5.5"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-function-name" "^7.7.0"
+    "@babel/helper-member-expression-to-functions" "^7.7.0"
+    "@babel/helper-optimise-call-expression" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
-    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/helper-replace-supers" "^7.7.0"
+    "@babel/helper-split-export-declaration" "^7.7.0"
 
 "@babel/helper-create-regexp-features-plugin@^7.7.0":
   version "7.7.2"
@@ -132,15 +122,6 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
-  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
 "@babel/helper-function-name@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz#44a5ad151cfff8ed2599c91682dda2ec2c8430a3"
@@ -310,13 +291,6 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-split-export-declaration@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
-  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
-  dependencies:
-    "@babel/types" "^7.4.4"
-
 "@babel/helper-split-export-declaration@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300"
@@ -334,14 +308,14 @@
     "@babel/traverse" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/helpers@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz#681ffe489ea4dcc55f23ce469e58e59c1c045153"
-  integrity sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==
+"@babel/helpers@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.0.tgz#359bb5ac3b4726f7c1fde0ec75f64b3f4275d60b"
+  integrity sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==
   dependencies:
-    "@babel/template" "^7.6.0"
-    "@babel/traverse" "^7.6.2"
-    "@babel/types" "^7.6.0"
+    "@babel/template" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -357,16 +331,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.3.tgz#32f5df65744b70888d17872ec106b02434ba1489"
   integrity sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==
 
-"@babel/parser@^7.6.0":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1"
-  integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==
-
-"@babel/parser@^7.6.3", "@babel/parser@^7.6.4":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
-  integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
-
 "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.2.tgz#ea8334dc77416bfd9473eb470fd00d8245b3943b"
@@ -381,12 +345,12 @@
     "@babel/helper-remap-async-to-generator" "^7.7.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"
-  integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==
+"@babel/plugin-proposal-class-properties@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz#ac54e728ecf81d90e8f4d2a9c05a890457107917"
+  integrity sha512-tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.5.5"
+    "@babel/helper-create-class-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.7.0":
@@ -754,15 +718,15 @@
     "@babel/helper-create-regexp-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/polyfill@^7.4.4":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.6.0.tgz#6d89203f8b6cd323e8d946e47774ea35dc0619cc"
-  integrity sha512-q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw==
+"@babel/polyfill@^7.6.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.7.0.tgz#e1066e251e17606ec7908b05617f9b7f8180d8f3"
+  integrity sha512-/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/preset-env@7.7.1", "@babel/preset-env@^7.6.2":
+"@babel/preset-env@7.7.1", "@babel/preset-env@^7.7.1":
   version "7.7.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.1.tgz#04a2ff53552c5885cf1083e291c8dd5490f744bb"
   integrity sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA==
@@ -819,7 +783,7 @@
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
-"@babel/preset-react@7.7.0", "@babel/preset-react@^7.0.0":
+"@babel/preset-react@7.7.0", "@babel/preset-react@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.0.tgz#8ab0c4787d98cf1f5f22dabf115552bf9e4e406c"
   integrity sha512-IXXgSUYBPHUGhUkH+89TR6faMcBtuMW0h5OHbMuVbL3/5wK2g6a2M2BBpkLa+Kw0sAHiZ9dNVgqJMDP/O4GRBA==
@@ -830,16 +794,16 @@
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
-"@babel/register@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.6.2.tgz#25765a922202cb06f8bdac5a3b1e70cd6bf3dd45"
-  integrity sha512-xgZk2LRZvt6i2SAUWxc7ellk4+OYRgS3Zpsnr13nMS1Qo25w21Uu8o6vTOAqNaxiqrnv30KTYzh9YWY2k21CeQ==
+"@babel/register@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.0.tgz#4e23ecf840296ef79c605baaa5c89e1a2426314b"
+  integrity sha512-HV3GJzTvSoyOMWGYn2TAh6uL6g+gqKTgEZ99Q3+X9UURT1VPT/WcU46R61XftIc5rXytcOHZ4Z0doDlsjPomIg==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
-    mkdirp "^0.5.1"
+    make-dir "^2.1.0"
     pirates "^4.0.0"
-    source-map-support "^0.5.9"
+    source-map-support "^0.5.16"
 
 "@babel/template@^7.1.0", "@babel/template@^7.2.2":
   version "7.2.2"
@@ -850,15 +814,6 @@
     "@babel/parser" "^7.2.2"
     "@babel/types" "^7.2.2"
 
-"@babel/template@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
-  integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.6.0"
-    "@babel/types" "^7.6.0"
-
 "@babel/template@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0"
@@ -868,22 +823,7 @@
     "@babel/parser" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9"
-  integrity sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.6.3"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.6.3"
-    "@babel/types" "^7.6.3"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.7.0":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09"
   integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==
@@ -898,7 +838,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0", "@babel/types@^7.6.1", "@babel/types@^7.6.3", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2":
+"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7"
   integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==
@@ -936,6 +876,11 @@
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.10.tgz#780d552467824be4a241b29510a7873a7432c4a6"
   integrity sha512-fOM/Jhv51iyugY7KOBZz2ThfT1gwvsGCfWxpLpZDgkGjpEO4Le9cld07OdskikLjDUQJ43dzDaVRSFwQlpdqVg==
 
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
 "@types/q@^1.5.1":
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
@@ -1183,6 +1128,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172"
+  integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    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"
@@ -1195,14 +1148,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1315,9 +1260,12 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
   integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -1328,6 +1276,13 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
+autolinker@^3.11.0:
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-3.11.1.tgz#aa4f910371df091b0d714d8d6e700d53f357ce95"
+  integrity sha512-6sAmetStorjXvwmV8MBxI5DGICHKD1B5EjdkIrq34X6YBDN6jj54EUHnoHgNqmNCclcf8c409zuVMNy449u80g==
+  dependencies:
+    tslib "^1.9.3"
+
 autolinker@~0.28.0:
   version "0.28.1"
   resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47"
@@ -1335,18 +1290,18 @@ autolinker@~0.28.0:
   dependencies:
     gulp-header "^1.7.1"
 
-autoprefixer@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
-  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
+autoprefixer@^9.7.0:
+  version "9.7.2"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.2.tgz#26cf729fbb709323b40171a874304884dcceffed"
+  integrity sha512-LCAfcdej1182uVvPOZnytbq61AhnOZ/4JelDaJGDeNwewyU1AMaNthcHsyz1NRjTmd2FkurMckLWfkHg3Z//KA==
   dependencies:
-    browserslist "^4.6.3"
-    caniuse-lite "^1.0.30000980"
+    browserslist "^4.7.3"
+    caniuse-lite "^1.0.30001010"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.17"
-    postcss-value-parser "^4.0.0"
+    postcss "^7.0.23"
+    postcss-value-parser "^4.0.2"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -1472,11 +1427,6 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.0.tgz#9523e001306a32444b907423f1de2164222f6ab1"
   integrity sha512-EgmjVLMn22z7eGGv3kcnHwSnJXmFHjISTY9E/S5lIcTD3Oxw05QTcBLNkJFzcb3cNueUdF/IN4U+d78V0zO8Hw==
 
-binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
-
 bl@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
@@ -1546,13 +1496,6 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1617,7 +1560,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.7.0, browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.6:
+browserslist@4.7.0, browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.6:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
   integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==
@@ -1626,6 +1569,15 @@ browserslist@4.7.0, browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.
     electron-to-chromium "^1.3.247"
     node-releases "^1.1.29"
 
+browserslist@^4.7.3:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.3.tgz#02341f162b6bcc1e1028e30624815d4924442dc3"
+  integrity sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==
+  dependencies:
+    caniuse-lite "^1.0.30001010"
+    electron-to-chromium "^1.3.306"
+    node-releases "^1.1.40"
+
 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"
@@ -1788,11 +1740,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000989:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000989:
   version "1.0.30000998"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz#7227a8046841e7d01e156ae7227a504d065f6744"
   integrity sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ==
 
+caniuse-lite@^1.0.30001010:
+  version "1.0.30001011"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz#0d6c4549c78c4a800bb043a83ca0cbe0aee6c6e1"
+  integrity sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1826,6 +1783,14 @@ chalk@^1.0.0, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -1872,21 +1837,6 @@ chokidar@^2.0.2, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.0.2:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.1.tgz#4634772a1924512d990d4505957bf3a510611387"
-  integrity sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.1.3"
-  optionalDependencies:
-    fsevents "~2.1.0"
-
 chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
@@ -2007,6 +1957,13 @@ color-convert@^1.9.0, color-convert@^1.9.1:
   dependencies:
     color-name "1.1.1"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
@@ -2015,6 +1972,11 @@ color-name@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 color-string@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9"
@@ -2049,6 +2011,11 @@ commander@^2.15.1, commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.1.tgz#3863ce3ca92d0831dcf2a102f5fb4b5926afd0f9"
   integrity sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==
 
+commander@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
+  integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
+
 commander@~2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -2143,10 +2110,10 @@ continuable-cache@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
 
-convert-source-map@^1.1.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
   dependencies:
     safe-buffer "~5.1.1"
 
@@ -2471,7 +2438,7 @@ debug@^3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.5:
+debug@^3.1.1, debug@^3.2.5:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2657,27 +2624,26 @@ dir-glob@2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
-docusaurus@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.14.0.tgz#081b931098fcb0a9e837fe3e4851815c607cd632"
-  integrity sha512-wdjdAQAk6Ndypl0F3BIg/EUtYgSCxN9g90KbZ+BkObs0Haz62ehCGPeCNqv97m88YVaYbFzk3geQk1jL77gz5g==
+docusaurus@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.14.1.tgz#970d3905bfff46f9772b1587bd012a9124bd1dde"
+  integrity sha512-+3tZ8MkJucaKuBmlgCCVRqundk1RJP3Ym71oiuLf7NLYIIQbK5gOqycmnOE0aD+vsL0/XsxH67yNJkd+tCTqVg==
   dependencies:
-    "@babel/core" "^7.6.2"
-    "@babel/plugin-proposal-class-properties" "^7.5.5"
+    "@babel/core" "^7.7.2"
+    "@babel/plugin-proposal-class-properties" "^7.7.0"
     "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
-    "@babel/polyfill" "^7.4.4"
-    "@babel/preset-env" "^7.6.2"
-    "@babel/preset-react" "^7.0.0"
-    "@babel/register" "^7.6.2"
-    "@babel/traverse" "^7.6.2"
-    "@babel/types" "^7.6.1"
-    autoprefixer "^9.6.1"
+    "@babel/polyfill" "^7.6.0"
+    "@babel/preset-env" "^7.7.1"
+    "@babel/preset-react" "^7.7.0"
+    "@babel/register" "^7.7.0"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.7.2"
+    autoprefixer "^9.7.0"
     babylon "^6.18.0"
-    chalk "^2.4.2"
-    chokidar "^3.0.2"
+    chalk "^3.0.0"
     classnames "^2.2.6"
     color "^2.0.1"
-    commander "^2.20.0"
+    commander "^4.0.1"
     cross-spawn "^6.0.5"
     crowdin-cli "^0.3.0"
     cssnano "^4.1.10"
@@ -2686,8 +2652,9 @@ docusaurus@1.14.0:
     feed "^1.1.0"
     fs-extra "^8.1.0"
     gaze "^1.1.3"
-    glob "^7.1.3"
-    highlight.js "^9.15.8"
+    github-slugger "^1.2.1"
+    glob "^7.1.5"
+    highlight.js "^9.16.1"
     imagemin "^6.0.0"
     imagemin-gifsicle "^6.0.1"
     imagemin-jpegtran "^6.0.0"
@@ -2696,21 +2663,20 @@ docusaurus@1.14.0:
     lodash "^4.17.15"
     markdown-toc "^1.2.0"
     mkdirp "^0.5.1"
-    portfinder "^1.0.21"
-    postcss "^7.0.17"
+    portfinder "^1.0.25"
+    postcss "^7.0.21"
     prismjs "^1.17.1"
     react "^16.8.4"
-    react-dev-utils "^9.0.1"
+    react-dev-utils "^9.1.0"
     react-dom "^16.8.4"
-    remarkable "^1.7.4"
+    remarkable "^2.0.0"
     request "^2.88.0"
     shelljs "^0.8.3"
     sitemap "^3.2.2"
-    striptags "^3.1.1"
     tcp-port-used "^1.0.1"
     tiny-lr "^1.1.1"
     tree-node-cli "^1.2.5"
-    truncate-html "^1.0.2"
+    truncate-html "^1.0.3"
 
 dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.0"
@@ -2834,6 +2800,11 @@ electron-to-chromium@^1.3.247:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.273.tgz#94872d6823219f2812f2e35a2ce2a7d03c1eaa3f"
   integrity sha512-0kUppiHQvHEENHh+nTtvTt4eXMwcPyWmMaj73GPrSEm3ldKhmmHuOH6IjrmuW6YmyS/fpXcLvMQLNVpqRhpNWw==
 
+electron-to-chromium@^1.3.306:
+  version "1.3.308"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.308.tgz#73c2cd8f865abc1c31623725e4f89225e9e209e6"
+  integrity sha512-IwU/0LTzTa03Q0YDzg11RlK8e/V92tmPqFOaTEsdv7JJXtC/+v/H4bT2FmsA/xaFQWJvi0ZVcRppw8o0AD9XJQ==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -2847,6 +2818,11 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+"emoji-regex@>=6.0.0 <=6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"
+  integrity sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=
+
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -3318,13 +3294,6 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-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"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
 finalhandler@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -3493,11 +3462,6 @@ fsevents@^1.2.7:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-fsevents@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.0.tgz#ce1a5f9ac71c6d75278b0c5bd236d7dfece4cbaa"
-  integrity sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==
-
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3583,6 +3547,13 @@ gifsicle@^4.0.0:
     execa "^1.0.0"
     logalot "^2.0.0"
 
+github-slugger@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz#47e904e70bf2dccd0014748142d31126cfd49508"
+  integrity sha512-SsZUjg/P03KPzQBt7OxJPasGw6NRO5uOgiZ5RGXVud5iSIZ0eNZeNp5rTwCxtavrRUa/A77j8mePVc5lEvk0KQ==
+  dependencies:
+    emoji-regex ">=6.0.0 <=6.1.1"
+
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -3590,22 +3561,15 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
-  dependencies:
-    is-glob "^4.0.1"
-
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.5, glob@~7.1.1:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3853,6 +3817,11 @@ has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
@@ -3938,10 +3907,10 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-highlight.js@^9.15.8:
-  version "9.15.10"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.10.tgz#7b18ed75c90348c045eef9ed08ca1319a2219ad2"
-  integrity sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw==
+highlight.js@^9.16.1:
+  version "9.16.2"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
+  integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -4262,13 +4231,6 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-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"
-  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"
@@ -4392,13 +4354,6 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
-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==
-  dependencies:
-    is-extglob "^2.1.1"
-
 is-jpg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-2.0.0.tgz#2e1997fa6e9166eaac0242daae443403e4ef1d97"
@@ -4421,11 +4376,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  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"
@@ -4854,7 +4804,7 @@ lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4, lodash@~4.17.10:
+lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@~4.17.10:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -4932,7 +4882,7 @@ make-dir@^1.2.0:
   dependencies:
     pify "^3.0.0"
 
-make-dir@^2.0.0:
+make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -5191,7 +5141,7 @@ mixin-deep@^1.1.3, mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -5329,6 +5279,13 @@ node-releases@^1.1.29:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.1.40:
+  version "1.1.40"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.40.tgz#a94facfa8e2d612302601ca1361741d529c4515a"
+  integrity sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==
+  dependencies:
+    semver "^6.3.0"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -5352,7 +5309,7 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0, 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"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -5804,11 +5761,6 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
-picomatch@^2.0.4:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
-  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
-
 pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -5853,14 +5805,14 @@ pkg-up@2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-portfinder@^1.0.21:
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.24.tgz#11efbc6865f12f37624b6531ead1d809ed965cfa"
-  integrity sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==
+portfinder@^1.0.25:
+  version "1.0.25"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
+  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
   dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.1"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -6138,15 +6090,15 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0:
+postcss-value-parser@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
   integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.17, postcss@^7.0.5:
-  version "7.0.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
-  integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.21, postcss@^7.0.23, postcss@^7.0.5:
+  version "7.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.23.tgz#9f9759fad661b15964f3cfc3140f66f1e05eadc1"
+  integrity sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -6361,10 +6313,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dev-utils@^9.0.1:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.0.4.tgz#5c71a8e8afdec0232c44d4e049d21baa437a92af"
-  integrity sha512-VwR+mBUXPLdYk/rOz6s6qpasIFGd7GW0KXd/3bih+/qGcMQvPG19XxtjDMtiAg0zWiFwp1ugCzAjLThbzFjVqw==
+react-dev-utils@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.1.0.tgz#3ad2bb8848a32319d760d0a84c56c14bdaae5e81"
+  integrity sha512-X2KYF/lIGyGwP/F/oXgGDF24nxDA2KC4b7AFto+eqzc/t838gpSGiaU8trTqHXOohuLxxc5qi1eDzsl9ucPDpg==
   dependencies:
     "@babel/code-frame" "7.5.5"
     address "1.1.2"
@@ -6385,7 +6337,7 @@ react-dev-utils@^9.0.1:
     loader-utils "1.2.3"
     open "^6.3.0"
     pkg-up "2.0.0"
-    react-error-overlay "^6.0.2"
+    react-error-overlay "^6.0.3"
     recursive-readdir "2.2.2"
     shell-quote "1.7.2"
     sockjs-client "1.4.0"
@@ -6402,10 +6354,10 @@ react-dom@16.12.0, react-dom@^16.2.0, react-dom@^16.8.4:
     prop-types "^15.6.2"
     scheduler "^0.18.0"
 
-react-error-overlay@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.2.tgz#642bd6157c6a4b6e9ca4a816f7ed30b868c47f81"
-  integrity sha512-DHRuRk3K4Lg9obI6J4Y+nKvtwjasYRU9CFL3ud42x9YJG1HbQjSNublapC/WBJOA726gNUbqbj0U2df9+uzspQ==
+react-error-overlay@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.3.tgz#c378c4b0a21e88b2e159a3e62b2f531fd63bf60d"
+  integrity sha512-bOUvMWFQVk5oz8Ded9Xb7WVdEi3QGLC8tH7HmYP0Fdp4Bn3qw0tRFmr5TW6mvahzvmrK4a6bqWGfCevBflP+Xw==
 
 react-is@^16.8.1:
   version "16.10.1"
@@ -6475,13 +6427,6 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-readdirp@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.3.tgz#d6e011ed5b9240a92f08651eeb40f7942ceb6cc1"
-  integrity sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==
-  dependencies:
-    picomatch "^2.0.4"
-
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -6557,7 +6502,7 @@ regjsparser@^0.6.0:
   dependencies:
     jsesc "~0.5.0"
 
-remarkable@^1.7.1, remarkable@^1.7.4:
+remarkable@^1.7.1:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00"
   integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg==
@@ -6565,6 +6510,14 @@ remarkable@^1.7.1, remarkable@^1.7.4:
     argparse "^1.0.10"
     autolinker "~0.28.0"
 
+remarkable@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-2.0.0.tgz#795f965bede8300362ce51a716edc322d9e7a4ca"
+  integrity sha512-3gvKFAgL4xmmVRKAMNm6UzDo/rO2gPVkZrWagp6AXEA4JvCcMcRx9aapYbb7AJAmLLvi/u06+EhzqoS7ha9qOg==
+  dependencies:
+    argparse "^1.0.10"
+    autolinker "^3.11.0"
+
 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"
@@ -7027,10 +6980,10 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.9:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
+source-map-support@^0.5.16:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -7296,11 +7249,6 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-striptags@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.1.tgz#c8c3e7fdd6fb4bb3a32a3b752e5b5e3e38093ebd"
-  integrity sha1-yMPn/db7S7OjKjt1LltePjgJPr0=
-
 stylehacks@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -7335,6 +7283,13 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 svgo@1.3.2, svgo@^1.0.0, svgo@^1.0.5:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
@@ -7510,13 +7465,6 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
-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"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -7572,7 +7520,7 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-truncate-html@^1.0.2:
+truncate-html@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/truncate-html/-/truncate-html-1.0.3.tgz#0166dfc7890626130c2e4174c6b73d4d63993e5f"
   integrity sha512-1o1prdRv+iehXcGwn29YgXU17DotHkr+OK3ijVEG7FGMwHNG9RyobXwimw6djDvbIc24rhmz3tjNNvNESjkNkQ==
@@ -7585,6 +7533,11 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
+tslib@^1.9.3:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"

From 13d37dac20d0e7a6608a349309accd402d4403b0 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Thu, 21 Nov 2019 12:27:23 +0200
Subject: [PATCH 28/88] TypeScript: print JSDoc-only types (#7020)

* TypeScript: print JSDoc-only types

* add changelog
---
 changelog_unreleased/typescript/pr-7020.md    | 15 +++++++++
 cspell.json                                   |  1 +
 src/language-js/needs-parens.js               |  5 ++-
 src/language-js/printer-estree.js             | 18 +++++++++++
 .../__snapshots__/jsfmt.spec.js.snap          | 32 +++++++++++++++++++
 .../jsdoc_only_types.ts                       | 10 ++++++
 6 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/typescript/pr-7020.md
 create mode 100644 tests/typescript_error_recovery/jsdoc_only_types.ts

diff --git a/changelog_unreleased/typescript/pr-7020.md b/changelog_unreleased/typescript/pr-7020.md
new file mode 100644
index 000000000..76e2fabba
--- /dev/null
+++ b/changelog_unreleased/typescript/pr-7020.md
@@ -0,0 +1,15 @@
+#### Print JSDoc-only types as is instead of throwing strange errors ([#7020](https://github.com/prettier/prettier/pull/7020) by [@thorn0](https://github.com/thorn0))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+function fromFlow(arg: ?Maybe) {}
+
+// Prettier stable
+Error: unknown type: "TSJSDocNullableType"
+    at printPathNoParens (https://prettier.io/lib/standalone.js:26012:13)
+    at Object.genericPrint$3 [as print] (https://prettier.io/lib/standalone.js:23541:28)
+
+// Prettier master
+function fromFlow(arg: ?Maybe) {}
+```
diff --git a/cspell.json b/cspell.json
index 2dcef8169..44bb5ded4 100644
--- a/cspell.json
+++ b/cspell.json
@@ -348,6 +348,7 @@
         "Transloadit",
         "TSAs",
         "tsep",
+        "TSJS",
         "Typeahead",
         "typecasted",
         "typeof",
diff --git a/src/language-js/needs-parens.js b/src/language-js/needs-parens.js
index e6b5aa0e2..9ff9bba87 100644
--- a/src/language-js/needs-parens.js
+++ b/src/language-js/needs-parens.js
@@ -450,6 +450,7 @@ function needsParens(path, options) {
           return false;
       }
 
+    case "TSJSDocFunctionType":
     case "TSConditionalType":
       if (parent.type === "TSConditionalType" && node === parent.extendsType) {
         return true;
@@ -477,7 +478,9 @@ function needsParens(path, options) {
         parent.type === "TSOptionalType" ||
         parent.type === "TSRestType" ||
         (parent.type === "TSIndexedAccessType" && node === parent.objectType) ||
-        parent.type === "TSTypeOperator"
+        parent.type === "TSTypeOperator" ||
+        (parent.type === "TSTypeAnnotation" &&
+          /^TSJSDoc/.test(path.getParentNode(1).type))
       );
 
     case "ArrayTypeAnnotation":
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index df2dea511..baeb979a4 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -3637,6 +3637,24 @@ function printPathNoParens(path, options, print, args) {
 
     case "ArgumentPlaceholder":
       return "?";
+
+    // These are not valid TypeScript. Printing them just for the sake of error recovery.
+    case "TSJSDocAllType":
+      return "*";
+    case "TSJSDocUnknownType":
+      return "?";
+    case "TSJSDocNullableType":
+      return concat(["?", path.call(print, "typeAnnotation")]);
+    case "TSJSDocNonNullableType":
+      return concat(["!", path.call(print, "typeAnnotation")]);
+    case "TSJSDocFunctionType":
+      return concat([
+        "function(",
+        // The parameters could be here, but typescript-estree doesn't convert them anyway (throws an error).
+        "): ",
+        path.call(print, "typeAnnotation")
+      ]);
+
     default:
       /* istanbul ignore next */
       throw new Error("unknown type: " + JSON.stringify(n.type));
diff --git a/tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap
index e37181540..09f0493bb 100644
--- a/tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap
@@ -49,3 +49,35 @@ class f7<> {
 
 ================================================================================
 `;
+
+exports[`jsdoc_only_types.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+let a: *;
+function b(x: ?) {}
+let c: ?string;
+let d: string?;
+let e: ?(string | number);
+let f: !string;
+let g: string!;
+let h: !(string | number);
+let i: function(): string;
+let j: (function(): string) | number;
+
+=====================================output=====================================
+let a: *;
+function b(x: ?) {}
+let c: ?string;
+let d: ?string;
+let e: ?(string | number);
+let f: !string;
+let g: !string;
+let h: !(string | number);
+let i: function(): string;
+let j: (function(): string) | number;
+
+================================================================================
+`;
diff --git a/tests/typescript_error_recovery/jsdoc_only_types.ts b/tests/typescript_error_recovery/jsdoc_only_types.ts
new file mode 100644
index 000000000..991c4d3f2
--- /dev/null
+++ b/tests/typescript_error_recovery/jsdoc_only_types.ts
@@ -0,0 +1,10 @@
+let a: *;
+function b(x: ?) {}
+let c: ?string;
+let d: string?;
+let e: ?(string | number);
+let f: !string;
+let g: string!;
+let h: !(string | number);
+let i: function(): string;
+let j: (function(): string) | number;

From 35cc90192d3117a373d0c386bb639c26d12cdfbd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2019 18:01:00 +0100
Subject: [PATCH 29/88] Bump rollup from 1.27.2 to 1.27.3 (#7025)

Bumps [rollup](https://github.com/rollup/rollup) from 1.27.2 to 1.27.3.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v1.27.2...v1.27.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 73164b18d..e55beb112 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "mkdirp": "0.5.1",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
-    "rollup": "1.27.2",
+    "rollup": "1.27.3",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 718f780f9..a967d0b53 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5939,10 +5939,10 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0,
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@1.27.2:
-  version "1.27.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.2.tgz#caf54a93df228bf7864f13dddcdb363d3e958509"
-  integrity sha512-sD3iyd0zlvgK1S3MmICi6F/Y+R/QWY5XxzsTGN4pAd+nCasDUizmAhgq2hdh1t2eLux974NHU2TW41fhuGPv+Q==
+rollup@1.27.3:
+  version "1.27.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.3.tgz#0e427d9bee9e30e6017e89b942d88276ce26f9e2"
+  integrity sha512-79AEh4m5NPCz97GTuIoXpSFIMPyk2AiqVQp040baSRPXk/I4YMGt5/CR9GX5oEYEkxwBZoWLheaS1/w/FidfJw==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"

From bf2989718b83ff81f994b5a663833a1d239fb76c Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Fri, 22 Nov 2019 00:14:34 +0200
Subject: [PATCH 30/88] fix unstable formatting of logical expressions (#7026)

---
 changelog_unreleased/javascript/pr-7026.md    | 26 +++++++++++
 src/language-js/clean.js                      | 33 --------------
 src/language-js/loc.js                        | 19 +++++++-
 src/language-js/postprocess.js                | 44 +++++++++++++++++++
 .../__snapshots__/jsfmt.spec.js.snap          | 21 +++++++++
 tests/logical_expressions/issue-7024.js       |  4 ++
 6 files changed, 113 insertions(+), 34 deletions(-)
 create mode 100644 changelog_unreleased/javascript/pr-7026.md
 create mode 100644 tests/logical_expressions/issue-7024.js

diff --git a/changelog_unreleased/javascript/pr-7026.md b/changelog_unreleased/javascript/pr-7026.md
new file mode 100644
index 000000000..877722019
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-7026.md
@@ -0,0 +1,26 @@
+#### Fix unstable formatting of logical expressions ([#7026](https://github.com/prettier/prettier/pull/7026) by [@thorn0](https://github.com/thorn0))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+const averredBathersBoxroomBuggyNurl =
+  bifornCringerMoshedPerplexSawder === 1 ||
+  (askTrovenaBeenaDependsRowans === 2 || glimseGlyphsHazardNoopsTieTie === 3);
+
+// Prettier stable (first output)
+const averredBathersBoxroomBuggyNurl =
+  bifornCringerMoshedPerplexSawder === 1 ||
+  askTrovenaBeenaDependsRowans === 2 || glimseGlyphsHazardNoopsTieTie === 3;
+
+// Prettier stable (second output)
+const averredBathersBoxroomBuggyNurl =
+  bifornCringerMoshedPerplexSawder === 1 ||
+  askTrovenaBeenaDependsRowans === 2 ||
+  glimseGlyphsHazardNoopsTieTie === 3;
+
+// Prettier master (first output)
+const averredBathersBoxroomBuggyNurl =
+  bifornCringerMoshedPerplexSawder === 1 ||
+  askTrovenaBeenaDependsRowans === 2 ||
+  glimseGlyphsHazardNoopsTieTie === 3;
+```
diff --git a/src/language-js/clean.js b/src/language-js/clean.js
index 77b4b9f1b..2801323f8 100644
--- a/src/language-js/clean.js
+++ b/src/language-js/clean.js
@@ -37,11 +37,6 @@ function clean(ast, newObj, parent) {
     return null;
   }
 
-  // We remove unneeded parens around same-operator LogicalExpressions
-  if (isUnbalancedLogicalTree(newObj)) {
-    return rebalanceLogicalTree(newObj);
-  }
-
   // (TypeScript) Ignore `static` in `constructor(static p) {}`
   // and `export` in `constructor(export p) {}`
   if (
@@ -199,32 +194,4 @@ function clean(ast, newObj, parent) {
   }
 }
 
-function isUnbalancedLogicalTree(newObj) {
-  return (
-    newObj.type === "LogicalExpression" &&
-    newObj.right.type === "LogicalExpression" &&
-    newObj.operator === newObj.right.operator
-  );
-}
-
-function rebalanceLogicalTree(newObj) {
-  if (isUnbalancedLogicalTree(newObj)) {
-    return rebalanceLogicalTree({
-      type: "LogicalExpression",
-      operator: newObj.operator,
-      left: rebalanceLogicalTree({
-        type: "LogicalExpression",
-        operator: newObj.operator,
-        left: newObj.left,
-        right: newObj.right.left,
-        loc: {}
-      }),
-      right: newObj.right.right,
-      loc: {}
-    });
-  }
-
-  return newObj;
-}
-
 module.exports = clean;
diff --git a/src/language-js/loc.js b/src/language-js/loc.js
index e2d0e9586..214de144c 100644
--- a/src/language-js/loc.js
+++ b/src/language-js/loc.js
@@ -59,7 +59,24 @@ function locEnd(node) {
   return loc;
 }
 
+function composeLoc(startNode, endNode = startNode) {
+  const loc = {};
+  if (typeof startNode.start === "number") {
+    loc.start = startNode.start;
+    loc.end = endNode.end;
+  }
+  if (Array.isArray(startNode.range)) {
+    loc.range = [startNode.range[0], endNode.range[1]];
+  }
+  loc.loc = {
+    start: startNode.loc.start,
+    end: endNode.loc.end
+  };
+  return loc;
+}
+
 module.exports = {
   locStart,
-  locEnd
+  locEnd,
+  composeLoc
 };
diff --git a/src/language-js/postprocess.js b/src/language-js/postprocess.js
index 888140e25..bf4a9d178 100644
--- a/src/language-js/postprocess.js
+++ b/src/language-js/postprocess.js
@@ -1,10 +1,18 @@
 "use strict";
 
 const { getLast } = require("../common/util");
+const { composeLoc } = require("./loc");
 
 function postprocess(ast, options) {
   visitNode(ast, node => {
     switch (node.type) {
+      case "LogicalExpression": {
+        // We remove unneeded parens around same-operator LogicalExpressions
+        if (isUnbalancedLogicalTree(node)) {
+          return rebalanceLogicalTree(node);
+        }
+        break;
+      }
       // fix unexpected locEnd caused by --no-semi style
       case "VariableDeclaration": {
         const lastDeclaration = getLast(node.declarations);
@@ -101,4 +109,40 @@ function visitNode(node, fn, parent, property) {
   }
 }
 
+function isUnbalancedLogicalTree(node) {
+  return (
+    node.type === "LogicalExpression" &&
+    node.right.type === "LogicalExpression" &&
+    node.operator === node.right.operator
+  );
+}
+
+function rebalanceLogicalTree(node) {
+  if (!isUnbalancedLogicalTree(node)) {
+    return node;
+  }
+
+  return rebalanceLogicalTree(
+    Object.assign(
+      {
+        type: "LogicalExpression",
+        operator: node.operator,
+        left: rebalanceLogicalTree(
+          Object.assign(
+            {
+              type: "LogicalExpression",
+              operator: node.operator,
+              left: node.left,
+              right: node.right.left
+            },
+            composeLoc(node.left, node.right.left)
+          )
+        ),
+        right: node.right.right
+      },
+      composeLoc(node)
+    )
+  );
+}
+
 module.exports = postprocess;
diff --git a/tests/logical_expressions/__snapshots__/jsfmt.spec.js.snap b/tests/logical_expressions/__snapshots__/jsfmt.spec.js.snap
index 4feb44940..714f2f726 100644
--- a/tests/logical_expressions/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/logical_expressions/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,26 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`issue-7024.js 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+const radioSelectedAttr =
+  (isAnyValueSelected &&
+    node.getAttribute(radioAttr.toLowerCase()) === radioValue) ||
+  ((!isAnyValueSelected && values[a].default === true) || a === 0);
+
+=====================================output=====================================
+const radioSelectedAttr =
+  (isAnyValueSelected &&
+    node.getAttribute(radioAttr.toLowerCase()) === radioValue) ||
+  (!isAnyValueSelected && values[a].default === true) ||
+  a === 0;
+
+================================================================================
+`;
+
 exports[`logical_expression_operators.js 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]
diff --git a/tests/logical_expressions/issue-7024.js b/tests/logical_expressions/issue-7024.js
new file mode 100644
index 000000000..fa8e8ff1e
--- /dev/null
+++ b/tests/logical_expressions/issue-7024.js
@@ -0,0 +1,4 @@
+const radioSelectedAttr =
+  (isAnyValueSelected &&
+    node.getAttribute(radioAttr.toLowerCase()) === radioValue) ||
+  ((!isAnyValueSelected && values[a].default === true) || a === 0);

From a8794373ec680bb020e9731519d69540c6ee2f09 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2019 15:29:06 +0300
Subject: [PATCH 31/88] Bump docusaurus from 1.14.1 to 1.14.2 in /website
 (#7030)

Bumps [docusaurus](https://github.com/facebook/docusaurus) from 1.14.1 to 1.14.2.
- [Release notes](https://github.com/facebook/docusaurus/releases)
- [Changelog](https://github.com/facebook/docusaurus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/docusaurus/compare/v1.14.1...v1.14.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index c74613027..76696680e 100644
--- a/website/package.json
+++ b/website/package.json
@@ -24,7 +24,7 @@
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
     "concurrently": "5.0.0",
-    "docusaurus": "1.14.1",
+    "docusaurus": "1.14.2",
     "js-yaml": "3.13.1",
     "svgo": "1.3.2",
     "webpack": "4.41.2",
diff --git a/website/yarn.lock b/website/yarn.lock
index 8cdbe90aa..03365fd90 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2624,10 +2624,10 @@ dir-glob@2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
-docusaurus@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.14.1.tgz#970d3905bfff46f9772b1587bd012a9124bd1dde"
-  integrity sha512-+3tZ8MkJucaKuBmlgCCVRqundk1RJP3Ym71oiuLf7NLYIIQbK5gOqycmnOE0aD+vsL0/XsxH67yNJkd+tCTqVg==
+docusaurus@1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.14.2.tgz#6631a1cb34f82345147ed12af8233a3b2b43428e"
+  integrity sha512-hPn2v8UDsxZ+rAB+HdrNg4iK0VccubB2y9fJle4kag5MKlk1jele07hyXKhGgOvW2KSroRMHQVFF9EIeS0yYRg==
   dependencies:
     "@babel/core" "^7.7.2"
     "@babel/plugin-proposal-class-properties" "^7.7.0"

From cad32c0e22f5dba73c4e9ec7110e20cf310dd4dc Mon Sep 17 00:00:00 2001
From: Evilebot Tnawi <evilebottnawi@users.noreply.github.com>
Date: Fri, 22 Nov 2019 15:36:34 +0300
Subject: [PATCH 32/88] fix formatting of logical and binary expressions in
 template literals (#7010)

---
 changelog_unreleased/javascript/pr-7003.md    | 28 +++++++
 src/language-js/printer-estree.js             |  9 +-
 .../__snapshots__/jsfmt.spec.js.snap          |  3 +-
 .../strings/__snapshots__/jsfmt.spec.js.snap  | 64 +++++---------
 .../__snapshots__/jsfmt.spec.js.snap          | 83 +++++++++++++++++++
 .../template_literals/binary-exporessions.js  |  4 +
 .../conditional-expressions.js                |  3 +
 .../template_literals/logical-expressions.js  |  6 ++
 .../template_literals/sequence-expressions.js |  1 +
 .../__snapshots__/jsfmt.spec.js.snap          | 32 +++++++
 .../as-expression.ts                          |  5 ++
 .../jsfmt.spec.js                             |  1 +
 12 files changed, 194 insertions(+), 45 deletions(-)
 create mode 100644 changelog_unreleased/javascript/pr-7003.md
 create mode 100644 tests/template_literals/binary-exporessions.js
 create mode 100644 tests/template_literals/conditional-expressions.js
 create mode 100644 tests/template_literals/logical-expressions.js
 create mode 100644 tests/template_literals/sequence-expressions.js
 create mode 100644 tests/typescript_template_literals/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/typescript_template_literals/as-expression.ts
 create mode 100644 tests/typescript_template_literals/jsfmt.spec.js

diff --git a/changelog_unreleased/javascript/pr-7003.md b/changelog_unreleased/javascript/pr-7003.md
new file mode 100644
index 000000000..73563471a
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-7003.md
@@ -0,0 +1,28 @@
+#### Fix formatting of logical, binary and sequence expressions in template literals ([#7010](https://github.com/prettier/prettier/pull/7010) by [@evilebottnawi](https://github.com/evilebottnawi))
+
+<!-- prettier-ignore -->
+```js
+// Input
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${foo || bar}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${foo | bar}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${(foo, bar)}`;
+
+// Prettier stable
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${foo ||
+  bar}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${foo |
+  bar}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${(foo,
+bar)}`;
+
+// Prettier master
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${
+  foo || bar
+}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${
+  foo | bar
+}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${
+  (foo, bar)
+}`;
+```
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index baeb979a4..49b4552e3 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -609,7 +609,8 @@ function printPathNoParens(path, options, print, args) {
         (parent.type === "ConditionalExpression" &&
           parentParent.type !== "ReturnStatement" &&
           parentParent.type !== "CallExpression" &&
-          parentParent.type !== "OptionalCallExpression");
+          parentParent.type !== "OptionalCallExpression") ||
+        parent.type === "TemplateLiteral";
 
       const shouldIndentIfInlining =
         parent.type === "AssignmentExpression" ||
@@ -2481,7 +2482,11 @@ function printPathNoParens(path, options, print, args) {
               (n.expressions[i].comments && n.expressions[i].comments.length) ||
               n.expressions[i].type === "MemberExpression" ||
               n.expressions[i].type === "OptionalMemberExpression" ||
-              n.expressions[i].type === "ConditionalExpression"
+              n.expressions[i].type === "ConditionalExpression" ||
+              n.expressions[i].type === "LogicalExpression" ||
+              n.expressions[i].type === "BinaryExpression" ||
+              n.expressions[i].type === "SequenceExpression" ||
+              n.expressions[i].type === "TSAsExpression"
             ) {
               printed = concat([indent(concat([softline, printed])), softline]);
             }
diff --git a/tests/line_suffix_boundary/__snapshots__/jsfmt.spec.js.snap b/tests/line_suffix_boundary/__snapshots__/jsfmt.spec.js.snap
index 583f31c1d..475d1d817 100644
--- a/tests/line_suffix_boundary/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/line_suffix_boundary/__snapshots__/jsfmt.spec.js.snap
@@ -32,7 +32,8 @@ ExampleStory.getFragment('story')}
 </div>;
 
 =====================================output=====================================
-\`\${a + a // a
+\`\${
+  a + a // a
 }
 
 \${
diff --git a/tests/strings/__snapshots__/jsfmt.spec.js.snap b/tests/strings/__snapshots__/jsfmt.spec.js.snap
index ff176f2b3..d3cdd404a 100644
--- a/tests/strings/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/strings/__snapshots__/jsfmt.spec.js.snap
@@ -191,26 +191,13 @@ const Bar = styled.div\`
 
 =====================================output=====================================
 foo(
-  \`a long string \${1 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3} with expr\`
+  \`a long string \${
+    1 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3
+  } with expr\`
 );
 
-const x = \`a long string \${1 +
+const x = \`a long string \${
+  1 +
   2 +
   3 +
   2 +
@@ -229,10 +216,12 @@ const x = \`a long string \${1 +
   2 +
   3 +
   2 +
-  3} with expr\`;
+  3
+} with expr\`;
 
 foo(
-  \`a long string \${1 +
+  \`a long string \${
+    1 +
     2 +
     3 +
     2 +
@@ -253,7 +242,8 @@ foo(
     2 +
     3 +
     2 +
-    3} with expr\`
+    3
+  } with expr\`
 );
 
 pipe.write(
@@ -385,26 +375,13 @@ const Bar = styled.div\`
 
 =====================================output=====================================
 foo(
-  \`a long string \${1 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3 +
-    2 +
-    3} with expr\`,
+  \`a long string \${
+    1 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3 + 2 + 3
+  } with expr\`,
 );
 
-const x = \`a long string \${1 +
+const x = \`a long string \${
+  1 +
   2 +
   3 +
   2 +
@@ -423,10 +400,12 @@ const x = \`a long string \${1 +
   2 +
   3 +
   2 +
-  3} with expr\`;
+  3
+} with expr\`;
 
 foo(
-  \`a long string \${1 +
+  \`a long string \${
+    1 +
     2 +
     3 +
     2 +
@@ -447,7 +426,8 @@ foo(
     2 +
     3 +
     2 +
-    3} with expr\`,
+    3
+  } with expr\`,
 );
 
 pipe.write(
diff --git a/tests/template_literals/__snapshots__/jsfmt.spec.js.snap b/tests/template_literals/__snapshots__/jsfmt.spec.js.snap
index 4768cc0d2..812b09b51 100644
--- a/tests/template_literals/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/template_literals/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,45 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`binary-exporessions.js 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${1 |
+2}\`;
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${1 &
+2}\`;
+
+=====================================output=====================================
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${
+  1 | 2
+}\`;
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${
+  1 & 2
+}\`;
+
+================================================================================
+`;
+
+exports[`conditional-expressions.js 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${
+  1 ? 1 : 2
+}\`;
+
+=====================================output=====================================
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${
+  1 ? 1 : 2
+}\`;
+
+================================================================================
+`;
+
 exports[`css-prop.js 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]
@@ -191,6 +231,49 @@ throw new Error(
 ================================================================================
 `;
 
+exports[`logical-expressions.js 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${1 ??
+2}\`;
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${1 &&
+2}\`;
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${1 ||
+2}\`;
+
+=====================================output=====================================
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${
+  1 ?? 2
+}\`;
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${
+  1 && 2
+}\`;
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${
+  1 || 2
+}\`;
+
+================================================================================
+`;
+
+exports[`sequence-expressions.js 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${(1, 2)}\`;
+
+=====================================output=====================================
+\`111111111 222222222 333333333 444444444 555555555 666666666 777777777 \${
+  (1, 2)
+}\`;
+
+================================================================================
+`;
+
 exports[`styled-components-with-expressions.js 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]
diff --git a/tests/template_literals/binary-exporessions.js b/tests/template_literals/binary-exporessions.js
new file mode 100644
index 000000000..7507623e0
--- /dev/null
+++ b/tests/template_literals/binary-exporessions.js
@@ -0,0 +1,4 @@
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${1 |
+2}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${1 &
+2}`;
diff --git a/tests/template_literals/conditional-expressions.js b/tests/template_literals/conditional-expressions.js
new file mode 100644
index 000000000..5da7c3bd5
--- /dev/null
+++ b/tests/template_literals/conditional-expressions.js
@@ -0,0 +1,3 @@
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${
+  1 ? 1 : 2
+}`;
diff --git a/tests/template_literals/logical-expressions.js b/tests/template_literals/logical-expressions.js
new file mode 100644
index 000000000..f2964d8f1
--- /dev/null
+++ b/tests/template_literals/logical-expressions.js
@@ -0,0 +1,6 @@
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${1 ??
+2}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${1 &&
+2}`;
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${1 ||
+2}`;
diff --git a/tests/template_literals/sequence-expressions.js b/tests/template_literals/sequence-expressions.js
new file mode 100644
index 000000000..ab20d4972
--- /dev/null
+++ b/tests/template_literals/sequence-expressions.js
@@ -0,0 +1 @@
+`111111111 222222222 333333333 444444444 555555555 666666666 777777777 ${(1, 2)}`;
diff --git a/tests/typescript_template_literals/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_template_literals/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..abb2f5474
--- /dev/null
+++ b/tests/typescript_template_literals/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,32 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`as-expression.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+const a = \`\${(foo + bar) as baz}\`;
+const b = \`\${(veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongFoo + bar) as baz}\`;
+const b = \`\${(foo + veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBar) as baz}\`;
+const b = \`\${(foo + bar) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz}\`;
+const b = \`\${(veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongFoo + veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBar) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz}\`;
+
+=====================================output=====================================
+const a = \`\${(foo + bar) as baz}\`;
+const b = \`\${
+  (veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongFoo + bar) as baz
+}\`;
+const b = \`\${
+  (foo + veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBar) as baz
+}\`;
+const b = \`\${
+  (foo + bar) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz
+}\`;
+const b = \`\${
+  (veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongFoo +
+    veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBar) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz
+}\`;
+
+================================================================================
+`;
diff --git a/tests/typescript_template_literals/as-expression.ts b/tests/typescript_template_literals/as-expression.ts
new file mode 100644
index 000000000..3c2edeff8
--- /dev/null
+++ b/tests/typescript_template_literals/as-expression.ts
@@ -0,0 +1,5 @@
+const a = `${(foo + bar) as baz}`;
+const b = `${(veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongFoo + bar) as baz}`;
+const b = `${(foo + veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBar) as baz}`;
+const b = `${(foo + bar) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz}`;
+const b = `${(veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongFoo + veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBar) as veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongBaz}`;
diff --git a/tests/typescript_template_literals/jsfmt.spec.js b/tests/typescript_template_literals/jsfmt.spec.js
new file mode 100644
index 000000000..2ea3bb6eb
--- /dev/null
+++ b/tests/typescript_template_literals/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["typescript"]);

From b7e6d7cf26f25e9b773dd1a778a9f6ed0d574191 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2019 15:56:02 +0100
Subject: [PATCH 33/88] Bump resolve from 1.12.0 to 1.12.2 (#7032)

Bumps [resolve](https://github.com/browserify/resolve) from 1.12.0 to 1.12.2.
- [Release notes](https://github.com/browserify/resolve/releases)
- [Commits](https://github.com/browserify/resolve/compare/v1.12.0...v1.12.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e55beb112..81895b820 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "regexp-util": "1.2.2",
     "remark-math": "1.0.6",
     "remark-parse": "5.0.0",
-    "resolve": "1.12.0",
+    "resolve": "1.12.2",
     "semver": "6.3.0",
     "string-width": "4.1.0",
     "typescript": "3.7.2",
diff --git a/yarn.lock b/yarn.lock
index a967d0b53..a323c78eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5832,10 +5832,10 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@1.12.0, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
-  integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
+resolve@1.12.2, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.2.tgz#08b12496d9aa8659c75f534a8f05f0d892fff594"
+  integrity sha512-cAVTI2VLHWYsGOirfeYVVQ7ZDejtQ9fp4YhYckWDEkFfqbVjaT11iM8k6xSAfGFMM+gDpZjMnFssPu8we+mqFw==
   dependencies:
     path-parse "^1.0.6"
 

From 3b782eb9766a54183759300d0fcdb1ada3909c3d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 23 Nov 2019 20:04:37 +0100
Subject: [PATCH 34/88] Bump @babel/preset-env from 7.7.1 to 7.7.4 (#7035)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.1 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.1...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |   2 +-
 yarn.lock    | 746 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 413 insertions(+), 335 deletions(-)

diff --git a/package.json b/package.json
index 81895b820..f1ebec2ee 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.7.2",
-    "@babel/preset-env": "7.7.1",
+    "@babel/preset-env": "7.7.4",
     "@rollup/plugin-alias": "2.2.0",
     "@rollup/plugin-json": "4.0.0",
     "@rollup/plugin-replace": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index a323c78eb..fa025df83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -58,52 +58,64 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz#efc54032d43891fe267679e63f6860aa7dbf4a5e"
-  integrity sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==
+"@babel/generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
+  integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==
   dependencies:
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
+"@babel/helper-annotate-as-pure@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
+  integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-call-delegate@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
-  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f"
+  integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/helper-explode-assignable-expression" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.0.tgz#2e8badfe201cfafb5d930f46cf1e0b6f1cdcab23"
-  integrity sha512-ZhagAAVGD3L6MPM9/zZi7RRteonfBFLVUz3kjsnYsMAtr9hOJCKI9BAKIMpqn3NyWicPieoX779UL+7/3BEAOA==
+"@babel/helper-call-delegate@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801"
+  integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-create-regexp-features-plugin@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
+  integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==
   dependencies:
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.6.0"
 
-"@babel/helper-define-map@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz#60b0e9fd60def9de5054c38afde8c8ee409c7529"
-  integrity sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==
+"@babel/helper-define-map@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176"
+  integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==
   dependencies:
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/types" "^7.7.4"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
+"@babel/helper-explode-assignable-expression@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84"
+  integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==
   dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-function-name@^7.7.0":
   version "7.7.0"
@@ -114,52 +126,68 @@
     "@babel/template" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/helper-get-function-arity@^7.0.0", "@babel/helper-get-function-arity@^7.7.0":
+"@babel/helper-function-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
+  integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-get-function-arity@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz#c604886bc97287a1d1398092bc666bc3d7d7aa2d"
   integrity sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==
   dependencies:
     "@babel/types" "^7.7.0"
 
-"@babel/helper-hoist-variables@^7.4.4", "@babel/helper-hoist-variables@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz#b4552e4cfe5577d7de7b183e193e84e4ec538c81"
-  integrity sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==
+"@babel/helper-get-function-arity@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
+  integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==
   dependencies:
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-member-expression-to-functions@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz#472b93003a57071f95a541ea6c2b098398bcad8a"
-  integrity sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==
+"@babel/helper-hoist-variables@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
+  integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==
   dependencies:
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz#99c095889466e5f7b6d66d98dffc58baaf42654d"
-  integrity sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==
+"@babel/helper-member-expression-to-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
+  integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==
   dependencies:
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz#154a69f0c5b8fd4d39e49750ff7ac4faa3f36786"
-  integrity sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
+  integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.0"
-    "@babel/helper-simple-access" "^7.7.0"
-    "@babel/helper-split-export-declaration" "^7.7.0"
-    "@babel/template" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-module-transforms@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.4.tgz#8d7cdb1e1f8ea3d8c38b067345924ac4f8e0879a"
+  integrity sha512-ehGBu4mXrhs0FxAqN8tWkzF8GSIGAiEumu4ONZ/hD9M88uHcD+Yu2ttKfOCgwzoesJOJrtQh7trI5YPbRtMmnA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-simple-access" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
     lodash "^4.17.13"
 
-"@babel/helper-optimise-call-expression@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz#4f66a216116a66164135dc618c5d8b7a959f9365"
-  integrity sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==
+"@babel/helper-optimise-call-expression@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
+  integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==
   dependencies:
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
@@ -172,34 +200,34 @@
   dependencies:
     lodash "^4.17.11"
 
-"@babel/helper-remap-async-to-generator@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz#4d69ec653e8bff5bce62f5d33fc1508f223c75a7"
-  integrity sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==
+"@babel/helper-remap-async-to-generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234"
+  integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.0"
-    "@babel/helper-wrap-function" "^7.7.0"
-    "@babel/template" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-wrap-function" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-replace-supers@^7.5.5", "@babel/helper-replace-supers@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz#d5365c8667fe7cbd13b8ddddceb9bd7f2b387512"
-  integrity sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==
+"@babel/helper-replace-supers@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
+  integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.7.0"
-    "@babel/helper-optimise-call-expression" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/helper-member-expression-to-functions" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-simple-access@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz#97a8b6c52105d76031b86237dc1852b44837243d"
-  integrity sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==
+"@babel/helper-simple-access@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
+  integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==
   dependencies:
-    "@babel/template" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-split-export-declaration@^7.7.0":
   version "7.7.0"
@@ -208,15 +236,22 @@
   dependencies:
     "@babel/types" "^7.7.0"
 
-"@babel/helper-wrap-function@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz#15af3d3e98f8417a60554acbb6c14e75e0b33b74"
-  integrity sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==
+"@babel/helper-split-export-declaration@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
+  integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==
   dependencies:
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/template" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-wrap-function@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
+  integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helpers@^7.7.0":
   version "7.7.0"
@@ -249,378 +284,397 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.3.tgz#5fad457c2529de476a248f75b0f090b3060af043"
   integrity sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==
 
-"@babel/plugin-proposal-async-generator-functions@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz#83ef2d6044496b4c15d8b4904e2219e6dccc6971"
-  integrity sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==
+"@babel/parser@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
+  integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
+
+"@babel/plugin-proposal-async-generator-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
+  integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.4"
+    "@babel/plugin-syntax-async-generators" "^7.7.4"
 
-"@babel/plugin-proposal-dynamic-import@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz#dc02a8bad8d653fb59daf085516fa416edd2aa7f"
-  integrity sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ==
+"@babel/plugin-proposal-dynamic-import@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
+  integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
 
-"@babel/plugin-proposal-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
+"@babel/plugin-proposal-json-strings@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
+  integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
+    "@babel/plugin-syntax-json-strings" "^7.7.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"
-  integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==
+"@babel/plugin-proposal-object-rest-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
+  integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
+"@babel/plugin-proposal-optional-catch-binding@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379"
+  integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz#549fe1717a1bd0a2a7e63163841cb37e78179d5d"
-  integrity sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==
+"@babel/plugin-proposal-unicode-property-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
+  integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-async-generators@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
+"@babel/plugin-syntax-async-generators@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889"
+  integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-dynamic-import@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
-  integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
+"@babel/plugin-syntax-dynamic-import@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
+  integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
+"@babel/plugin-syntax-json-strings@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
+  integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+"@babel/plugin-syntax-object-rest-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
+  integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
+"@babel/plugin-syntax-optional-catch-binding@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
+  integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-top-level-await@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz#f5699549f50bbe8d12b1843a4e82f0a37bb65f4d"
-  integrity sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA==
+"@babel/plugin-syntax-top-level-await@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
+  integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-arrow-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
+"@babel/plugin-transform-arrow-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
+  integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz#e2b84f11952cf5913fe3438b7d2585042772f492"
-  integrity sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==
+"@babel/plugin-transform-async-to-generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba"
+  integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.0"
+    "@babel/helper-module-imports" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
+"@babel/plugin-transform-block-scoped-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b"
+  integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a"
-  integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==
+"@babel/plugin-transform-block-scoping@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224"
+  integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz#b411ecc1b8822d24b81e5d184f24149136eddd4a"
-  integrity sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==
+"@babel/plugin-transform-classes@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec"
+  integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.0"
-    "@babel/helper-define-map" "^7.7.0"
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/helper-optimise-call-expression" "^7.7.0"
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-define-map" "^7.7.4"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.0"
-    "@babel/helper-split-export-declaration" "^7.7.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
+"@babel/plugin-transform-computed-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d"
+  integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6"
-  integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==
+"@babel/plugin-transform-destructuring@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267"
+  integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz#c5c9ecacab3a5e0c11db6981610f0c32fd698b3b"
-  integrity sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==
+"@babel/plugin-transform-dotall-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96"
+  integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-duplicate-keys@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
-  integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==
+"@babel/plugin-transform-duplicate-keys@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91"
+  integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-exponentiation-operator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
+"@babel/plugin-transform-exponentiation-operator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9"
+  integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-for-of@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
-  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
+"@babel/plugin-transform-for-of@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc"
+  integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz#0fa786f1eef52e3b7d4fc02e54b2129de8a04c2a"
-  integrity sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==
+"@babel/plugin-transform-function-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1"
+  integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==
   dependencies:
-    "@babel/helper-function-name" "^7.7.0"
+    "@babel/helper-function-name" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
+"@babel/plugin-transform-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e"
+  integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-member-expression-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
-  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
+"@babel/plugin-transform-member-expression-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a"
+  integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-amd@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
-  integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==
+"@babel/plugin-transform-modules-amd@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.4.tgz#276b3845ca2b228f2995e453adc2e6f54d72fb71"
+  integrity sha512-/542/5LNA18YDtg1F+QHvvUSlxdvjZoD/aldQwkq+E3WCkbEjNSN9zdrOXaSlfg3IfGi22ijzecklF/A7kVZFQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-module-transforms" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz#3e5ffb4fd8c947feede69cbe24c9554ab4113fe3"
-  integrity sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==
+"@babel/plugin-transform-modules-commonjs@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.4.tgz#bee4386e550446343dd52a571eda47851ff857a3"
+  integrity sha512-k8iVS7Jhc367IcNF53KCwIXtKAH7czev866ThsTgy8CwlXjnKZna2VHwChglzLleYrcHz1eQEIJlGRQxB53nqA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.0"
+    "@babel/helper-module-transforms" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.7.0"
+    "@babel/helper-simple-access" "^7.7.4"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz#9baf471213af9761c1617bb12fd278e629041417"
-  integrity sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==
+"@babel/plugin-transform-modules-systemjs@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30"
+  integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.7.0"
+    "@babel/helper-hoist-variables" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-umd@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz#d62c7da16670908e1d8c68ca0b5d4c0097b69966"
-  integrity sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==
+"@babel/plugin-transform-modules-umd@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f"
+  integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.0"
+    "@babel/helper-module-transforms" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz#358e6fd869b9a4d8f5cbc79e4ed4fc340e60dcaf"
-  integrity sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220"
+  integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
 
-"@babel/plugin-transform-new-target@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
-  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
+"@babel/plugin-transform-new-target@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167"
+  integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-object-super@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9"
-  integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==
+"@babel/plugin-transform-object-super@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262"
+  integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
+    "@babel/helper-replace-supers" "^7.7.4"
 
-"@babel/plugin-transform-parameters@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
-  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
+"@babel/plugin-transform-parameters@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce"
+  integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==
   dependencies:
-    "@babel/helper-call-delegate" "^7.4.4"
-    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/helper-call-delegate" "^7.7.4"
+    "@babel/helper-get-function-arity" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-property-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
-  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
+"@babel/plugin-transform-property-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2"
+  integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-regenerator@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz#f1b20b535e7716b622c99e989259d7dd942dd9cc"
-  integrity sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==
+"@babel/plugin-transform-regenerator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.4.tgz#d18eac0312a70152d7d914cbed2dc3999601cfc0"
+  integrity sha512-e7MWl5UJvmPEwFJTwkBlPmqixCtr9yAASBqff4ggXTNicZiwbF8Eefzm6NVgfiBp7JdAGItecnctKTgH44q2Jw==
   dependencies:
     regenerator-transform "^0.14.0"
 
-"@babel/plugin-transform-reserved-words@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
-  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
+"@babel/plugin-transform-reserved-words@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb"
+  integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
+"@babel/plugin-transform-shorthand-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e"
+  integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-spread@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"
-  integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==
+"@babel/plugin-transform-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578"
+  integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-sticky-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
+"@babel/plugin-transform-sticky-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c"
+  integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
-"@babel/plugin-transform-template-literals@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
-  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
+"@babel/plugin-transform-template-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604"
+  integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-typeof-symbol@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
+"@babel/plugin-transform-typeof-symbol@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e"
+  integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz#743d9bcc44080e3cc7d49259a066efa30f9187a3"
-  integrity sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==
+"@babel/plugin-transform-unicode-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
+  integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/preset-env@7.7.1":
-  version "7.7.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.1.tgz#04a2ff53552c5885cf1083e291c8dd5490f744bb"
-  integrity sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA==
+"@babel/preset-env@7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.4.tgz#ccaf309ae8d1ee2409c85a4e2b5e280ceee830f8"
+  integrity sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.0"
+    "@babel/helper-module-imports" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.7.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.7.0"
-    "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.7.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-syntax-top-level-await" "^7.7.0"
-    "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.7.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.6.3"
-    "@babel/plugin-transform-classes" "^7.7.0"
-    "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.6.0"
-    "@babel/plugin-transform-dotall-regex" "^7.7.0"
-    "@babel/plugin-transform-duplicate-keys" "^7.5.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.4.4"
-    "@babel/plugin-transform-function-name" "^7.7.0"
-    "@babel/plugin-transform-literals" "^7.2.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
-    "@babel/plugin-transform-modules-amd" "^7.5.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.7.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.7.0"
-    "@babel/plugin-transform-modules-umd" "^7.7.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.0"
-    "@babel/plugin-transform-new-target" "^7.4.4"
-    "@babel/plugin-transform-object-super" "^7.5.5"
-    "@babel/plugin-transform-parameters" "^7.4.4"
-    "@babel/plugin-transform-property-literals" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.7.0"
-    "@babel/plugin-transform-reserved-words" "^7.2.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.6.2"
-    "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.4.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.7.0"
-    "@babel/types" "^7.7.1"
+    "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.7.4"
+    "@babel/plugin-proposal-json-strings" "^7.7.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.7.4"
+    "@babel/plugin-syntax-async-generators" "^7.7.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
+    "@babel/plugin-syntax-json-strings" "^7.7.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
+    "@babel/plugin-syntax-top-level-await" "^7.7.4"
+    "@babel/plugin-transform-arrow-functions" "^7.7.4"
+    "@babel/plugin-transform-async-to-generator" "^7.7.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.7.4"
+    "@babel/plugin-transform-block-scoping" "^7.7.4"
+    "@babel/plugin-transform-classes" "^7.7.4"
+    "@babel/plugin-transform-computed-properties" "^7.7.4"
+    "@babel/plugin-transform-destructuring" "^7.7.4"
+    "@babel/plugin-transform-dotall-regex" "^7.7.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.7.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
+    "@babel/plugin-transform-for-of" "^7.7.4"
+    "@babel/plugin-transform-function-name" "^7.7.4"
+    "@babel/plugin-transform-literals" "^7.7.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.7.4"
+    "@babel/plugin-transform-modules-amd" "^7.7.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.7.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.7.4"
+    "@babel/plugin-transform-modules-umd" "^7.7.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
+    "@babel/plugin-transform-new-target" "^7.7.4"
+    "@babel/plugin-transform-object-super" "^7.7.4"
+    "@babel/plugin-transform-parameters" "^7.7.4"
+    "@babel/plugin-transform-property-literals" "^7.7.4"
+    "@babel/plugin-transform-regenerator" "^7.7.4"
+    "@babel/plugin-transform-reserved-words" "^7.7.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.7.4"
+    "@babel/plugin-transform-spread" "^7.7.4"
+    "@babel/plugin-transform-sticky-regex" "^7.7.4"
+    "@babel/plugin-transform-template-literals" "^7.7.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.7.4"
+    "@babel/plugin-transform-unicode-regex" "^7.7.4"
+    "@babel/types" "^7.7.4"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"
@@ -643,7 +697,16 @@
     "@babel/parser" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+"@babel/template@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
+  integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09"
   integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==
@@ -658,10 +721,25 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7"
-  integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==
+"@babel/traverse@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
+  integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.4"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/parser" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.7.0", "@babel/types@^7.7.2", "@babel/types@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
+  integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.13"

From 4ea67fa7061c23b24b4e9b85dbb0e8aea86b3895 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 23 Nov 2019 20:04:55 +0100
Subject: [PATCH 35/88] Bump @babel/parser from 7.7.3 to 7.7.4 (#7034)

Bumps [@babel/parser](https://github.com/babel/babel) from 7.7.3 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.3...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f1ebec2ee..2c291375f 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@angular/compiler": "8.2.14",
     "@babel/code-frame": "7.5.5",
-    "@babel/parser": "7.7.3",
+    "@babel/parser": "7.7.4",
     "@glimmer/syntax": "0.41.0",
     "@iarna/toml": "2.2.3",
     "@typescript-eslint/typescript-estree": "2.8.0",
diff --git a/yarn.lock b/yarn.lock
index fa025df83..afcd0af9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -279,10 +279,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.7.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
-  version "7.7.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.3.tgz#5fad457c2529de476a248f75b0f090b3060af043"
-  integrity sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==
+"@babel/parser@7.7.4", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
+  integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
 
 "@babel/parser@^7.7.4":
   version "7.7.4"

From 4b6c6801a5f2a1f81e9bd45fce32007db01abbc3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2019 10:11:46 +0100
Subject: [PATCH 36/88] Bump rollup from 1.27.3 to 1.27.5 (#7047)

Bumps [rollup](https://github.com/rollup/rollup) from 1.27.3 to 1.27.5.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v1.27.3...v1.27.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 2c291375f..fd0b3ea40 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "mkdirp": "0.5.1",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
-    "rollup": "1.27.3",
+    "rollup": "1.27.5",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index afcd0af9c..c056c988a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -279,12 +279,7 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.7.4", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
-  integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
-
-"@babel/parser@^7.7.4":
+"@babel/parser@7.7.4", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
   integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
@@ -6017,10 +6012,10 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0,
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@1.27.3:
-  version "1.27.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.3.tgz#0e427d9bee9e30e6017e89b942d88276ce26f9e2"
-  integrity sha512-79AEh4m5NPCz97GTuIoXpSFIMPyk2AiqVQp040baSRPXk/I4YMGt5/CR9GX5oEYEkxwBZoWLheaS1/w/FidfJw==
+rollup@1.27.5:
+  version "1.27.5"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.5.tgz#d100fb0ffd8353575cb2057152547b9abfddfe59"
+  integrity sha512-8rfVdzuTg2kt8ObD9LNJpEwUN7B6lsl3sHc5fddtgICpLjpYeSf4m2+RftBzcCaBTMi1iYX3Ez8zFT4Gj2nJjg==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"

From b43bb40400985abaed644a32b0c45792b6a99ee3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2019 10:12:12 +0100
Subject: [PATCH 37/88] Bump @babel/preset-env from 7.7.1 to 7.7.4 in /website
 (#7045)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.1 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.1...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json |   2 +-
 website/yarn.lock    | 818 +++++++++++++++++++++----------------------
 2 files changed, 410 insertions(+), 410 deletions(-)

diff --git a/website/package.json b/website/package.json
index 76696680e..6759c315e 100644
--- a/website/package.json
+++ b/website/package.json
@@ -19,7 +19,7 @@
     "react-dom": "16.12.0"
   },
   "devDependencies": {
-    "@babel/preset-env": "7.7.1",
+    "@babel/preset-env": "7.7.4",
     "@babel/preset-react": "7.7.0",
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
diff --git a/website/yarn.lock b/website/yarn.lock
index 03365fd90..401f63e62 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -46,27 +46,30 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
-  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
+"@babel/generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
+  integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.7.4"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz#efc54032d43891fe267679e63f6860aa7dbf4a5e"
-  integrity sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==
+"@babel/helper-annotate-as-pure@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
+  integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==
   dependencies:
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
-  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f"
+  integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-explode-assignable-expression" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-builder-react-jsx@^7.7.0":
   version "7.7.0"
@@ -76,14 +79,14 @@
     "@babel/types" "^7.7.0"
     esutils "^2.0.0"
 
-"@babel/helper-call-delegate@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
-  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
+"@babel/helper-call-delegate@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801"
+  integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
+    "@babel/helper-hoist-variables" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-create-class-features-plugin@^7.7.0":
   version "7.7.0"
@@ -97,30 +100,30 @@
     "@babel/helper-replace-supers" "^7.7.0"
     "@babel/helper-split-export-declaration" "^7.7.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.7.0":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz#6f20443778c8fce2af2ff4206284afc0ced65db6"
-  integrity sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ==
+"@babel/helper-create-regexp-features-plugin@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
+  integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==
   dependencies:
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.6.0"
 
-"@babel/helper-define-map@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz#60b0e9fd60def9de5054c38afde8c8ee409c7529"
-  integrity sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==
+"@babel/helper-define-map@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176"
+  integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==
   dependencies:
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/types" "^7.7.4"
     lodash "^4.17.13"
 
-"@babel/helper-explode-assignable-expression@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
-  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
+"@babel/helper-explode-assignable-expression@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84"
+  integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==
   dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-function-name@^7.7.0":
   version "7.7.0"
@@ -131,12 +134,14 @@
     "@babel/template" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
-  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
+"@babel/helper-function-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
+  integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/helper-get-function-arity" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-get-function-arity@^7.7.0":
   version "7.7.0"
@@ -145,26 +150,19 @@
   dependencies:
     "@babel/types" "^7.7.0"
 
-"@babel/helper-hoist-variables@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
-  integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
+"@babel/helper-get-function-arity@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
+  integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==
   dependencies:
-    "@babel/types" "^7.4.4"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-hoist-variables@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz#b4552e4cfe5577d7de7b183e193e84e4ec538c81"
-  integrity sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==
+"@babel/helper-hoist-variables@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
+  integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==
   dependencies:
-    "@babel/types" "^7.7.0"
-
-"@babel/helper-member-expression-to-functions@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"
-  integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==
-  dependencies:
-    "@babel/types" "^7.5.5"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-member-expression-to-functions@^7.7.0":
   version "7.7.0"
@@ -173,44 +171,32 @@
   dependencies:
     "@babel/types" "^7.7.0"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz#99c095889466e5f7b6d66d98dffc58baaf42654d"
-  integrity sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==
+"@babel/helper-member-expression-to-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
+  integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==
   dependencies:
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-module-transforms@^7.1.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
-  integrity sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==
+"@babel/helper-module-imports@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
+  integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.2.2"
-    "@babel/types" "^7.2.2"
-    lodash "^4.17.10"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-module-transforms@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz#154a69f0c5b8fd4d39e49750ff7ac4faa3f36786"
-  integrity sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==
+"@babel/helper-module-transforms@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.4.tgz#8d7cdb1e1f8ea3d8c38b067345924ac4f8e0879a"
+  integrity sha512-ehGBu4mXrhs0FxAqN8tWkzF8GSIGAiEumu4ONZ/hD9M88uHcD+Yu2ttKfOCgwzoesJOJrtQh7trI5YPbRtMmnA==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.0"
-    "@babel/helper-simple-access" "^7.7.0"
-    "@babel/helper-split-export-declaration" "^7.7.0"
-    "@babel/template" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-simple-access" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
     lodash "^4.17.13"
 
-"@babel/helper-optimise-call-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
-  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
 "@babel/helper-optimise-call-expression@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz#4f66a216116a66164135dc618c5d8b7a959f9365"
@@ -218,6 +204,13 @@
   dependencies:
     "@babel/types" "^7.7.0"
 
+"@babel/helper-optimise-call-expression@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
+  integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
@@ -237,26 +230,16 @@
   dependencies:
     lodash "^4.17.13"
 
-"@babel/helper-remap-async-to-generator@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz#4d69ec653e8bff5bce62f5d33fc1508f223c75a7"
-  integrity sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==
+"@babel/helper-remap-async-to-generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234"
+  integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.0"
-    "@babel/helper-wrap-function" "^7.7.0"
-    "@babel/template" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-
-"@babel/helper-replace-supers@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2"
-  integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.5.5"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-wrap-function" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-replace-supers@^7.7.0":
   version "7.7.0"
@@ -268,28 +251,23 @@
     "@babel/traverse" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/helper-simple-access@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
-  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
+"@babel/helper-replace-supers@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
+  integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==
   dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-member-expression-to-functions" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
-"@babel/helper-simple-access@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz#97a8b6c52105d76031b86237dc1852b44837243d"
-  integrity sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==
+"@babel/helper-simple-access@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
+  integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==
   dependencies:
-    "@babel/template" "^7.7.0"
-    "@babel/types" "^7.7.0"
-
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
-  dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helper-split-export-declaration@^7.7.0":
   version "7.7.0"
@@ -298,15 +276,22 @@
   dependencies:
     "@babel/types" "^7.7.0"
 
-"@babel/helper-wrap-function@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz#15af3d3e98f8417a60554acbb6c14e75e0b33b74"
-  integrity sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==
+"@babel/helper-split-export-declaration@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
+  integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==
   dependencies:
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/template" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
+
+"@babel/helper-wrap-function@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
+  integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/helpers@^7.7.0":
   version "7.7.0"
@@ -326,24 +311,24 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.2.2":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.3.tgz#32f5df65744b70888d17872ec106b02434ba1489"
-  integrity sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==
-
 "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.2.tgz#ea8334dc77416bfd9473eb470fd00d8245b3943b"
   integrity sha512-DDaR5e0g4ZTb9aP7cpSZLkACEBdoLGwJDWgHtBhrGX7Q1RjhdoMOfexICj5cqTAtpowjGQWfcvfnQG7G2kAB5w==
 
-"@babel/plugin-proposal-async-generator-functions@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz#83ef2d6044496b4c15d8b4904e2219e6dccc6971"
-  integrity sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==
+"@babel/parser@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
+  integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
+
+"@babel/plugin-proposal-async-generator-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
+  integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.4"
+    "@babel/plugin-syntax-async-generators" "^7.7.4"
 
 "@babel/plugin-proposal-class-properties@^7.7.0":
   version "7.7.0"
@@ -353,64 +338,64 @@
     "@babel/helper-create-class-features-plugin" "^7.7.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz#dc02a8bad8d653fb59daf085516fa416edd2aa7f"
-  integrity sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ==
+"@babel/plugin-proposal-dynamic-import@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
+  integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
 
-"@babel/plugin-proposal-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
-  integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
+"@babel/plugin-proposal-json-strings@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
+  integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
+    "@babel/plugin-syntax-json-strings" "^7.7.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"
-  integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==
+"@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
+  integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
-  integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
+"@babel/plugin-proposal-optional-catch-binding@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379"
+  integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz#549fe1717a1bd0a2a7e63163841cb37e78179d5d"
-  integrity sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==
+"@babel/plugin-proposal-unicode-property-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
+  integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-async-generators@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
-  integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
+"@babel/plugin-syntax-async-generators@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889"
+  integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-dynamic-import@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
-  integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
+"@babel/plugin-syntax-dynamic-import@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
+  integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
-  integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
+"@babel/plugin-syntax-json-strings@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
+  integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -421,209 +406,209 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
-  integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
+"@babel/plugin-syntax-object-rest-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
+  integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
-  integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
+"@babel/plugin-syntax-optional-catch-binding@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
+  integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-top-level-await@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz#f5699549f50bbe8d12b1843a4e82f0a37bb65f4d"
-  integrity sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA==
+"@babel/plugin-syntax-top-level-await@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
+  integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-arrow-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
-  integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
+"@babel/plugin-transform-arrow-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
+  integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz#e2b84f11952cf5913fe3438b7d2585042772f492"
-  integrity sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==
+"@babel/plugin-transform-async-to-generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba"
+  integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.0"
+    "@babel/helper-module-imports" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
-  integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
+"@babel/plugin-transform-block-scoped-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b"
+  integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.6.3":
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a"
-  integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==
+"@babel/plugin-transform-block-scoping@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224"
+  integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-classes@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz#b411ecc1b8822d24b81e5d184f24149136eddd4a"
-  integrity sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==
+"@babel/plugin-transform-classes@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec"
+  integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.0"
-    "@babel/helper-define-map" "^7.7.0"
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/helper-optimise-call-expression" "^7.7.0"
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-define-map" "^7.7.4"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.0"
-    "@babel/helper-split-export-declaration" "^7.7.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
-  integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
+"@babel/plugin-transform-computed-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d"
+  integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6"
-  integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==
+"@babel/plugin-transform-destructuring@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267"
+  integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz#c5c9ecacab3a5e0c11db6981610f0c32fd698b3b"
-  integrity sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==
+"@babel/plugin-transform-dotall-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96"
+  integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-duplicate-keys@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
-  integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==
+"@babel/plugin-transform-duplicate-keys@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91"
+  integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-exponentiation-operator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
-  integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
+"@babel/plugin-transform-exponentiation-operator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9"
+  integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-for-of@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
-  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
+"@babel/plugin-transform-for-of@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc"
+  integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz#0fa786f1eef52e3b7d4fc02e54b2129de8a04c2a"
-  integrity sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==
+"@babel/plugin-transform-function-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1"
+  integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==
   dependencies:
-    "@babel/helper-function-name" "^7.7.0"
+    "@babel/helper-function-name" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
-  integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
+"@babel/plugin-transform-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e"
+  integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-member-expression-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
-  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
+"@babel/plugin-transform-member-expression-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a"
+  integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-amd@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
-  integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==
+"@babel/plugin-transform-modules-amd@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.4.tgz#276b3845ca2b228f2995e453adc2e6f54d72fb71"
+  integrity sha512-/542/5LNA18YDtg1F+QHvvUSlxdvjZoD/aldQwkq+E3WCkbEjNSN9zdrOXaSlfg3IfGi22ijzecklF/A7kVZFQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-module-transforms" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz#3e5ffb4fd8c947feede69cbe24c9554ab4113fe3"
-  integrity sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==
+"@babel/plugin-transform-modules-commonjs@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.4.tgz#bee4386e550446343dd52a571eda47851ff857a3"
+  integrity sha512-k8iVS7Jhc367IcNF53KCwIXtKAH7czev866ThsTgy8CwlXjnKZna2VHwChglzLleYrcHz1eQEIJlGRQxB53nqA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.0"
+    "@babel/helper-module-transforms" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.7.0"
+    "@babel/helper-simple-access" "^7.7.4"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz#9baf471213af9761c1617bb12fd278e629041417"
-  integrity sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==
+"@babel/plugin-transform-modules-systemjs@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30"
+  integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.7.0"
+    "@babel/helper-hoist-variables" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-umd@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz#d62c7da16670908e1d8c68ca0b5d4c0097b69966"
-  integrity sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==
+"@babel/plugin-transform-modules-umd@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f"
+  integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.0"
+    "@babel/helper-module-transforms" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz#358e6fd869b9a4d8f5cbc79e4ed4fc340e60dcaf"
-  integrity sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220"
+  integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
 
-"@babel/plugin-transform-new-target@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
-  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
+"@babel/plugin-transform-new-target@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167"
+  integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-object-super@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9"
-  integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==
+"@babel/plugin-transform-object-super@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262"
+  integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
+    "@babel/helper-replace-supers" "^7.7.4"
 
-"@babel/plugin-transform-parameters@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
-  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
+"@babel/plugin-transform-parameters@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce"
+  integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==
   dependencies:
-    "@babel/helper-call-delegate" "^7.4.4"
-    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/helper-call-delegate" "^7.7.4"
+    "@babel/helper-get-function-arity" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-property-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
-  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
+"@babel/plugin-transform-property-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2"
+  integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -659,63 +644,63 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-regenerator@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz#f1b20b535e7716b622c99e989259d7dd942dd9cc"
-  integrity sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==
+"@babel/plugin-transform-regenerator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.4.tgz#d18eac0312a70152d7d914cbed2dc3999601cfc0"
+  integrity sha512-e7MWl5UJvmPEwFJTwkBlPmqixCtr9yAASBqff4ggXTNicZiwbF8Eefzm6NVgfiBp7JdAGItecnctKTgH44q2Jw==
   dependencies:
     regenerator-transform "^0.14.0"
 
-"@babel/plugin-transform-reserved-words@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
-  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
+"@babel/plugin-transform-reserved-words@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb"
+  integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
-  integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
+"@babel/plugin-transform-shorthand-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e"
+  integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-spread@^7.6.2":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"
-  integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==
+"@babel/plugin-transform-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578"
+  integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-sticky-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
-  integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
+"@babel/plugin-transform-sticky-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c"
+  integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
-"@babel/plugin-transform-template-literals@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
-  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
+"@babel/plugin-transform-template-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604"
+  integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-typeof-symbol@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
-  integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
+"@babel/plugin-transform-typeof-symbol@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e"
+  integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz#743d9bcc44080e3cc7d49259a066efa30f9187a3"
-  integrity sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==
+"@babel/plugin-transform-unicode-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
+  integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/polyfill@^7.6.0":
@@ -726,57 +711,57 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/preset-env@7.7.1", "@babel/preset-env@^7.7.1":
-  version "7.7.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.1.tgz#04a2ff53552c5885cf1083e291c8dd5490f744bb"
-  integrity sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA==
+"@babel/preset-env@7.7.4", "@babel/preset-env@^7.7.1":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.4.tgz#ccaf309ae8d1ee2409c85a4e2b5e280ceee830f8"
+  integrity sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==
   dependencies:
-    "@babel/helper-module-imports" "^7.7.0"
+    "@babel/helper-module-imports" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.7.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.7.0"
-    "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.7.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-syntax-top-level-await" "^7.7.0"
-    "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.7.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.6.3"
-    "@babel/plugin-transform-classes" "^7.7.0"
-    "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.6.0"
-    "@babel/plugin-transform-dotall-regex" "^7.7.0"
-    "@babel/plugin-transform-duplicate-keys" "^7.5.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.4.4"
-    "@babel/plugin-transform-function-name" "^7.7.0"
-    "@babel/plugin-transform-literals" "^7.2.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
-    "@babel/plugin-transform-modules-amd" "^7.5.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.7.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.7.0"
-    "@babel/plugin-transform-modules-umd" "^7.7.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.0"
-    "@babel/plugin-transform-new-target" "^7.4.4"
-    "@babel/plugin-transform-object-super" "^7.5.5"
-    "@babel/plugin-transform-parameters" "^7.4.4"
-    "@babel/plugin-transform-property-literals" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.7.0"
-    "@babel/plugin-transform-reserved-words" "^7.2.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.6.2"
-    "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.4.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.7.0"
-    "@babel/types" "^7.7.1"
+    "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.7.4"
+    "@babel/plugin-proposal-json-strings" "^7.7.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.7.4"
+    "@babel/plugin-syntax-async-generators" "^7.7.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
+    "@babel/plugin-syntax-json-strings" "^7.7.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
+    "@babel/plugin-syntax-top-level-await" "^7.7.4"
+    "@babel/plugin-transform-arrow-functions" "^7.7.4"
+    "@babel/plugin-transform-async-to-generator" "^7.7.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.7.4"
+    "@babel/plugin-transform-block-scoping" "^7.7.4"
+    "@babel/plugin-transform-classes" "^7.7.4"
+    "@babel/plugin-transform-computed-properties" "^7.7.4"
+    "@babel/plugin-transform-destructuring" "^7.7.4"
+    "@babel/plugin-transform-dotall-regex" "^7.7.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.7.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
+    "@babel/plugin-transform-for-of" "^7.7.4"
+    "@babel/plugin-transform-function-name" "^7.7.4"
+    "@babel/plugin-transform-literals" "^7.7.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.7.4"
+    "@babel/plugin-transform-modules-amd" "^7.7.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.7.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.7.4"
+    "@babel/plugin-transform-modules-umd" "^7.7.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
+    "@babel/plugin-transform-new-target" "^7.7.4"
+    "@babel/plugin-transform-object-super" "^7.7.4"
+    "@babel/plugin-transform-parameters" "^7.7.4"
+    "@babel/plugin-transform-property-literals" "^7.7.4"
+    "@babel/plugin-transform-regenerator" "^7.7.4"
+    "@babel/plugin-transform-reserved-words" "^7.7.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.7.4"
+    "@babel/plugin-transform-spread" "^7.7.4"
+    "@babel/plugin-transform-sticky-regex" "^7.7.4"
+    "@babel/plugin-transform-template-literals" "^7.7.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.7.4"
+    "@babel/plugin-transform-unicode-regex" "^7.7.4"
+    "@babel/types" "^7.7.4"
     browserslist "^4.6.0"
     core-js-compat "^3.1.1"
     invariant "^2.2.2"
@@ -805,15 +790,6 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/template@^7.1.0", "@babel/template@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
-  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/types" "^7.2.2"
-
 "@babel/template@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0"
@@ -823,7 +799,16 @@
     "@babel/parser" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+"@babel/template@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
+  integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
+"@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09"
   integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==
@@ -838,10 +823,25 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7"
-  integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==
+"@babel/traverse@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
+  integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.4"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/parser" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.7.0", "@babel/types@^7.7.2", "@babel/types@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
+  integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.13"
@@ -1560,7 +1560,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.7.0, browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.6:
+browserslist@4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
   integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==
@@ -1569,7 +1569,7 @@ browserslist@4.7.0, browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.
     electron-to-chromium "^1.3.247"
     node-releases "^1.1.29"
 
-browserslist@^4.7.3:
+browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.6, browserslist@^4.7.3:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.3.tgz#02341f162b6bcc1e1028e30624815d4924442dc3"
   integrity sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==

From 674f13123d1ac2321ba0f2cef1d4dcd18643d403 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2019 13:16:30 +0300
Subject: [PATCH 38/88] Bump @babel/preset-react from 7.7.0 to 7.7.4 in
 /website (#7044)

Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.7.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 74 ++++++++++++++++++++++----------------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/website/package.json b/website/package.json
index 6759c315e..bb3ed65f3 100644
--- a/website/package.json
+++ b/website/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@babel/preset-env": "7.7.4",
-    "@babel/preset-react": "7.7.0",
+    "@babel/preset-react": "7.7.4",
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
     "concurrently": "5.0.0",
diff --git a/website/yarn.lock b/website/yarn.lock
index 401f63e62..a3e10559a 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -71,12 +71,12 @@
     "@babel/helper-explode-assignable-expression" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-builder-react-jsx@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.0.tgz#c6b8254d305bacd62beb648e4dea7d3ed79f352d"
-  integrity sha512-LSln3cexwInTMYYoFeVLKnYPPMfWNJ8PubTBs3hkh7wCu9iBaqq1OOyW+xGmEdLxT1nhsl+9SJ+h2oUDYz0l2A==
+"@babel/helper-builder-react-jsx@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz#da188d247508b65375b2c30cf59de187be6b0c66"
+  integrity sha512-kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA==
   dependencies:
-    "@babel/types" "^7.7.0"
+    "@babel/types" "^7.7.4"
     esutils "^2.0.0"
 
 "@babel/helper-call-delegate@^7.7.4":
@@ -399,10 +399,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-jsx@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
-  integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
+"@babel/plugin-syntax-jsx@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz#dab2b56a36fb6c3c222a1fbc71f7bf97f327a9ec"
+  integrity sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -612,37 +612,37 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
-  integrity sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==
+"@babel/plugin-transform-react-display-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.7.4.tgz#9f2b80b14ebc97eef4a9b29b612c58ed9c0d10dd"
+  integrity sha512-sBbIvqYkthai0X0vkD2xsAwluBp+LtNHH+/V4a5ydifmTtb8KOVOlrMIk/MYmIc4uTYDnjZUHQildYNo36SRJw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-react-jsx-self@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz#461e21ad9478f1031dd5e276108d027f1b5240ba"
-  integrity sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==
+"@babel/plugin-transform-react-jsx-self@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.7.4.tgz#81b8fbfd14b2215e8f1c2c3adfba266127b0231c"
+  integrity sha512-PWYjSfqrO273mc1pKCRTIJXyqfc9vWYBax88yIhQb+bpw3XChVC7VWS4VwRVs63wFHKxizvGSd00XEr+YB9Q2A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@babel/plugin-syntax-jsx" "^7.7.4"
 
-"@babel/plugin-transform-react-jsx-source@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.2.0.tgz#20c8c60f0140f5dd3cd63418d452801cf3f7180f"
-  integrity sha512-A32OkKTp4i5U6aE88GwwcuV4HAprUgHcTq0sSafLxjr6AW0QahrCRCjxogkbbcdtpbXkuTOlgpjophCxb6sh5g==
+"@babel/plugin-transform-react-jsx-source@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.7.4.tgz#8994b1bf6014b133f5a46d3b7d1ee5f5e3e72c10"
+  integrity sha512-5ZU9FnPhqtHsOXxutRtXZAzoEJwDaP32QcobbMP1/qt7NYcsCNK8XgzJcJfoEr/ZnzVvUNInNjIW22Z6I8p9mg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@babel/plugin-syntax-jsx" "^7.7.4"
 
-"@babel/plugin-transform-react-jsx@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.0.tgz#834b0723ba78cd4d24d7d629300c2270f516d0b7"
-  integrity sha512-mXhBtyVB1Ujfy+0L6934jeJcSXj/VCg6whZzEcgiiZHNS0PGC7vUCsZDQCxxztkpIdF+dY1fUMcjAgEOC3ZOMQ==
+"@babel/plugin-transform-react-jsx@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.4.tgz#d91205717fae4e2f84d020cd3057ec02a10f11da"
+  integrity sha512-LixU4BS95ZTEAZdPaIuyg/k8FiiqN9laQ0dMHB4MlpydHY53uQdWCUrwjLr5o6ilS6fAgZey4Q14XBjl5tL6xw==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.7.0"
+    "@babel/helper-builder-react-jsx" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
+    "@babel/plugin-syntax-jsx" "^7.7.4"
 
 "@babel/plugin-transform-regenerator@^7.7.4":
   version "7.7.4"
@@ -768,16 +768,16 @@
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
-"@babel/preset-react@7.7.0", "@babel/preset-react@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.0.tgz#8ab0c4787d98cf1f5f22dabf115552bf9e4e406c"
-  integrity sha512-IXXgSUYBPHUGhUkH+89TR6faMcBtuMW0h5OHbMuVbL3/5wK2g6a2M2BBpkLa+Kw0sAHiZ9dNVgqJMDP/O4GRBA==
+"@babel/preset-react@7.7.4", "@babel/preset-react@^7.7.0":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.4.tgz#3fe2ea698d8fb536d8e7881a592c3c1ee8bf5707"
+  integrity sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.7.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
+    "@babel/plugin-transform-react-display-name" "^7.7.4"
+    "@babel/plugin-transform-react-jsx" "^7.7.4"
+    "@babel/plugin-transform-react-jsx-self" "^7.7.4"
+    "@babel/plugin-transform-react-jsx-source" "^7.7.4"
 
 "@babel/register@^7.7.0":
   version "7.7.0"

From 3212bb40b0ff0d4c4cb116e2249158faf2a57cf9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2019 10:00:44 +0100
Subject: [PATCH 39/88] Bump @typescript-eslint/typescript-estree from 2.8.0 to
 2.9.0 (#7054)

Bumps [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-estree) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/typescript-estree/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v2.9.0/packages/typescript-estree)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fd0b3ea40..b6cd1370b 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@babel/parser": "7.7.4",
     "@glimmer/syntax": "0.41.0",
     "@iarna/toml": "2.2.3",
-    "@typescript-eslint/typescript-estree": "2.8.0",
+    "@typescript-eslint/typescript-estree": "2.9.0",
     "angular-estree-parser": "1.1.5",
     "angular-html-parser": "1.3.0",
     "camelcase": "5.3.1",
diff --git a/yarn.lock b/yarn.lock
index c056c988a..72e7925c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -890,10 +890,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/typescript-estree@2.8.0":
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.8.0.tgz#fcc3fe6532840085d29b75432c8a59895876aeca"
-  integrity sha512-ksvjBDTdbAQ04cR5JyFSDX113k66FxH1tAXmi+dj6hufsl/G0eMc/f1GgLjEVPkYClDbRKv+rnBFuE5EusomUw==
+"@typescript-eslint/typescript-estree@2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.9.0.tgz#09138daf8f47d0e494ba7db9e77394e928803017"
+  integrity sha512-v6btSPXEWCP594eZbM+JCXuFoXWXyF/z8kaSBSdCb83DF+Y7+xItW29SsKtSULgLemqJBT+LpT+0ZqdfH7QVmA==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"

From 7bc7b7954033bb91ba7b834dec27da66e7b689b6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 11:12:26 +0100
Subject: [PATCH 40/88] Bump execa from 3.3.0 to 3.4.0 (#7059)

Bumps [execa](https://github.com/sindresorhus/execa) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/sindresorhus/execa/releases)
- [Commits](https://github.com/sindresorhus/execa/compare/v3.3.0...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b6cd1370b..90faea8f4 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-prettier": "3.1.1",
     "eslint-plugin-react": "7.16.0",
-    "execa": "3.3.0",
+    "execa": "3.4.0",
     "jest": "23.3.0",
     "jest-junit": "9.0.0",
     "jest-snapshot-serializer-ansi": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 72e7925c8..7595d743d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2697,10 +2697,10 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.1.3"
 
-execa@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-3.3.0.tgz#7e348eef129a1937f21ecbbd53390942653522c1"
-  integrity sha512-j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg==
+execa@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
+  integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==
   dependencies:
     cross-spawn "^7.0.0"
     get-stream "^5.0.0"

From 77a12672aaff78688aae1dcee834de4d1567a19e Mon Sep 17 00:00:00 2001
From: "imgbot[bot]" <31301654+imgbot[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 17:52:38 +0100
Subject: [PATCH 41/88] [ImgBot] Optimize images (#7056)

---
 website/static/images/editors/editor_atom.svg | 11 +---
 .../static/images/editors/editor_emacs.svg    |  7 +--
 .../static/images/editors/editor_espresso.svg |  4 +-
 .../static/images/editors/editor_sublime.svg  |  4 +-
 website/static/images/editors/editor_vim.svg  |  7 +--
 website/static/images/editors/editor_vs.svg   |  4 +-
 .../static/images/editors/editor_vscode.svg   |  8 +--
 .../static/images/editors/editor_webstorm.svg |  7 +--
 website/static/images/get_started_rects.svg   | 52 +------------------
 website/static/images/github.svg              |  4 +-
 website/static/images/github_grey.svg         |  4 +-
 .../images/languages/css_small_grey.svg       |  4 +-
 .../images/languages/graphql_small_grey.svg   | 13 +----
 .../static/images/languages/js_small_grey.svg |  4 +-
 .../images/languages/markdown_small_grey.svg  |  7 +--
 .../images/languages/python_small_grey.svg    |  7 +--
 .../images/languages/swift_small_grey.svg     |  4 +-
 website/static/images/languages/tools_css.svg |  4 +-
 website/static/images/languages/tools_gql.svg | 13 +----
 .../static/images/languages/tools_html.svg    |  4 +-
 website/static/images/languages/tools_js.svg  |  4 +-
 website/static/images/languages/tools_md.svg  |  4 +-
 website/static/images/languages/tools_wip.svg |  7 +--
 .../static/images/languages/tools_yaml.svg    |  4 +-
 website/static/images/npm.svg                 |  5 +-
 website/static/images/npm_grey.svg            |  5 +-
 website/static/images/users/3yourmind.svg     | 14 +----
 website/static/images/users/buildcom.svg      | 10 +---
 website/static/images/users/codecarrot.svg    | 12 +----
 website/static/images/users/computerbase.svg  |  8 +--
 website/static/images/users/dropbox.svg       |  5 +-
 website/static/images/users/dropbox_grey.svg  |  4 +-
 website/static/images/users/estalee.svg       | 12 +----
 website/static/images/users/exponea.svg       |  4 +-
 website/static/images/users/heroku.svg        | 18 +------
 .../static/images/users/housinganywhere.svg   |  4 +-
 website/static/images/users/leesa.svg         |  4 +-
 .../static/images/users/metric-ai-white.svg   | 13 +----
 website/static/images/users/quip.svg          |  9 +---
 .../static/images/users/researchanddesign.svg |  4 +-
 website/static/images/users/salesforce.svg    | 10 +---
 website/static/images/users/used_by_babel.svg |  4 +-
 .../static/images/users/used_by_danger.svg    |  4 +-
 .../static/images/users/used_by_facebook.svg  |  4 +-
 website/static/images/users/used_by_jest.svg  | 14 +----
 website/static/images/users/used_by_react.svg | 11 +---
 .../static/images/users/used_by_storybook.svg |  4 +-
 .../static/images/users/used_by_webpack.svg   |  4 +-
 website/static/images/users/used_by_yarn.svg  |  4 +-
 website/static/images/users/used_by_zeit.svg  |  4 +-
 .../static/prettier-centered-logo-static.svg  | 10 +---
 51 files changed, 51 insertions(+), 344 deletions(-)

diff --git a/website/static/images/editors/editor_atom.svg b/website/static/images/editors/editor_atom.svg
index 84b5691b6..83cb74523 100644
--- a/website/static/images/editors/editor_atom.svg
+++ b/website/static/images/editors/editor_atom.svg
@@ -1,10 +1 @@
-<svg viewBox="0 0 104 95" xmlns="http://www.w3.org/2000/svg">
-  <g fill="none" fill-rule="evenodd">
-    <g stroke="#56b3b4" stroke-linecap="round" stroke-width="3">
-      <path d="M82.213 22.714c1.663-8.514.733-14.976-3.199-17.543-1.31-.856-2.882-1.23-4.65-1.163-9.55.364-24.959 13.587-37.548 33.082C21.895 60.195 16.592 83.35 24.98 88.828c3.982 2.6 10.327.757 17.495-4.38"/>
-      <path d="M90.22 60c7.147-2.774 11.542-6.57 11.77-10.931.529-10.085-21.41-19.422-49.021-20.87a137.05 137.05 0 00-7.624-.198c-24.07.08-42.857 6.686-43.336 15.825-.228 4.353 3.736 8.573 10.53 12.075"/>
-      <path d="M45.162 7.999c-4.897-4.068-9.49-6.253-13.18-5.976a7.111 7.111 0 00-2.736.747c-9.007 4.595-6.13 28.357 6.441 53.055 12.571 24.7 30.063 40.994 39.07 36.4 8.663-4.419 6.325-26.56-5.048-50.217"/>
-    </g>
-    <path d="M60 48a8 8 0 11-16 0 8 8 0 0116 0z" fill="#56b3b4" fill-rule="nonzero"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 104 95"><g fill="none" fill-rule="evenodd"><g stroke="#56b3b4" stroke-linecap="round" stroke-width="3"><path d="M82.213 22.714c1.663-8.514.733-14.976-3.199-17.543-1.31-.856-2.882-1.23-4.65-1.163-9.55.364-24.959 13.587-37.548 33.082C21.895 60.195 16.592 83.35 24.98 88.828c3.982 2.6 10.327.757 17.495-4.38"/><path d="M90.22 60c7.147-2.774 11.542-6.57 11.77-10.931.529-10.085-21.41-19.422-49.021-20.87a137.05 137.05 0 00-7.624-.198c-24.07.08-42.857 6.686-43.336 15.825-.228 4.353 3.736 8.573 10.53 12.075"/><path d="M45.162 7.999c-4.897-4.068-9.49-6.253-13.18-5.976a7.111 7.111 0 00-2.736.747c-9.007 4.595-6.13 28.357 6.441 53.055 12.571 24.7 30.063 40.994 39.07 36.4 8.663-4.419 6.325-26.56-5.048-50.217"/></g><path fill="#56b3b4" fill-rule="nonzero" d="M60 48a8 8 0 11-16 0 8 8 0 0116 0z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/editors/editor_emacs.svg b/website/static/images/editors/editor_emacs.svg
index 73fa7968b..8670bb9a6 100644
--- a/website/static/images/editors/editor_emacs.svg
+++ b/website/static/images/editors/editor_emacs.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92 93">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#56B3B4" fill-rule="nonzero" d="M92 46.5C92 72.181 71.405 93 46 93S0 72.181 0 46.5 20.595 0 46 0s46 20.819 46 46.5z"/>
-    <path fill="#000" d="M32.522 72.933s3.089.218 7.062-.131c1.61-.142 7.72-.74 12.288-1.74 0 0 5.57-1.187 8.55-2.282 3.117-1.146 4.814-2.118 5.578-3.496-.034-.282.235-1.283-1.203-1.884-3.676-1.537-7.94-1.26-16.375-1.438-9.355-.32-12.467-1.881-14.125-3.139-1.59-1.275-.79-4.804 6.021-7.913C43.75 49.255 57.2 46.2 57.2 46.2c-4.53-2.232-12.977-6.156-14.713-7.004-1.523-.743-3.96-1.862-4.488-3.216-.599-1.3 1.414-2.42 2.54-2.74 3.621-1.042 8.734-1.69 13.388-1.762 2.34-.037 2.719-.187 2.719-.187 3.228-.534 5.352-2.735 4.467-6.222-.795-3.56-4.986-5.65-8.97-4.926-3.75.681-12.791 3.3-12.791 3.3 11.175-.097 13.045.09 13.88 1.254.494.687-.223 1.63-3.204 2.116-3.244.528-9.99 1.164-9.99 1.164-6.47.383-11.027.409-12.394 3.294-.893 1.885.952 3.552 1.761 4.595 3.418 3.79 8.355 5.834 11.533 7.34 1.196.566 4.704 1.635 4.704 1.635-10.31-.565-17.747 2.59-22.11 6.225-4.933 4.55-2.75 9.974 7.358 13.313 5.97 1.973 8.932 2.9 17.838 2.1 5.246-.281 6.073-.113 6.125.316.073.604-5.827 2.105-7.437 2.568-4.098 1.179-14.84 3.558-14.894 3.57z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92 93"><g fill="none" fill-rule="evenodd"><path fill="#56B3B4" fill-rule="nonzero" d="M92 46.5C92 72.181 71.405 93 46 93S0 72.181 0 46.5 20.595 0 46 0s46 20.819 46 46.5z"/><path fill="#000" d="M32.522 72.933s3.089.218 7.062-.131c1.61-.142 7.72-.74 12.288-1.74 0 0 5.57-1.187 8.55-2.282 3.117-1.146 4.814-2.118 5.578-3.496-.034-.282.235-1.283-1.203-1.884-3.676-1.537-7.94-1.26-16.375-1.438-9.355-.32-12.467-1.881-14.125-3.139-1.59-1.275-.79-4.804 6.021-7.913C43.75 49.255 57.2 46.2 57.2 46.2c-4.53-2.232-12.977-6.156-14.713-7.004-1.523-.743-3.96-1.862-4.488-3.216-.599-1.3 1.414-2.42 2.54-2.74 3.621-1.042 8.734-1.69 13.388-1.762 2.34-.037 2.719-.187 2.719-.187 3.228-.534 5.352-2.735 4.467-6.222-.795-3.56-4.986-5.65-8.97-4.926-3.75.681-12.791 3.3-12.791 3.3 11.175-.097 13.045.09 13.88 1.254.494.687-.223 1.63-3.204 2.116-3.244.528-9.99 1.164-9.99 1.164-6.47.383-11.027.409-12.394 3.294-.893 1.885.952 3.552 1.761 4.595 3.418 3.79 8.355 5.834 11.533 7.34 1.196.566 4.704 1.635 4.704 1.635-10.31-.565-17.747 2.59-22.11 6.225-4.933 4.55-2.75 9.974 7.358 13.313 5.97 1.973 8.932 2.9 17.838 2.1 5.246-.281 6.073-.113 6.125.316.073.604-5.827 2.105-7.437 2.568-4.098 1.179-14.84 3.558-14.894 3.57z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/editors/editor_espresso.svg b/website/static/images/editors/editor_espresso.svg
index 3246e2876..3237869df 100644
--- a/website/static/images/editors/editor_espresso.svg
+++ b/website/static/images/editors/editor_espresso.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 100 94" xmlns="http://www.w3.org/2000/svg">
-  <path d="M0 23.095C2.193 9.275 38.074.02 50.593.04S94.12-1.55 98.479 13.69s1.797 77.236-41.126 79.365C14.43 95.185 2.22 46.558 0 23.095zm47.113-2.893c.028 3.48 4.592 4.28 6.217 4.33 1.082.035 3.433-.57 7.05-1.812-4.496-.88-6.744-2.215-6.744-4.006 0-2.687 3.456-3.856 3.442-5.581-.013-1.725-3.728-5.152-7.712-4.436 2.326 1.787 4.27 1.711 4.27 3.553s-6.55 4.472-6.523 7.952zM34.33 30.346c-1.135-.092-1.829-.012-2.08.238-.253.25-.348.952-.287 2.108 3.331 19.463 5.38 30.21 6.143 32.238.764 2.03 2.706 3.02 5.826 2.973h17.341c2.875 0 4.054.241 5.001-.743C67.722 65.655 68 62.615 68 61.887c0-.803-.121-1.248-.363-1.333-12.563 0-19.267-.034-20.112-.1-.846-.067-1.359-.378-1.54-.933-.355-2.134-.532-3.586-.532-4.357 0-.77.338-1.152 1.016-1.143 11.66-.207 17.753-.346 18.282-.417s.873-.36 1.032-.864c.28-2.012.443-3.38.491-4.108.049-.727-.46-1.237-1.523-1.53-12.248 0-18.68-.01-19.298-.031-.618-.02-.991-.483-1.12-1.389-.212-2.371-.345-3.9-.4-4.584-.057-.685.333-1.11 1.169-1.274 15.74-.208 24.254-.313 25.54-.314 1.287-.001 1.95-.48 1.99-1.434.404-2.41.758-4.272 1.063-5.584.306-1.312-.24-2.028-1.637-2.146z" fill="#56b3b4" fill-rule="evenodd"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 94"><path fill="#56b3b4" fill-rule="evenodd" d="M0 23.095C2.193 9.275 38.074.02 50.593.04S94.12-1.55 98.479 13.69s1.797 77.236-41.126 79.365C14.43 95.185 2.22 46.558 0 23.095zm47.113-2.893c.028 3.48 4.592 4.28 6.217 4.33 1.082.035 3.433-.57 7.05-1.812-4.496-.88-6.744-2.215-6.744-4.006 0-2.687 3.456-3.856 3.442-5.581-.013-1.725-3.728-5.152-7.712-4.436 2.326 1.787 4.27 1.711 4.27 3.553s-6.55 4.472-6.523 7.952zM34.33 30.346c-1.135-.092-1.829-.012-2.08.238-.253.25-.348.952-.287 2.108 3.331 19.463 5.38 30.21 6.143 32.238.764 2.03 2.706 3.02 5.826 2.973h17.341c2.875 0 4.054.241 5.001-.743C67.722 65.655 68 62.615 68 61.887c0-.803-.121-1.248-.363-1.333-12.563 0-19.267-.034-20.112-.1-.846-.067-1.359-.378-1.54-.933-.355-2.134-.532-3.586-.532-4.357 0-.77.338-1.152 1.016-1.143 11.66-.207 17.753-.346 18.282-.417s.873-.36 1.032-.864c.28-2.012.443-3.38.491-4.108.049-.727-.46-1.237-1.523-1.53-12.248 0-18.68-.01-19.298-.031-.618-.02-.991-.483-1.12-1.389-.212-2.371-.345-3.9-.4-4.584-.057-.685.333-1.11 1.169-1.274 15.74-.208 24.254-.313 25.54-.314 1.287-.001 1.95-.48 1.99-1.434.404-2.41.758-4.272 1.063-5.584.306-1.312-.24-2.028-1.637-2.146z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/editors/editor_sublime.svg b/website/static/images/editors/editor_sublime.svg
index d18ef86b5..dd873be6c 100644
--- a/website/static/images/editors/editor_sublime.svg
+++ b/website/static/images/editors/editor_sublime.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 89 89">
-  <path fill="#56B3B4" d="M80.934 0h3.052c1.744.446 3.488 1.561 4.36 3.346C89 4.46 89 6.023 89 7.36v50.188c-.218 8.922 0 17.621-.218 26.32C88.346 86.547 85.948 89 83.114 89H6.377c-2.834 0-5.45-2.23-6.104-5.13-.437-2.454-.218-4.685-.218-7.138V8.03c0-1.784 0-4.015 1.308-5.576C2.67 1.115 4.633 0 6.813 0h74.121zM20 27.301V44l21.256 8.07L20 58.236V77l50-16.058v-17.23l-21.165-8.224L70 29.218V11L20 27.301z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 89 89"><path fill="#56B3B4" d="M80.934 0h3.052c1.744.446 3.488 1.561 4.36 3.346C89 4.46 89 6.023 89 7.36v50.188c-.218 8.922 0 17.621-.218 26.32C88.346 86.547 85.948 89 83.114 89H6.377c-2.834 0-5.45-2.23-6.104-5.13-.437-2.454-.218-4.685-.218-7.138V8.03c0-1.784 0-4.015 1.308-5.576C2.67 1.115 4.633 0 6.813 0h74.121zM20 27.301V44l21.256 8.07L20 58.236V77l50-16.058v-17.23l-21.165-8.224L70 29.218V11L20 27.301z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/editors/editor_vim.svg b/website/static/images/editors/editor_vim.svg
index 31089650b..cdedf09a0 100644
--- a/website/static/images/editors/editor_vim.svg
+++ b/website/static/images/editors/editor_vim.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92 86">
-  <g fill="#56B3B4" fill-rule="evenodd">
-    <path d="M2.394.825H34.66l1.966 1.966v6.031l-1.56 1.898h-3.524v29.955L61.91 10.72h-5.016l-1.762-1.898v-6.37L56.758.96h32.673l1.627 1.626V8.55L17.171 84.32H8.766l-2.433-1.405V10.449H2.258L.767 8.958v-6.37z"/>
-    <path fill-rule="nonzero" stroke="#56B3B4" stroke-width="3" d="M45.308 51.385a.329.329 0 00-.15.076l-1.42 1.225a.331.331 0 00-.092.143l-1.42 3.995a.332.332 0 00.076.344l1.085 1.09a.326.326 0 00.234.093h4.385a.329.329 0 00.234-.092l1.144-1.158a.331.331 0 00.083-.143l1.22-4.205a.332.332 0 00-.084-.327l-.943-.949a.329.329 0 00-.234-.092h-4.05a.328.328 0 00-.068 0zm-8.034 11.263a.33.33 0 00-.25.244l-.543 2.165a.332.332 0 00.317.411h2.58l-6.397 18.355a.333.333 0 00.31.437h9.311a.33.33 0 00.318-.227l.61-1.972a.332.332 0 00-.318-.428h-2.105l6.331-18.548a.333.333 0 00-.309-.437h-9.788a.328.328 0 00-.067 0zm29.632.067a.33.33 0 00-.184.11l-1.938 2.198h-3.081l-2.055-2.14a.329.329 0 00-.234-.1h-7.358a.33.33 0 00-.309.218l-.676 2.03a.333.333 0 00.309.437h1.971l-6.13 18.154a.333.333 0 00.309.436h7.834a.33.33 0 00.309-.218l.601-1.77a.333.333 0 00-.309-.437h-1.37l3.909-12.363h7.074l-4.46 14.36a.332.332 0 00.317.428h7.559a.33.33 0 00.3-.201l.677-1.628a.333.333 0 00-.3-.454H68.3l3.975-12.572h6.731L74.481 83.63a.332.332 0 00.317.428H83.1a.33.33 0 00.309-.21l.676-1.77a.333.333 0 00-.309-.445h-1.645l5.003-16.324a.332.332 0 00-.05-.302l-1.554-2.099a.329.329 0 00-.267-.126h-5.938a.329.329 0 00-.242.101l-1.871 2.065h-3.274L72 62.816a.329.329 0 00-.242-.1h-4.785a.328.328 0 00-.067 0z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92 86"><g fill="#56B3B4" fill-rule="evenodd"><path d="M2.394.825H34.66l1.966 1.966v6.031l-1.56 1.898h-3.524v29.955L61.91 10.72h-5.016l-1.762-1.898v-6.37L56.758.96h32.673l1.627 1.626V8.55L17.171 84.32H8.766l-2.433-1.405V10.449H2.258L.767 8.958v-6.37z"/><path fill-rule="nonzero" stroke="#56B3B4" stroke-width="3" d="M45.308 51.385a.329.329 0 00-.15.076l-1.42 1.225a.331.331 0 00-.092.143l-1.42 3.995a.332.332 0 00.076.344l1.085 1.09a.326.326 0 00.234.093h4.385a.329.329 0 00.234-.092l1.144-1.158a.331.331 0 00.083-.143l1.22-4.205a.332.332 0 00-.084-.327l-.943-.949a.329.329 0 00-.234-.092h-4.05a.328.328 0 00-.068 0zm-8.034 11.263a.33.33 0 00-.25.244l-.543 2.165a.332.332 0 00.317.411h2.58l-6.397 18.355a.333.333 0 00.31.437h9.311a.33.33 0 00.318-.227l.61-1.972a.332.332 0 00-.318-.428h-2.105l6.331-18.548a.333.333 0 00-.309-.437h-9.788a.328.328 0 00-.067 0zm29.632.067a.33.33 0 00-.184.11l-1.938 2.198h-3.081l-2.055-2.14a.329.329 0 00-.234-.1h-7.358a.33.33 0 00-.309.218l-.676 2.03a.333.333 0 00.309.437h1.971l-6.13 18.154a.333.333 0 00.309.436h7.834a.33.33 0 00.309-.218l.601-1.77a.333.333 0 00-.309-.437h-1.37l3.909-12.363h7.074l-4.46 14.36a.332.332 0 00.317.428h7.559a.33.33 0 00.3-.201l.677-1.628a.333.333 0 00-.3-.454H68.3l3.975-12.572h6.731L74.481 83.63a.332.332 0 00.317.428H83.1a.33.33 0 00.309-.21l.676-1.77a.333.333 0 00-.309-.445h-1.645l5.003-16.324a.332.332 0 00-.05-.302l-1.554-2.099a.329.329 0 00-.267-.126h-5.938a.329.329 0 00-.242.101l-1.871 2.065h-3.274L72 62.816a.329.329 0 00-.242-.1h-4.785a.328.328 0 00-.067 0z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/editors/editor_vs.svg b/website/static/images/editors/editor_vs.svg
index aa450e0eb..5b80be7b1 100644
--- a/website/static/images/editors/editor_vs.svg
+++ b/website/static/images/editors/editor_vs.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 100 103" xmlns="http://www.w3.org/2000/svg">
-  <path d="M99.99 9.55l.01 83.326-23.807 9.514-41.691-40.463L9.478 80.975 0 76.221l.01-49.996 9.522-4.79L34.577 40.5 76.165 0l23.826 9.55zM73.727 33.429l-23.798 17.79 23.808 17.93zM11.786 40.5l.014 21.398 11.89-10.772L11.785 40.5z" fill="#56b3b4"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 103"><path fill="#56b3b4" d="M99.99 9.55l.01 83.326-23.807 9.514-41.691-40.463L9.478 80.975 0 76.221l.01-49.996 9.522-4.79L34.577 40.5 76.165 0l23.826 9.55zM73.727 33.429l-23.798 17.79 23.808 17.93zM11.786 40.5l.014 21.398 11.89-10.772L11.785 40.5z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/editors/editor_vscode.svg b/website/static/images/editors/editor_vscode.svg
index df1b0352e..4f7bb9806 100644
--- a/website/static/images/editors/editor_vscode.svg
+++ b/website/static/images/editors/editor_vscode.svg
@@ -1,7 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 93 96">
-  <g fill="none" fill-rule="evenodd" transform="translate(-1 -2)">
-    <rect width="69.984" height="84.618" x="8.504" y="7.691" stroke="#56B3B4" stroke-width="4" rx="13" transform="rotate(-9 43.496 50)"/>
-    <path fill="#56B3B4" d="M18.267 59.016l8.808-11.053-11.628-9.03 3.417-2.674 11.26 6.481 15.272-19.976 10.874 3.19 5.519 33.062-9.605 6.838-19.678-14.481-9.54 9.104-4.699-1.461zm19.108-13.048l12.578 6.71-3.11-16.637-9.468 9.927z"/>
-    <path fill="#56B3B4" d="M63.629 8.943c.255 0 7.008 1.67 20.26 5.012l9.607 58.722-17.64 11.876-58.783-10.07 56.636-.969c-6.975-43.047-10.335-64.57-10.08-64.57z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 93 96"><g fill="none" fill-rule="evenodd" transform="translate(-1 -2)"><rect width="69.984" height="84.618" x="8.504" y="7.691" stroke="#56B3B4" stroke-width="4" rx="13" transform="rotate(-9 43.496 50)"/><path fill="#56B3B4" d="M18.267 59.016l8.808-11.053-11.628-9.03 3.417-2.674 11.26 6.481 15.272-19.976 10.874 3.19 5.519 33.062-9.605 6.838-19.678-14.481-9.54 9.104-4.699-1.461zm19.108-13.048l12.578 6.71-3.11-16.637-9.468 9.927z"/><path fill="#56B3B4" d="M63.629 8.943c.255 0 7.008 1.67 20.26 5.012l9.607 58.722-17.64 11.876-58.783-10.07 56.636-.969c-6.975-43.047-10.335-64.57-10.08-64.57z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/editors/editor_webstorm.svg b/website/static/images/editors/editor_webstorm.svg
index 0b5334dce..f48143501 100644
--- a/website/static/images/editors/editor_webstorm.svg
+++ b/website/static/images/editors/editor_webstorm.svg
@@ -1,6 +1 @@
-<svg viewBox="0 0 100 102" xmlns="http://www.w3.org/2000/svg">
-  <g fill="#56b3b4" fill-rule="evenodd">
-    <path d="M80.976 82.044h1.109v-4.376l17.87-11.915-10.222-20.042 10.222-11.483L87.153 1.633 63.11 0l-3.384 3.86-4.138-2.227-15.259 7.798L24.773 0 0 10.824l12.987 80.919 50.122 9.33h5.954l4.167-18.665H18.383V18.446h62.593z"/>
-    <path d="M22.682 27.187h6.282l3.772 14.407 4.504-14.407h4.488l4.286 14.407 4.006-14.407h6.157l-7.35 26.438H43.86l-3.78-14.8h-.65l-3.958 14.8H30.26c-5.37-17.626-7.895-26.438-7.578-26.438zm1.449 43.414h24.026V74.5H24.131zM55.533 49.73l2.702-3.859c3.807 1.992 6.42 2.995 7.84 3.012 2.128.024 4.167-.653 4.168-2.607.001-1.302-2.371-2.628-7.117-3.977-4.655-.922-6.978-3.536-6.967-7.84.015-6.456 6.671-7.917 8.856-7.792s8.83 1.915 9.718 3.43c-.621.825-1.69 2.279-3.204 4.362-2.115-2.129-4.02-3.17-5.715-3.125-2.543.069-4.198 1.332-4.303 3.125s3.692 2.717 7.298 3.736c3.606 1.018 7.633 4.628 7.264 8.081-.37 3.454-3.238 8.12-9.496 7.943-4.172-.117-7.854-1.614-11.044-4.49z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 102"><g fill="#56b3b4" fill-rule="evenodd"><path d="M80.976 82.044h1.109v-4.376l17.87-11.915-10.222-20.042 10.222-11.483L87.153 1.633 63.11 0l-3.384 3.86-4.138-2.227-15.259 7.798L24.773 0 0 10.824l12.987 80.919 50.122 9.33h5.954l4.167-18.665H18.383V18.446h62.593z"/><path d="M22.682 27.187h6.282l3.772 14.407 4.504-14.407h4.488l4.286 14.407 4.006-14.407h6.157l-7.35 26.438H43.86l-3.78-14.8h-.65l-3.958 14.8H30.26c-5.37-17.626-7.895-26.438-7.578-26.438zm1.449 43.414h24.026V74.5H24.131zM55.533 49.73l2.702-3.859c3.807 1.992 6.42 2.995 7.84 3.012 2.128.024 4.167-.653 4.168-2.607.001-1.302-2.371-2.628-7.117-3.977-4.655-.922-6.978-3.536-6.967-7.84.015-6.456 6.671-7.917 8.856-7.792s8.83 1.915 9.718 3.43c-.621.825-1.69 2.279-3.204 4.362-2.115-2.129-4.02-3.17-5.715-3.125-2.543.069-4.198 1.332-4.303 3.125s3.692 2.717 7.298 3.736c3.606 1.018 7.633 4.628 7.264 8.081-.37 3.454-3.238 8.12-9.496 7.943-4.172-.117-7.854-1.614-11.044-4.49z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/get_started_rects.svg b/website/static/images/get_started_rects.svg
index 8a168c526..07e2beeba 100644
--- a/website/static/images/get_started_rects.svg
+++ b/website/static/images/get_started_rects.svg
@@ -1,51 +1 @@
-<svg viewBox="0 0 385 289" xmlns="http://www.w3.org/2000/svg">
-  <g fill="#c6cbd0" fill-rule="evenodd" opacity=".5">
-    <rect height="10" rx="5" width="70" x="315" y="20"/>
-    <rect height="10" rx="5" width="90" x="235" y="100"/>
-    <rect height="10" rx="5" width="40" x="343" y="200"/>
-    <rect height="10" rx="5" width="90" x="255" y="80"/>
-    <rect height="10" rx="5" width="90" x="295" y="180"/>
-    <rect height="10" rx="5" width="90" x="155" y="80"/>
-    <rect height="10" rx="5" width="60" x="235" y="259"/>
-    <rect height="10" rx="5" width="60" x="205"/>
-    <rect height="10" rx="5" width="60" x="275"/>
-    <rect height="10" rx="5" width="60" x="295" y="40"/>
-    <rect height="10" rx="5" width="60" x="140" y="120"/>
-    <rect height="10" rx="5" width="60" x="65" y="60"/>
-    <rect height="10" rx="5" width="145" x="240" y="160"/>
-    <rect height="10" rx="5" width="145" x="50"/>
-    <rect height="10" rx="5" width="115" x="270" y="120"/>
-    <rect height="10" rx="5" width="40" x="345"/>
-    <rect height="10" rx="5" width="40" x="237" y="240"/>
-    <rect height="10" rx="5" width="40" x="95" y="40"/>
-    <rect height="10" rx="5" width="100" x="95" y="20"/>
-    <rect height="10" rx="5" width="40" x="245" y="40"/>
-    <rect height="10" rx="5" width="40" x="105" y="80"/>
-    <rect height="10" rx="5" width="40" x="245" y="180"/>
-    <rect height="10" rx="5" width="40" x="345" y="259"/>
-    <rect height="10" rx="5" width="40"/>
-    <rect height="10" rx="5" width="20" x="365" y="40"/>
-    <rect height="10" rx="5" width="110" x="275" y="60"/>
-    <rect height="10" rx="5" width="90" x="145" y="40"/>
-    <rect height="10" rx="5" width="100" x="205" y="20"/>
-    <rect height="10" rx="5" width="100" x="285" y="240"/>
-    <rect height="10" rx="5" width="50" x="210" y="120"/>
-    <rect height="10" rx="5" width="50" x="35" y="20"/>
-    <rect height="10" rx="5" width="50" x="180" y="160"/>
-    <rect height="10" rx="5" width="30" x="355" y="80"/>
-    <rect height="10" rx="5" width="30" x="305" y="259"/>
-    <rect height="10" rx="5" width="30" x="285" y="220"/>
-    <rect height="10" rx="5" width="20" x="295" y="140"/>
-    <rect height="10" rx="5" width="20" x="365" y="279"/>
-    <rect height="10" rx="5" width="60" x="325" y="140"/>
-    <rect height="10" rx="5" width="30" x="55" y="40"/>
-    <rect height="10" rx="5" width="60" x="325" y="220"/>
-    <rect height="10" rx="5" width="85" x="200" y="140"/>
-    <rect height="10" rx="5" width="60" x="165" y="100"/>
-    <rect height="10" rx="5" width="60" x="215" y="220"/>
-    <rect height="10" rx="5" width="60" x="203" y="200"/>
-    <rect height="10" rx="5" width="60" x="273" y="200"/>
-    <rect height="10" rx="5" width="130" x="135" y="60"/>
-    <rect height="10" rx="5" width="50" x="335" y="100"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 385 289"><g fill="#c6cbd0" fill-rule="evenodd" opacity=".5"><rect width="70" height="10" x="315" y="20" rx="5"/><rect width="90" height="10" x="235" y="100" rx="5"/><rect width="40" height="10" x="343" y="200" rx="5"/><rect width="90" height="10" x="255" y="80" rx="5"/><rect width="90" height="10" x="295" y="180" rx="5"/><rect width="90" height="10" x="155" y="80" rx="5"/><rect width="60" height="10" x="235" y="259" rx="5"/><rect width="60" height="10" x="205" rx="5"/><rect width="60" height="10" x="275" rx="5"/><rect width="60" height="10" x="295" y="40" rx="5"/><rect width="60" height="10" x="140" y="120" rx="5"/><rect width="60" height="10" x="65" y="60" rx="5"/><rect width="145" height="10" x="240" y="160" rx="5"/><rect width="145" height="10" x="50" rx="5"/><rect width="115" height="10" x="270" y="120" rx="5"/><rect width="40" height="10" x="345" rx="5"/><rect width="40" height="10" x="237" y="240" rx="5"/><rect width="40" height="10" x="95" y="40" rx="5"/><rect width="100" height="10" x="95" y="20" rx="5"/><rect width="40" height="10" x="245" y="40" rx="5"/><rect width="40" height="10" x="105" y="80" rx="5"/><rect width="40" height="10" x="245" y="180" rx="5"/><rect width="40" height="10" x="345" y="259" rx="5"/><rect width="40" height="10" rx="5"/><rect width="20" height="10" x="365" y="40" rx="5"/><rect width="110" height="10" x="275" y="60" rx="5"/><rect width="90" height="10" x="145" y="40" rx="5"/><rect width="100" height="10" x="205" y="20" rx="5"/><rect width="100" height="10" x="285" y="240" rx="5"/><rect width="50" height="10" x="210" y="120" rx="5"/><rect width="50" height="10" x="35" y="20" rx="5"/><rect width="50" height="10" x="180" y="160" rx="5"/><rect width="30" height="10" x="355" y="80" rx="5"/><rect width="30" height="10" x="305" y="259" rx="5"/><rect width="30" height="10" x="285" y="220" rx="5"/><rect width="20" height="10" x="295" y="140" rx="5"/><rect width="20" height="10" x="365" y="279" rx="5"/><rect width="60" height="10" x="325" y="140" rx="5"/><rect width="30" height="10" x="55" y="40" rx="5"/><rect width="60" height="10" x="325" y="220" rx="5"/><rect width="85" height="10" x="200" y="140" rx="5"/><rect width="60" height="10" x="165" y="100" rx="5"/><rect width="60" height="10" x="215" y="220" rx="5"/><rect width="60" height="10" x="203" y="200" rx="5"/><rect width="60" height="10" x="273" y="200" rx="5"/><rect width="130" height="10" x="135" y="60" rx="5"/><rect width="50" height="10" x="335" y="100" rx="5"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/github.svg b/website/static/images/github.svg
index 922b47b66..1ee010bd6 100644
--- a/website/static/images/github.svg
+++ b/website/static/images/github.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
\ No newline at end of file
diff --git a/website/static/images/github_grey.svg b/website/static/images/github_grey.svg
index ee1fc8320..48a73bf27 100644
--- a/website/static/images/github_grey.svg
+++ b/website/static/images/github_grey.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-  <path fill="#6f7b81" d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#6f7b81" d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/css_small_grey.svg b/website/static/images/languages/css_small_grey.svg
index 25bd398f1..474e68c52 100644
--- a/website/static/images/languages/css_small_grey.svg
+++ b/website/static/images/languages/css_small_grey.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 43 49">
-  <path fill="#FFF" d="M21.49 19.963H8.972l.483 5.409H28.11l-.626 7.014-6.004 1.629-.005.002-5.995-1.627-.383-4.314H9.695l.753 8.493 11.027 3.076.025-.007v-.001l11.017-3.068.081-.914 1.265-14.24.131-1.452.972-10.948H8.001l.49 5.409h20.576l-.49 5.539h-7.086zM43 0l-3.917 44.095L21.473 49l-17.56-4.898L0 0h43z" opacity=".5"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 43 49"><path fill="#FFF" d="M21.49 19.963H8.972l.483 5.409H28.11l-.626 7.014-6.004 1.629-.005.002-5.995-1.627-.383-4.314H9.695l.753 8.493 11.027 3.076.025-.007v-.001l11.017-3.068.081-.914 1.265-14.24.131-1.452.972-10.948H8.001l.49 5.409h20.576l-.49 5.539h-7.086zM43 0l-3.917 44.095L21.473 49l-17.56-4.898L0 0h43z" opacity=".5"/></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/graphql_small_grey.svg b/website/static/images/languages/graphql_small_grey.svg
index a871ca2a4..94a6ee774 100644
--- a/website/static/images/languages/graphql_small_grey.svg
+++ b/website/static/images/languages/graphql_small_grey.svg
@@ -1,12 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 49">
-  <g fill="#FFF" opacity=".499">
-    <path d="M4.11 37.337L2.294 36.29l20.02-34.673 1.814 1.048z"/>
-    <path d="M1.786 33.525h40.416V35.6H1.786z"/>
-    <path d="M22.806 46.308L2.591 34.636l1.037-1.797 20.216 11.672zm17.561-30.135L20.15 4.5l1.038-1.797 20.215 11.672z"/>
-    <path d="M3.733 16.12l-1.048-1.815L22.711 2.743l1.047 1.814z"/>
-    <path d="M39.998 37.497l-20.208-35 1.797-1.038 20.208 35zM3.388 12.938h2.095v23.125H3.388z"/>
-    <path d="M38.517 12.938h2.095v23.125h-2.095z"/>
-    <path d="M22.527 45.383l-.915-1.585L39.029 33.74l.915 1.585z"/>
-    <path d="M43.388 36.737c-1.211 2.088-3.912 2.8-6.019 1.6a4.347 4.347 0 01-1.615-5.962c1.211-2.087 3.912-2.8 6.019-1.6 2.12 1.213 2.839 3.875 1.615 5.962M8.233 16.625c-1.21 2.087-3.911 2.8-6.018 1.6a4.347 4.347 0 01-1.616-5.963c1.212-2.087 3.912-2.8 6.02-1.6a4.35 4.35 0 011.614 5.963M.612 36.737a4.35 4.35 0 011.615-5.962 4.438 4.438 0 016.02 1.6 4.35 4.35 0 01-1.616 5.962c-2.12 1.2-4.808.488-6.019-1.6m35.155-20.112a4.35 4.35 0 011.615-5.963c2.107-1.2 4.795-.487 6.019 1.6a4.351 4.351 0 01-1.616 5.963c-2.107 1.2-4.807.487-6.018-1.6M22 48.975c-2.435 0-4.404-1.95-4.404-4.363 0-2.412 1.969-4.362 4.404-4.362 2.435 0 4.404 1.95 4.404 4.362 0 2.4-1.969 4.363-4.404 4.363M22 8.75c-2.435 0-4.404-1.95-4.404-4.362 0-2.413 1.969-4.363 4.404-4.363 2.435 0 4.404 1.95 4.404 4.362C26.404 6.8 24.435 8.75 22 8.75"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 49"><g fill="#FFF" opacity=".499"><path d="M4.11 37.337L2.294 36.29l20.02-34.673 1.814 1.048z"/><path d="M1.786 33.525h40.416V35.6H1.786z"/><path d="M22.806 46.308L2.591 34.636l1.037-1.797 20.216 11.672zm17.561-30.135L20.15 4.5l1.038-1.797 20.215 11.672z"/><path d="M3.733 16.12l-1.048-1.815L22.711 2.743l1.047 1.814z"/><path d="M39.998 37.497l-20.208-35 1.797-1.038 20.208 35zM3.388 12.938h2.095v23.125H3.388z"/><path d="M38.517 12.938h2.095v23.125h-2.095z"/><path d="M22.527 45.383l-.915-1.585L39.029 33.74l.915 1.585z"/><path d="M43.388 36.737c-1.211 2.088-3.912 2.8-6.019 1.6a4.347 4.347 0 01-1.615-5.962c1.211-2.087 3.912-2.8 6.019-1.6 2.12 1.213 2.839 3.875 1.615 5.962M8.233 16.625c-1.21 2.087-3.911 2.8-6.018 1.6a4.347 4.347 0 01-1.616-5.963c1.212-2.087 3.912-2.8 6.02-1.6a4.35 4.35 0 011.614 5.963M.612 36.737a4.35 4.35 0 011.615-5.962 4.438 4.438 0 016.02 1.6 4.35 4.35 0 01-1.616 5.962c-2.12 1.2-4.808.488-6.019-1.6m35.155-20.112a4.35 4.35 0 011.615-5.963c2.107-1.2 4.795-.487 6.019 1.6a4.351 4.351 0 01-1.616 5.963c-2.107 1.2-4.807.487-6.018-1.6M22 48.975c-2.435 0-4.404-1.95-4.404-4.363 0-2.412 1.969-4.362 4.404-4.362 2.435 0 4.404 1.95 4.404 4.362 0 2.4-1.969 4.363-4.404 4.363M22 8.75c-2.435 0-4.404-1.95-4.404-4.362 0-2.413 1.969-4.363 4.404-4.363 2.435 0 4.404 1.95 4.404 4.362C26.404 6.8 24.435 8.75 22 8.75"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/js_small_grey.svg b/website/static/images/languages/js_small_grey.svg
index 6c10c64de..0c4fbfd5f 100644
--- a/website/static/images/languages/js_small_grey.svg
+++ b/website/static/images/languages/js_small_grey.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
-  <path d="M0 0h48v48H0zm32.244 37.5l-3.666 2.13c1.324 2.616 4.03 4.612 8.22 4.612 4.284 0 7.474-2.224 7.474-6.285 0-3.767-2.164-5.443-5.996-7.086l-1.128-.483c-1.935-.838-2.773-1.386-2.773-2.74 0-1.094.837-1.932 2.158-1.932 1.296 0 2.13.546 2.903 1.933l3.513-2.255c-1.486-2.614-3.548-3.612-6.416-3.612-4.028 0-6.605 2.575-6.605 5.958 0 3.673 2.162 5.41 5.417 6.796l1.127.484c2.058.9 3.284 1.448 3.284 2.994 0 1.291-1.194 2.225-3.063 2.225-2.224 0-3.482-1.16-4.45-2.739zm-15.934.391l-3.672 2.223c1.064 2.251 3.156 4.12 6.767 4.12 3.997 0 6.735-2.126 6.735-6.796V22.04h-4.51v15.337c0 2.254-.935 2.834-2.417 2.834-1.55 0-2.194-1.063-2.903-2.32z" fill="#8c9599"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#8c9599" d="M0 0h48v48H0zm32.244 37.5l-3.666 2.13c1.324 2.616 4.03 4.612 8.22 4.612 4.284 0 7.474-2.224 7.474-6.285 0-3.767-2.164-5.443-5.996-7.086l-1.128-.483c-1.935-.838-2.773-1.386-2.773-2.74 0-1.094.837-1.932 2.158-1.932 1.296 0 2.13.546 2.903 1.933l3.513-2.255c-1.486-2.614-3.548-3.612-6.416-3.612-4.028 0-6.605 2.575-6.605 5.958 0 3.673 2.162 5.41 5.417 6.796l1.127.484c2.058.9 3.284 1.448 3.284 2.994 0 1.291-1.194 2.225-3.063 2.225-2.224 0-3.482-1.16-4.45-2.739zm-15.934.391l-3.672 2.223c1.064 2.251 3.156 4.12 6.767 4.12 3.997 0 6.735-2.126 6.735-6.796V22.04h-4.51v15.337c0 2.254-.935 2.834-2.417 2.834-1.55 0-2.194-1.063-2.903-2.32z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/markdown_small_grey.svg b/website/static/images/languages/markdown_small_grey.svg
index 87fdfa8db..31daf953e 100644
--- a/website/static/images/languages/markdown_small_grey.svg
+++ b/website/static/images/languages/markdown_small_grey.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 49 31">
-  <g fill="none" fill-rule="evenodd" opacity=".499" transform="translate(2 2)">
-    <rect width="45" height="27" stroke="#FFF" stroke-width="3" rx="2"/>
-    <path fill="#FFF" fill-rule="nonzero" d="M5 22V6h4.5l4.5 5.882L18.5 6H23v16h-4.5v-9.176L14 18.706l-4.5-5.882V22H5zm28 0l-7-7.765h4.667V6h4.666v8.235H40L33 22z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 49 31"><g fill="none" fill-rule="evenodd" opacity=".499" transform="translate(2 2)"><rect width="45" height="27" stroke="#FFF" stroke-width="3" rx="2"/><path fill="#FFF" fill-rule="nonzero" d="M5 22V6h4.5l4.5 5.882L18.5 6H23v16h-4.5v-9.176L14 18.706l-4.5-5.882V22H5zm28 0l-7-7.765h4.667V6h4.666v8.235H40L33 22z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/python_small_grey.svg b/website/static/images/languages/python_small_grey.svg
index 850e05e10..c0bacb114 100644
--- a/website/static/images/languages/python_small_grey.svg
+++ b/website/static/images/languages/python_small_grey.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41 40">
-  <g fill="#FFF" fill-opacity=".5">
-    <path d="M19.9.98a28.78 28.78 0 00-4.619.38c-4.09.698-4.833 2.156-4.833 4.845v3.55h9.667v1.185H6.82c-2.81 0-5.27 1.627-6.04 4.724-.887 3.549-.926 5.764 0 9.47.688 2.758 2.329 4.724 5.138 4.724h3.324V25.6c0-3.076 2.76-5.789 6.038-5.789h9.655c2.688 0 4.834-2.133 4.834-4.735V6.205c0-2.526-2.21-4.423-4.834-4.844A31.253 31.253 0 0019.9.98zm-5.227 2.857c.998 0 1.814.799 1.814 1.781 0 .979-.816 1.77-1.814 1.77-1.002 0-1.814-.791-1.814-1.77 0-.982.812-1.781 1.814-1.781z"/>
-    <path d="M30.9 10.882v4.137c0 3.208-2.822 5.908-6.039 5.908h-9.655c-2.645 0-4.833 2.182-4.833 4.735v8.873c0 2.525 2.278 4.01 4.833 4.735 3.06.867 5.994 1.024 9.655 0 2.434-.68 4.833-2.046 4.833-4.735v-3.551H20.04V29.8h14.488c2.81 0 3.857-1.889 4.834-4.724 1.009-2.919.966-5.726 0-9.47-.695-2.696-2.02-4.724-4.834-4.724H30.9zm-5.43 22.47c1.002 0 1.813.79 1.813 1.77 0 .982-.811 1.78-1.814 1.78-.998 0-1.813-.798-1.813-1.78 0-.98.815-1.77 1.813-1.77z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41 40"><g fill="#FFF" fill-opacity=".5"><path d="M19.9.98a28.78 28.78 0 00-4.619.38c-4.09.698-4.833 2.156-4.833 4.845v3.55h9.667v1.185H6.82c-2.81 0-5.27 1.627-6.04 4.724-.887 3.549-.926 5.764 0 9.47.688 2.758 2.329 4.724 5.138 4.724h3.324V25.6c0-3.076 2.76-5.789 6.038-5.789h9.655c2.688 0 4.834-2.133 4.834-4.735V6.205c0-2.526-2.21-4.423-4.834-4.844A31.253 31.253 0 0019.9.98zm-5.227 2.857c.998 0 1.814.799 1.814 1.781 0 .979-.816 1.77-1.814 1.77-1.002 0-1.814-.791-1.814-1.77 0-.982.812-1.781 1.814-1.781z"/><path d="M30.9 10.882v4.137c0 3.208-2.822 5.908-6.039 5.908h-9.655c-2.645 0-4.833 2.182-4.833 4.735v8.873c0 2.525 2.278 4.01 4.833 4.735 3.06.867 5.994 1.024 9.655 0 2.434-.68 4.833-2.046 4.833-4.735v-3.551H20.04V29.8h14.488c2.81 0 3.857-1.889 4.834-4.724 1.009-2.919.966-5.726 0-9.47-.695-2.696-2.02-4.724-4.834-4.724H30.9zm-5.43 22.47c1.002 0 1.813.79 1.813 1.77 0 .982-.811 1.78-1.814 1.78-.998 0-1.813-.798-1.813-1.78 0-.98.815-1.77 1.813-1.77z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/swift_small_grey.svg b/website/static/images/languages/swift_small_grey.svg
index f116e308e..98979239a 100644
--- a/website/static/images/languages/swift_small_grey.svg
+++ b/website/static/images/languages/swift_small_grey.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 47 42">
-  <path fill="#FFF" fill-opacity=".5" d="M35.452 39.094c-5.537 3.19-13.149 3.517-20.808.244C8.444 36.707 3.298 32.1 0 26.84c1.583 1.315 3.43 2.368 5.41 3.288 7.908 3.697 15.816 3.444 21.38.01l-.008-.01C18.866 24.076 12.138 16.182 7.124 9.736 6.07 8.683 5.277 7.368 4.485 6.183c6.07 5.526 15.7 12.499 19.13 14.473-7.255-7.631-13.72-17.103-13.457-16.84 11.478 11.577 22.166 18.156 22.166 18.156.353.198.626.364.845.512.232-.587.435-1.196.605-1.828 1.847-6.71-.263-14.341-4.881-20.656 10.686 6.447 17.02 18.55 14.38 28.682a18.4 18.4 0 01-.224.808l.092.113c5.277 6.579 3.826 13.551 3.166 12.236-2.862-5.586-8.161-3.878-10.855-2.745z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 47 42"><path fill="#FFF" fill-opacity=".5" d="M35.452 39.094c-5.537 3.19-13.149 3.517-20.808.244C8.444 36.707 3.298 32.1 0 26.84c1.583 1.315 3.43 2.368 5.41 3.288 7.908 3.697 15.816 3.444 21.38.01l-.008-.01C18.866 24.076 12.138 16.182 7.124 9.736 6.07 8.683 5.277 7.368 4.485 6.183c6.07 5.526 15.7 12.499 19.13 14.473-7.255-7.631-13.72-17.103-13.457-16.84 11.478 11.577 22.166 18.156 22.166 18.156.353.198.626.364.845.512.232-.587.435-1.196.605-1.828 1.847-6.71-.263-14.341-4.881-20.656 10.686 6.447 17.02 18.55 14.38 28.682a18.4 18.4 0 01-.224.808l.092.113c5.277 6.579 3.826 13.551 3.166 12.236-2.862-5.586-8.161-3.878-10.855-2.745z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/tools_css.svg b/website/static/images/languages/tools_css.svg
index 689cce48b..695ff489d 100644
--- a/website/static/images/languages/tools_css.svg
+++ b/website/static/images/languages/tools_css.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 43 49">
-  <path fill="#C695C8" d="M21.49 19.963H8.972l.483 5.409H28.11l-.626 7.014-6.004 1.629-.005.002-5.995-1.627-.383-4.314H9.695l.753 8.493 11.027 3.076.025-.007v-.001l11.017-3.068.081-.914 1.265-14.24.131-1.452.972-10.948H8.001l.49 5.409h20.576l-.49 5.539h-7.086zM43 0l-3.917 44.095L21.473 49l-17.56-4.898L0 0h43z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 43 49"><path fill="#C695C8" d="M21.49 19.963H8.972l.483 5.409H28.11l-.626 7.014-6.004 1.629-.005.002-5.995-1.627-.383-4.314H9.695l.753 8.493 11.027 3.076.025-.007v-.001l11.017-3.068.081-.914 1.265-14.24.131-1.452.972-10.948H8.001l.49 5.409h20.576l-.49 5.539h-7.086zM43 0l-3.917 44.095L21.473 49l-17.56-4.898L0 0h43z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/tools_gql.svg b/website/static/images/languages/tools_gql.svg
index 40f20f38c..92c31a131 100644
--- a/website/static/images/languages/tools_gql.svg
+++ b/website/static/images/languages/tools_gql.svg
@@ -1,12 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 49">
-  <g fill="#C695C8">
-    <path d="M4.11 37.337L2.294 36.29l20.02-34.673 1.814 1.048z"/>
-    <path d="M1.786 33.525h40.416V35.6H1.786z"/>
-    <path d="M22.806 46.308L2.591 34.636l1.037-1.797 20.216 11.672zm17.561-30.135L20.15 4.5l1.038-1.797 20.215 11.672z"/>
-    <path d="M3.733 16.12l-1.048-1.815L22.711 2.743l1.047 1.814z"/>
-    <path d="M39.998 37.497l-20.208-35 1.797-1.038 20.208 35zM3.388 12.938h2.095v23.125H3.388z"/>
-    <path d="M38.517 12.938h2.095v23.125h-2.095z"/>
-    <path d="M22.527 45.383l-.915-1.585L39.029 33.74l.915 1.585z"/>
-    <path d="M43.388 36.737c-1.211 2.088-3.912 2.8-6.019 1.6a4.347 4.347 0 01-1.615-5.962c1.211-2.087 3.912-2.8 6.019-1.6 2.12 1.213 2.839 3.875 1.615 5.962M8.233 16.625c-1.21 2.087-3.911 2.8-6.018 1.6a4.347 4.347 0 01-1.616-5.963c1.212-2.087 3.912-2.8 6.02-1.6a4.35 4.35 0 011.614 5.963M.612 36.737a4.35 4.35 0 011.615-5.962 4.438 4.438 0 016.02 1.6 4.35 4.35 0 01-1.616 5.962c-2.12 1.2-4.808.488-6.019-1.6m35.155-20.112a4.35 4.35 0 011.615-5.963c2.107-1.2 4.795-.487 6.019 1.6a4.351 4.351 0 01-1.616 5.963c-2.107 1.2-4.807.487-6.018-1.6M22 48.975c-2.435 0-4.404-1.95-4.404-4.363 0-2.412 1.969-4.362 4.404-4.362 2.435 0 4.404 1.95 4.404 4.362 0 2.4-1.969 4.363-4.404 4.363M22 8.75c-2.435 0-4.404-1.95-4.404-4.362 0-2.413 1.969-4.363 4.404-4.363 2.435 0 4.404 1.95 4.404 4.362C26.404 6.8 24.435 8.75 22 8.75"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 49"><g fill="#C695C8"><path d="M4.11 37.337L2.294 36.29l20.02-34.673 1.814 1.048z"/><path d="M1.786 33.525h40.416V35.6H1.786z"/><path d="M22.806 46.308L2.591 34.636l1.037-1.797 20.216 11.672zm17.561-30.135L20.15 4.5l1.038-1.797 20.215 11.672z"/><path d="M3.733 16.12l-1.048-1.815L22.711 2.743l1.047 1.814z"/><path d="M39.998 37.497l-20.208-35 1.797-1.038 20.208 35zM3.388 12.938h2.095v23.125H3.388z"/><path d="M38.517 12.938h2.095v23.125h-2.095z"/><path d="M22.527 45.383l-.915-1.585L39.029 33.74l.915 1.585z"/><path d="M43.388 36.737c-1.211 2.088-3.912 2.8-6.019 1.6a4.347 4.347 0 01-1.615-5.962c1.211-2.087 3.912-2.8 6.019-1.6 2.12 1.213 2.839 3.875 1.615 5.962M8.233 16.625c-1.21 2.087-3.911 2.8-6.018 1.6a4.347 4.347 0 01-1.616-5.963c1.212-2.087 3.912-2.8 6.02-1.6a4.35 4.35 0 011.614 5.963M.612 36.737a4.35 4.35 0 011.615-5.962 4.438 4.438 0 016.02 1.6 4.35 4.35 0 01-1.616 5.962c-2.12 1.2-4.808.488-6.019-1.6m35.155-20.112a4.35 4.35 0 011.615-5.963c2.107-1.2 4.795-.487 6.019 1.6a4.351 4.351 0 01-1.616 5.963c-2.107 1.2-4.807.487-6.018-1.6M22 48.975c-2.435 0-4.404-1.95-4.404-4.363 0-2.412 1.969-4.362 4.404-4.362 2.435 0 4.404 1.95 4.404 4.362 0 2.4-1.969 4.363-4.404 4.363M22 8.75c-2.435 0-4.404-1.95-4.404-4.362 0-2.413 1.969-4.363 4.404-4.363 2.435 0 4.404 1.95 4.404 4.362C26.404 6.8 24.435 8.75 22 8.75"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/tools_html.svg b/website/static/images/languages/tools_html.svg
index 8ba7140b5..ccc7280f7 100644
--- a/website/static/images/languages/tools_html.svg
+++ b/website/static/images/languages/tools_html.svg
@@ -1,3 +1 @@
-<svg viewBox="4.1 2.5 15.65 20" xmlns="http://www.w3.org/2000/svg">
-  <path d="M12 17.56l4.07-1.13.55-6.1H9.38L9.2 8.3h7.6l.2-1.99H7l.56 6.01h6.89l-.23 2.58-2.22.6-2.22-.6-.14-1.66h-2l.29 3.19zM4.07 3h15.86L18.5 19.2 12 21l-6.5-1.8z" fill="#c695c8"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="4.1 2.5 15.65 20"><path fill="#c695c8" d="M12 17.56l4.07-1.13.55-6.1H9.38L9.2 8.3h7.6l.2-1.99H7l.56 6.01h6.89l-.23 2.58-2.22.6-2.22-.6-.14-1.66h-2l.29 3.19zM4.07 3h15.86L18.5 19.2 12 21l-6.5-1.8z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/tools_js.svg b/website/static/images/languages/tools_js.svg
index 008a44d84..5c893fa3e 100644
--- a/website/static/images/languages/tools_js.svg
+++ b/website/static/images/languages/tools_js.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
-  <path fill="#C695C8" d="M0 0h48v48H0V0zm32.244 37.5l-3.666 2.13c1.324 2.616 4.03 4.612 8.22 4.612 4.284 0 7.474-2.224 7.474-6.285 0-3.767-2.164-5.443-5.996-7.086l-1.128-.483c-1.935-.838-2.773-1.386-2.773-2.74 0-1.094.837-1.932 2.158-1.932 1.296 0 2.13.546 2.903 1.933l3.513-2.255c-1.486-2.614-3.548-3.612-6.416-3.612-4.028 0-6.605 2.575-6.605 5.958 0 3.673 2.162 5.41 5.417 6.796l1.127.484c2.058.9 3.284 1.448 3.284 2.994 0 1.291-1.194 2.225-3.063 2.225-2.224 0-3.482-1.16-4.45-2.739zm-15.934.391l-3.672 2.223c1.064 2.251 3.156 4.12 6.767 4.12 3.997 0 6.735-2.126 6.735-6.796V22.04h-4.51v15.337c0 2.254-.935 2.834-2.417 2.834-1.55 0-2.194-1.063-2.903-2.32z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#C695C8" d="M0 0h48v48H0V0zm32.244 37.5l-3.666 2.13c1.324 2.616 4.03 4.612 8.22 4.612 4.284 0 7.474-2.224 7.474-6.285 0-3.767-2.164-5.443-5.996-7.086l-1.128-.483c-1.935-.838-2.773-1.386-2.773-2.74 0-1.094.837-1.932 2.158-1.932 1.296 0 2.13.546 2.903 1.933l3.513-2.255c-1.486-2.614-3.548-3.612-6.416-3.612-4.028 0-6.605 2.575-6.605 5.958 0 3.673 2.162 5.41 5.417 6.796l1.127.484c2.058.9 3.284 1.448 3.284 2.994 0 1.291-1.194 2.225-3.063 2.225-2.224 0-3.482-1.16-4.45-2.739zm-15.934.391l-3.672 2.223c1.064 2.251 3.156 4.12 6.767 4.12 3.997 0 6.735-2.126 6.735-6.796V22.04h-4.51v15.337c0 2.254-.935 2.834-2.417 2.834-1.55 0-2.194-1.063-2.903-2.32z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/tools_md.svg b/website/static/images/languages/tools_md.svg
index 0420fa1ea..63ed2a2d8 100644
--- a/website/static/images/languages/tools_md.svg
+++ b/website/static/images/languages/tools_md.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 49 31" xmlns="http://www.w3.org/2000/svg">
-  <path d="M45 30.5H4C2.1 30.5.5 28.9.5 27V4C.5 2.1 2.1.5 4 .5h41c1.9 0 3.5 1.6 3.5 3.5v23c0 1.9-1.6 3.5-3.5 3.5zM4 3.5c-.3 0-.5.2-.5.5v23c0 .3.2.5.5.5h41c.3 0 .5-.2.5-.5V4c0-.3-.2-.5-.5-.5zM7 24V8h4.5l4.5 5.9L20.5 8H25v16h-4.5v-9.2L16 20.7l-4.5-5.9V24zm28 0l-7-7.8h4.7V8h4.7v8.2H42z" fill="#c695c8"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 49 31"><path fill="#c695c8" d="M45 30.5H4C2.1 30.5.5 28.9.5 27V4C.5 2.1 2.1.5 4 .5h41c1.9 0 3.5 1.6 3.5 3.5v23c0 1.9-1.6 3.5-3.5 3.5zM4 3.5c-.3 0-.5.2-.5.5v23c0 .3.2.5.5.5h41c.3 0 .5-.2.5-.5V4c0-.3-.2-.5-.5-.5zM7 24V8h4.5l4.5 5.9L20.5 8H25v16h-4.5v-9.2L16 20.7l-4.5-5.9V24zm28 0l-7-7.8h4.7V8h4.7v8.2H42z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/tools_wip.svg b/website/static/images/languages/tools_wip.svg
index 12aff681c..6ab886b8c 100644
--- a/website/static/images/languages/tools_wip.svg
+++ b/website/static/images/languages/tools_wip.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 67 63">
-  <g fill="none" fill-rule="evenodd" stroke="#C695C8" stroke-width="2">
-    <path fill="#192B34" d="M33.754 6.32c1.281.834 2.161 2.504 2.27 2.755.472 1.087.824 3.746.824 3.746l-3.75 10.735-1.359 3.892 3.335 1.28 6.47-14.104s1.81-1.355 2.896-1.85c1.091-.499 1.819-.711 2.89-.53 1.07.18 1.958 1.074 2.65 1.34.463.177 1.322 1.955 1.322 1.955s.3.605.498.777c.337.291 2.748 1.054 2.748 1.054s1.598-1.831 1.925-2.706c.355-.951.958-3.327.958-3.327l-2.263-1.257s-3.828-.437-4.404-.658c-.248-.095-1.343-.61-1.834-1.348-.49-.739-.886-2.585-1.002-2.628-.693-.26-5.571-2.62-10.517-3.723-1.916-.427-6.513-.65-10.3.026-3.634.649-5.376 2.888-5.38 3.227-.012.86-.194 1.558-.016 1.489.323-.126 2.327-.602 2.327-.602s2.853-.681 5.244-.546c1.323.076 3.113.12 4.468 1.002zM17.02 57.888l8.359 3.209c.53.203.914-.139.914-.139s.196-.244.325-.599c4.88-13.352 3.245-9.16 3.245-9.16s2.361-7.811 3.161-11.137c.986-4.1 2.195-11.142 2.195-11.142l-3.445-1.322-6.538 8.887s-3.608 6.749-8.713 19.604c-.28.708-.141 1.065-.141 1.065s.264.59.638.734z"/>
-    <path d="M1.418 14.253l7.716 43.322 56.119-11.506L54.718 4.778l-53.3 9.475z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 67 63"><g fill="none" fill-rule="evenodd" stroke="#C695C8" stroke-width="2"><path fill="#192B34" d="M33.754 6.32c1.281.834 2.161 2.504 2.27 2.755.472 1.087.824 3.746.824 3.746l-3.75 10.735-1.359 3.892 3.335 1.28 6.47-14.104s1.81-1.355 2.896-1.85c1.091-.499 1.819-.711 2.89-.53 1.07.18 1.958 1.074 2.65 1.34.463.177 1.322 1.955 1.322 1.955s.3.605.498.777c.337.291 2.748 1.054 2.748 1.054s1.598-1.831 1.925-2.706c.355-.951.958-3.327.958-3.327l-2.263-1.257s-3.828-.437-4.404-.658c-.248-.095-1.343-.61-1.834-1.348-.49-.739-.886-2.585-1.002-2.628-.693-.26-5.571-2.62-10.517-3.723-1.916-.427-6.513-.65-10.3.026-3.634.649-5.376 2.888-5.38 3.227-.012.86-.194 1.558-.016 1.489.323-.126 2.327-.602 2.327-.602s2.853-.681 5.244-.546c1.323.076 3.113.12 4.468 1.002zM17.02 57.888l8.359 3.209c.53.203.914-.139.914-.139s.196-.244.325-.599c4.88-13.352 3.245-9.16 3.245-9.16s2.361-7.811 3.161-11.137c.986-4.1 2.195-11.142 2.195-11.142l-3.445-1.322-6.538 8.887s-3.608 6.749-8.713 19.604c-.28.708-.141 1.065-.141 1.065s.264.59.638.734z"/><path d="M1.418 14.253l7.716 43.322 56.119-11.506L54.718 4.778l-53.3 9.475z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/languages/tools_yaml.svg b/website/static/images/languages/tools_yaml.svg
index b06631d39..2aaa70877 100644
--- a/website/static/images/languages/tools_yaml.svg
+++ b/website/static/images/languages/tools_yaml.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512">
-  <path fill="#C695C8" d="M235.793 20.939l-91.815 137.674v87.275H87.702v-87.275L0 20.939h63.25l55.768 88.646 56.225-88.646h60.55zm94.501 174.925H228.433l-20.717 50.024H162.61l95.38-224.949h46.137l91.51 224.949h-48.196l-17.148-50.024zm-16.92-44.734l-31.226-82.55-34.837 82.55h66.062zM87.701 270.59v220.47h47.303V338.982l49.505 102.22h37.234l51.196-105.813v155.626h45.379V270.59h-61.96l-54.977 99.706-52.36-99.706h-61.32zM512 443.2H395.638V270.59h-48.196v219.522H512v-46.91z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><path fill="#C695C8" d="M235.793 20.939l-91.815 137.674v87.275H87.702v-87.275L0 20.939h63.25l55.768 88.646 56.225-88.646h60.55zm94.501 174.925H228.433l-20.717 50.024H162.61l95.38-224.949h46.137l91.51 224.949h-48.196l-17.148-50.024zm-16.92-44.734l-31.226-82.55-34.837 82.55h66.062zM87.701 270.59v220.47h47.303V338.982l49.505 102.22h37.234l51.196-105.813v155.626h45.379V270.59h-61.96l-54.977 99.706-52.36-99.706h-61.32zM512 443.2H395.638V270.59h-48.196v219.522H512v-46.91z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/npm.svg b/website/static/images/npm.svg
index 2658484c2..e92cf3f61 100644
--- a/website/static/images/npm.svg
+++ b/website/static/images/npm.svg
@@ -1,4 +1 @@
-<svg viewBox="0 0 990 990" xmlns="http://www.w3.org/2000/svg">
-  <path d="M0 990V0h990v990zm186.19-804.47V803h312V314.29H680v488.8h123.78V185.53z" fill="#cb3837"/>
-  <path d="M186.19 185.53h617.6v617.56H680v-488.8H498.17V803h-312z" fill="#fff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 990 990"><path fill="#cb3837" d="M0 990V0h990v990zm186.19-804.47V803h312V314.29H680v488.8h123.78V185.53z"/><path fill="#fff" d="M186.19 185.53h617.6v617.56H680v-488.8H498.17V803h-312z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/npm_grey.svg b/website/static/images/npm_grey.svg
index 0a48ca1bb..3ffd01d6d 100644
--- a/website/static/images/npm_grey.svg
+++ b/website/static/images/npm_grey.svg
@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 990 990">
-  <path fill="#6f7b81" d="M0 990V0h990v990zm186.19-804.47V803h312V314.29H680v488.8h123.78V185.53z"/>
-  <path fill="transparent" d="M186.19 185.53h617.6v617.56H680v-488.8H498.17V803h-312z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 990 990"><path fill="#6f7b81" d="M0 990V0h990v990zm186.19-804.47V803h312V314.29H680v488.8h123.78V185.53z"/><path fill="transparent" d="M186.19 185.53h617.6v617.56H680v-488.8H498.17V803h-312z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/3yourmind.svg b/website/static/images/users/3yourmind.svg
index 9fdf84f12..161838c3d 100644
--- a/website/static/images/users/3yourmind.svg
+++ b/website/static/images/users/3yourmind.svg
@@ -1,13 +1 @@
-<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" viewBox="0 0 200 100" xmlns="http://www.w3.org/2000/svg">
-  <g fill-rule="nonzero">
-    <path d="M0 36.98h13l6.24-6.2H6.2z" fill="#78a0db"/>
-    <path d="M13 36.98v13.04l6.24-6.24v-13z" fill="#2c66c4"/>
-    <path d="M6.8 56.22h13l6.24-6.2H13z" fill="#78a0db"/>
-    <path d="M19.8 56.22v13l6.24-6.2v-13z" fill="#2c66c4"/>
-    <path d="M19.24 43.78h13l6.2-6.2h-13z" fill="#78a0db"/>
-    <path d="M32.24 43.78v13.04l6.2-6.24v-13z" fill="#2c66c4"/>
-    <path d="M73.88 43.9l-.08.16c-.08.12-.2.36-.4.72l-3.36 6.64-.76 1.52v-.04c-.2-.44-.48-.92-.76-1.48s-.6-1.16-.92-1.76l-.96-1.84c-.32-.6-.6-1.2-.88-1.68-.28-.52-.52-.96-.68-1.32-.2-.36-.32-.6-.4-.72l-.08-.16h-4.36l.36.52c.04.04.16.28.6 1.08.32.64.76 1.4 1.24 2.28s1 1.84 1.56 2.84 1.04 1.96 1.56 2.84c.48.88.92 1.64 1.24 2.28.36.68.52.96.6 1.08v6.2h3.76v-6.28l7.04-12.92h-4.32zm19.92 2.68c-.88-.88-1.92-1.6-3.12-2.12s-2.44-.8-3.8-.8-2.6.28-3.8.8c-1.16.52-2.2 1.24-3.08 2.12a9.28 9.28 0 00-2.08 3.12c-.52 1.2-.76 2.44-.76 3.8s.28 2.6.76 3.8c.52 1.16 1.2 2.2 2.08 3.08s1.92 1.6 3.08 2.08c1.16.52 2.44.76 3.8.76 1.32 0 2.6-.24 3.76-.76 1.2-.52 2.24-1.2 3.12-2.08s1.6-1.92 2.12-3.08.76-2.44.76-3.8c0-1.32-.28-2.6-.76-3.8a9.481 9.481 0 00-2.08-3.12zm-6.88.76c.84 0 1.6.16 2.32.48s1.36.76 1.92 1.32 1 1.24 1.32 1.96c.32.76.48 1.56.48 2.4s-.16 1.64-.48 2.4-.76 1.4-1.28 1.96-1.16 1-1.88 1.32-1.52.48-2.32.48c-.84 0-1.64-.16-2.36-.48s-1.36-.76-1.92-1.32-1-1.2-1.28-1.96c-.32-.76-.48-1.56-.48-2.4s.16-1.64.48-2.4.76-1.4 1.28-1.96 1.16-1 1.88-1.32 1.48-.48 2.32-.48zm23.24 8.68c0 .48-.08.96-.28 1.4s-.48.8-.8 1.12c-.36.32-.76.6-1.2.8-.92.4-2.04.4-2.96 0-.44-.2-.84-.44-1.16-.8-.32-.32-.6-.72-.8-1.16s-.28-.88-.28-1.4V43.9h-3.76v12.2c0 1.04.2 2.04.6 2.92s.92 1.64 1.6 2.24 1.48 1.12 2.36 1.44c.92.36 1.88.52 2.92.52s2-.16 2.92-.52 1.72-.84 2.4-1.44 1.24-1.36 1.6-2.24c.4-.88.6-1.84.6-2.92V43.9h-3.76z" fill="#4f4f4f"/>
-  </g>
-  <path d="M156.4 43.9h3.76v19.12h-3.76z" fill="#4f4f4f"/>
-  <path d="M199.44 50.22c-.36-1.16-1-2.24-1.84-3.16s-1.92-1.68-3.28-2.28c-1.32-.6-2.96-.88-4.88-.88h-5.12v19.12h6.08c1.28 0 2.52-.2 3.68-.64s2.2-1.04 3.08-1.84 1.56-1.8 2.08-2.92c.52-1.16.76-2.44.76-3.88 0-1.16-.2-2.36-.56-3.52zm-3.2 3.32c0 .96-.16 1.84-.48 2.56s-.76 1.32-1.28 1.84c-.56.48-1.24.88-2 1.12s-1.64.4-2.56.4h-1.76V47.54h2.16c.64 0 1.32.12 2.04.32.68.2 1.36.56 1.92 1.04s1.04 1.08 1.44 1.84c.32.76.52 1.68.52 2.8zm-44.64-9.52c-.32.44-.68.92-1.12 1.56-.44.6-.92 1.28-1.48 2.04-.52.76-1.08 1.48-1.64 2.24s-1.12 1.52-1.64 2.24-1 1.4-1.4 1.96-.76 1.04-1.04 1.44l-.2.28c-.08-.12-.16-.24-.28-.36-.28-.4-.64-.88-1.08-1.48s-.88-1.24-1.44-1.96l-3.24-4.44c-.52-.72-1-1.4-1.44-2s-.8-1.12-1.08-1.52l-.32-.48h-.84v19.48h3.76v-9.28l.96 1.32c.44.6.92 1.28 1.44 2s1 1.4 1.44 2c.44.64.84 1.16 1.16 1.64s.56.76.64.84l.28.32 5.76-8.12v9.28h3.96V43.54h-.84zM177 55.14c-.16-.16-.36-.36-.6-.64-.4-.4-.88-.88-1.48-1.4-.6-.56-1.24-1.16-1.96-1.84s-1.44-1.36-2.2-2.04l-2.2-2c-.72-.64-1.36-1.28-1.96-1.84s-1.08-1.04-1.48-1.44l-.32-.32-.08-.08h-.92v19.48h3.76V51.5c.16.16.36.4.64.68.4.4.88.88 1.48 1.44s1.24 1.2 1.96 1.88 1.44 1.36 2.2 2.08 1.48 1.4 2.2 2.08l1.96 1.88c.6.56 1.08 1.04 1.48 1.44l.32.32.08.12h.96V43.9h-3.76zm-48.52-.56c.52-.6.92-1.32 1.16-2.08s.36-1.56.36-2.32c0-.96-.16-1.84-.52-2.64-.32-.8-.84-1.44-1.44-2-.6-.52-1.36-.96-2.24-1.24a9.45 9.45 0 00-2.88-.44h-5.56v19.16h3.76v-6.36h1.52l4.12 6.28h4.84l-4.72-7.08c.64-.36 1.16-.76 1.6-1.28zm-2.28-4.32c0 .24-.04.56-.12.88s-.24.64-.48.92-.52.52-.92.72c-.36.2-.84.28-1.44.28h-2.16v-5.6h2.16c.6 0 1.08.08 1.48.28.36.2.68.44.88.72s.36.6.44.92c.12.36.16.64.16.88zm-76.04 3.52l3.72-6.4h-6.8V43.9h12.4l-.28.48-1.92 3.36c-.6 1-1.2 2-1.76 3.04 1.04.6 1.88 1.36 2.52 2.28.72 1.04 1.08 2.24 1.08 3.6 0 .92-.16 1.76-.52 2.56a7.1 7.1 0 01-1.44 2.12c-.6.6-1.32 1.08-2.12 1.4-.8.36-1.68.52-2.56.52-.92 0-1.84-.2-2.68-.6-.08-.04-.12-.04-.16-.08l-.12-.04-.24-.12c-.08-.04-.12-.08-.2-.12-.12-.08-.28-.16-.4-.28l-.08-.08-.48-.36-.04-.04c-.16-.12-.28-.28-.44-.4l-.28-.28a6.51 6.51 0 01-1.28-2.44l-.08-.24 3.2-1.68.08.44c.24 1.56 1.68 2.84 3.2 2.88.4 0 .8-.08 1.16-.24.4-.16.72-.4 1-.68s.52-.6.68-1c.16-.36.24-.8.24-1.24 0-.4-.08-.8-.24-1.2s-.4-.72-.68-1-.6-.48-1-.64c-.36-.16-.76-.24-1.2-.24-.64 0-1.24.12-1.72.4l-.24.12-.32-.32.12-.24" fill="#4f4f4f" fill-rule="nonzero"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" clip-rule="evenodd" viewBox="0 0 200 100"><g fill-rule="nonzero"><path fill="#78a0db" d="M0 36.98h13l6.24-6.2H6.2z"/><path fill="#2c66c4" d="M13 36.98v13.04l6.24-6.24v-13z"/><path fill="#78a0db" d="M6.8 56.22h13l6.24-6.2H13z"/><path fill="#2c66c4" d="M19.8 56.22v13l6.24-6.2v-13z"/><path fill="#78a0db" d="M19.24 43.78h13l6.2-6.2h-13z"/><path fill="#2c66c4" d="M32.24 43.78v13.04l6.2-6.24v-13z"/><path fill="#4f4f4f" d="M73.88 43.9l-.08.16c-.08.12-.2.36-.4.72l-3.36 6.64-.76 1.52v-.04c-.2-.44-.48-.92-.76-1.48s-.6-1.16-.92-1.76l-.96-1.84c-.32-.6-.6-1.2-.88-1.68-.28-.52-.52-.96-.68-1.32-.2-.36-.32-.6-.4-.72l-.08-.16h-4.36l.36.52c.04.04.16.28.6 1.08.32.64.76 1.4 1.24 2.28s1 1.84 1.56 2.84 1.04 1.96 1.56 2.84c.48.88.92 1.64 1.24 2.28.36.68.52.96.6 1.08v6.2h3.76v-6.28l7.04-12.92h-4.32zm19.92 2.68c-.88-.88-1.92-1.6-3.12-2.12s-2.44-.8-3.8-.8-2.6.28-3.8.8c-1.16.52-2.2 1.24-3.08 2.12a9.28 9.28 0 00-2.08 3.12c-.52 1.2-.76 2.44-.76 3.8s.28 2.6.76 3.8c.52 1.16 1.2 2.2 2.08 3.08s1.92 1.6 3.08 2.08c1.16.52 2.44.76 3.8.76 1.32 0 2.6-.24 3.76-.76 1.2-.52 2.24-1.2 3.12-2.08s1.6-1.92 2.12-3.08.76-2.44.76-3.8c0-1.32-.28-2.6-.76-3.8a9.481 9.481 0 00-2.08-3.12zm-6.88.76c.84 0 1.6.16 2.32.48s1.36.76 1.92 1.32 1 1.24 1.32 1.96c.32.76.48 1.56.48 2.4s-.16 1.64-.48 2.4-.76 1.4-1.28 1.96-1.16 1-1.88 1.32-1.52.48-2.32.48c-.84 0-1.64-.16-2.36-.48s-1.36-.76-1.92-1.32-1-1.2-1.28-1.96c-.32-.76-.48-1.56-.48-2.4s.16-1.64.48-2.4.76-1.4 1.28-1.96 1.16-1 1.88-1.32 1.48-.48 2.32-.48zm23.24 8.68c0 .48-.08.96-.28 1.4s-.48.8-.8 1.12c-.36.32-.76.6-1.2.8-.92.4-2.04.4-2.96 0-.44-.2-.84-.44-1.16-.8-.32-.32-.6-.72-.8-1.16s-.28-.88-.28-1.4V43.9h-3.76v12.2c0 1.04.2 2.04.6 2.92s.92 1.64 1.6 2.24 1.48 1.12 2.36 1.44c.92.36 1.88.52 2.92.52s2-.16 2.92-.52 1.72-.84 2.4-1.44 1.24-1.36 1.6-2.24c.4-.88.6-1.84.6-2.92V43.9h-3.76z"/></g><path fill="#4f4f4f" d="M156.4 43.9h3.76v19.12h-3.76z"/><path fill="#4f4f4f" fill-rule="nonzero" d="M199.44 50.22c-.36-1.16-1-2.24-1.84-3.16s-1.92-1.68-3.28-2.28c-1.32-.6-2.96-.88-4.88-.88h-5.12v19.12h6.08c1.28 0 2.52-.2 3.68-.64s2.2-1.04 3.08-1.84 1.56-1.8 2.08-2.92c.52-1.16.76-2.44.76-3.88 0-1.16-.2-2.36-.56-3.52zm-3.2 3.32c0 .96-.16 1.84-.48 2.56s-.76 1.32-1.28 1.84c-.56.48-1.24.88-2 1.12s-1.64.4-2.56.4h-1.76V47.54h2.16c.64 0 1.32.12 2.04.32.68.2 1.36.56 1.92 1.04s1.04 1.08 1.44 1.84c.32.76.52 1.68.52 2.8zm-44.64-9.52c-.32.44-.68.92-1.12 1.56-.44.6-.92 1.28-1.48 2.04-.52.76-1.08 1.48-1.64 2.24s-1.12 1.52-1.64 2.24-1 1.4-1.4 1.96-.76 1.04-1.04 1.44l-.2.28c-.08-.12-.16-.24-.28-.36-.28-.4-.64-.88-1.08-1.48s-.88-1.24-1.44-1.96l-3.24-4.44c-.52-.72-1-1.4-1.44-2s-.8-1.12-1.08-1.52l-.32-.48h-.84v19.48h3.76v-9.28l.96 1.32c.44.6.92 1.28 1.44 2s1 1.4 1.44 2c.44.64.84 1.16 1.16 1.64s.56.76.64.84l.28.32 5.76-8.12v9.28h3.96V43.54h-.84zM177 55.14c-.16-.16-.36-.36-.6-.64-.4-.4-.88-.88-1.48-1.4-.6-.56-1.24-1.16-1.96-1.84s-1.44-1.36-2.2-2.04l-2.2-2c-.72-.64-1.36-1.28-1.96-1.84s-1.08-1.04-1.48-1.44l-.32-.32-.08-.08h-.92v19.48h3.76V51.5c.16.16.36.4.64.68.4.4.88.88 1.48 1.44s1.24 1.2 1.96 1.88 1.44 1.36 2.2 2.08 1.48 1.4 2.2 2.08l1.96 1.88c.6.56 1.08 1.04 1.48 1.44l.32.32.08.12h.96V43.9h-3.76zm-48.52-.56c.52-.6.92-1.32 1.16-2.08s.36-1.56.36-2.32c0-.96-.16-1.84-.52-2.64-.32-.8-.84-1.44-1.44-2-.6-.52-1.36-.96-2.24-1.24a9.45 9.45 0 00-2.88-.44h-5.56v19.16h3.76v-6.36h1.52l4.12 6.28h4.84l-4.72-7.08c.64-.36 1.16-.76 1.6-1.28zm-2.28-4.32c0 .24-.04.56-.12.88s-.24.64-.48.92-.52.52-.92.72c-.36.2-.84.28-1.44.28h-2.16v-5.6h2.16c.6 0 1.08.08 1.48.28.36.2.68.44.88.72s.36.6.44.92c.12.36.16.64.16.88zm-76.04 3.52l3.72-6.4h-6.8V43.9h12.4l-.28.48-1.92 3.36c-.6 1-1.2 2-1.76 3.04 1.04.6 1.88 1.36 2.52 2.28.72 1.04 1.08 2.24 1.08 3.6 0 .92-.16 1.76-.52 2.56a7.1 7.1 0 01-1.44 2.12c-.6.6-1.32 1.08-2.12 1.4-.8.36-1.68.52-2.56.52-.92 0-1.84-.2-2.68-.6-.08-.04-.12-.04-.16-.08l-.12-.04-.24-.12c-.08-.04-.12-.08-.2-.12-.12-.08-.28-.16-.4-.28l-.08-.08-.48-.36-.04-.04c-.16-.12-.28-.28-.44-.4l-.28-.28a6.51 6.51 0 01-1.28-2.44l-.08-.24 3.2-1.68.08.44c.24 1.56 1.68 2.84 3.2 2.88.4 0 .8-.08 1.16-.24.4-.16.72-.4 1-.68s.52-.6.68-1c.16-.36.24-.8.24-1.24 0-.4-.08-.8-.24-1.2s-.4-.72-.68-1-.6-.48-1-.64c-.36-.16-.76-.24-1.2-.24-.64 0-1.24.12-1.72.4l-.24.12-.32-.32.12-.24"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/buildcom.svg b/website/static/images/users/buildcom.svg
index 6f009691d..d44dcd59c 100644
--- a/website/static/images/users/buildcom.svg
+++ b/website/static/images/users/buildcom.svg
@@ -1,9 +1 @@
-<svg viewBox="0 0 200 100" xmlns="http://www.w3.org/2000/svg">
-  <g fill="none">
-    <path d="M181.445 59.473L186 51.154 102.833 5.402 93 0l-9.84 5.402L0 51.161l4.555 8.319 16.38-9.018v47.592h9.24v-4.567h.137c2.122 3.914 6.436 5.487 11.636 5.487 7.048 0 14.649-5.696 14.649-18.74 0-13.042-7.601-18.64-14.623-18.64-4.38 0-8.76 1.644-11.16 5.285h-.163v-21.76L93 10.825l62.206 34.228V66.88h-.137c-2.193-3.498-6.299-5.285-10.47-5.285-10.412 0-15.677 8.854-15.677 18.393 0 9.787 5.206 19.013 15.878 19.013 4.517 0 8.46-1.644 10.744-5.487h.137v4.54h9.286v-47.63l16.478 9.05zM38.59 68.934c5.753 0 8.284 5.422 8.284 11.392s-2.531 11.327-8.284 11.327-8.284-5.422-8.284-11.327 2.557-11.392 8.284-11.392zm108.631 22.72c-6.026 0-8.557-5.834-8.557-11.393 0-5.833 2.193-11.327 8.557-11.327 6.365 0 8.35 5.494 8.35 11.255 0 5.762-1.914 11.464-8.35 11.464z" fill="#66676C"/>
-    <path d="M85.33 81.39c0 7.095-2.244 10.043-7.483 10.043-4.49 0-6.19-2.851-6.19-8.618V63H62v21.55C62 93.232 64.587 99 74.858 99a12.557 12.557 0 0010.75-5.805h.207v4.902H95V63h-9.67v18.39zM114 46h10v52h-10z" fill="#66676C"/>
-    <path fill="#00A79F" d="M99 94.692L109 100V61l-10 5.315z"/>
-    <path d="M178.688 89v2.741c.547 0 1.07.227 1.44.626.371.398.556.932.51 1.472 0 1.755-1.569 2.427-3.138 2.427-1.57 0-3.132-.7-3.132-2.427a1.899 1.899 0 011.626-2.098v-2.72c-2.545.07-3.994 2.517-3.994 4.77 0 3.16 2.439 5.209 5.5 5.209s5.5-2.049 5.5-5.21c.007-2.671-1.59-4.643-4.312-4.79zM177.5 78c-3.061 0-5.5 1.807-5.5 5s2.439 5 5.5 5 5.5-1.807 5.5-5-2.439-5-5.5-5zm0 7.364c-1.57 0-3.132-.68-3.132-2.357 0-1.678 1.57-2.358 3.132-2.358s3.139.68 3.139 2.358-1.577 2.35-3.139 2.35v.007zm5.5-16.721V66h-10v4.134l6.671 1.852v.028L173 73.873V78h10v-2.636h-7.589v-.036L183 73.073v-2.139l-7.589-2.262v-.029zM185.994 95A2 2 0 10188 96.994 1.994 1.994 0 00185.994 95zm0 3.707a1.707 1.707 0 111.643-1.72 1.656 1.656 0 01-1.643 1.72z" fill="#66676C"/>
-    <path d="M186.95 96.574c.01-.178-.094-.35-.278-.459a.9.9 0 00-.65-.091H185V98h.41v-.87h.432l.72.87H187l-.755-.892c.383-.005.693-.24.705-.534zm-1.108.32h-.432v-.644h.547c.28 0 .583.044.583.308s-.339.341-.698.341v-.005z" fill="#66676C"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 100"><g fill="none"><path fill="#66676C" d="M181.445 59.473L186 51.154 102.833 5.402 93 0l-9.84 5.402L0 51.161l4.555 8.319 16.38-9.018v47.592h9.24v-4.567h.137c2.122 3.914 6.436 5.487 11.636 5.487 7.048 0 14.649-5.696 14.649-18.74 0-13.042-7.601-18.64-14.623-18.64-4.38 0-8.76 1.644-11.16 5.285h-.163v-21.76L93 10.825l62.206 34.228V66.88h-.137c-2.193-3.498-6.299-5.285-10.47-5.285-10.412 0-15.677 8.854-15.677 18.393 0 9.787 5.206 19.013 15.878 19.013 4.517 0 8.46-1.644 10.744-5.487h.137v4.54h9.286v-47.63l16.478 9.05zM38.59 68.934c5.753 0 8.284 5.422 8.284 11.392s-2.531 11.327-8.284 11.327-8.284-5.422-8.284-11.327 2.557-11.392 8.284-11.392zm108.631 22.72c-6.026 0-8.557-5.834-8.557-11.393 0-5.833 2.193-11.327 8.557-11.327 6.365 0 8.35 5.494 8.35 11.255 0 5.762-1.914 11.464-8.35 11.464z"/><path fill="#66676C" d="M85.33 81.39c0 7.095-2.244 10.043-7.483 10.043-4.49 0-6.19-2.851-6.19-8.618V63H62v21.55C62 93.232 64.587 99 74.858 99a12.557 12.557 0 0010.75-5.805h.207v4.902H95V63h-9.67v18.39zM114 46h10v52h-10z"/><path fill="#00A79F" d="M99 94.692L109 100V61l-10 5.315z"/><path fill="#66676C" d="M178.688 89v2.741c.547 0 1.07.227 1.44.626.371.398.556.932.51 1.472 0 1.755-1.569 2.427-3.138 2.427-1.57 0-3.132-.7-3.132-2.427a1.899 1.899 0 011.626-2.098v-2.72c-2.545.07-3.994 2.517-3.994 4.77 0 3.16 2.439 5.209 5.5 5.209s5.5-2.049 5.5-5.21c.007-2.671-1.59-4.643-4.312-4.79zM177.5 78c-3.061 0-5.5 1.807-5.5 5s2.439 5 5.5 5 5.5-1.807 5.5-5-2.439-5-5.5-5zm0 7.364c-1.57 0-3.132-.68-3.132-2.357 0-1.678 1.57-2.358 3.132-2.358s3.139.68 3.139 2.358-1.577 2.35-3.139 2.35v.007zm5.5-16.721V66h-10v4.134l6.671 1.852v.028L173 73.873V78h10v-2.636h-7.589v-.036L183 73.073v-2.139l-7.589-2.262v-.029zM185.994 95A2 2 0 10188 96.994 1.994 1.994 0 00185.994 95zm0 3.707a1.707 1.707 0 111.643-1.72 1.656 1.656 0 01-1.643 1.72z"/><path fill="#66676C" d="M186.95 96.574c.01-.178-.094-.35-.278-.459a.9.9 0 00-.65-.091H185V98h.41v-.87h.432l.72.87H187l-.755-.892c.383-.005.693-.24.705-.534zm-1.108.32h-.432v-.644h.547c.28 0 .583.044.583.308s-.339.341-.698.341v-.005z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/codecarrot.svg b/website/static/images/users/codecarrot.svg
index bf3acbe45..f497edcea 100644
--- a/website/static/images/users/codecarrot.svg
+++ b/website/static/images/users/codecarrot.svg
@@ -1,11 +1 @@
-<svg viewBox="0 0 673.35 104.56" xmlns="http://www.w3.org/2000/svg">
-  <path d="M56.39 82.27c-3.9-.06-5.81-2.12-5-5.87 2-9.12 4.18-18.21 6.35-27.3 2.51-10.5 5.1-21 7.66-31.48a20.78 20.78 0 01.67-2.15c1.16-3.2 3.53-4.35 6.91-3.37 2.82.81 4.09 3 3.34 6.18q-4.26 18.12-8.66 36.21C65.83 62.2 63.95 69.93 62 77.64c-.91 3.53-2.42 4.67-5.61 4.63z" fill="#ff7c41"/>
-  <path d="M168.81 73.68c-2.13-.91-4.09-1.73-6-2.58q-19-8.24-38-16.45a1.93 1.93 0 01-1.45-2.11c.09-2.74.07-5.5 0-8.24a1.54 1.54 0 011.11-1.68l43.13-18.73c.33-.14.69-.23 1.2-.39 0 4.05 0 8-.06 11.88 0 .43-.79 1-1.34 1.24q-14 5.48-28.09 10.87c-.65.25-1.28.52-2.24.91.79.37 1.33.65 1.89.87 9.48 3.76 19 7.54 28.46 11.25a1.88 1.88 0 011.43 2.11c-.09 3.59-.04 7.2-.04 11.05z" fill="#00d664"/>
-  <path d="M100 52.42c-.6-.46-1-.8-1.43-1.1-4.8-3.23-7.23-7.9-7.89-13.5-.42-3.57-.5-7.19-.68-10.79-.15-2.85-.16-5.71-.35-8.56-.23-3.55-1.63-5-5-5.47-4.72-.62-6.95-4-5.77-8.63a5.2 5.2 0 014.36-4c10-1.86 19.69 4 20.19 15 .28 6 .45 12.06.61 18.1a13 13 0 006.1 11.28c.77.5 1.51 1 2.3 1.5 4.87 2.76 4.11 10.46-.32 12.46a19.41 19.41 0 00-1.76 1.14c-4.42 2.62-6.19 6.66-6.32 11.63-.17 6-.35 12.06-.6 18.09a15.42 15.42 0 01-15.18 15 19.25 19.25 0 01-5.87-.63c-2.8-.82-4.11-3.5-3.71-6.73s2.11-5 5-5.47c4.61-.7 5.69-1.75 6-6.44.31-4.89.45-9.79.59-14.69.21-7.37 2.55-13.61 9.06-17.74zM45.52 73.49c-2.13-.91-4.09-1.73-6-2.58q-19-8.24-38-16.45A1.93 1.93 0 010 52.34c.09-2.74.07-5.5 0-8.24a1.54 1.54 0 011.11-1.68q21.61-9.34 43.2-18.72c.33-.14.69-.23 1.2-.39 0 4.05 0 8-.06 11.88 0 .43-.79 1-1.34 1.24Q30.08 41.9 16 47.3c-.65.25-1.28.52-2.24.91.79.37 1.33.65 1.89.87 9.48 3.76 19 7.54 28.46 11.25a1.88 1.88 0 011.43 2.11c-.06 3.56-.02 7.2-.02 11.05z" fill="#ff7c41"/>
-  <path d="M254.54 58.15a4.63 4.63 0 00-5.38 2.31c-.64 1.17-1.1 2.44-1.63 3.67-2.54 6-7 9.17-13.56 9.27-6.23.09-10.9-2.46-13.74-8.11a23 23 0 01-2.23-8.57c-.46-5.64-.26-11.24 2.12-16.49 2.26-5 6-8.27 11.59-9 6-.79 10.87 1.12 14.3 6.22 1.17 1.75 2.16 3.62 3.35 5.35a5 5 0 008.77-2.07 9.09 9.09 0 00-.2-3.8c-1.37-5-4.68-8.49-9-11.16-6-3.77-12.63-4.77-19.57-3.77-8.63 1.28-15.42 5.57-19.53 13.33-5.42 10.24-5.44 20.9-1.2 31.52a23.83 23.83 0 0012.87 13.67 29.79 29.79 0 0011.89 2.25c8.63.11 15.25-2.46 20-7.77 3.1-3.49 5.22-7.46 5.08-12.31a5 5 0 00-3.93-4.54z" fill="#424243"/>
-  <path d="M466.59 58.18a4.65 4.65 0 00-5.35 2.61c-.34.63-.55 1.32-.89 2a41.48 41.48 0 01-3.09 5.62c-2.72 3.63-6.66 5.07-11.06 5.14-5.05.08-9.41-1.56-12.45-5.85a21.17 21.17 0 01-3.57-10.46c-.55-5.7-.37-11.33 1.89-16.66 2.37-5.59 6.6-9 12.77-9.51s10.69 1.93 13.86 7.14c.92 1.51 1.79 3.06 2.81 4.5a4.69 4.69 0 005.88 1.56 5.16 5.16 0 003-5.37c-.85-6-4.5-10-9.37-13.05-6.18-3.9-13-4.82-20-3.62-9.08 1.55-15.93 6.41-19.79 14.88-4.25 9.33-4.29 19-.85 28.53 2.25 6.27 6.19 11.36 12.36 14.36a28.7 28.7 0 0013 2.71c7.44.07 13.79-1.75 18.87-6.84 3.52-3.52 5.91-7.64 6-12.79a5 5 0 00-4.02-4.9z" fill="#ff7c41"/>
-  <path d="M358.78 26.1c-.49-3-2.09-4.38-4.9-4.41s-4.36 1.37-4.9 4.25a17.54 17.54 0 00-.27 3.14V44.7c-.63-.54-1-.79-1.27-1.08a17.94 17.94 0 00-14.74-5.4 16.6 16.6 0 00-12.35 6.44A21.77 21.77 0 00316 56.5c-.57 6.38.15 12.55 3.6 18.13A16.74 16.74 0 00343.53 80a59.94 59.94 0 005.11-4.23c0 .7 0 1.23.08 1.75.19 3 2.05 5.16 4.64 5.31 3.07.17 4.89-1.33 5.47-4.59A12.27 12.27 0 00359 76V28.63a15.84 15.84 0 00-.22-2.53zM346.3 69.25a9.65 9.65 0 01-17 .43 18.16 18.16 0 010-18.65c3.84-6.84 13.09-6.38 16.92.62a19.37 19.37 0 012.05 8.81 19.6 19.6 0 01-1.97 8.79z" fill="#424243"/>
-  <path d="M518.46 64c.15-4.31.14-8.63-.13-12.93s-1.61-8.11-5.6-10.42a19.05 19.05 0 00-7.79-2.27c-5.78-.59-11.49-.51-16.94 1.87-3.48 1.52-6.16 3.83-7.3 7.62-.77 2.57 0 4.77 2.2 5.7 1.74.74 4.15 1 5.66-1.72a15.44 15.44 0 013.4-4.2c3.19-2.67 7-2.3 10.84-1.85a5.23 5.23 0 014.59 4.16c.29 1 .31 2.08.52 3.11.17.85-.18 1.24-1 1.43-2.46.61-4.9 1.29-7.37 1.87-4.19 1-8.44 1.71-12.57 2.91s-7.32 4.06-8.24 8.55c-1.68 8.18 4.1 14.22 12 14.88a22.36 22.36 0 0015.16-4.27c.85-.6 1.74-1.13 2.69-1.75.62.81 1.15 1.54 1.71 2.25A25.51 25.51 0 00512 81c1.83 1.87 3.89 2.23 6 1.09s3-2.83 2.18-5.55A40 40 0 01518.46 64zm-11.76 6.15c-2.14 4.49-9.26 7.07-13.77 5A5.75 5.75 0 01489.3 70a4.85 4.85 0 013.06-5.2 63.14 63.14 0 017.11-2.11c2.4-.64 4.82-1.21 7.24-1.78a11.13 11.13 0 011.37-.13c-.01 3.36 0 6.48-1.38 9.37z" fill="#ff7c41"/>
-  <path d="M389.37 63.15c4.94-.06 9.88 0 14.8-.3 4.27-.23 6.13-2.29 6-6.48-.31-7.16-3.59-12.61-10-16-4.34-2.33-9.05-2.71-13.84-2.1-7.55 1-13.22 4.68-16.11 11.92a27.27 27.27 0 00-.27 19.93A17.68 17.68 0 00380.51 81a26.59 26.59 0 006.49 1.61c5.57.63 11 .11 16-2.82 2.69-1.59 5-3.59 6.09-6.64.74-2 .38-3.71-1-4.66a4.3 4.3 0 00-5.18.48c-.75.67-1.43 1.42-2.22 2a33.57 33.57 0 01-4.29 3.12c-3.89 2.15-7.93 2.29-11.73-.11s-5-6.29-5.28-10.85c3.47.02 6.72.06 9.98.02zm.19-17.47c5.95 0 9.75 4.28 9.93 11.22H379.6c.22-6.82 4.16-11.25 9.95-11.22zm-87.49-2.99c-5.26-4.18-11.35-5.1-17.79-4.35a19.58 19.58 0 00-13.67 7.35 21.86 21.86 0 00-4.49 11.78c-.54 5.72.19 11.23 3.4 16.13 3.92 6 9.66 8.8 16.7 9.17 5.56.3 10.81-.68 15.34-4.13 6-4.55 8.15-10.89 8.13-18.14 0-.86.07-1.73 0-2.59-.57-6.06-2.69-11.33-7.62-15.22zm-3.23 17.82a18 18 0 01-2.11 9.12c-2.22 3.89-5.66 5.47-10 5.09a9.53 9.53 0 01-8.45-6.62 20.37 20.37 0 01.37-16.1c1.9-4.21 5.34-6.09 9.95-5.86a9.3 9.3 0 018.73 6.37 60.19 60.19 0 011.91 7.87z" fill="#424243"/>
-  <path d="M627.5 40.19a24.7 24.7 0 00-14.9-1.58 19.29 19.29 0 00-11.79 6.57 21.84 21.84 0 00-5 12.75c-.53 6.62.65 12.85 5.23 17.94 5.79 6.42 13.24 7.76 21.39 6.44a19.14 19.14 0 0011.78-6.55c3.77-4.39 5.19-9.6 5.32-15.31-.26-2-.41-4-.81-6a19.23 19.23 0 00-11.22-14.26zm1 20.26a17.35 17.35 0 01-2.26 9.55 10.19 10.19 0 01-17.34.09c-2.55-4.25-2.85-8.93-2-13.74.63-3.51 1.88-6.66 5-8.69 4.23-2.78 11.72-2.42 14.91 4.12a18.36 18.36 0 011.71 8.67zm44.73 15.92c-.48-1.9-2.28-2.73-4.91-2.32a27.69 27.69 0 01-3.84.44 3.1 3.1 0 01-3.27-2.82 20.72 20.72 0 01-.29-3.15V48.24c0-1.06.35-1.44 1.4-1.47a32.5 32.5 0 004.43-.37 3.54 3.54 0 00.3-7 17.71 17.71 0 00-4.41-.31c-1.31 0-1.73-.34-1.73-1.68 0-3.3 0-6.61-.3-9.9a4.84 4.84 0 00-5.16-4.35 5 5 0 00-5 4.68c-.16 2.44-.19 4.88-.26 7.33v3.9h-2.16c-3 .27-4.71 2.4-4 5 .45 1.55 1.94 2.49 4.2 2.63 1.91.12 1.91.12 1.91 2.05 0 5.9-.08 11.8 0 17.69a78.22 78.22 0 00.74 9.14A7.38 7.38 0 00656.6 82a22.43 22.43 0 0013.69-.52 4.43 4.43 0 002.94-5.11zm-84.1-37.59c-4.18-1.29-8.58-.85-11.37 3.31-.55.82-1.2 1.58-2.09 2.75-.14-.88-.23-1.33-.29-1.79-.41-3.13-1.94-4.71-4.68-4.86s-4.49 1.15-5.23 4.22a13.14 13.14 0 00-.31 3v31.66c.07 3 2 5.41 4.49 5.67 3.15.33 5.21-1.18 6-4.45a11.56 11.56 0 00.29-2.56c0-4.37-.12-8.74.08-13.09a60.11 60.11 0 011.17-9.23c.78-3.84 2.78-5.8 6.21-5.89a25.2 25.2 0 016.16 1.11 4.41 4.41 0 005.06-2 4.09 4.09 0 00-.69-5.13 14.74 14.74 0 00-4.8-2.72zm-30.96 2.03a13.32 13.32 0 00-8.33-2.63 8.45 8.45 0 00-7.11 3.66l-2.22 3c-.25-1.21-.38-2.1-.63-3-.76-2.64-2.12-3.66-4.77-3.65a4.41 4.41 0 00-4.68 3.63 10.1 10.1 0 00-.43 2.68q-.05 14.82 0 29.65c0 1.15 0 2.31.05 3.45a5.26 5.26 0 004.55 5.12c3.13.2 5.22-1.29 5.83-4.3a20 20 0 00.34-3.72c.06-4.56-.08-9.12.13-13.67a40.53 40.53 0 011.2-8.06c1.09-4.31 3.57-5.9 7.95-5.4a23.72 23.72 0 014 .92 4.25 4.25 0 005.38-2 4.53 4.53 0 00-1.26-5.68z" fill="#ff7c41"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 673.35 104.56"><path fill="#ff7c41" d="M56.39 82.27c-3.9-.06-5.81-2.12-5-5.87 2-9.12 4.18-18.21 6.35-27.3 2.51-10.5 5.1-21 7.66-31.48a20.78 20.78 0 01.67-2.15c1.16-3.2 3.53-4.35 6.91-3.37 2.82.81 4.09 3 3.34 6.18q-4.26 18.12-8.66 36.21C65.83 62.2 63.95 69.93 62 77.64c-.91 3.53-2.42 4.67-5.61 4.63z"/><path fill="#00d664" d="M168.81 73.68c-2.13-.91-4.09-1.73-6-2.58q-19-8.24-38-16.45a1.93 1.93 0 01-1.45-2.11c.09-2.74.07-5.5 0-8.24a1.54 1.54 0 011.11-1.68l43.13-18.73c.33-.14.69-.23 1.2-.39 0 4.05 0 8-.06 11.88 0 .43-.79 1-1.34 1.24q-14 5.48-28.09 10.87c-.65.25-1.28.52-2.24.91.79.37 1.33.65 1.89.87 9.48 3.76 19 7.54 28.46 11.25a1.88 1.88 0 011.43 2.11c-.09 3.59-.04 7.2-.04 11.05z"/><path fill="#ff7c41" d="M100 52.42c-.6-.46-1-.8-1.43-1.1-4.8-3.23-7.23-7.9-7.89-13.5-.42-3.57-.5-7.19-.68-10.79-.15-2.85-.16-5.71-.35-8.56-.23-3.55-1.63-5-5-5.47-4.72-.62-6.95-4-5.77-8.63a5.2 5.2 0 014.36-4c10-1.86 19.69 4 20.19 15 .28 6 .45 12.06.61 18.1a13 13 0 006.1 11.28c.77.5 1.51 1 2.3 1.5 4.87 2.76 4.11 10.46-.32 12.46a19.41 19.41 0 00-1.76 1.14c-4.42 2.62-6.19 6.66-6.32 11.63-.17 6-.35 12.06-.6 18.09a15.42 15.42 0 01-15.18 15 19.25 19.25 0 01-5.87-.63c-2.8-.82-4.11-3.5-3.71-6.73s2.11-5 5-5.47c4.61-.7 5.69-1.75 6-6.44.31-4.89.45-9.79.59-14.69.21-7.37 2.55-13.61 9.06-17.74zM45.52 73.49c-2.13-.91-4.09-1.73-6-2.58q-19-8.24-38-16.45A1.93 1.93 0 010 52.34c.09-2.74.07-5.5 0-8.24a1.54 1.54 0 011.11-1.68q21.61-9.34 43.2-18.72c.33-.14.69-.23 1.2-.39 0 4.05 0 8-.06 11.88 0 .43-.79 1-1.34 1.24Q30.08 41.9 16 47.3c-.65.25-1.28.52-2.24.91.79.37 1.33.65 1.89.87 9.48 3.76 19 7.54 28.46 11.25a1.88 1.88 0 011.43 2.11c-.06 3.56-.02 7.2-.02 11.05z"/><path fill="#424243" d="M254.54 58.15a4.63 4.63 0 00-5.38 2.31c-.64 1.17-1.1 2.44-1.63 3.67-2.54 6-7 9.17-13.56 9.27-6.23.09-10.9-2.46-13.74-8.11a23 23 0 01-2.23-8.57c-.46-5.64-.26-11.24 2.12-16.49 2.26-5 6-8.27 11.59-9 6-.79 10.87 1.12 14.3 6.22 1.17 1.75 2.16 3.62 3.35 5.35a5 5 0 008.77-2.07 9.09 9.09 0 00-.2-3.8c-1.37-5-4.68-8.49-9-11.16-6-3.77-12.63-4.77-19.57-3.77-8.63 1.28-15.42 5.57-19.53 13.33-5.42 10.24-5.44 20.9-1.2 31.52a23.83 23.83 0 0012.87 13.67 29.79 29.79 0 0011.89 2.25c8.63.11 15.25-2.46 20-7.77 3.1-3.49 5.22-7.46 5.08-12.31a5 5 0 00-3.93-4.54z"/><path fill="#ff7c41" d="M466.59 58.18a4.65 4.65 0 00-5.35 2.61c-.34.63-.55 1.32-.89 2a41.48 41.48 0 01-3.09 5.62c-2.72 3.63-6.66 5.07-11.06 5.14-5.05.08-9.41-1.56-12.45-5.85a21.17 21.17 0 01-3.57-10.46c-.55-5.7-.37-11.33 1.89-16.66 2.37-5.59 6.6-9 12.77-9.51s10.69 1.93 13.86 7.14c.92 1.51 1.79 3.06 2.81 4.5a4.69 4.69 0 005.88 1.56 5.16 5.16 0 003-5.37c-.85-6-4.5-10-9.37-13.05-6.18-3.9-13-4.82-20-3.62-9.08 1.55-15.93 6.41-19.79 14.88-4.25 9.33-4.29 19-.85 28.53 2.25 6.27 6.19 11.36 12.36 14.36a28.7 28.7 0 0013 2.71c7.44.07 13.79-1.75 18.87-6.84 3.52-3.52 5.91-7.64 6-12.79a5 5 0 00-4.02-4.9z"/><path fill="#424243" d="M358.78 26.1c-.49-3-2.09-4.38-4.9-4.41s-4.36 1.37-4.9 4.25a17.54 17.54 0 00-.27 3.14V44.7c-.63-.54-1-.79-1.27-1.08a17.94 17.94 0 00-14.74-5.4 16.6 16.6 0 00-12.35 6.44A21.77 21.77 0 00316 56.5c-.57 6.38.15 12.55 3.6 18.13A16.74 16.74 0 00343.53 80a59.94 59.94 0 005.11-4.23c0 .7 0 1.23.08 1.75.19 3 2.05 5.16 4.64 5.31 3.07.17 4.89-1.33 5.47-4.59A12.27 12.27 0 00359 76V28.63a15.84 15.84 0 00-.22-2.53zM346.3 69.25a9.65 9.65 0 01-17 .43 18.16 18.16 0 010-18.65c3.84-6.84 13.09-6.38 16.92.62a19.37 19.37 0 012.05 8.81 19.6 19.6 0 01-1.97 8.79z"/><path fill="#ff7c41" d="M518.46 64c.15-4.31.14-8.63-.13-12.93s-1.61-8.11-5.6-10.42a19.05 19.05 0 00-7.79-2.27c-5.78-.59-11.49-.51-16.94 1.87-3.48 1.52-6.16 3.83-7.3 7.62-.77 2.57 0 4.77 2.2 5.7 1.74.74 4.15 1 5.66-1.72a15.44 15.44 0 013.4-4.2c3.19-2.67 7-2.3 10.84-1.85a5.23 5.23 0 014.59 4.16c.29 1 .31 2.08.52 3.11.17.85-.18 1.24-1 1.43-2.46.61-4.9 1.29-7.37 1.87-4.19 1-8.44 1.71-12.57 2.91s-7.32 4.06-8.24 8.55c-1.68 8.18 4.1 14.22 12 14.88a22.36 22.36 0 0015.16-4.27c.85-.6 1.74-1.13 2.69-1.75.62.81 1.15 1.54 1.71 2.25A25.51 25.51 0 00512 81c1.83 1.87 3.89 2.23 6 1.09s3-2.83 2.18-5.55A40 40 0 01518.46 64zm-11.76 6.15c-2.14 4.49-9.26 7.07-13.77 5A5.75 5.75 0 01489.3 70a4.85 4.85 0 013.06-5.2 63.14 63.14 0 017.11-2.11c2.4-.64 4.82-1.21 7.24-1.78a11.13 11.13 0 011.37-.13c-.01 3.36 0 6.48-1.38 9.37z"/><path fill="#424243" d="M389.37 63.15c4.94-.06 9.88 0 14.8-.3 4.27-.23 6.13-2.29 6-6.48-.31-7.16-3.59-12.61-10-16-4.34-2.33-9.05-2.71-13.84-2.1-7.55 1-13.22 4.68-16.11 11.92a27.27 27.27 0 00-.27 19.93A17.68 17.68 0 00380.51 81a26.59 26.59 0 006.49 1.61c5.57.63 11 .11 16-2.82 2.69-1.59 5-3.59 6.09-6.64.74-2 .38-3.71-1-4.66a4.3 4.3 0 00-5.18.48c-.75.67-1.43 1.42-2.22 2a33.57 33.57 0 01-4.29 3.12c-3.89 2.15-7.93 2.29-11.73-.11s-5-6.29-5.28-10.85c3.47.02 6.72.06 9.98.02zm.19-17.47c5.95 0 9.75 4.28 9.93 11.22H379.6c.22-6.82 4.16-11.25 9.95-11.22zm-87.49-2.99c-5.26-4.18-11.35-5.1-17.79-4.35a19.58 19.58 0 00-13.67 7.35 21.86 21.86 0 00-4.49 11.78c-.54 5.72.19 11.23 3.4 16.13 3.92 6 9.66 8.8 16.7 9.17 5.56.3 10.81-.68 15.34-4.13 6-4.55 8.15-10.89 8.13-18.14 0-.86.07-1.73 0-2.59-.57-6.06-2.69-11.33-7.62-15.22zm-3.23 17.82a18 18 0 01-2.11 9.12c-2.22 3.89-5.66 5.47-10 5.09a9.53 9.53 0 01-8.45-6.62 20.37 20.37 0 01.37-16.1c1.9-4.21 5.34-6.09 9.95-5.86a9.3 9.3 0 018.73 6.37 60.19 60.19 0 011.91 7.87z"/><path fill="#ff7c41" d="M627.5 40.19a24.7 24.7 0 00-14.9-1.58 19.29 19.29 0 00-11.79 6.57 21.84 21.84 0 00-5 12.75c-.53 6.62.65 12.85 5.23 17.94 5.79 6.42 13.24 7.76 21.39 6.44a19.14 19.14 0 0011.78-6.55c3.77-4.39 5.19-9.6 5.32-15.31-.26-2-.41-4-.81-6a19.23 19.23 0 00-11.22-14.26zm1 20.26a17.35 17.35 0 01-2.26 9.55 10.19 10.19 0 01-17.34.09c-2.55-4.25-2.85-8.93-2-13.74.63-3.51 1.88-6.66 5-8.69 4.23-2.78 11.72-2.42 14.91 4.12a18.36 18.36 0 011.71 8.67zm44.73 15.92c-.48-1.9-2.28-2.73-4.91-2.32a27.69 27.69 0 01-3.84.44 3.1 3.1 0 01-3.27-2.82 20.72 20.72 0 01-.29-3.15V48.24c0-1.06.35-1.44 1.4-1.47a32.5 32.5 0 004.43-.37 3.54 3.54 0 00.3-7 17.71 17.71 0 00-4.41-.31c-1.31 0-1.73-.34-1.73-1.68 0-3.3 0-6.61-.3-9.9a4.84 4.84 0 00-5.16-4.35 5 5 0 00-5 4.68c-.16 2.44-.19 4.88-.26 7.33v3.9h-2.16c-3 .27-4.71 2.4-4 5 .45 1.55 1.94 2.49 4.2 2.63 1.91.12 1.91.12 1.91 2.05 0 5.9-.08 11.8 0 17.69a78.22 78.22 0 00.74 9.14A7.38 7.38 0 00656.6 82a22.43 22.43 0 0013.69-.52 4.43 4.43 0 002.94-5.11zm-84.1-37.59c-4.18-1.29-8.58-.85-11.37 3.31-.55.82-1.2 1.58-2.09 2.75-.14-.88-.23-1.33-.29-1.79-.41-3.13-1.94-4.71-4.68-4.86s-4.49 1.15-5.23 4.22a13.14 13.14 0 00-.31 3v31.66c.07 3 2 5.41 4.49 5.67 3.15.33 5.21-1.18 6-4.45a11.56 11.56 0 00.29-2.56c0-4.37-.12-8.74.08-13.09a60.11 60.11 0 011.17-9.23c.78-3.84 2.78-5.8 6.21-5.89a25.2 25.2 0 016.16 1.11 4.41 4.41 0 005.06-2 4.09 4.09 0 00-.69-5.13 14.74 14.74 0 00-4.8-2.72zm-30.96 2.03a13.32 13.32 0 00-8.33-2.63 8.45 8.45 0 00-7.11 3.66l-2.22 3c-.25-1.21-.38-2.1-.63-3-.76-2.64-2.12-3.66-4.77-3.65a4.41 4.41 0 00-4.68 3.63 10.1 10.1 0 00-.43 2.68q-.05 14.82 0 29.65c0 1.15 0 2.31.05 3.45a5.26 5.26 0 004.55 5.12c3.13.2 5.22-1.29 5.83-4.3a20 20 0 00.34-3.72c.06-4.56-.08-9.12.13-13.67a40.53 40.53 0 011.2-8.06c1.09-4.31 3.57-5.9 7.95-5.4a23.72 23.72 0 014 .92 4.25 4.25 0 005.38-2 4.53 4.53 0 00-1.26-5.68z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/computerbase.svg b/website/static/images/users/computerbase.svg
index 4e6d6f7cc..8bd98cfaf 100644
--- a/website/static/images/users/computerbase.svg
+++ b/website/static/images/users/computerbase.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 177 84" xmlns="http://www.w3.org/2000/svg">
-  <path d="M0 0h177v84H0z" fill="#2c5b9c"/>
-  <g fill="#fff">
-    <path d="M107.22 34.35c.5-.69.89-1.52 1.16-2.48s.4-2.02.4-3.16c0-1.2-.11-2.28-.32-3.25-.21-.96-.55-1.78-1.01-2.47s-1.04-1.21-1.74-1.57-1.52-.54-2.48-.54c-.68 0-1.39.16-2.14.49-.74.32-1.41.87-2 1.65l-.22-1.64H95v20.88l4.41-.47v-6.77c.9 1.04 2.08 1.55 3.55 1.55.9 0 1.71-.2 2.42-.6.72-.38 1.33-.93 1.84-1.62zm-3.72-2.07c-.47.7-1.1 1.05-1.89 1.05-.9 0-1.64-.43-2.21-1.3v-6.18c.31-.54.68-.95 1.09-1.25.41-.29.86-.44 1.34-.44.37 0 .7.07.99.21s.54.38.74.72.36.81.47 1.41.16 1.35.16 2.26c.01 1.64-.22 2.82-.69 3.52zm16.16-.55c-.29.44-.64.81-1.05 1.1-.4.29-.85.43-1.35.43-.53 0-.88-.17-1.03-.51-.16-.34-.23-.77-.23-1.29V21.38h-4.41V32c0 1.4.32 2.52.96 3.34s1.68 1.23 3.11 1.23c.88 0 1.7-.19 2.47-.55.76-.37 1.39-.92 1.89-1.64l.19 1.72h3.86V21.38h-4.41zm14.13 1.36c-.46 0-.8-.14-1.03-.43s-.34-.78-.34-1.48v-6.74h2.98l.47-3.05h-3.44v-3.72l-4.41.53v3.19h-2.18v3.05h2.18v6.71c0 .85.07 1.61.22 2.29s.41 1.24.78 1.71.88.82 1.5 1.07 1.4.38 2.34.38c.64 0 1.33-.1 2.07-.29.73-.2 1.38-.49 1.93-.87l-1.49-2.83c-.59.31-1.12.48-1.58.48zm9.82-12.21c-1.14 0-2.14.21-2.99.62-.85.42-1.58.98-2.16 1.69-.59.71-1.03 1.54-1.32 2.5s-.44 1.97-.44 3.06c0 1.15.15 2.2.45 3.15s.76 1.77 1.38 2.47 1.39 1.23 2.33 1.62 2.03.58 3.28.58c1.16 0 2.21-.19 3.15-.58.95-.39 1.78-.87 2.49-1.44l-1.85-2.53c-.62.48-1.21.82-1.75 1.03-.54.2-1.11.3-1.69.3-.88 0-1.61-.25-2.19-.76s-.94-1.36-1.09-2.56h9.04c.04-.22.06-.48.07-.76s.01-.56.01-.82c0-2.4-.6-4.27-1.79-5.59-1.19-1.31-2.83-1.98-4.93-1.98zm-2.45 6.49c.09-1.22.35-2.11.79-2.68.43-.56 1-.85 1.69-.85.44 0 .81.09 1.12.26.3.17.55.42.73.72.18.31.32.67.4 1.11.08.43.12.91.12 1.43h-4.85zm20.11-6.44c-.23-.04-.47-.05-.73-.05-.83 0-1.57.28-2.23.85-.66.56-1.17 1.34-1.52 2.34l-.33-2.75h-3.91v14.72h4.41v-7.4c.11-.48.25-.93.41-1.36.17-.42.36-.79.59-1.09s.51-.54.84-.72.72-.26 1.16-.26c.48 0 .92.06 1.32.19l.71-4.3c-.25-.08-.49-.13-.72-.17zM91.52 56.51c-.14-.25-.21-.65-.21-1.21v-5.74c0-1.72-.48-3.02-1.45-3.9-.96-.88-2.56-1.32-4.78-1.32-.77 0-1.64.09-2.62.28-.97.19-1.93.46-2.87.83l.99 2.94c.75-.26 1.46-.45 2.13-.58s1.23-.2 1.67-.2c.99 0 1.69.16 2.08.47.4.31.59.91.59 1.78v.53h-1.68c-2.28 0-4.01.43-5.21 1.3s-1.79 2.11-1.79 3.72c0 .68.11 1.31.33 1.87s.54 1.05.96 1.46.94.73 1.54.96c.61.23 1.29.35 2.04.35.88 0 1.72-.16 2.51-.47s1.45-.81 1.98-1.5c.35.61.81 1.06 1.39 1.35s1.31.47 2.19.57l.91-2.91c-.31-.14-.56-.33-.7-.58zm-4.45-1.23c-.28.52-.62.92-1.02 1.19-.4.28-.84.42-1.32.42-.57 0-.99-.16-1.27-.47s-.41-.75-.41-1.3c0-.72.24-1.27.72-1.63.48-.37 1.32-.56 2.54-.56h.77zm17.78-3.15c-.39-.36-.85-.67-1.41-.93s-1.17-.49-1.85-.69c-.68-.19-1.23-.35-1.64-.5s-.73-.29-.97-.43c-.23-.14-.38-.28-.45-.43s-.11-.31-.11-.5c0-.35.17-.63.5-.83s.82-.31 1.46-.31c.61 0 1.2.1 1.79.31.59.2 1.15.47 1.68.8l1.79-2.61c-.59-.44-1.37-.83-2.33-1.17-.96-.33-2.01-.5-3.13-.5-1.03 0-1.93.12-2.7.36s-1.41.57-1.93.98-.9.9-1.17 1.46c-.27.55-.4 1.14-.4 1.75 0 1.2.37 2.17 1.12 2.91.74.74 1.77 1.29 3.07 1.64.72.2 1.29.37 1.72.51s.77.29 1.01.44c.24.16.39.32.47.5.07.18.11.38.11.62 0 .42-.19.76-.56 1-.38.24-.9.36-1.58.36-.73 0-1.42-.13-2.07-.4-.64-.27-1.25-.62-1.82-1.07l-2.18 2.44c.72.67 1.6 1.2 2.66 1.6s2.24.59 3.54.59c.9 0 1.75-.11 2.56-.33s1.51-.54 2.09-.96c.59-.42 1.06-.93 1.4-1.53.35-.6.52-1.29.52-2.07 0-.68-.11-1.27-.32-1.76a3.41 3.41 0 00-.87-1.25zm9.45-7.78c-1.14 0-2.14.21-2.99.62-.85.42-1.57.98-2.16 1.69s-1.03 1.54-1.32 2.5c-.29.95-.44 1.97-.44 3.06 0 1.14.15 2.2.45 3.15s.76 1.77 1.38 2.47a6.14 6.14 0 002.33 1.62c.94.39 2.03.58 3.28.58 1.16 0 2.21-.19 3.15-.58.95-.39 1.78-.87 2.49-1.44l-1.85-2.53c-.62.48-1.21.82-1.75 1.03-.54.2-1.11.3-1.69.3-.88 0-1.61-.25-2.19-.76s-.94-1.36-1.09-2.56h9.04c.04-.22.06-.48.07-.76.01-.29.01-.56.01-.82 0-2.4-.6-4.27-1.79-5.59s-2.84-1.98-4.93-1.98zm-2.45 6.49c.09-1.22.35-2.11.78-2.68.43-.56 1-.85 1.7-.85.44 0 .81.09 1.12.26.3.18.55.42.73.72s.32.67.4 1.11.12.91.12 1.43h-4.85zM54.73 13.4c-1.92-1.11-4.11-1.97-6.5-2.54-2.38-.57-4.99-.86-7.75-.86-3.45 0-6.8.66-9.93 1.95-3.15 1.29-5.88 3.11-8.13 5.41-2.3 2.37-4.13 5.21-5.44 8.45-1.31 3.25-1.98 6.9-1.98 10.88 0 5.11 1.54 9.1 4.57 11.85 3.01 2.75 7.32 4.14 12.81 4.14 2.01 0 3.61-.1 4.75-.3s2.37-.5 3.64-.87c.99-.29 2.05-.67 3.13-1.14 1.06-.45 1.99-.84 2.78-1.16.18-.07.32-.23.36-.42l2.32-9.54c.04-.18 0-.37-.11-.52a.588.588 0 00-.48-.23h-1.06c-.14 0-.27.05-.38.13-1.87 1.5-3.88 2.75-5.97 3.71-2.06.95-4.3 1.43-6.64 1.43-2.55 0-4.51-.66-5.8-1.97-1.3-1.3-1.95-3.49-1.95-6.49 0-4.78 1.25-8.77 3.71-11.84 2.47-3.07 5.52-4.56 9.32-4.56 2.15 0 4.04.41 5.61 1.22 1.6.82 3.24 2.13 4.87 3.89.11.12.27.19.44.19h1.17c.28 0 .52-.19.59-.46l2.34-9.68a.625.625 0 00-.29-.67z"/>
-    <path d="M70.92 52.23c2.15-.82 3.81-1.92 4.97-3.31 1.41-1.69 2.13-3.84 2.13-6.41 0-3.07-1.37-5.49-4.07-7.18-2.61-1.63-6.4-2.46-11.27-2.46H48.21c-.28 0-.53.2-.59.47l-1.01 4.39a.55.55 0 00.09-.07c.32-.26.72-.4 1.13-.4h1.06c.56 0 1.08.25 1.43.7.35.44.47 1.01.33 1.56l-2.32 9.54c-.14.57-.54 1.04-1.09 1.26-.77.31-1.68.69-2.76 1.15-.38.16-.76.31-1.13.46l-4.88 21.31c-.04.18 0 .37.12.52s.29.24.47.24h17.17c6.34 0 11.34-1.23 14.84-3.64 3.58-2.47 5.39-5.95 5.39-10.34 0-2.3-.62-4.11-1.83-5.4-.91-.98-2.16-1.78-3.71-2.39zm-8.2 11.85c-1.51.92-3.72 1.39-6.57 1.39h-4.4l2-8.73h4.87c2.24 0 3.88.3 4.88.89.91.54 1.35 1.41 1.35 2.65 0 1.68-.7 2.93-2.13 3.8zm1.66-16.64c-1.14.79-2.78 1.19-4.88 1.19h-3.9l1.66-7.23h4.12c1.52 0 2.71.24 3.53.71.73.42 1.08 1.07 1.08 2.03 0 1.47-.53 2.55-1.61 3.3zm5.27-18.74c0-1.18-.17-2.25-.5-3.22-.33-.96-.8-1.78-1.42-2.47a6.276 6.276 0 00-2.26-1.58c-.89-.37-1.9-.55-3.02-.55s-2.13.19-3.02.57-1.65.91-2.27 1.59-1.1 1.51-1.43 2.48-.5 2.04-.5 3.2c0 1.08.13 2.05.37 2.92h4.58c-.25-.71-.37-1.69-.37-2.92 0-1.61.22-2.77.66-3.49s1.1-1.08 1.98-1.08 1.54.36 1.97 1.08.65 1.88.65 3.47c0 1.29-.13 2.29-.4 3.01.04 0 .08.01.13.01 1.56.04 3 .17 4.32.38.35-.98.53-2.11.53-3.4zm21.43-6.66c-.63-.77-1.6-1.15-2.91-1.15-.75 0-1.5.18-2.23.54s-1.43.91-2.09 1.65c-.57-1.46-1.73-2.19-3.47-2.19-.77 0-1.51.17-2.2.53s-1.37.91-2.01 1.66l-.33-1.69H72V32.8c1.15.37 2.18.82 3.07 1.38.5.31.93.66 1.34 1.02v-9.31c.35-.54.72-.96 1.1-1.26s.76-.46 1.13-.46c.4 0 .7.12.9.37.19.25.29.68.29 1.29v10.29h4.41V25.88c.33-.54.69-.96 1.08-1.26s.77-.46 1.16-.46c.4 0 .7.13.88.39s.28.71.28 1.36v10.21h4.41V25.29c-.02-1.4-.34-2.49-.97-3.25z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 177 84"><path fill="#2c5b9c" d="M0 0h177v84H0z"/><g fill="#fff"><path d="M107.22 34.35c.5-.69.89-1.52 1.16-2.48s.4-2.02.4-3.16c0-1.2-.11-2.28-.32-3.25-.21-.96-.55-1.78-1.01-2.47s-1.04-1.21-1.74-1.57-1.52-.54-2.48-.54c-.68 0-1.39.16-2.14.49-.74.32-1.41.87-2 1.65l-.22-1.64H95v20.88l4.41-.47v-6.77c.9 1.04 2.08 1.55 3.55 1.55.9 0 1.71-.2 2.42-.6.72-.38 1.33-.93 1.84-1.62zm-3.72-2.07c-.47.7-1.1 1.05-1.89 1.05-.9 0-1.64-.43-2.21-1.3v-6.18c.31-.54.68-.95 1.09-1.25.41-.29.86-.44 1.34-.44.37 0 .7.07.99.21s.54.38.74.72.36.81.47 1.41.16 1.35.16 2.26c.01 1.64-.22 2.82-.69 3.52zm16.16-.55c-.29.44-.64.81-1.05 1.1-.4.29-.85.43-1.35.43-.53 0-.88-.17-1.03-.51-.16-.34-.23-.77-.23-1.29V21.38h-4.41V32c0 1.4.32 2.52.96 3.34s1.68 1.23 3.11 1.23c.88 0 1.7-.19 2.47-.55.76-.37 1.39-.92 1.89-1.64l.19 1.72h3.86V21.38h-4.41zm14.13 1.36c-.46 0-.8-.14-1.03-.43s-.34-.78-.34-1.48v-6.74h2.98l.47-3.05h-3.44v-3.72l-4.41.53v3.19h-2.18v3.05h2.18v6.71c0 .85.07 1.61.22 2.29s.41 1.24.78 1.71.88.82 1.5 1.07 1.4.38 2.34.38c.64 0 1.33-.1 2.07-.29.73-.2 1.38-.49 1.93-.87l-1.49-2.83c-.59.31-1.12.48-1.58.48zm9.82-12.21c-1.14 0-2.14.21-2.99.62-.85.42-1.58.98-2.16 1.69-.59.71-1.03 1.54-1.32 2.5s-.44 1.97-.44 3.06c0 1.15.15 2.2.45 3.15s.76 1.77 1.38 2.47 1.39 1.23 2.33 1.62 2.03.58 3.28.58c1.16 0 2.21-.19 3.15-.58.95-.39 1.78-.87 2.49-1.44l-1.85-2.53c-.62.48-1.21.82-1.75 1.03-.54.2-1.11.3-1.69.3-.88 0-1.61-.25-2.19-.76s-.94-1.36-1.09-2.56h9.04c.04-.22.06-.48.07-.76s.01-.56.01-.82c0-2.4-.6-4.27-1.79-5.59-1.19-1.31-2.83-1.98-4.93-1.98zm-2.45 6.49c.09-1.22.35-2.11.79-2.68.43-.56 1-.85 1.69-.85.44 0 .81.09 1.12.26.3.17.55.42.73.72.18.31.32.67.4 1.11.08.43.12.91.12 1.43h-4.85zm20.11-6.44c-.23-.04-.47-.05-.73-.05-.83 0-1.57.28-2.23.85-.66.56-1.17 1.34-1.52 2.34l-.33-2.75h-3.91v14.72h4.41v-7.4c.11-.48.25-.93.41-1.36.17-.42.36-.79.59-1.09s.51-.54.84-.72.72-.26 1.16-.26c.48 0 .92.06 1.32.19l.71-4.3c-.25-.08-.49-.13-.72-.17zM91.52 56.51c-.14-.25-.21-.65-.21-1.21v-5.74c0-1.72-.48-3.02-1.45-3.9-.96-.88-2.56-1.32-4.78-1.32-.77 0-1.64.09-2.62.28-.97.19-1.93.46-2.87.83l.99 2.94c.75-.26 1.46-.45 2.13-.58s1.23-.2 1.67-.2c.99 0 1.69.16 2.08.47.4.31.59.91.59 1.78v.53h-1.68c-2.28 0-4.01.43-5.21 1.3s-1.79 2.11-1.79 3.72c0 .68.11 1.31.33 1.87s.54 1.05.96 1.46.94.73 1.54.96c.61.23 1.29.35 2.04.35.88 0 1.72-.16 2.51-.47s1.45-.81 1.98-1.5c.35.61.81 1.06 1.39 1.35s1.31.47 2.19.57l.91-2.91c-.31-.14-.56-.33-.7-.58zm-4.45-1.23c-.28.52-.62.92-1.02 1.19-.4.28-.84.42-1.32.42-.57 0-.99-.16-1.27-.47s-.41-.75-.41-1.3c0-.72.24-1.27.72-1.63.48-.37 1.32-.56 2.54-.56h.77zm17.78-3.15c-.39-.36-.85-.67-1.41-.93s-1.17-.49-1.85-.69c-.68-.19-1.23-.35-1.64-.5s-.73-.29-.97-.43c-.23-.14-.38-.28-.45-.43s-.11-.31-.11-.5c0-.35.17-.63.5-.83s.82-.31 1.46-.31c.61 0 1.2.1 1.79.31.59.2 1.15.47 1.68.8l1.79-2.61c-.59-.44-1.37-.83-2.33-1.17-.96-.33-2.01-.5-3.13-.5-1.03 0-1.93.12-2.7.36s-1.41.57-1.93.98-.9.9-1.17 1.46c-.27.55-.4 1.14-.4 1.75 0 1.2.37 2.17 1.12 2.91.74.74 1.77 1.29 3.07 1.64.72.2 1.29.37 1.72.51s.77.29 1.01.44c.24.16.39.32.47.5.07.18.11.38.11.62 0 .42-.19.76-.56 1-.38.24-.9.36-1.58.36-.73 0-1.42-.13-2.07-.4-.64-.27-1.25-.62-1.82-1.07l-2.18 2.44c.72.67 1.6 1.2 2.66 1.6s2.24.59 3.54.59c.9 0 1.75-.11 2.56-.33s1.51-.54 2.09-.96c.59-.42 1.06-.93 1.4-1.53.35-.6.52-1.29.52-2.07 0-.68-.11-1.27-.32-1.76a3.41 3.41 0 00-.87-1.25zm9.45-7.78c-1.14 0-2.14.21-2.99.62-.85.42-1.57.98-2.16 1.69s-1.03 1.54-1.32 2.5c-.29.95-.44 1.97-.44 3.06 0 1.14.15 2.2.45 3.15s.76 1.77 1.38 2.47a6.14 6.14 0 002.33 1.62c.94.39 2.03.58 3.28.58 1.16 0 2.21-.19 3.15-.58.95-.39 1.78-.87 2.49-1.44l-1.85-2.53c-.62.48-1.21.82-1.75 1.03-.54.2-1.11.3-1.69.3-.88 0-1.61-.25-2.19-.76s-.94-1.36-1.09-2.56h9.04c.04-.22.06-.48.07-.76.01-.29.01-.56.01-.82 0-2.4-.6-4.27-1.79-5.59s-2.84-1.98-4.93-1.98zm-2.45 6.49c.09-1.22.35-2.11.78-2.68.43-.56 1-.85 1.7-.85.44 0 .81.09 1.12.26.3.18.55.42.73.72s.32.67.4 1.11.12.91.12 1.43h-4.85zM54.73 13.4c-1.92-1.11-4.11-1.97-6.5-2.54-2.38-.57-4.99-.86-7.75-.86-3.45 0-6.8.66-9.93 1.95-3.15 1.29-5.88 3.11-8.13 5.41-2.3 2.37-4.13 5.21-5.44 8.45-1.31 3.25-1.98 6.9-1.98 10.88 0 5.11 1.54 9.1 4.57 11.85 3.01 2.75 7.32 4.14 12.81 4.14 2.01 0 3.61-.1 4.75-.3s2.37-.5 3.64-.87c.99-.29 2.05-.67 3.13-1.14 1.06-.45 1.99-.84 2.78-1.16.18-.07.32-.23.36-.42l2.32-9.54c.04-.18 0-.37-.11-.52a.588.588 0 00-.48-.23h-1.06c-.14 0-.27.05-.38.13-1.87 1.5-3.88 2.75-5.97 3.71-2.06.95-4.3 1.43-6.64 1.43-2.55 0-4.51-.66-5.8-1.97-1.3-1.3-1.95-3.49-1.95-6.49 0-4.78 1.25-8.77 3.71-11.84 2.47-3.07 5.52-4.56 9.32-4.56 2.15 0 4.04.41 5.61 1.22 1.6.82 3.24 2.13 4.87 3.89.11.12.27.19.44.19h1.17c.28 0 .52-.19.59-.46l2.34-9.68a.625.625 0 00-.29-.67z"/><path d="M70.92 52.23c2.15-.82 3.81-1.92 4.97-3.31 1.41-1.69 2.13-3.84 2.13-6.41 0-3.07-1.37-5.49-4.07-7.18-2.61-1.63-6.4-2.46-11.27-2.46H48.21c-.28 0-.53.2-.59.47l-1.01 4.39a.55.55 0 00.09-.07c.32-.26.72-.4 1.13-.4h1.06c.56 0 1.08.25 1.43.7.35.44.47 1.01.33 1.56l-2.32 9.54c-.14.57-.54 1.04-1.09 1.26-.77.31-1.68.69-2.76 1.15-.38.16-.76.31-1.13.46l-4.88 21.31c-.04.18 0 .37.12.52s.29.24.47.24h17.17c6.34 0 11.34-1.23 14.84-3.64 3.58-2.47 5.39-5.95 5.39-10.34 0-2.3-.62-4.11-1.83-5.4-.91-.98-2.16-1.78-3.71-2.39zm-8.2 11.85c-1.51.92-3.72 1.39-6.57 1.39h-4.4l2-8.73h4.87c2.24 0 3.88.3 4.88.89.91.54 1.35 1.41 1.35 2.65 0 1.68-.7 2.93-2.13 3.8zm1.66-16.64c-1.14.79-2.78 1.19-4.88 1.19h-3.9l1.66-7.23h4.12c1.52 0 2.71.24 3.53.71.73.42 1.08 1.07 1.08 2.03 0 1.47-.53 2.55-1.61 3.3zm5.27-18.74c0-1.18-.17-2.25-.5-3.22-.33-.96-.8-1.78-1.42-2.47a6.276 6.276 0 00-2.26-1.58c-.89-.37-1.9-.55-3.02-.55s-2.13.19-3.02.57-1.65.91-2.27 1.59-1.1 1.51-1.43 2.48-.5 2.04-.5 3.2c0 1.08.13 2.05.37 2.92h4.58c-.25-.71-.37-1.69-.37-2.92 0-1.61.22-2.77.66-3.49s1.1-1.08 1.98-1.08 1.54.36 1.97 1.08.65 1.88.65 3.47c0 1.29-.13 2.29-.4 3.01.04 0 .08.01.13.01 1.56.04 3 .17 4.32.38.35-.98.53-2.11.53-3.4zm21.43-6.66c-.63-.77-1.6-1.15-2.91-1.15-.75 0-1.5.18-2.23.54s-1.43.91-2.09 1.65c-.57-1.46-1.73-2.19-3.47-2.19-.77 0-1.51.17-2.2.53s-1.37.91-2.01 1.66l-.33-1.69H72V32.8c1.15.37 2.18.82 3.07 1.38.5.31.93.66 1.34 1.02v-9.31c.35-.54.72-.96 1.1-1.26s.76-.46 1.13-.46c.4 0 .7.12.9.37.19.25.29.68.29 1.29v10.29h4.41V25.88c.33-.54.69-.96 1.08-1.26s.77-.46 1.16-.46c.4 0 .7.13.88.39s.28.71.28 1.36v10.21h4.41V25.29c-.02-1.4-.34-2.49-.97-3.25z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/dropbox.svg b/website/static/images/users/dropbox.svg
index 1acc731bc..9920438e2 100644
--- a/website/static/images/users/dropbox.svg
+++ b/website/static/images/users/dropbox.svg
@@ -1,4 +1 @@
-<svg height="63.8" width="324" xmlns="http://www.w3.org/2000/svg">
-  <path d="M37.6 12L18.8 24l18.8 12-18.8 12L0 35.9l18.8-12L0 12 18.8 0zM18.7 51.8l18.8-12 18.8 12-18.8 12zm18.9-15.9l18.8-12L37.6 12 56.3 0l18.8 12-18.8 12 18.8 12-18.8 12z" fill="#0061ff"/>
-  <path d="M89.8 12H105c9.7 0 17.7 5.6 17.7 18.4v2.7c0 12.9-7.5 18.7-17.4 18.7H89.8zm8.5 7.2v25.3h6.5c5.5 0 9.2-3.6 9.2-11.6v-2.1c0-8-3.9-11.6-9.5-11.6zm28.9.4h6.8l1.1 7.5c1.3-5.1 4.6-7.8 10.6-7.8h2.1v8.6h-3.5c-6.9 0-8.6 2.4-8.6 9.2v14.8h-8.4V19.6zm22.3 16.8v-.9c0-10.8 6.9-16.7 16.3-16.7 9.6 0 16.3 5.9 16.3 16.7v.9c0 10.6-6.5 16.3-16.3 16.3-10.4-.1-16.3-5.7-16.3-16.3zm24-.1v-.8c0-6-3-9.6-7.8-9.6-4.7 0-7.8 3.3-7.8 9.6v.8c0 5.8 3 9.1 7.8 9.1 4.8-.1 7.8-3.3 7.8-9.1zm13-16.7h7l.8 6.1c1.7-4.1 5.3-6.9 10.6-6.9 8.2 0 13.6 5.9 13.6 16.8v.9c0 10.6-6 16.2-13.6 16.2-5.1 0-8.6-2.3-10.3-6V63h-8.2zM210 36.3v-.7c0-6.4-3.3-9.6-7.7-9.6-4.7 0-7.8 3.6-7.8 9.6v.6c0 5.7 3 9.3 7.7 9.3 4.8-.1 7.8-3.2 7.8-9.2zm20.9 9.6l-.7 5.9H223v-43h8.2v16.5c1.8-4.2 5.4-6.5 10.5-6.5 7.7.1 13.4 5.4 13.4 16.1v1c0 10.7-5.4 16.8-13.6 16.8-5.4-.1-8.9-2.6-10.6-6.8zm15.6-10v-.8c0-5.9-3.2-9.2-7.7-9.2-4.6 0-7.8 3.7-7.8 9.3v.7c0 6 3.1 9.5 7.7 9.5 4.9 0 7.8-3.1 7.8-9.5zm12.2.5v-.9c0-10.8 6.9-16.7 16.3-16.7 9.6 0 16.3 5.9 16.3 16.7v.9c0 10.6-6.6 16.3-16.3 16.3-10.4-.1-16.3-5.7-16.3-16.3zm24.1-.1v-.8c0-6-3-9.6-7.8-9.6-4.7 0-7.8 3.3-7.8 9.6v.8c0 5.8 3 9.1 7.8 9.1 4.8-.1 7.8-3.3 7.8-9.1zm19.5-1.2L291 19.6h9.7l6.5 9.7 6.6-9.7h9.6L311.9 35 324 51.8h-9.5l-7.4-10.7-7.2 10.7H290z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="324" height="63.8"><path fill="#0061ff" d="M37.6 12L18.8 24l18.8 12-18.8 12L0 35.9l18.8-12L0 12 18.8 0zM18.7 51.8l18.8-12 18.8 12-18.8 12zm18.9-15.9l18.8-12L37.6 12 56.3 0l18.8 12-18.8 12 18.8 12-18.8 12z"/><path d="M89.8 12H105c9.7 0 17.7 5.6 17.7 18.4v2.7c0 12.9-7.5 18.7-17.4 18.7H89.8zm8.5 7.2v25.3h6.5c5.5 0 9.2-3.6 9.2-11.6v-2.1c0-8-3.9-11.6-9.5-11.6zm28.9.4h6.8l1.1 7.5c1.3-5.1 4.6-7.8 10.6-7.8h2.1v8.6h-3.5c-6.9 0-8.6 2.4-8.6 9.2v14.8h-8.4V19.6zm22.3 16.8v-.9c0-10.8 6.9-16.7 16.3-16.7 9.6 0 16.3 5.9 16.3 16.7v.9c0 10.6-6.5 16.3-16.3 16.3-10.4-.1-16.3-5.7-16.3-16.3zm24-.1v-.8c0-6-3-9.6-7.8-9.6-4.7 0-7.8 3.3-7.8 9.6v.8c0 5.8 3 9.1 7.8 9.1 4.8-.1 7.8-3.3 7.8-9.1zm13-16.7h7l.8 6.1c1.7-4.1 5.3-6.9 10.6-6.9 8.2 0 13.6 5.9 13.6 16.8v.9c0 10.6-6 16.2-13.6 16.2-5.1 0-8.6-2.3-10.3-6V63h-8.2zM210 36.3v-.7c0-6.4-3.3-9.6-7.7-9.6-4.7 0-7.8 3.6-7.8 9.6v.6c0 5.7 3 9.3 7.7 9.3 4.8-.1 7.8-3.2 7.8-9.2zm20.9 9.6l-.7 5.9H223v-43h8.2v16.5c1.8-4.2 5.4-6.5 10.5-6.5 7.7.1 13.4 5.4 13.4 16.1v1c0 10.7-5.4 16.8-13.6 16.8-5.4-.1-8.9-2.6-10.6-6.8zm15.6-10v-.8c0-5.9-3.2-9.2-7.7-9.2-4.6 0-7.8 3.7-7.8 9.3v.7c0 6 3.1 9.5 7.7 9.5 4.9 0 7.8-3.1 7.8-9.5zm12.2.5v-.9c0-10.8 6.9-16.7 16.3-16.7 9.6 0 16.3 5.9 16.3 16.7v.9c0 10.6-6.6 16.3-16.3 16.3-10.4-.1-16.3-5.7-16.3-16.3zm24.1-.1v-.8c0-6-3-9.6-7.8-9.6-4.7 0-7.8 3.3-7.8 9.6v.8c0 5.8 3 9.1 7.8 9.1 4.8-.1 7.8-3.3 7.8-9.1zm19.5-1.2L291 19.6h9.7l6.5 9.7 6.6-9.7h9.6L311.9 35 324 51.8h-9.5l-7.4-10.7-7.2 10.7H290z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/dropbox_grey.svg b/website/static/images/users/dropbox_grey.svg
index 30367cb0d..f9ce5d554 100644
--- a/website/static/images/users/dropbox_grey.svg
+++ b/website/static/images/users/dropbox_grey.svg
@@ -1,3 +1 @@
-<svg height="63.8" width="324" xmlns="http://www.w3.org/2000/svg">
-  <path d="M37.6 12L18.8 24l18.8 12-18.8 12L0 35.9l18.8-12L0 12 18.8 0zM18.7 51.8l18.8-12 18.8 12-18.8 12zm18.9-15.9l18.8-12L37.6 12 56.3 0l18.8 12-18.8 12 18.8 12-18.8 12zM89.8 12H105c9.7 0 17.7 5.6 17.7 18.4v2.7c0 12.9-7.5 18.7-17.4 18.7H89.8zm8.5 7.2v25.3h6.5c5.5 0 9.2-3.6 9.2-11.6v-2.1c0-8-3.9-11.6-9.5-11.6zm28.9.4h6.8l1.1 7.5c1.3-5.1 4.6-7.8 10.6-7.8h2.1v8.6h-3.5c-6.9 0-8.6 2.4-8.6 9.2v14.8h-8.4V19.6zm22.3 16.8v-.9c0-10.8 6.9-16.7 16.3-16.7 9.6 0 16.3 5.9 16.3 16.7v.9c0 10.6-6.5 16.3-16.3 16.3-10.4-.1-16.3-5.7-16.3-16.3zm24-.1v-.8c0-6-3-9.6-7.8-9.6-4.7 0-7.8 3.3-7.8 9.6v.8c0 5.8 3 9.1 7.8 9.1 4.8-.1 7.8-3.3 7.8-9.1zm13-16.7h7l.8 6.1c1.7-4.1 5.3-6.9 10.6-6.9 8.2 0 13.6 5.9 13.6 16.8v.9c0 10.6-6 16.2-13.6 16.2-5.1 0-8.6-2.3-10.3-6V63h-8.2zM210 36.3v-.7c0-6.4-3.3-9.6-7.7-9.6-4.7 0-7.8 3.6-7.8 9.6v.6c0 5.7 3 9.3 7.7 9.3 4.8-.1 7.8-3.2 7.8-9.2zm20.9 9.6l-.7 5.9H223v-43h8.2v16.5c1.8-4.2 5.4-6.5 10.5-6.5 7.7.1 13.4 5.4 13.4 16.1v1c0 10.7-5.4 16.8-13.6 16.8-5.4-.1-8.9-2.6-10.6-6.8zm15.6-10v-.8c0-5.9-3.2-9.2-7.7-9.2-4.6 0-7.8 3.7-7.8 9.3v.7c0 6 3.1 9.5 7.7 9.5 4.9 0 7.8-3.1 7.8-9.5zm12.2.5v-.9c0-10.8 6.9-16.7 16.3-16.7 9.6 0 16.3 5.9 16.3 16.7v.9c0 10.6-6.6 16.3-16.3 16.3-10.4-.1-16.3-5.7-16.3-16.3zm24.1-.1v-.8c0-6-3-9.6-7.8-9.6-4.7 0-7.8 3.3-7.8 9.6v.8c0 5.8 3 9.1 7.8 9.1 4.8-.1 7.8-3.3 7.8-9.1zm19.5-1.2L291 19.6h9.7l6.5 9.7 6.6-9.7h9.6L311.9 35 324 51.8h-9.5l-7.4-10.7-7.2 10.7H290z" fill="#6f7b81"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="324" height="63.8"><path fill="#6f7b81" d="M37.6 12L18.8 24l18.8 12-18.8 12L0 35.9l18.8-12L0 12 18.8 0zM18.7 51.8l18.8-12 18.8 12-18.8 12zm18.9-15.9l18.8-12L37.6 12 56.3 0l18.8 12-18.8 12 18.8 12-18.8 12zM89.8 12H105c9.7 0 17.7 5.6 17.7 18.4v2.7c0 12.9-7.5 18.7-17.4 18.7H89.8zm8.5 7.2v25.3h6.5c5.5 0 9.2-3.6 9.2-11.6v-2.1c0-8-3.9-11.6-9.5-11.6zm28.9.4h6.8l1.1 7.5c1.3-5.1 4.6-7.8 10.6-7.8h2.1v8.6h-3.5c-6.9 0-8.6 2.4-8.6 9.2v14.8h-8.4V19.6zm22.3 16.8v-.9c0-10.8 6.9-16.7 16.3-16.7 9.6 0 16.3 5.9 16.3 16.7v.9c0 10.6-6.5 16.3-16.3 16.3-10.4-.1-16.3-5.7-16.3-16.3zm24-.1v-.8c0-6-3-9.6-7.8-9.6-4.7 0-7.8 3.3-7.8 9.6v.8c0 5.8 3 9.1 7.8 9.1 4.8-.1 7.8-3.3 7.8-9.1zm13-16.7h7l.8 6.1c1.7-4.1 5.3-6.9 10.6-6.9 8.2 0 13.6 5.9 13.6 16.8v.9c0 10.6-6 16.2-13.6 16.2-5.1 0-8.6-2.3-10.3-6V63h-8.2zM210 36.3v-.7c0-6.4-3.3-9.6-7.7-9.6-4.7 0-7.8 3.6-7.8 9.6v.6c0 5.7 3 9.3 7.7 9.3 4.8-.1 7.8-3.2 7.8-9.2zm20.9 9.6l-.7 5.9H223v-43h8.2v16.5c1.8-4.2 5.4-6.5 10.5-6.5 7.7.1 13.4 5.4 13.4 16.1v1c0 10.7-5.4 16.8-13.6 16.8-5.4-.1-8.9-2.6-10.6-6.8zm15.6-10v-.8c0-5.9-3.2-9.2-7.7-9.2-4.6 0-7.8 3.7-7.8 9.3v.7c0 6 3.1 9.5 7.7 9.5 4.9 0 7.8-3.1 7.8-9.5zm12.2.5v-.9c0-10.8 6.9-16.7 16.3-16.7 9.6 0 16.3 5.9 16.3 16.7v.9c0 10.6-6.6 16.3-16.3 16.3-10.4-.1-16.3-5.7-16.3-16.3zm24.1-.1v-.8c0-6-3-9.6-7.8-9.6-4.7 0-7.8 3.3-7.8 9.6v.8c0 5.8 3 9.1 7.8 9.1 4.8-.1 7.8-3.3 7.8-9.1zm19.5-1.2L291 19.6h9.7l6.5 9.7 6.6-9.7h9.6L311.9 35 324 51.8h-9.5l-7.4-10.7-7.2 10.7H290z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/estalee.svg b/website/static/images/users/estalee.svg
index cb1f2d5ad..92e7308b9 100644
--- a/website/static/images/users/estalee.svg
+++ b/website/static/images/users/estalee.svg
@@ -1,11 +1 @@
-<svg viewBox="0 0 960 720" fill="none" stroke-linecap="square" stroke-miterlimit="10" xmlns="http://www.w3.org/2000/svg">
-  <clipPath id="a">
-    <path d="M0 0h960v720H0V0z"/>
-  </clipPath>
-  <g clip-path="url(#a)">
-    <path d="M0 0h960v720H0z"/>
-    <path fill="#7e57c2" d="M602.303 586.5v82.205H346.616V586.5z" fill-rule="evenodd"/>
-    <path fill="#f90" d="M602.303 586.5l71.962 41.093-71.962 41.093zm-255.635 82.239H324.95c-11.994 0-21.717-18.402-21.717-41.103 0-22.7 9.723-41.102 21.717-41.102h21.717z" fill-rule="evenodd"/>
-    <path fill="#7e57c2" d="M537.54 51.261c-28.725 0-54.97 7.409-78.734 22.226-23.694 14.748-42.25 33.864-55.67 57.348-13.35 23.484-20.025 47.598-20.025 72.34 0 17.054 3.67 33.34 11.009 48.856 7.408 15.446 12.476 23.275 15.201 23.484-10.903 1.188-26.14 11.358-45.71 30.509-19.57 19.08-34.527 41.167-44.872 66.259-10.344 25.022-15.516 50.009-15.516 74.961 0 36.135 11.218 66.33 33.654 90.582 22.505 24.183 55.286 36.275 98.34 36.275 42.076 0 81.6-11.637 118.574-34.912 37.044-23.344 66.364-58.815 87.961-106.413l-38.581-16.88c-13.7 24.953-31.173 42.776-52.42 53.47-21.178 10.693-41.447 16.04-60.807 16.04-16.425 0-28.517-4.578-36.275-13.734-7.689-9.226-11.533-21.877-11.533-37.952 0-18.313 4.578-37.673 13.734-58.082 9.156-20.41 21.737-38.232 37.743-53.469 16.006-15.306 52.455-29.04 109.348-41.202-55.775-14.189-88.17-27.853-97.187-40.993-8.946-13.21-13.42-28.691-13.42-46.444 0-13.35 2.412-26.105 7.235-38.267 4.892-12.161 11.358-21.737 19.395-28.726 8.038-6.99 16.6-10.484 25.686-10.484 6.57 0 11.882 1.712 15.936 5.137s6.08 9.26 6.08 17.508c0 9.576-2.166 18.872-6.5 27.888-4.333 8.946-14.363 16.075-30.089 21.387 18.452 25.092 35.75 37.638 51.896 37.638 17.474 0 32.011-7.933 43.614-23.799 11.672-15.936 17.508-34.807 17.508-56.614 0-29.565-10.03-52.595-30.09-69.09-20.059-16.564-45.22-24.847-75.484-24.847z" fill-rule="evenodd"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" stroke-linecap="square" stroke-miterlimit="10" viewBox="0 0 960 720"><clipPath id="a"><path d="M0 0h960v720H0V0z"/></clipPath><g clip-path="url(#a)"><path d="M0 0h960v720H0z"/><path fill="#7e57c2" fill-rule="evenodd" d="M602.303 586.5v82.205H346.616V586.5z"/><path fill="#f90" fill-rule="evenodd" d="M602.303 586.5l71.962 41.093-71.962 41.093zm-255.635 82.239H324.95c-11.994 0-21.717-18.402-21.717-41.103 0-22.7 9.723-41.102 21.717-41.102h21.717z"/><path fill="#7e57c2" fill-rule="evenodd" d="M537.54 51.261c-28.725 0-54.97 7.409-78.734 22.226-23.694 14.748-42.25 33.864-55.67 57.348-13.35 23.484-20.025 47.598-20.025 72.34 0 17.054 3.67 33.34 11.009 48.856 7.408 15.446 12.476 23.275 15.201 23.484-10.903 1.188-26.14 11.358-45.71 30.509-19.57 19.08-34.527 41.167-44.872 66.259-10.344 25.022-15.516 50.009-15.516 74.961 0 36.135 11.218 66.33 33.654 90.582 22.505 24.183 55.286 36.275 98.34 36.275 42.076 0 81.6-11.637 118.574-34.912 37.044-23.344 66.364-58.815 87.961-106.413l-38.581-16.88c-13.7 24.953-31.173 42.776-52.42 53.47-21.178 10.693-41.447 16.04-60.807 16.04-16.425 0-28.517-4.578-36.275-13.734-7.689-9.226-11.533-21.877-11.533-37.952 0-18.313 4.578-37.673 13.734-58.082 9.156-20.41 21.737-38.232 37.743-53.469 16.006-15.306 52.455-29.04 109.348-41.202-55.775-14.189-88.17-27.853-97.187-40.993-8.946-13.21-13.42-28.691-13.42-46.444 0-13.35 2.412-26.105 7.235-38.267 4.892-12.161 11.358-21.737 19.395-28.726 8.038-6.99 16.6-10.484 25.686-10.484 6.57 0 11.882 1.712 15.936 5.137s6.08 9.26 6.08 17.508c0 9.576-2.166 18.872-6.5 27.888-4.333 8.946-14.363 16.075-30.089 21.387 18.452 25.092 35.75 37.638 51.896 37.638 17.474 0 32.011-7.933 43.614-23.799 11.672-15.936 17.508-34.807 17.508-56.614 0-29.565-10.03-52.595-30.09-69.09-20.059-16.564-45.22-24.847-75.484-24.847z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/exponea.svg b/website/static/images/users/exponea.svg
index c57588547..dd5b61131 100644
--- a/website/static/images/users/exponea.svg
+++ b/website/static/images/users/exponea.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 524.5 134.5">
-  <path fill="#1b1632" d="M262.2 0c-19.3 0-35 15.7-35 35s15.7 35 35 35 35-15.7 35-35-15.7-35-35-35zm0 56c-11.5 0-21-9.5-21-21s9.5-21 21-21 21 9.5 21 21-9.4 21-21 21zm129.4 14h56V56h-42V41.9h31.5V28h-31.5V14h42V0h-56zM150.3 0h-17.4l-17.5 23.3L97.9 0H80.4l26.2 35-26.2 35h17.5l17.5-23.4L132.9 70h17.4l-26.2-35zm374.2 70L497 0h-15l-27.4 70h15l19.9-50.8 20 50.8zM363.6 51.3L325.2 0h-17.5v70h14V18.7L360.2 70h17.4V0h-14zM28 28H14v28H0v14h69.9V56H28V41.9h41.9V28H42V14h27.9V0H28zM192.3 0h-31.5v69.9h14V14h17.5c7.8 0 14 6.2 14 14s-6.2 14-14 14h-3.5l-7 14h10.5c15.4 0 28-12.6 28-28s-12.6-28-28-28zM0 133.9v-32h21.9v4.9H5.6v8.3h16v4.9h-16v8.9h16.3v4.9H0zm54.1 0l-9-12.5-9 12.5h-6.7l12-16.4-11.2-15.6h6.7l8.3 11.7 8.2-11.7h6.8l-11.3 15.6 12 16.5h-6.8zm15.3 0v-32h14.1c6.7 0 10.4 4.6 10.4 10s-3.7 10-10.4 10H75v12h-5.6zM88.2 112c0-3.1-2.3-5.1-5.4-5.1H75V117h7.7c3.2 0 5.5-2 5.5-5zm15.4 21.9v-32h21.9v4.9h-16.3v8.3h16v4.9h-16v8.9h16.3v4.9h-21.9zm51 0l-7.1-12h-5.6v12h-5.6v-32h14.1c6.3 0 10.5 4.1 10.5 10 0 5.7-3.7 8.8-7.6 9.4l7.9 12.6h-6.6zm.5-22c0-3.1-2.3-5-5.5-5h-7.7V117h7.7c3.2 0 5.5-2 5.5-5.1zm16.4 22v-32h5.6v32h-5.6zm17.4 0v-32h21.9v4.9h-16.3v8.3h16v4.9h-16v8.9h16.3v4.9h-21.9zm55 0L227.2 111v22.9h-5.6v-32h5.8l16.4 22.2v-22.2h5.6v32h-5.5zm15.9-15.9c0-9.9 7.3-16.6 16.8-16.6 6.4 0 10.5 3.3 12.8 7.2l-4.8 2.5a9.5 9.5 0 00-8.1-4.7c-6.3 0-11 4.8-11 11.6 0 6.7 4.7 11.6 11 11.6 3.4 0 6.5-2 8.1-4.7l4.8 2.4c-2.4 3.8-6.4 7.2-12.9 7.2-9.4 0-16.7-6.7-16.7-16.5zm39.1 15.9v-32h21.9v4.9h-16.3v8.3h16v4.9h-16v8.9h16.3v4.9h-21.9zm48.7-15.9c0-9.9 7.3-16.6 16.8-16.6 6.4 0 10.5 3.3 12.8 7.2l-4.8 2.5a9.5 9.5 0 00-8.1-4.7c-6.3 0-11 4.8-11 11.6 0 6.7 4.7 11.6 11 11.6 3.4 0 6.5-2 8.1-4.7l4.8 2.4c-2.4 3.8-6.4 7.2-12.9 7.2-9.4 0-16.7-6.7-16.7-16.5zm38.7 15.9v-32h5.6V129H406v4.9h-19.7zm26.8-15.9c0-9.6 6.8-16.6 16.4-16.6 9.6 0 16.4 7 16.4 16.6s-6.8 16.6-16.4 16.6c-9.6-.1-16.4-7.1-16.4-16.6zm27 0c0-6.6-4.2-11.6-10.6-11.6-6.5 0-10.6 4.9-10.6 11.6 0 6.6 4.1 11.6 10.6 11.6 6.4-.1 10.6-5.1 10.6-11.6zm16.1 3.3V102h5.7v19.2c0 5.1 2.8 8.4 8.2 8.4 5.3 0 8.2-3.3 8.2-8.4V102h5.7v19.3c0 7.9-4.6 13.2-13.9 13.2s-13.9-5.3-13.9-13.2zm39.6 12.6v-32h11.9c10 0 16.8 6.6 16.8 16 0 9.5-6.7 16-16.7 16h-12zm22.9-16c0-6.1-3.8-11-10.9-11h-6.3V129h6.3c6.8 0 10.9-5 10.9-11.1z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 524.5 134.5"><path fill="#1b1632" d="M262.2 0c-19.3 0-35 15.7-35 35s15.7 35 35 35 35-15.7 35-35-15.7-35-35-35zm0 56c-11.5 0-21-9.5-21-21s9.5-21 21-21 21 9.5 21 21-9.4 21-21 21zm129.4 14h56V56h-42V41.9h31.5V28h-31.5V14h42V0h-56zM150.3 0h-17.4l-17.5 23.3L97.9 0H80.4l26.2 35-26.2 35h17.5l17.5-23.4L132.9 70h17.4l-26.2-35zm374.2 70L497 0h-15l-27.4 70h15l19.9-50.8 20 50.8zM363.6 51.3L325.2 0h-17.5v70h14V18.7L360.2 70h17.4V0h-14zM28 28H14v28H0v14h69.9V56H28V41.9h41.9V28H42V14h27.9V0H28zM192.3 0h-31.5v69.9h14V14h17.5c7.8 0 14 6.2 14 14s-6.2 14-14 14h-3.5l-7 14h10.5c15.4 0 28-12.6 28-28s-12.6-28-28-28zM0 133.9v-32h21.9v4.9H5.6v8.3h16v4.9h-16v8.9h16.3v4.9H0zm54.1 0l-9-12.5-9 12.5h-6.7l12-16.4-11.2-15.6h6.7l8.3 11.7 8.2-11.7h6.8l-11.3 15.6 12 16.5h-6.8zm15.3 0v-32h14.1c6.7 0 10.4 4.6 10.4 10s-3.7 10-10.4 10H75v12h-5.6zM88.2 112c0-3.1-2.3-5.1-5.4-5.1H75V117h7.7c3.2 0 5.5-2 5.5-5zm15.4 21.9v-32h21.9v4.9h-16.3v8.3h16v4.9h-16v8.9h16.3v4.9h-21.9zm51 0l-7.1-12h-5.6v12h-5.6v-32h14.1c6.3 0 10.5 4.1 10.5 10 0 5.7-3.7 8.8-7.6 9.4l7.9 12.6h-6.6zm.5-22c0-3.1-2.3-5-5.5-5h-7.7V117h7.7c3.2 0 5.5-2 5.5-5.1zm16.4 22v-32h5.6v32h-5.6zm17.4 0v-32h21.9v4.9h-16.3v8.3h16v4.9h-16v8.9h16.3v4.9h-21.9zm55 0L227.2 111v22.9h-5.6v-32h5.8l16.4 22.2v-22.2h5.6v32h-5.5zm15.9-15.9c0-9.9 7.3-16.6 16.8-16.6 6.4 0 10.5 3.3 12.8 7.2l-4.8 2.5a9.5 9.5 0 00-8.1-4.7c-6.3 0-11 4.8-11 11.6 0 6.7 4.7 11.6 11 11.6 3.4 0 6.5-2 8.1-4.7l4.8 2.4c-2.4 3.8-6.4 7.2-12.9 7.2-9.4 0-16.7-6.7-16.7-16.5zm39.1 15.9v-32h21.9v4.9h-16.3v8.3h16v4.9h-16v8.9h16.3v4.9h-21.9zm48.7-15.9c0-9.9 7.3-16.6 16.8-16.6 6.4 0 10.5 3.3 12.8 7.2l-4.8 2.5a9.5 9.5 0 00-8.1-4.7c-6.3 0-11 4.8-11 11.6 0 6.7 4.7 11.6 11 11.6 3.4 0 6.5-2 8.1-4.7l4.8 2.4c-2.4 3.8-6.4 7.2-12.9 7.2-9.4 0-16.7-6.7-16.7-16.5zm38.7 15.9v-32h5.6V129H406v4.9h-19.7zm26.8-15.9c0-9.6 6.8-16.6 16.4-16.6 9.6 0 16.4 7 16.4 16.6s-6.8 16.6-16.4 16.6c-9.6-.1-16.4-7.1-16.4-16.6zm27 0c0-6.6-4.2-11.6-10.6-11.6-6.5 0-10.6 4.9-10.6 11.6 0 6.6 4.1 11.6 10.6 11.6 6.4-.1 10.6-5.1 10.6-11.6zm16.1 3.3V102h5.7v19.2c0 5.1 2.8 8.4 8.2 8.4 5.3 0 8.2-3.3 8.2-8.4V102h5.7v19.3c0 7.9-4.6 13.2-13.9 13.2s-13.9-5.3-13.9-13.2zm39.6 12.6v-32h11.9c10 0 16.8 6.6 16.8 16 0 9.5-6.7 16-16.7 16h-12zm22.9-16c0-6.1-3.8-11-10.9-11h-6.3V129h6.3c6.8 0 10.9-5 10.9-11.1z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/heroku.svg b/website/static/images/users/heroku.svg
index 1345c03ba..a5581530a 100644
--- a/website/static/images/users/heroku.svg
+++ b/website/static/images/users/heroku.svg
@@ -1,17 +1 @@
-<svg width="268" height="80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <symbol id="c">
-    <path d="M62.848 6.736V.207h2.948v6.515c0 1.503.486 2.181 1.666 2.181 1.179 0 1.65-.678 1.65-2.181V.207H72v6.529c0 2.889-1.385 4.539-4.569 4.539s-4.583-1.65-4.583-4.539zM50.428.207h2.948v3.95l3.007-3.95h3.419l-3.67 4.304 3.994 6.603h-3.331l-2.579-4.363-.84.973v3.39h-2.948V.207zM36.433 5.66c0-3.993 2.726-5.66 5.365-5.66 2.623 0 5.35 1.666 5.35 5.66s-2.727 5.66-5.35 5.66c-2.639-.001-5.365-1.666-5.365-5.66zm7.766 0c0-2.004-.87-3.227-2.402-3.227-1.548 0-2.417 1.223-2.417 3.227 0 2.005.87 3.302 2.417 3.302 1.533-.001 2.402-1.297 2.402-3.302zM24.588.207h4.259c2.8 0 4.51.929 4.51 3.552 0 1.709-.722 2.698-2.152 3.183l2.314 4.171h-3.124l-2.108-3.787h-.811v3.787h-2.889V.207h.001zm4.156 4.878c1.209 0 1.739-.339 1.739-1.253 0-.914-.531-1.238-1.739-1.238h-1.267v2.491h1.267zM13.318.207H21.1v2.447h-4.834v1.769h3.449v2.299h-3.449v2.019h5.085v2.373h-8.032V.207h-.001zM0 .207h2.948V4.26h3.626V.207h2.948v10.906H6.574V6.706H2.948v4.407H0V.207z"/>
-  </symbol>
-  <symbol id="b">
-    <path d="M19 68l9-8-9-8v16zm32.517-32.425C49.905 33.944 46.945 32 42 32c-5.423 0-11.006 1.411-15 2.711V12h-8v34.692l5.651-2.56C24.742 44.091 33.866 40 42 40c4.062 0 4.961 2.243 5 4.11V68h8V44c.005-.512-.042-4.945-3.483-8.425zM41 25h8c3.618-4.1 5.46-8.456 6-13h-8c-.882 4.534-2.856 8.875-6 13z"/>
-  </symbol>
-  <symbol id="a">
-    <path d="M64.8 0H7.2A7.2 7.2 0 000 7.2v65.6A7.2 7.2 0 007.2 80h57.6a7.2 7.2 0 007.2-7.2V7.2A7.2 7.2 0 0064.8 0zM68 72.8c0 1.764-1.435 3.2-3.2 3.2H7.2A3.204 3.204 0 014 72.8V7.2C4 5.435 5.436 4 7.2 4h57.6C66.565 4 68 5.435 68 7.2v65.6z"/>
-  </symbol>
-  <g fill-rule="evenodd" fill="#430098">
-    <rect x="1" y="1" width="70" height="78" rx="5" fill="transparent"/>
-    <use xlink:href="#a"/>
-    <use xlink:href="#b"/>
-    <use xlink:href="#c" x="35" y="10" transform="scale(2.5)"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="268" height="80"><symbol id="c"><path d="M62.848 6.736V.207h2.948v6.515c0 1.503.486 2.181 1.666 2.181 1.179 0 1.65-.678 1.65-2.181V.207H72v6.529c0 2.889-1.385 4.539-4.569 4.539s-4.583-1.65-4.583-4.539zM50.428.207h2.948v3.95l3.007-3.95h3.419l-3.67 4.304 3.994 6.603h-3.331l-2.579-4.363-.84.973v3.39h-2.948V.207zM36.433 5.66c0-3.993 2.726-5.66 5.365-5.66 2.623 0 5.35 1.666 5.35 5.66s-2.727 5.66-5.35 5.66c-2.639-.001-5.365-1.666-5.365-5.66zm7.766 0c0-2.004-.87-3.227-2.402-3.227-1.548 0-2.417 1.223-2.417 3.227 0 2.005.87 3.302 2.417 3.302 1.533-.001 2.402-1.297 2.402-3.302zM24.588.207h4.259c2.8 0 4.51.929 4.51 3.552 0 1.709-.722 2.698-2.152 3.183l2.314 4.171h-3.124l-2.108-3.787h-.811v3.787h-2.889V.207h.001zm4.156 4.878c1.209 0 1.739-.339 1.739-1.253 0-.914-.531-1.238-1.739-1.238h-1.267v2.491h1.267zM13.318.207H21.1v2.447h-4.834v1.769h3.449v2.299h-3.449v2.019h5.085v2.373h-8.032V.207h-.001zM0 .207h2.948V4.26h3.626V.207h2.948v10.906H6.574V6.706H2.948v4.407H0V.207z"/></symbol><symbol id="b"><path d="M19 68l9-8-9-8v16zm32.517-32.425C49.905 33.944 46.945 32 42 32c-5.423 0-11.006 1.411-15 2.711V12h-8v34.692l5.651-2.56C24.742 44.091 33.866 40 42 40c4.062 0 4.961 2.243 5 4.11V68h8V44c.005-.512-.042-4.945-3.483-8.425zM41 25h8c3.618-4.1 5.46-8.456 6-13h-8c-.882 4.534-2.856 8.875-6 13z"/></symbol><symbol id="a"><path d="M64.8 0H7.2A7.2 7.2 0 000 7.2v65.6A7.2 7.2 0 007.2 80h57.6a7.2 7.2 0 007.2-7.2V7.2A7.2 7.2 0 0064.8 0zM68 72.8c0 1.764-1.435 3.2-3.2 3.2H7.2A3.204 3.204 0 014 72.8V7.2C4 5.435 5.436 4 7.2 4h57.6C66.565 4 68 5.435 68 7.2v65.6z"/></symbol><g fill="#430098" fill-rule="evenodd"><rect width="70" height="78" x="1" y="1" fill="transparent" rx="5"/><use xlink:href="#a"/><use xlink:href="#b"/><use x="35" y="10" transform="scale(2.5)" xlink:href="#c"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/housinganywhere.svg b/website/static/images/users/housinganywhere.svg
index 94075c65d..15d13ff09 100644
--- a/website/static/images/users/housinganywhere.svg
+++ b/website/static/images/users/housinganywhere.svg
@@ -1,3 +1 @@
-<svg fill="#ff8127" height="32" viewBox="0 0 330 95" width="134" xmlns="http://www.w3.org/2000/svg">
-  <path d="M76.75 85.736H5.69A5.686 5.686 0 010 80.047a5.686 5.686 0 015.69-5.689h65.37V42.365L40.908 17.334l-29.53 25v13.635a5.686 5.686 0 01-5.69 5.689A5.685 5.685 0 010 55.969V39.697c0-1.676.734-3.259 2.017-4.345L37.205 5.563a5.69 5.69 0 017.313-.031L80.39 35.321a5.688 5.688 0 012.058 4.376v40.35a5.701 5.701 0 01-5.699 5.689zm27.427-81.547h8.579v12.069h9.674V4.189h8.579v32.417h-8.58V23.739h-9.673v12.867h-8.58zm47.984 19.949c0-3.79-.997-6.185-3.59-6.185s-3.593 2.394-3.593 6.185 1 6.185 3.593 6.185 3.59-2.394 3.59-6.185m-15.959 0c0-8.279 5.985-13.067 12.37-13.067 6.382 0 12.366 4.788 12.366 13.067 0 8.28-5.984 13.067-12.367 13.067-6.384 0-12.369-4.788-12.369-13.067m29.031 2.892V11.67h8.579v14.264c0 3.192.799 3.99 2.494 3.99 1.596 0 2.494-.6 3.59-2.195v-16.06h8.578v24.938h-6.982l-.597-3.292h-.2c-1.994 2.394-4.29 3.89-7.68 3.89-5.486 0-7.782-3.99-7.782-10.174m27.037 6.683l3.79-5.286c2.294 1.695 4.338 2.493 6.085 2.493 1.794 0 2.494-.499 2.494-1.496 0-1.297-2.296-1.896-4.788-2.893-2.892-1.147-6.284-3.292-6.284-7.381 0-4.888 3.988-8.08 9.875-8.08 4.09 0 6.982 1.646 9.177 3.292l-3.791 5.087c-1.796-1.297-3.541-2.095-5.087-2.095-1.447 0-2.195.4-2.195 1.397 0 1.296 2.195 1.795 4.689 2.693 2.992 1.097 6.384 2.993 6.384 7.481 0 4.688-3.692 8.279-10.674 8.279-3.192 0-7.082-1.396-9.675-3.491m24.542 2.893h8.579V11.67h-8.579v24.936zm-.499-32.317c0-2.494 1.996-4.29 4.79-4.29 2.791 0 4.785 1.796 4.785 4.29 0 2.493-1.994 4.288-4.785 4.288-2.794 0-4.79-1.795-4.79-4.288zm14.865 7.38h6.983l.598 2.992h.198c1.997-1.895 4.49-3.59 7.881-3.59 5.486 0 7.782 3.99 7.782 10.174v15.36h-8.579V22.343c0-3.192-.799-3.99-2.494-3.99-1.596 0-2.494.698-3.79 1.895v16.358h-8.579zm41.598 8.478c0-2.294-1.096-3.39-2.692-3.39s-2.692 1.096-2.692 3.39c0 2.395 1.096 3.492 2.692 3.492s2.692-1.098 2.692-3.492M275.57 39.3c0-1.296-1.197-1.495-3.34-1.495h-1.945c-1.995 0-2.892-.102-3.591-.3-.597.597-.897 1.095-.897 1.794 0 1.596 1.995 2.294 4.887 2.294 2.793 0 4.887-.897 4.887-2.294m-16.757 1.398c0-2.046 1.196-3.592 3.493-4.789v-.2c-1.297-.896-2.297-2.194-2.297-4.287 0-1.697 1.099-3.491 2.793-4.69v-.199c-1.793-1.198-3.39-3.49-3.39-6.384 0-6.184 5.187-9.076 10.673-9.076 1.394 0 2.793.199 3.989.599h9.277v6.183h-3.591c.2.599.4 1.596.4 2.594 0 5.886-4.489 8.28-10.076 8.28-.796 0-1.695-.102-2.793-.352-.498.45-.599.75-.599 1.448 0 1.096.998 1.496 3.491 1.496h3.742c6.234 0 9.825 1.895 9.825 6.484 0 5.386-5.587 9.075-14.462 9.075-5.687 0-10.475-1.694-10.475-6.182M112.008 72.221h5.985l-.549-2.244c-.799-3.092-1.596-7.032-2.395-10.274h-.198c-.698 3.291-1.497 7.182-2.296 10.274zm-2.046-18.9h10.375l9.875 32.416h-9.079l-1.596-6.882h-9.075l-1.596 6.882h-8.779l9.875-32.417zm22.65 7.479h6.983l.597 2.994h.198c1.998-1.896 4.49-3.592 7.882-3.592 5.486 0 7.782 3.99 7.782 10.175v15.36h-8.58V71.474c0-3.192-.798-3.99-2.493-3.99-1.596 0-2.494.698-3.79 1.894v16.359h-8.58V60.8zm28.932 33.815l1.495-6.484c.45.1 1.098.299 1.596.299 2.296 0 3.392-.997 3.892-2.494l.299-1.097-9.477-24.038h8.579l2.99 9.575c.699 2.294 1.199 4.589 1.798 7.082h.198c.499-2.394.999-4.688 1.596-7.082l2.494-9.575h8.18l-8.378 24.537c-2.596 6.733-5.288 9.776-11.471 9.776-1.698 0-2.695-.201-3.791-.499M186.982 60.8h8.477l1.895 10.474c.401 2.494.6 4.988.998 7.58h.2c.398-2.592.797-5.186 1.396-7.58l2.296-10.473h7.28l2.394 10.473c.6 2.494.998 4.988 1.497 7.58h.198c.4-2.592.6-5.086.997-7.58l1.896-10.473h7.881l-5.686 24.936h-9.975l-1.796-8.677c-.398-2.295-.797-4.59-1.197-7.332h-.198c-.399 2.743-.698 5.037-1.099 7.332l-1.695 8.677h-9.776zm41.502-9.774h8.578v8.079l-.398 4.289c1.695-1.496 4.09-3.192 7.48-3.192 5.486 0 7.779 3.99 7.779 10.175v15.36h-8.576V71.474c0-3.192-.8-3.99-2.494-3.99-1.596 0-2.494.698-3.791 1.894v16.359h-8.578zm43.296 19.25c0-1.895-.8-3.59-3.393-3.59-1.896 0-3.492 1.096-3.989 3.59h7.381zm-15.562 2.993c0-8.08 5.884-13.067 11.971-13.067 7.381 0 10.872 5.386 10.872 12.07 0 1.495-.2 2.991-.35 3.59h-14.214c.797 2.993 2.992 3.99 5.785 3.99 1.695 0 3.291-.499 5.087-1.496l2.794 5.087c-2.695 1.894-6.285 2.893-9.078 2.893-7.28 0-12.867-4.788-12.867-13.067zM283.752 60.8h6.983l.599 4.29h.197c1.846-3.392 4.64-4.888 7.084-4.888 1.544 0 2.394.199 3.091.499l-1.396 7.38c-.897-.198-1.695-.398-2.793-.398-1.793 0-3.988 1.098-5.187 4.189v13.865h-8.577V60.8zm34.618 9.476c0-1.895-.798-3.59-3.391-3.59-1.896 0-3.492 1.096-3.99 3.59h7.382zm-15.56 2.993c0-8.08 5.884-13.067 11.97-13.067 7.382 0 10.873 5.386 10.873 12.07 0 1.495-.2 2.991-.351 3.59h-14.213c.797 2.993 2.992 3.99 5.785 3.99 1.695 0 3.29-.499 5.087-1.496l2.794 5.087c-2.695 1.894-6.285 2.893-9.078 2.893-7.28 0-12.867-4.788-12.867-13.067z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="134" height="32" fill="#ff8127" viewBox="0 0 330 95"><path d="M76.75 85.736H5.69A5.686 5.686 0 010 80.047a5.686 5.686 0 015.69-5.689h65.37V42.365L40.908 17.334l-29.53 25v13.635a5.686 5.686 0 01-5.69 5.689A5.685 5.685 0 010 55.969V39.697c0-1.676.734-3.259 2.017-4.345L37.205 5.563a5.69 5.69 0 017.313-.031L80.39 35.321a5.688 5.688 0 012.058 4.376v40.35a5.701 5.701 0 01-5.699 5.689zm27.427-81.547h8.579v12.069h9.674V4.189h8.579v32.417h-8.58V23.739h-9.673v12.867h-8.58zm47.984 19.949c0-3.79-.997-6.185-3.59-6.185s-3.593 2.394-3.593 6.185 1 6.185 3.593 6.185 3.59-2.394 3.59-6.185m-15.959 0c0-8.279 5.985-13.067 12.37-13.067 6.382 0 12.366 4.788 12.366 13.067 0 8.28-5.984 13.067-12.367 13.067-6.384 0-12.369-4.788-12.369-13.067m29.031 2.892V11.67h8.579v14.264c0 3.192.799 3.99 2.494 3.99 1.596 0 2.494-.6 3.59-2.195v-16.06h8.578v24.938h-6.982l-.597-3.292h-.2c-1.994 2.394-4.29 3.89-7.68 3.89-5.486 0-7.782-3.99-7.782-10.174m27.037 6.683l3.79-5.286c2.294 1.695 4.338 2.493 6.085 2.493 1.794 0 2.494-.499 2.494-1.496 0-1.297-2.296-1.896-4.788-2.893-2.892-1.147-6.284-3.292-6.284-7.381 0-4.888 3.988-8.08 9.875-8.08 4.09 0 6.982 1.646 9.177 3.292l-3.791 5.087c-1.796-1.297-3.541-2.095-5.087-2.095-1.447 0-2.195.4-2.195 1.397 0 1.296 2.195 1.795 4.689 2.693 2.992 1.097 6.384 2.993 6.384 7.481 0 4.688-3.692 8.279-10.674 8.279-3.192 0-7.082-1.396-9.675-3.491m24.542 2.893h8.579V11.67h-8.579v24.936zm-.499-32.317c0-2.494 1.996-4.29 4.79-4.29 2.791 0 4.785 1.796 4.785 4.29 0 2.493-1.994 4.288-4.785 4.288-2.794 0-4.79-1.795-4.79-4.288zm14.865 7.38h6.983l.598 2.992h.198c1.997-1.895 4.49-3.59 7.881-3.59 5.486 0 7.782 3.99 7.782 10.174v15.36h-8.579V22.343c0-3.192-.799-3.99-2.494-3.99-1.596 0-2.494.698-3.79 1.895v16.358h-8.579zm41.598 8.478c0-2.294-1.096-3.39-2.692-3.39s-2.692 1.096-2.692 3.39c0 2.395 1.096 3.492 2.692 3.492s2.692-1.098 2.692-3.492M275.57 39.3c0-1.296-1.197-1.495-3.34-1.495h-1.945c-1.995 0-2.892-.102-3.591-.3-.597.597-.897 1.095-.897 1.794 0 1.596 1.995 2.294 4.887 2.294 2.793 0 4.887-.897 4.887-2.294m-16.757 1.398c0-2.046 1.196-3.592 3.493-4.789v-.2c-1.297-.896-2.297-2.194-2.297-4.287 0-1.697 1.099-3.491 2.793-4.69v-.199c-1.793-1.198-3.39-3.49-3.39-6.384 0-6.184 5.187-9.076 10.673-9.076 1.394 0 2.793.199 3.989.599h9.277v6.183h-3.591c.2.599.4 1.596.4 2.594 0 5.886-4.489 8.28-10.076 8.28-.796 0-1.695-.102-2.793-.352-.498.45-.599.75-.599 1.448 0 1.096.998 1.496 3.491 1.496h3.742c6.234 0 9.825 1.895 9.825 6.484 0 5.386-5.587 9.075-14.462 9.075-5.687 0-10.475-1.694-10.475-6.182M112.008 72.221h5.985l-.549-2.244c-.799-3.092-1.596-7.032-2.395-10.274h-.198c-.698 3.291-1.497 7.182-2.296 10.274zm-2.046-18.9h10.375l9.875 32.416h-9.079l-1.596-6.882h-9.075l-1.596 6.882h-8.779l9.875-32.417zm22.65 7.479h6.983l.597 2.994h.198c1.998-1.896 4.49-3.592 7.882-3.592 5.486 0 7.782 3.99 7.782 10.175v15.36h-8.58V71.474c0-3.192-.798-3.99-2.493-3.99-1.596 0-2.494.698-3.79 1.894v16.359h-8.58V60.8zm28.932 33.815l1.495-6.484c.45.1 1.098.299 1.596.299 2.296 0 3.392-.997 3.892-2.494l.299-1.097-9.477-24.038h8.579l2.99 9.575c.699 2.294 1.199 4.589 1.798 7.082h.198c.499-2.394.999-4.688 1.596-7.082l2.494-9.575h8.18l-8.378 24.537c-2.596 6.733-5.288 9.776-11.471 9.776-1.698 0-2.695-.201-3.791-.499M186.982 60.8h8.477l1.895 10.474c.401 2.494.6 4.988.998 7.58h.2c.398-2.592.797-5.186 1.396-7.58l2.296-10.473h7.28l2.394 10.473c.6 2.494.998 4.988 1.497 7.58h.198c.4-2.592.6-5.086.997-7.58l1.896-10.473h7.881l-5.686 24.936h-9.975l-1.796-8.677c-.398-2.295-.797-4.59-1.197-7.332h-.198c-.399 2.743-.698 5.037-1.099 7.332l-1.695 8.677h-9.776zm41.502-9.774h8.578v8.079l-.398 4.289c1.695-1.496 4.09-3.192 7.48-3.192 5.486 0 7.779 3.99 7.779 10.175v15.36h-8.576V71.474c0-3.192-.8-3.99-2.494-3.99-1.596 0-2.494.698-3.791 1.894v16.359h-8.578zm43.296 19.25c0-1.895-.8-3.59-3.393-3.59-1.896 0-3.492 1.096-3.989 3.59h7.381zm-15.562 2.993c0-8.08 5.884-13.067 11.971-13.067 7.381 0 10.872 5.386 10.872 12.07 0 1.495-.2 2.991-.35 3.59h-14.214c.797 2.993 2.992 3.99 5.785 3.99 1.695 0 3.291-.499 5.087-1.496l2.794 5.087c-2.695 1.894-6.285 2.893-9.078 2.893-7.28 0-12.867-4.788-12.867-13.067zM283.752 60.8h6.983l.599 4.29h.197c1.846-3.392 4.64-4.888 7.084-4.888 1.544 0 2.394.199 3.091.499l-1.396 7.38c-.897-.198-1.695-.398-2.793-.398-1.793 0-3.988 1.098-5.187 4.189v13.865h-8.577V60.8zm34.618 9.476c0-1.895-.798-3.59-3.391-3.59-1.896 0-3.492 1.096-3.99 3.59h7.382zm-15.56 2.993c0-8.08 5.884-13.067 11.97-13.067 7.382 0 10.873 5.386 10.873 12.07 0 1.495-.2 2.991-.351 3.59h-14.213c.797 2.993 2.992 3.99 5.785 3.99 1.695 0 3.29-.499 5.087-1.496l2.794 5.087c-2.695 1.894-6.285 2.893-9.078 2.893-7.28 0-12.867-4.788-12.867-13.067z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/leesa.svg b/website/static/images/users/leesa.svg
index dfc94dcd7..8e131eee6 100644
--- a/website/static/images/users/leesa.svg
+++ b/website/static/images/users/leesa.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 68.97 31.96">
-  <path d="M0 0h3.85v24.26H0zm8.82 17.9a3.91 3.91 0 001.35 2.7 4.22 4.22 0 002.79 1 4.59 4.59 0 002.42-.6 6.72 6.72 0 001.72-1.49l2.76 2.09a7.82 7.82 0 01-3 2.37 8.89 8.89 0 01-3.5.71 9.24 9.24 0 01-3.27-.58 7.85 7.85 0 01-2.66-1.64 7.76 7.76 0 01-1.78-2.55A8.14 8.14 0 015 16.56a8.14 8.14 0 01.66-3.32 7.76 7.76 0 011.78-2.55A7.85 7.85 0 0110.07 9a9.24 9.24 0 013.27-.58 7.49 7.49 0 012.94.58 6.3 6.3 0 012.28 1.62A7.49 7.49 0 0120 13.27a11.1 11.1 0 01.53 3.58v1.05zm7.9-2.9a3.63 3.63 0 00-1.06-2.68 4 4 0 00-2.86-1 3.74 3.74 0 00-2.74 1A4.44 4.44 0 008.82 15zm8.75 2.9a3.91 3.91 0 001.35 2.7 4.22 4.22 0 002.79 1A4.59 4.59 0 0032 21a6.72 6.72 0 001.72-1.49l2.76 2.09a7.82 7.82 0 01-3 2.37 8.89 8.89 0 01-3.5.71 9.24 9.24 0 01-3.27-.58 7.85 7.85 0 01-2.66-1.64 7.76 7.76 0 01-1.78-2.55 8.14 8.14 0 01-.66-3.32 8.14 8.14 0 01.66-3.32 7.76 7.76 0 011.78-2.55A7.85 7.85 0 0126.73 9 9.24 9.24 0 0130 8.47a7.49 7.49 0 012.93.53 6.3 6.3 0 012.28 1.62 7.49 7.49 0 011.48 2.61 11.09 11.09 0 01.53 3.58v1.09zm7.9-2.9a3.63 3.63 0 00-1.06-2.68 4 4 0 00-2.86-1 3.74 3.74 0 00-2.74 1A4.44 4.44 0 0025.47 15zm14.18-1.88a3.52 3.52 0 00-3-1.57 3.22 3.22 0 00-1.51.39 1.31 1.31 0 00-.74 1.25 1.08 1.08 0 00.61 1 6.69 6.69 0 001.54.55l2 .47a7.9 7.9 0 012 .74A4.39 4.39 0 0150 17.33a4.07 4.07 0 01.61 2.37A4.3 4.3 0 0150 22a4.67 4.67 0 01-1.54 1.52 6.84 6.84 0 01-2.13.83 11.22 11.22 0 01-2.37.26 10.2 10.2 0 01-3.3-.51A6.27 6.27 0 0138 22.27l2.57-2.41a7.22 7.22 0 001.59 1.36 3.84 3.84 0 002.07.53 4.13 4.13 0 00.87-.1 2.81 2.81 0 00.83-.32 2 2 0 00.63-.56 1.44 1.44 0 00-.37-2 5.44 5.44 0 00-1.54-.63q-.93-.24-2-.45a7.75 7.75 0 01-2-.67A4.2 4.2 0 0139 15.75a3.85 3.85 0 01-.61-2.31 4.5 4.5 0 01.61-2.23 4.66 4.66 0 011.4-1.56 6 6 0 012-.9 9.08 9.08 0 015.28.25 5 5 0 012.44 1.81zm14.5 9.02H62A5 5 0 0159.84 24a6.65 6.65 0 01-2.82.59 7.5 7.5 0 01-2.07-.29 5.6 5.6 0 01-1.8-.87A4.45 4.45 0 0151.88 22a4.09 4.09 0 01-.48-2 4.65 4.65 0 01.45-2.13 4.38 4.38 0 011.2-1.48 6.1 6.1 0 011.75-.95 12 12 0 012.07-.53 18.39 18.39 0 012.13-.2h3.05v-.42a2.5 2.5 0 00-1-2.17 4.21 4.21 0 00-2.53-.72 6 6 0 00-2.28.43A5.77 5.77 0 0054.41 13l-2-2a7.46 7.46 0 013-1.89 11 11 0 013.55-.58 8.94 8.94 0 012.76.37 6.08 6.08 0 011.86.95 4.2 4.2 0 011.14 1.33 6.2 6.2 0 01.58 1.52 8.39 8.39 0 01.21 1.49v10.13h-3.46zm-.22-4.78H61q-.8 0-1.8.06a9.44 9.44 0 00-1.88.3 4.29 4.29 0 00-1.49.71 1.54 1.54 0 00-.61 1.3 1.64 1.64 0 00.24.91 2.17 2.17 0 00.63.63 2.61 2.61 0 00.87.37 4.2 4.2 0 001 .11 4 4 0 002.94-.95 3.49 3.49 0 00.95-2.58zM0 31.96v-6.18h65.52v6.18h-3.8V29.9H3.77v2.06m62.91-1.13a1.12 1.12 0 01.09-.45 1.15 1.15 0 011.5-.6 1.15 1.15 0 01.37.24 1.13 1.13 0 01.25.36 1.09 1.09 0 01.09.45 1.12 1.12 0 01-.09.45 1.15 1.15 0 01-1.5.6 1.16 1.16 0 01-.36-.24 1.14 1.14 0 01-.25-.36 1.09 1.09 0 01-.1-.45zm.18 0a1 1 0 00.07.38 1 1 0 00.21.31 1 1 0 00.31.2 1 1 0 00.75 0 1 1 0 00.31-.21 1 1 0 00.21-.31 1 1 0 00.07-.39 1 1 0 00-.07-.38.94.94 0 00-.21-.31 1 1 0 00-.68-.28.94.94 0 00-.38.07 1 1 0 00-.31.2.94.94 0 00-.21.31 1 1 0 00-.07.41zm.54-.66h.48a.56.56 0 01.35.09.35.35 0 01.11.29.32.32 0 01-.1.26.46.46 0 01-.25.1l.38.58h-.2l-.36-.57h-.24v.57h-.17zm.18.59h.47a.18.18 0 00.08-.06.22.22 0 000-.12.2.2 0 000-.11.17.17 0 00-.07-.06h-.49z" class="cls-1"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 68.97 31.96"><path d="M0 0h3.85v24.26H0zm8.82 17.9a3.91 3.91 0 001.35 2.7 4.22 4.22 0 002.79 1 4.59 4.59 0 002.42-.6 6.72 6.72 0 001.72-1.49l2.76 2.09a7.82 7.82 0 01-3 2.37 8.89 8.89 0 01-3.5.71 9.24 9.24 0 01-3.27-.58 7.85 7.85 0 01-2.66-1.64 7.76 7.76 0 01-1.78-2.55A8.14 8.14 0 015 16.56a8.14 8.14 0 01.66-3.32 7.76 7.76 0 011.78-2.55A7.85 7.85 0 0110.07 9a9.24 9.24 0 013.27-.58 7.49 7.49 0 012.94.58 6.3 6.3 0 012.28 1.62A7.49 7.49 0 0120 13.27a11.1 11.1 0 01.53 3.58v1.05zm7.9-2.9a3.63 3.63 0 00-1.06-2.68 4 4 0 00-2.86-1 3.74 3.74 0 00-2.74 1A4.44 4.44 0 008.82 15zm8.75 2.9a3.91 3.91 0 001.35 2.7 4.22 4.22 0 002.79 1A4.59 4.59 0 0032 21a6.72 6.72 0 001.72-1.49l2.76 2.09a7.82 7.82 0 01-3 2.37 8.89 8.89 0 01-3.5.71 9.24 9.24 0 01-3.27-.58 7.85 7.85 0 01-2.66-1.64 7.76 7.76 0 01-1.78-2.55 8.14 8.14 0 01-.66-3.32 8.14 8.14 0 01.66-3.32 7.76 7.76 0 011.78-2.55A7.85 7.85 0 0126.73 9 9.24 9.24 0 0130 8.47a7.49 7.49 0 012.93.53 6.3 6.3 0 012.28 1.62 7.49 7.49 0 011.48 2.61 11.09 11.09 0 01.53 3.58v1.09zm7.9-2.9a3.63 3.63 0 00-1.06-2.68 4 4 0 00-2.86-1 3.74 3.74 0 00-2.74 1A4.44 4.44 0 0025.47 15zm14.18-1.88a3.52 3.52 0 00-3-1.57 3.22 3.22 0 00-1.51.39 1.31 1.31 0 00-.74 1.25 1.08 1.08 0 00.61 1 6.69 6.69 0 001.54.55l2 .47a7.9 7.9 0 012 .74A4.39 4.39 0 0150 17.33a4.07 4.07 0 01.61 2.37A4.3 4.3 0 0150 22a4.67 4.67 0 01-1.54 1.52 6.84 6.84 0 01-2.13.83 11.22 11.22 0 01-2.37.26 10.2 10.2 0 01-3.3-.51A6.27 6.27 0 0138 22.27l2.57-2.41a7.22 7.22 0 001.59 1.36 3.84 3.84 0 002.07.53 4.13 4.13 0 00.87-.1 2.81 2.81 0 00.83-.32 2 2 0 00.63-.56 1.44 1.44 0 00-.37-2 5.44 5.44 0 00-1.54-.63q-.93-.24-2-.45a7.75 7.75 0 01-2-.67A4.2 4.2 0 0139 15.75a3.85 3.85 0 01-.61-2.31 4.5 4.5 0 01.61-2.23 4.66 4.66 0 011.4-1.56 6 6 0 012-.9 9.08 9.08 0 015.28.25 5 5 0 012.44 1.81zm14.5 9.02H62A5 5 0 0159.84 24a6.65 6.65 0 01-2.82.59 7.5 7.5 0 01-2.07-.29 5.6 5.6 0 01-1.8-.87A4.45 4.45 0 0151.88 22a4.09 4.09 0 01-.48-2 4.65 4.65 0 01.45-2.13 4.38 4.38 0 011.2-1.48 6.1 6.1 0 011.75-.95 12 12 0 012.07-.53 18.39 18.39 0 012.13-.2h3.05v-.42a2.5 2.5 0 00-1-2.17 4.21 4.21 0 00-2.53-.72 6 6 0 00-2.28.43A5.77 5.77 0 0054.41 13l-2-2a7.46 7.46 0 013-1.89 11 11 0 013.55-.58 8.94 8.94 0 012.76.37 6.08 6.08 0 011.86.95 4.2 4.2 0 011.14 1.33 6.2 6.2 0 01.58 1.52 8.39 8.39 0 01.21 1.49v10.13h-3.46zm-.22-4.78H61q-.8 0-1.8.06a9.44 9.44 0 00-1.88.3 4.29 4.29 0 00-1.49.71 1.54 1.54 0 00-.61 1.3 1.64 1.64 0 00.24.91 2.17 2.17 0 00.63.63 2.61 2.61 0 00.87.37 4.2 4.2 0 001 .11 4 4 0 002.94-.95 3.49 3.49 0 00.95-2.58zM0 31.96v-6.18h65.52v6.18h-3.8V29.9H3.77v2.06m62.91-1.13a1.12 1.12 0 01.09-.45 1.15 1.15 0 011.5-.6 1.15 1.15 0 01.37.24 1.13 1.13 0 01.25.36 1.09 1.09 0 01.09.45 1.12 1.12 0 01-.09.45 1.15 1.15 0 01-1.5.6 1.16 1.16 0 01-.36-.24 1.14 1.14 0 01-.25-.36 1.09 1.09 0 01-.1-.45zm.18 0a1 1 0 00.07.38 1 1 0 00.21.31 1 1 0 00.31.2 1 1 0 00.75 0 1 1 0 00.31-.21 1 1 0 00.21-.31 1 1 0 00.07-.39 1 1 0 00-.07-.38.94.94 0 00-.21-.31 1 1 0 00-.68-.28.94.94 0 00-.38.07 1 1 0 00-.31.2.94.94 0 00-.21.31 1 1 0 00-.07.41zm.54-.66h.48a.56.56 0 01.35.09.35.35 0 01.11.29.32.32 0 01-.1.26.46.46 0 01-.25.1l.38.58h-.2l-.36-.57h-.24v.57h-.17zm.18.59h.47a.18.18 0 00.08-.06.22.22 0 000-.12.2.2 0 000-.11.17.17 0 00-.07-.06h-.49z" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/metric-ai-white.svg b/website/static/images/users/metric-ai-white.svg
index 7aa55e546..1c6c261e3 100644
--- a/website/static/images/users/metric-ai-white.svg
+++ b/website/static/images/users/metric-ai-white.svg
@@ -1,12 +1 @@
-<svg viewBox="0 0 213 40" xmlns="http://www.w3.org/2000/svg">
-  <path d="M145.49 22.24l4.61-2.89a12.26 12.26 0 00-11-6.35 12.71 12.71 0 00-13 13 13 13 0 0024.13 6.6l-4.7-2.85a7.5 7.5 0 110-7.5z" fill="#273844" fill-rule="evenodd"/>
-  <path d="M113 14h6v25h-6z" fill="#273844"/>
-  <path d="M116 8a4 4 0 004-4 4 4 0 10-8 0 4 4 0 004 4zm-17 6h-6v25h6V27a5.84 5.84 0 012.72-5 7.38 7.38 0 015.28-1v-7c-3.39 0-6.8.8-8 4zm-13 0h-6V7l-6 2v5h-4v6h4v10.61C74 37.45 76.8 40 86 39v-5.85c-3.85.2-6 0-6-2.65V20h6zm-58.42-.7a8.43 8.43 0 00-7.43 3.6 7.38 7.38 0 00-6.78-3.6c-3.14 0-5.44 1.1-6.93 3.35V14H0v25h6V25c0-3.65 2.08-5.65 4.6-5.65C14 19.33 15 21 15 24v15h6V25c0-3.65 1.66-5.65 4.6-5.65C29 19.3 30 21 30 24v15h6V23.6c0-6.25-2.69-10.3-8.42-10.3zM66.37 28H47.2a7.54 7.54 0 007.48 5.5A8.38 8.38 0 0061 30.78l4.38 3C63 37.23 59.34 39 54.59 39a13.34 13.34 0 01-9.86-3.69A12.58 12.58 0 0141 26a12.7 12.7 0 013.67-9.26A12.54 12.54 0 0154.09 13a11.7 11.7 0 019 3.74A12.9 12.9 0 0166.62 26a10 10 0 01-.25 2zM47.5 23h13c-.76-3.1-3.31-4.6-6.32-4.6-3.52 0-5.91 1.69-6.68 4.6z" fill="#273844" fill-rule="evenodd"/>
-  <path d="M206 14h6v25h-6z" fill="#0fb191"/>
-  <g fill-rule="evenodd">
-    <path d="M209 8a4 4 0 004-4 4 4 0 10-8 0 4 4 0 004 4zm-16 9v-3h6v25h-6v-3c-2 2.45-5.2 3.65-8.74 3.65a11.51 11.51 0 01-8.68-3.8A13.33 13.33 0 01172 26.5a13.21 13.21 0 013.58-9.35 11.56 11.56 0 018.68-3.85c3.53 0 6.77 1.2 8.74 3.65zm-12.94 14.82a7.33 7.33 0 0012.54-5.32 7.4 7.4 0 00-12.54-5.27A7.11 7.11 0 00178 26.5a7.32 7.32 0 002.06 5.32z" fill="#0fb191"/>
-    <path d="M164.83 38.83a4 4 0 10-5.66 0 4 4 0 005.66 0z" fill="#1ec4c6"/>
-    <path d="M166 4a4 4 0 01-8 0 4 4 0 118 0z" fill="#f7ab59"/>
-    <path d="M162 24a4 4 0 004-4 4 4 0 10-8 0 4 4 0 004 4z" fill="#1ec4c6"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 213 40"><path fill="#273844" fill-rule="evenodd" d="M145.49 22.24l4.61-2.89a12.26 12.26 0 00-11-6.35 12.71 12.71 0 00-13 13 13 13 0 0024.13 6.6l-4.7-2.85a7.5 7.5 0 110-7.5z"/><path fill="#273844" d="M113 14h6v25h-6z"/><path fill="#273844" fill-rule="evenodd" d="M116 8a4 4 0 004-4 4 4 0 10-8 0 4 4 0 004 4zm-17 6h-6v25h6V27a5.84 5.84 0 012.72-5 7.38 7.38 0 015.28-1v-7c-3.39 0-6.8.8-8 4zm-13 0h-6V7l-6 2v5h-4v6h4v10.61C74 37.45 76.8 40 86 39v-5.85c-3.85.2-6 0-6-2.65V20h6zm-58.42-.7a8.43 8.43 0 00-7.43 3.6 7.38 7.38 0 00-6.78-3.6c-3.14 0-5.44 1.1-6.93 3.35V14H0v25h6V25c0-3.65 2.08-5.65 4.6-5.65C14 19.33 15 21 15 24v15h6V25c0-3.65 1.66-5.65 4.6-5.65C29 19.3 30 21 30 24v15h6V23.6c0-6.25-2.69-10.3-8.42-10.3zM66.37 28H47.2a7.54 7.54 0 007.48 5.5A8.38 8.38 0 0061 30.78l4.38 3C63 37.23 59.34 39 54.59 39a13.34 13.34 0 01-9.86-3.69A12.58 12.58 0 0141 26a12.7 12.7 0 013.67-9.26A12.54 12.54 0 0154.09 13a11.7 11.7 0 019 3.74A12.9 12.9 0 0166.62 26a10 10 0 01-.25 2zM47.5 23h13c-.76-3.1-3.31-4.6-6.32-4.6-3.52 0-5.91 1.69-6.68 4.6z"/><path fill="#0fb191" d="M206 14h6v25h-6z"/><g fill-rule="evenodd"><path fill="#0fb191" d="M209 8a4 4 0 004-4 4 4 0 10-8 0 4 4 0 004 4zm-16 9v-3h6v25h-6v-3c-2 2.45-5.2 3.65-8.74 3.65a11.51 11.51 0 01-8.68-3.8A13.33 13.33 0 01172 26.5a13.21 13.21 0 013.58-9.35 11.56 11.56 0 018.68-3.85c3.53 0 6.77 1.2 8.74 3.65zm-12.94 14.82a7.33 7.33 0 0012.54-5.32 7.4 7.4 0 00-12.54-5.27A7.11 7.11 0 00178 26.5a7.32 7.32 0 002.06 5.32z"/><path fill="#1ec4c6" d="M164.83 38.83a4 4 0 10-5.66 0 4 4 0 005.66 0z"/><path fill="#f7ab59" d="M166 4a4 4 0 01-8 0 4 4 0 118 0z"/><path fill="#1ec4c6" d="M162 24a4 4 0 004-4 4 4 0 10-8 0 4 4 0 004 4z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/quip.svg b/website/static/images/users/quip.svg
index b0f73a98f..66d0f2ab7 100644
--- a/website/static/images/users/quip.svg
+++ b/website/static/images/users/quip.svg
@@ -1,8 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 112 35">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#F27557" d="M21.152 13.573a.984.984 0 01-.984.984H5.41a.984.984 0 010-1.968h14.757c.543 0 .984.44.984.984m-3.935 5.41H8.362a.984.984 0 110-1.967h8.855a.984.984 0 010 1.968M8.362 8.162h8.855a.984.984 0 010 1.968H8.362a.984.984 0 110-1.968M20.2 5.686a10.72 10.72 0 00-7.403-2.934c-.232 0-.465.007-.699.021-5.426.337-9.77 4.682-10.107 10.108-.188 3.026.846 5.903 2.912 8.102a10.722 10.722 0 007.887 3.412h10.822V13.573A10.72 10.72 0 0020.2 5.686"/>
-    <path fill="#C34027" d="M23.611 24.395H12.789a10.721 10.721 0 01-7.887-3.412c-2.066-2.199-3.1-5.076-2.912-8.102.336-5.426 4.68-9.771 10.107-10.108.234-.014.468-.021.7-.021a10.72 10.72 0 017.402 2.934 10.72 10.72 0 013.412 7.887v10.822zM21.546 4.252C18.948 1.81 15.55.585 11.975.81 5.561 1.208.424 6.345.025 12.759c-.221 3.573 1.001 6.973 3.444 9.571a12.84 12.84 0 009.32 4.032h11.806c.543 0 .984-.44.984-.983V13.573a12.84 12.84 0 00-4.033-9.32z"/>
-    <path fill="#FEFEFE" d="M17.217 17.016H8.362a.984.984 0 000 1.968h8.855a.984.984 0 000-1.968M8.362 10.13h8.855a.984.984 0 000-1.968H8.362a.984.984 0 000 1.968m-2.951 2.46a.984.984 0 000 1.967h14.757a.984.984 0 000-1.968H5.411z"/>
-    <path fill="#3C3D3F" d="M53.982 13.852c0-4.095-2.777-7.906-7.3-7.906-4.558 0-7.3 3.81-7.3 7.906 0 4.095 2.742 7.905 7.3 7.905 4.523 0 7.3-3.81 7.3-7.905m-1.424 11.715l2.136 2.885-5.056 2.564-2.991-4.06C38.349 26.92 33.47 20.69 33.47 13.852 33.47 7.015 38.384.748 46.68.748c8.262 0 13.177 6.267 13.177 13.104 0 4.985-2.671 9.686-7.3 11.715m27.03-16.416v17.164h-5.448v-2.457c-.962 1.816-2.956 2.885-5.627 2.885-2.207 0-3.881-.749-4.807-1.96-1.069-1.317-1.318-2.99-1.318-5.447V9.15H67.8v8.796c0 2.457.748 4.167 3.027 4.167 2.244 0 3.312-1.71 3.312-4.345V9.151h5.448zm3.919 17.164h5.448V9.151h-5.448v17.164zM86.212 0c1.994 0 3.525 1.53 3.525 3.455 0 1.886-1.531 3.453-3.525 3.453a3.465 3.465 0 01-3.49-3.453C82.722 1.53 84.254 0 86.212 0zM98.32 17.734c0 2.385 1.637 4.38 4.13 4.38 2.421 0 4.06-1.995 4.06-4.38 0-2.386-1.639-4.38-4.06-4.38-2.493 0-4.13 1.994-4.13 4.38zm0-6.125c.818-1.567 3.026-2.885 5.27-2.885 4.949 0 8.368 3.882 8.368 9.01 0 5.127-3.42 9.009-8.369 9.009-2.243 0-4.45-1.318-5.27-2.885v10.22h-5.448V9.152h5.448v2.457z"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 112 35"><g fill="none" fill-rule="evenodd"><path fill="#F27557" d="M21.152 13.573a.984.984 0 01-.984.984H5.41a.984.984 0 010-1.968h14.757c.543 0 .984.44.984.984m-3.935 5.41H8.362a.984.984 0 110-1.967h8.855a.984.984 0 010 1.968M8.362 8.162h8.855a.984.984 0 010 1.968H8.362a.984.984 0 110-1.968M20.2 5.686a10.72 10.72 0 00-7.403-2.934c-.232 0-.465.007-.699.021-5.426.337-9.77 4.682-10.107 10.108-.188 3.026.846 5.903 2.912 8.102a10.722 10.722 0 007.887 3.412h10.822V13.573A10.72 10.72 0 0020.2 5.686"/><path fill="#C34027" d="M23.611 24.395H12.789a10.721 10.721 0 01-7.887-3.412c-2.066-2.199-3.1-5.076-2.912-8.102.336-5.426 4.68-9.771 10.107-10.108.234-.014.468-.021.7-.021a10.72 10.72 0 017.402 2.934 10.72 10.72 0 013.412 7.887v10.822zM21.546 4.252C18.948 1.81 15.55.585 11.975.81 5.561 1.208.424 6.345.025 12.759c-.221 3.573 1.001 6.973 3.444 9.571a12.84 12.84 0 009.32 4.032h11.806c.543 0 .984-.44.984-.983V13.573a12.84 12.84 0 00-4.033-9.32z"/><path fill="#FEFEFE" d="M17.217 17.016H8.362a.984.984 0 000 1.968h8.855a.984.984 0 000-1.968M8.362 10.13h8.855a.984.984 0 000-1.968H8.362a.984.984 0 000 1.968m-2.951 2.46a.984.984 0 000 1.967h14.757a.984.984 0 000-1.968H5.411z"/><path fill="#3C3D3F" d="M53.982 13.852c0-4.095-2.777-7.906-7.3-7.906-4.558 0-7.3 3.81-7.3 7.906 0 4.095 2.742 7.905 7.3 7.905 4.523 0 7.3-3.81 7.3-7.905m-1.424 11.715l2.136 2.885-5.056 2.564-2.991-4.06C38.349 26.92 33.47 20.69 33.47 13.852 33.47 7.015 38.384.748 46.68.748c8.262 0 13.177 6.267 13.177 13.104 0 4.985-2.671 9.686-7.3 11.715m27.03-16.416v17.164h-5.448v-2.457c-.962 1.816-2.956 2.885-5.627 2.885-2.207 0-3.881-.749-4.807-1.96-1.069-1.317-1.318-2.99-1.318-5.447V9.15H67.8v8.796c0 2.457.748 4.167 3.027 4.167 2.244 0 3.312-1.71 3.312-4.345V9.151h5.448zm3.919 17.164h5.448V9.151h-5.448v17.164zM86.212 0c1.994 0 3.525 1.53 3.525 3.455 0 1.886-1.531 3.453-3.525 3.453a3.465 3.465 0 01-3.49-3.453C82.722 1.53 84.254 0 86.212 0zM98.32 17.734c0 2.385 1.637 4.38 4.13 4.38 2.421 0 4.06-1.995 4.06-4.38 0-2.386-1.639-4.38-4.06-4.38-2.493 0-4.13 1.994-4.13 4.38zm0-6.125c.818-1.567 3.026-2.885 5.27-2.885 4.949 0 8.368 3.882 8.368 9.01 0 5.127-3.42 9.009-8.369 9.009-2.243 0-4.45-1.318-5.27-2.885v10.22h-5.448V9.152h5.448v2.457z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/researchanddesign.svg b/website/static/images/users/researchanddesign.svg
index 47d10f9f2..14d459691 100644
--- a/website/static/images/users/researchanddesign.svg
+++ b/website/static/images/users/researchanddesign.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1030.1" height="386.21">
-	<path fill="#1eb152" d="M22.56 76.74h16.86c18.55 0 32.25-6.75 32.25-22.76 0-14.13-11.38-23.62-28.24-23.62H22.56v46.38zm21.92-66.19c22.98 0 51.22 12.02 51.22 42.79 0 24.66-17.28 37.31-35 41.53l46.38 63.23H78.85L35.42 96.55H22.56v61.55H0V10.55h44.48zM165.9 67.04c-16.44 0-26.55 11.6-30.36 26.57h56.92c-.83-14.55-11.59-26.57-26.56-26.57m.63 75.26c14.13 0 24.46-5.28 30.99-16.86l15.17 9.91c-10.96 17.28-25.29 25.29-47.22 25.29-33.52 0-53.12-24.24-53.12-55.65 0-31.83 23.18-56.07 53.12-56.07 28.68 0 49.55 21.07 49.55 49.53 0 3.8-.43 8.65-1.06 11.8h-79.69c1.49 17.5 13.29 32.05 32.26 32.05M289.83 74.84c-4.85-4.43-13.49-8.23-21.09-8.23-8.64 0-14.54 5.06-14.54 12.65 0 7.81 9.69 11.6 19.6 15.6 13.91 5.48 31.2 13.07 31.2 32.03 0 23.83-18.96 33.73-39.21 33.73-15.17 0-29.08-5.9-38.37-17.07l14.33-12.44c7.39 7.59 14.76 11.6 23.83 11.6 9.27 0 17.7-4.64 17.7-14.55 0-8.23-9.69-12.02-20.23-16.23-13.91-5.7-29.73-12.03-29.73-30.99 0-21.72 17.08-32.05 35.42-32.05 12.65 0 24.87 4.22 33.73 12.23l-12.64 13.72zM375.98 67.04c-16.44 0-26.55 11.6-30.36 26.57h56.92c-.83-14.55-11.59-26.57-26.56-26.57m.64 75.26c14.13 0 24.46-5.28 30.99-16.86l15.17 9.91c-10.96 17.28-25.29 25.29-47.22 25.29-33.52 0-53.12-24.24-53.12-55.65 0-31.83 23.18-56.07 53.12-56.07 28.66 0 49.53 21.07 49.53 49.53 0 3.8-.42 8.65-1.04 11.8h-79.69c1.48 17.5 13.28 32.05 32.26 32.05M509.09 110.04c-7.38-1.46-12.86-1.89-18.12-1.89-12.44 0-28.66 3.38-28.66 18.55 0 12.02 9.27 16.66 19.81 16.66 10.33 0 18.97-5.06 26.97-11.81v-21.51zm1.69 48.07l-.64-10.75c-8.22 9.49-18.12 13.28-31.2 13.28-19.81 0-37.95-10.12-37.95-32.89 0-26.77 24.04-35.2 47.22-35.2 5.48 0 12.23.62 20.87 2.31v-3.15c0-15.6-7.16-24.67-24.24-24.67-12.22 0-24.66 4.64-33.51 9.49l-6.12-17.5c11.59-5.48 28.03-10.12 43-10.12 30.57 0 42.59 16.88 42.59 44.48v64.72h-20.02zM580.69 68.85c6.32-11.18 15.81-19.18 26.99-19.18 4.63 0 8.22.42 12.22 1.46l-4.43 21.92c-3.17-1.68-6.12-2.31-10.12-2.31-10.33 0-18.34 6.12-24.24 16.44v71.67H559.4V52.19h20.65l.64 16.66zM716.73 149.47c-8.43 7.16-20.67 11.17-33.94 11.17-30.78 0-54.6-22.34-54.6-55.85 0-31.21 24.04-55.87 55.43-55.87 12.23 0 22.98 3.59 32.05 10.12L705.13 76.1c-6.1-4.63-13.7-7.58-21.5-7.58-18.54 0-33.31 16.23-33.31 36.26 0 21.71 15.6 36.26 33.31 36.26 7.17 0 16.24-2.95 22.14-7.59l10.96 16.02zM762.19 67.88c8.01-12.02 20.65-18.97 34.15-18.97 14.13 0 24.04 5.06 30.36 13.49 7.38 10.12 9.49 24.24 9.49 40.26v55.45h-21.71v-53.55c0-9.69-.42-20.45-5.06-27.83-3.17-5.06-8.85-8.22-17.5-8.22-11.38 0-22.76 7.8-29.72 18.96v70.63h-21.71V0h21.71v67.88zM36.9 211.33H22.56v107.93h6.1c40.28 0 67.46-13.07 67.46-52.7.01-36.03-21.91-55.23-59.22-55.23M0 191.52h40.48c37.73 0 79.69 19.81 79.69 73.15 0 54.6-41.53 74.42-81.58 74.42H0V191.52zM187.94 247.96c-16.44 0-26.55 11.6-30.36 26.57h56.92c-.84-14.55-11.59-26.57-26.56-26.57m.63 75.26c14.13 0 24.46-5.26 30.99-16.86l15.17 9.91c-10.96 17.28-25.29 25.29-47.22 25.29-33.52 0-53.12-24.24-53.12-55.65 0-31.83 23.18-56.07 53.12-56.07 28.68 0 49.53 21.07 49.53 49.53 0 3.8-.42 8.65-1.04 11.8h-79.69c1.49 17.5 13.29 32.05 32.26 32.05M309.92 255.76c-4.85-4.43-13.49-8.23-21.09-8.23-8.64 0-14.55 5.06-14.55 12.65 0 7.8 9.7 11.6 19.61 15.6 13.91 5.48 31.2 13.07 31.2 32.03 0 23.82-18.96 33.74-39.21 33.74-15.17 0-29.08-5.91-38.37-17.08l14.33-12.44c7.39 7.59 14.76 11.6 23.82 11.6 9.28 0 17.72-4.64 17.72-14.55 0-8.23-9.69-12.02-20.23-16.24-13.91-5.68-29.73-12.01-29.73-30.98 0-21.72 17.08-32.05 35.42-32.05 12.65 0 24.87 4.22 33.73 12.22l-12.65 13.73zM370.27 198.34c0 7.27-5.89 13.16-13.15 13.16-7.27 0-13.16-5.89-13.16-13.16 0-7.26 5.89-13.16 13.16-13.16 7.26 0 13.15 5.9 13.15 13.16m-24.01 33.98h21.71V339h-21.71V232.32zM478.11 264.78c-7.17-10.12-18.97-15.39-29.52-15.39-23.18 0-34.15 17.7-34.15 35.2 0 18.97 12.86 34.78 33.73 34.78 10.96 0 24.46-6.32 29.94-18.97v-35.62zm-33.53 74.21c-30.14 0-52.28-23.62-52.28-54.81 0-28.66 21.09-54.38 52.7-54.38 12.23 0 25.29 5.26 33.73 14.54l.43-12.02h20.65v100.97c0 11.18-1.89 20.45-5.9 28.04-9.49 17.92-28.04 24.87-47.85 24.87-16.44 0-34.36-4.85-47.85-14.33l8.43-18.34c10.34 7.58 26.15 13.07 38.79 13.07 17.5 0 32.68-8.65 32.68-30.15v-13.7c-7.6 10.76-21.31 16.24-33.53 16.24M547.37 232.32l.64 16.86c8-12.44 20.87-19.39 34.57-19.39 14.13 0 24.04 5.06 30.36 13.49 7.38 10.12 9.49 24.24 9.49 40.26v55.45H600.7v-53.55c0-9.69-.42-20.45-5.06-27.83-3.17-5.06-8.85-8.22-17.5-8.22-11.38 0-22.76 7.8-29.72 18.97v70.62H526.7V232.32h20.67zM939.75 141.24c-16.23 0-29.94-12.02-29.94-27.19 0-11.6 6.54-20.87 16.44-25.73l4.01 3.59 21.92 19.61 16.66 14.97c-6.74 9.49-16.65 14.75-29.09 14.75m56.8-16.29l21.58-23.62-14.64-12.73-21.4 23.4-17.04-15.24-22.13-19.61c-14.13-12.64-22.56-20.87-22.56-31.61 0-10.76 8.85-18.13 20.03-18.13 10.12 0 17.5 4.85 19.81 14.13l.15-.05h20.5c.14-2.16-.62-5.65-.62-5.65-4.85-17.5-20.23-27.83-39-27.83-20.87 0-42.37 14.75-42.37 36.68 0 12.02 5.7 21.5 13.71 30.36-14.75 8.01-24.46 22.34-24.46 39.42 0 24.66 23.18 46.16 49.75 46.16 17.92 0 34.58-6.54 45.54-21.29l17.5 15.69 29.2-.06-33.55-30.02z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1030.1" height="386.21"><path fill="#1eb152" d="M22.56 76.74h16.86c18.55 0 32.25-6.75 32.25-22.76 0-14.13-11.38-23.62-28.24-23.62H22.56v46.38zm21.92-66.19c22.98 0 51.22 12.02 51.22 42.79 0 24.66-17.28 37.31-35 41.53l46.38 63.23H78.85L35.42 96.55H22.56v61.55H0V10.55h44.48zM165.9 67.04c-16.44 0-26.55 11.6-30.36 26.57h56.92c-.83-14.55-11.59-26.57-26.56-26.57m.63 75.26c14.13 0 24.46-5.28 30.99-16.86l15.17 9.91c-10.96 17.28-25.29 25.29-47.22 25.29-33.52 0-53.12-24.24-53.12-55.65 0-31.83 23.18-56.07 53.12-56.07 28.68 0 49.55 21.07 49.55 49.53 0 3.8-.43 8.65-1.06 11.8h-79.69c1.49 17.5 13.29 32.05 32.26 32.05M289.83 74.84c-4.85-4.43-13.49-8.23-21.09-8.23-8.64 0-14.54 5.06-14.54 12.65 0 7.81 9.69 11.6 19.6 15.6 13.91 5.48 31.2 13.07 31.2 32.03 0 23.83-18.96 33.73-39.21 33.73-15.17 0-29.08-5.9-38.37-17.07l14.33-12.44c7.39 7.59 14.76 11.6 23.83 11.6 9.27 0 17.7-4.64 17.7-14.55 0-8.23-9.69-12.02-20.23-16.23-13.91-5.7-29.73-12.03-29.73-30.99 0-21.72 17.08-32.05 35.42-32.05 12.65 0 24.87 4.22 33.73 12.23l-12.64 13.72zM375.98 67.04c-16.44 0-26.55 11.6-30.36 26.57h56.92c-.83-14.55-11.59-26.57-26.56-26.57m.64 75.26c14.13 0 24.46-5.28 30.99-16.86l15.17 9.91c-10.96 17.28-25.29 25.29-47.22 25.29-33.52 0-53.12-24.24-53.12-55.65 0-31.83 23.18-56.07 53.12-56.07 28.66 0 49.53 21.07 49.53 49.53 0 3.8-.42 8.65-1.04 11.8h-79.69c1.48 17.5 13.28 32.05 32.26 32.05M509.09 110.04c-7.38-1.46-12.86-1.89-18.12-1.89-12.44 0-28.66 3.38-28.66 18.55 0 12.02 9.27 16.66 19.81 16.66 10.33 0 18.97-5.06 26.97-11.81v-21.51zm1.69 48.07l-.64-10.75c-8.22 9.49-18.12 13.28-31.2 13.28-19.81 0-37.95-10.12-37.95-32.89 0-26.77 24.04-35.2 47.22-35.2 5.48 0 12.23.62 20.87 2.31v-3.15c0-15.6-7.16-24.67-24.24-24.67-12.22 0-24.66 4.64-33.51 9.49l-6.12-17.5c11.59-5.48 28.03-10.12 43-10.12 30.57 0 42.59 16.88 42.59 44.48v64.72h-20.02zM580.69 68.85c6.32-11.18 15.81-19.18 26.99-19.18 4.63 0 8.22.42 12.22 1.46l-4.43 21.92c-3.17-1.68-6.12-2.31-10.12-2.31-10.33 0-18.34 6.12-24.24 16.44v71.67H559.4V52.19h20.65l.64 16.66zM716.73 149.47c-8.43 7.16-20.67 11.17-33.94 11.17-30.78 0-54.6-22.34-54.6-55.85 0-31.21 24.04-55.87 55.43-55.87 12.23 0 22.98 3.59 32.05 10.12L705.13 76.1c-6.1-4.63-13.7-7.58-21.5-7.58-18.54 0-33.31 16.23-33.31 36.26 0 21.71 15.6 36.26 33.31 36.26 7.17 0 16.24-2.95 22.14-7.59l10.96 16.02zM762.19 67.88c8.01-12.02 20.65-18.97 34.15-18.97 14.13 0 24.04 5.06 30.36 13.49 7.38 10.12 9.49 24.24 9.49 40.26v55.45h-21.71v-53.55c0-9.69-.42-20.45-5.06-27.83-3.17-5.06-8.85-8.22-17.5-8.22-11.38 0-22.76 7.8-29.72 18.96v70.63h-21.71V0h21.71v67.88zM36.9 211.33H22.56v107.93h6.1c40.28 0 67.46-13.07 67.46-52.7.01-36.03-21.91-55.23-59.22-55.23M0 191.52h40.48c37.73 0 79.69 19.81 79.69 73.15 0 54.6-41.53 74.42-81.58 74.42H0V191.52zM187.94 247.96c-16.44 0-26.55 11.6-30.36 26.57h56.92c-.84-14.55-11.59-26.57-26.56-26.57m.63 75.26c14.13 0 24.46-5.26 30.99-16.86l15.17 9.91c-10.96 17.28-25.29 25.29-47.22 25.29-33.52 0-53.12-24.24-53.12-55.65 0-31.83 23.18-56.07 53.12-56.07 28.68 0 49.53 21.07 49.53 49.53 0 3.8-.42 8.65-1.04 11.8h-79.69c1.49 17.5 13.29 32.05 32.26 32.05M309.92 255.76c-4.85-4.43-13.49-8.23-21.09-8.23-8.64 0-14.55 5.06-14.55 12.65 0 7.8 9.7 11.6 19.61 15.6 13.91 5.48 31.2 13.07 31.2 32.03 0 23.82-18.96 33.74-39.21 33.74-15.17 0-29.08-5.91-38.37-17.08l14.33-12.44c7.39 7.59 14.76 11.6 23.82 11.6 9.28 0 17.72-4.64 17.72-14.55 0-8.23-9.69-12.02-20.23-16.24-13.91-5.68-29.73-12.01-29.73-30.98 0-21.72 17.08-32.05 35.42-32.05 12.65 0 24.87 4.22 33.73 12.22l-12.65 13.73zM370.27 198.34c0 7.27-5.89 13.16-13.15 13.16-7.27 0-13.16-5.89-13.16-13.16 0-7.26 5.89-13.16 13.16-13.16 7.26 0 13.15 5.9 13.15 13.16m-24.01 33.98h21.71V339h-21.71V232.32zM478.11 264.78c-7.17-10.12-18.97-15.39-29.52-15.39-23.18 0-34.15 17.7-34.15 35.2 0 18.97 12.86 34.78 33.73 34.78 10.96 0 24.46-6.32 29.94-18.97v-35.62zm-33.53 74.21c-30.14 0-52.28-23.62-52.28-54.81 0-28.66 21.09-54.38 52.7-54.38 12.23 0 25.29 5.26 33.73 14.54l.43-12.02h20.65v100.97c0 11.18-1.89 20.45-5.9 28.04-9.49 17.92-28.04 24.87-47.85 24.87-16.44 0-34.36-4.85-47.85-14.33l8.43-18.34c10.34 7.58 26.15 13.07 38.79 13.07 17.5 0 32.68-8.65 32.68-30.15v-13.7c-7.6 10.76-21.31 16.24-33.53 16.24M547.37 232.32l.64 16.86c8-12.44 20.87-19.39 34.57-19.39 14.13 0 24.04 5.06 30.36 13.49 7.38 10.12 9.49 24.24 9.49 40.26v55.45H600.7v-53.55c0-9.69-.42-20.45-5.06-27.83-3.17-5.06-8.85-8.22-17.5-8.22-11.38 0-22.76 7.8-29.72 18.97v70.62H526.7V232.32h20.67zM939.75 141.24c-16.23 0-29.94-12.02-29.94-27.19 0-11.6 6.54-20.87 16.44-25.73l4.01 3.59 21.92 19.61 16.66 14.97c-6.74 9.49-16.65 14.75-29.09 14.75m56.8-16.29l21.58-23.62-14.64-12.73-21.4 23.4-17.04-15.24-22.13-19.61c-14.13-12.64-22.56-20.87-22.56-31.61 0-10.76 8.85-18.13 20.03-18.13 10.12 0 17.5 4.85 19.81 14.13l.15-.05h20.5c.14-2.16-.62-5.65-.62-5.65-4.85-17.5-20.23-27.83-39-27.83-20.87 0-42.37 14.75-42.37 36.68 0 12.02 5.7 21.5 13.71 30.36-14.75 8.01-24.46 22.34-24.46 39.42 0 24.66 23.18 46.16 49.75 46.16 17.92 0 34.58-6.54 45.54-21.29l17.5 15.69 29.2-.06-33.55-30.02z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/salesforce.svg b/website/static/images/users/salesforce.svg
index f4e92d42a..3e22911bf 100644
--- a/website/static/images/users/salesforce.svg
+++ b/website/static/images/users/salesforce.svg
@@ -1,9 +1 @@
-<svg viewBox="0 0 115 80" xmlns="http://www.w3.org/2000/svg">
-  <g fill="none" fill-rule="evenodd">
-    <path d="M47.931 8.782c3.704-3.835 8.86-6.214 14.562-6.214 7.58 0 14.194 4.201 17.716 10.438a24.607 24.607 0 0110.013-2.115c13.672 0 24.757 11.113 24.757 24.822 0 13.71-11.085 24.824-24.757 24.824-1.668 0-3.3-.166-4.876-.483a18.11 18.11 0 01-15.796 9.214c-2.84 0-5.526-.652-7.917-1.811a20.653 20.653 0 01-19.007 12.505A20.65 20.65 0 0123.25 66.528a19.051 19.051 0 01-3.94.408C8.726 66.936.145 58.32.145 47.686a19.258 19.258 0 019.584-16.674 21.922 21.922 0 01-1.835-8.804C7.893 9.98 17.88.068 30.197.068c7.232 0 13.66 3.418 17.734 8.714" fill="#00A1E0" fill-rule="nonzero"/>
-    <path d="M17.16 41.522c-.07.19.026.229.048.261.211.158.426.271.642.398 1.145.624 2.227.806 3.358.806 2.304 0 3.734-1.258 3.734-3.282v-.04c0-1.871-1.614-2.55-3.13-3.042l-.196-.065c-1.142-.381-2.128-.71-2.128-1.481v-.041c0-.66.576-1.146 1.469-1.146.992 0 2.17.338 2.928.768 0 0 .222.148.304-.074.045-.118.429-1.179.469-1.294.043-.124-.034-.216-.112-.266-.866-.54-2.063-.91-3.301-.91l-.23.003c-2.11 0-3.581 1.306-3.581 3.18v.04c0 1.974 1.624 2.614 3.145 3.061l.245.077c1.109.35 2.064.65 2.064 1.452v.039c0 .732-.62 1.277-1.622 1.277a5.341 5.341 0 01-2.968-.876c-.162-.097-.256-.168-.381-.245-.066-.043-.23-.117-.303.107l-.454 1.293zm34 0c-.07.19.026.229.048.261.211.158.426.271.642.398 1.145.624 2.227.806 3.358.806 2.304 0 3.734-1.258 3.734-3.282v-.04c0-1.871-1.614-2.55-3.13-3.042l-.196-.065c-1.142-.381-2.128-.71-2.128-1.481v-.041c0-.66.576-1.146 1.469-1.146.992 0 2.17.338 2.928.768 0 0 .222.148.304-.074.045-.118.429-1.179.469-1.294.043-.124-.034-.216-.112-.266-.866-.54-2.063-.91-3.301-.91l-.23.003c-2.11 0-3.581 1.306-3.581 3.18v.04c0 1.974 1.624 2.614 3.145 3.061l.245.077c1.109.35 2.066.65 2.066 1.452v.039c0 .732-.623 1.277-1.624 1.277a5.341 5.341 0 01-2.968-.876c-.162-.097-.258-.165-.38-.245-.041-.028-.236-.105-.304.107l-.454 1.293zM74.627 37.5c0 1.162-.22 2.077-.654 2.723-.429.64-1.078.952-1.983.952-.907 0-1.553-.31-1.975-.952-.427-.645-.644-1.561-.644-2.723 0-1.16.217-2.073.644-2.713.422-.634 1.068-.942 1.975-.942.905 0 1.554.308 1.985.942.432.64.652 1.553.652 2.713m2.037-2.153a4.795 4.795 0 00-.927-1.74 4.474 4.474 0 00-1.564-1.17c-.622-.285-1.358-.43-2.183-.43-.827 0-1.563.145-2.185.43-.624.286-1.15.68-1.566 1.17a4.874 4.874 0 00-.927 1.74 7.498 7.498 0 00-.298 2.153c0 .768.1 1.493.298 2.153.202.664.512 1.25.929 1.74.415.49.942.882 1.564 1.16.624.279 1.358.42 2.185.42.825 0 1.56-.141 2.183-.42a4.366 4.366 0 001.564-1.16 4.795 4.795 0 00.927-1.74c.2-.661.3-1.386.3-2.153 0-.767-.1-1.492-.3-2.153" fill="#FFF" fill-rule="nonzero"/>
-    <path d="M92.373 40.866c-.063-.192-.24-.12-.24-.12a4.21 4.21 0 01-.877.263c-.316.05-.662.077-1.034.077-.913 0-1.638-.284-2.157-.846-.52-.561-.812-1.47-.81-2.697.004-1.118.261-1.959.724-2.6.46-.636 1.159-.963 2.092-.963.778 0 1.371.094 1.993.299 0 0 .149.067.22-.136.164-.48.286-.823.462-1.35.05-.15-.072-.213-.116-.232a7.087 7.087 0 00-1.258-.331 9.024 9.024 0 00-1.415-.1c-.792 0-1.498.14-2.102.423a4.368 4.368 0 00-1.519 1.151 4.963 4.963 0 00-.917 1.714 7.118 7.118 0 00-.308 2.125c0 1.637.422 2.96 1.255 3.928.835.972 2.088 1.467 3.723 1.467.966 0 1.957-.206 2.67-.5 0 0 .136-.068.076-.234l-.462-1.338zm3.955-4.433c.088-.636.254-1.164.51-1.576.386-.626.976-.969 1.805-.969.828 0 1.376.345 1.769.969.26.412.374.963.419 1.576h-4.503zm6.28-1.397a4.22 4.22 0 00-.809-1.563c-.407-.463-.804-.787-1.198-.967a4.4 4.4 0 00-1.81-.388c-.788 0-1.503.14-2.083.429a4.182 4.182 0 00-1.454 1.174 4.915 4.915 0 00-.855 1.733 7.905 7.905 0 00-.278 2.133c0 .77.096 1.487.287 2.133.193.65.5 1.223.916 1.697.414.478.948.852 1.587 1.113.635.26 1.406.394 2.292.393 1.823-.007 2.784-.437 3.18-.668.07-.041.136-.114.052-.32l-.413-1.224c-.062-.182-.237-.115-.237-.115-.452.178-1.094.496-2.591.493-.98-.002-1.706-.307-2.16-.785-.467-.49-.696-1.208-.736-2.223l6.314.007s.166-.004.183-.174c.006-.073.217-1.373-.188-2.878zm-59.28 1.397c.09-.636.254-1.164.51-1.576.386-.626.976-.969 1.805-.969.828 0 1.376.345 1.77.969.26.412.373.963.418 1.576h-4.503zm6.278-1.397a4.22 4.22 0 00-.807-1.563c-.407-.463-.804-.787-1.198-.967a4.4 4.4 0 00-1.81-.388c-.786 0-1.503.14-2.083.429a4.182 4.182 0 00-1.454 1.174 4.915 4.915 0 00-.855 1.733 7.967 7.967 0 00-.278 2.133c0 .77.096 1.487.287 2.133.193.65.5 1.223.916 1.697.414.478.948.852 1.587 1.113.635.26 1.406.394 2.292.393 1.823-.007 2.784-.437 3.18-.668.07-.041.136-.114.052-.32l-.411-1.224c-.064-.182-.239-.115-.239-.115-.452.178-1.092.496-2.593.493-.978-.002-1.704-.307-2.158-.785-.467-.49-.696-1.208-.736-2.223l6.314.007s.166-.004.183-.174c.006-.073.217-1.373-.19-2.878z" fill="#FFF"/>
-    <path d="M28.887 40.833c-.27-.211-.308-.265-.4-.401-.135-.209-.205-.505-.205-.882 0-.597.2-1.025.617-1.313-.005.001.594-.509 2.003-.49.99.013 1.875.156 1.875.156v3.084h.002s-.878.185-1.866.243c-1.406.083-2.031-.398-2.026-.397m2.749-4.765a15.64 15.64 0 00-1.078-.031 6.67 6.67 0 00-1.702.215 4.475 4.475 0 00-1.443.656 3.29 3.29 0 00-1.002 1.119c-.245.446-.369.973-.369 1.563 0 .6.106 1.122.316 1.548.21.429.515.785.902 1.06.384.275.858.477 1.408.599a8.403 8.403 0 001.829.183c.708 0 1.414-.057 2.098-.172a43.27 43.27 0 001.741-.33c.23-.053.484-.121.484-.121.172-.042.158-.222.158-.222l-.003-6.202c0-1.36-.37-2.368-1.1-2.993-.724-.623-1.792-.938-3.173-.938-.518 0-1.352.07-1.85.168 0 0-1.51.287-2.132.763 0 0-.136.084-.061.27l.489 1.29c.061.167.226.11.226.11s.052-.02.114-.055c1.33-.71 3.01-.688 3.01-.688.747 0 1.321.147 1.709.438.377.284.568.712.568 1.615v.287a25.492 25.492 0 00-1.139-.132" fill="#FFF" fill-rule="nonzero"/>
-    <path d="M84.846 32.508c.048-.156-.052-.23-.094-.247-.106-.046-.638-.17-1.049-.198-.786-.053-1.223.093-1.614.286-.387.193-.818.504-1.058.858v-.838c0-.117-.076-.21-.18-.21h-1.605c-.104 0-.18.093-.18.21v10.27c0 .116.086.21.19.21h1.646c.104 0 .189-.094.189-.21v-5.13c0-.69.069-1.376.207-1.808.136-.426.32-.768.548-1.014.23-.243.49-.414.774-.51.29-.099.612-.131.84-.131.328 0 .688.093.688.093.12.015.187-.066.227-.186.108-.315.413-1.257.471-1.445M68.833 28.33a5.869 5.869 0 00-.67-.158c-.26-.046-.57-.07-.921-.07-1.227 0-2.194.344-2.872 1.022-.675.674-1.133 1.7-1.363 3.051l-.084.455h-1.54s-.186-.007-.226.195l-.252 1.4c-.018.132.04.216.22.216h1.498l-1.52 8.417c-.118.678-.255 1.235-.406 1.658-.149.416-.294.729-.474.957-.173.218-.336.38-.62.474a2.542 2.542 0 01-.798.114 3.02 3.02 0 01-.543-.06 1.616 1.616 0 01-.367-.117s-.175-.066-.245.108a226.95 226.95 0 00-.503 1.367c-.047.134.02.238.105.27.2.069.348.115.62.18.376.087.695.092.993.092.623 0 1.193-.088 1.665-.256.473-.17.887-.466 1.253-.866.395-.434.644-.886.88-1.506.235-.612.437-1.372.597-2.258l1.528-8.574h2.234s.188.007.226-.196l.254-1.399c.016-.134-.04-.216-.222-.216h-2.168c.011-.048.11-.805.358-1.518.107-.302.307-.548.475-.717a1.42 1.42 0 01.568-.35c.215-.07.46-.103.729-.103.203 0 .405.023.556.055.21.044.292.067.347.084.222.066.252.002.295-.104l.518-1.412c.054-.152-.078-.216-.125-.234M39 42.67c0 .112-.07.203-.167.203H37.29c-.097 0-.165-.09-.165-.203V28.356c0-.112.068-.203.165-.203h1.542c.097 0 .167.091.167.203V42.67z" fill="#FFF"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 115 80"><g fill="none" fill-rule="evenodd"><path fill="#00A1E0" fill-rule="nonzero" d="M47.931 8.782c3.704-3.835 8.86-6.214 14.562-6.214 7.58 0 14.194 4.201 17.716 10.438a24.607 24.607 0 0110.013-2.115c13.672 0 24.757 11.113 24.757 24.822 0 13.71-11.085 24.824-24.757 24.824-1.668 0-3.3-.166-4.876-.483a18.11 18.11 0 01-15.796 9.214c-2.84 0-5.526-.652-7.917-1.811a20.653 20.653 0 01-19.007 12.505A20.65 20.65 0 0123.25 66.528a19.051 19.051 0 01-3.94.408C8.726 66.936.145 58.32.145 47.686a19.258 19.258 0 019.584-16.674 21.922 21.922 0 01-1.835-8.804C7.893 9.98 17.88.068 30.197.068c7.232 0 13.66 3.418 17.734 8.714"/><path fill="#FFF" fill-rule="nonzero" d="M17.16 41.522c-.07.19.026.229.048.261.211.158.426.271.642.398 1.145.624 2.227.806 3.358.806 2.304 0 3.734-1.258 3.734-3.282v-.04c0-1.871-1.614-2.55-3.13-3.042l-.196-.065c-1.142-.381-2.128-.71-2.128-1.481v-.041c0-.66.576-1.146 1.469-1.146.992 0 2.17.338 2.928.768 0 0 .222.148.304-.074.045-.118.429-1.179.469-1.294.043-.124-.034-.216-.112-.266-.866-.54-2.063-.91-3.301-.91l-.23.003c-2.11 0-3.581 1.306-3.581 3.18v.04c0 1.974 1.624 2.614 3.145 3.061l.245.077c1.109.35 2.064.65 2.064 1.452v.039c0 .732-.62 1.277-1.622 1.277a5.341 5.341 0 01-2.968-.876c-.162-.097-.256-.168-.381-.245-.066-.043-.23-.117-.303.107l-.454 1.293zm34 0c-.07.19.026.229.048.261.211.158.426.271.642.398 1.145.624 2.227.806 3.358.806 2.304 0 3.734-1.258 3.734-3.282v-.04c0-1.871-1.614-2.55-3.13-3.042l-.196-.065c-1.142-.381-2.128-.71-2.128-1.481v-.041c0-.66.576-1.146 1.469-1.146.992 0 2.17.338 2.928.768 0 0 .222.148.304-.074.045-.118.429-1.179.469-1.294.043-.124-.034-.216-.112-.266-.866-.54-2.063-.91-3.301-.91l-.23.003c-2.11 0-3.581 1.306-3.581 3.18v.04c0 1.974 1.624 2.614 3.145 3.061l.245.077c1.109.35 2.066.65 2.066 1.452v.039c0 .732-.623 1.277-1.624 1.277a5.341 5.341 0 01-2.968-.876c-.162-.097-.258-.165-.38-.245-.041-.028-.236-.105-.304.107l-.454 1.293zM74.627 37.5c0 1.162-.22 2.077-.654 2.723-.429.64-1.078.952-1.983.952-.907 0-1.553-.31-1.975-.952-.427-.645-.644-1.561-.644-2.723 0-1.16.217-2.073.644-2.713.422-.634 1.068-.942 1.975-.942.905 0 1.554.308 1.985.942.432.64.652 1.553.652 2.713m2.037-2.153a4.795 4.795 0 00-.927-1.74 4.474 4.474 0 00-1.564-1.17c-.622-.285-1.358-.43-2.183-.43-.827 0-1.563.145-2.185.43-.624.286-1.15.68-1.566 1.17a4.874 4.874 0 00-.927 1.74 7.498 7.498 0 00-.298 2.153c0 .768.1 1.493.298 2.153.202.664.512 1.25.929 1.74.415.49.942.882 1.564 1.16.624.279 1.358.42 2.185.42.825 0 1.56-.141 2.183-.42a4.366 4.366 0 001.564-1.16 4.795 4.795 0 00.927-1.74c.2-.661.3-1.386.3-2.153 0-.767-.1-1.492-.3-2.153"/><path fill="#FFF" d="M92.373 40.866c-.063-.192-.24-.12-.24-.12a4.21 4.21 0 01-.877.263c-.316.05-.662.077-1.034.077-.913 0-1.638-.284-2.157-.846-.52-.561-.812-1.47-.81-2.697.004-1.118.261-1.959.724-2.6.46-.636 1.159-.963 2.092-.963.778 0 1.371.094 1.993.299 0 0 .149.067.22-.136.164-.48.286-.823.462-1.35.05-.15-.072-.213-.116-.232a7.087 7.087 0 00-1.258-.331 9.024 9.024 0 00-1.415-.1c-.792 0-1.498.14-2.102.423a4.368 4.368 0 00-1.519 1.151 4.963 4.963 0 00-.917 1.714 7.118 7.118 0 00-.308 2.125c0 1.637.422 2.96 1.255 3.928.835.972 2.088 1.467 3.723 1.467.966 0 1.957-.206 2.67-.5 0 0 .136-.068.076-.234l-.462-1.338zm3.955-4.433c.088-.636.254-1.164.51-1.576.386-.626.976-.969 1.805-.969.828 0 1.376.345 1.769.969.26.412.374.963.419 1.576h-4.503zm6.28-1.397a4.22 4.22 0 00-.809-1.563c-.407-.463-.804-.787-1.198-.967a4.4 4.4 0 00-1.81-.388c-.788 0-1.503.14-2.083.429a4.182 4.182 0 00-1.454 1.174 4.915 4.915 0 00-.855 1.733 7.905 7.905 0 00-.278 2.133c0 .77.096 1.487.287 2.133.193.65.5 1.223.916 1.697.414.478.948.852 1.587 1.113.635.26 1.406.394 2.292.393 1.823-.007 2.784-.437 3.18-.668.07-.041.136-.114.052-.32l-.413-1.224c-.062-.182-.237-.115-.237-.115-.452.178-1.094.496-2.591.493-.98-.002-1.706-.307-2.16-.785-.467-.49-.696-1.208-.736-2.223l6.314.007s.166-.004.183-.174c.006-.073.217-1.373-.188-2.878zm-59.28 1.397c.09-.636.254-1.164.51-1.576.386-.626.976-.969 1.805-.969.828 0 1.376.345 1.77.969.26.412.373.963.418 1.576h-4.503zm6.278-1.397a4.22 4.22 0 00-.807-1.563c-.407-.463-.804-.787-1.198-.967a4.4 4.4 0 00-1.81-.388c-.786 0-1.503.14-2.083.429a4.182 4.182 0 00-1.454 1.174 4.915 4.915 0 00-.855 1.733 7.967 7.967 0 00-.278 2.133c0 .77.096 1.487.287 2.133.193.65.5 1.223.916 1.697.414.478.948.852 1.587 1.113.635.26 1.406.394 2.292.393 1.823-.007 2.784-.437 3.18-.668.07-.041.136-.114.052-.32l-.411-1.224c-.064-.182-.239-.115-.239-.115-.452.178-1.092.496-2.593.493-.978-.002-1.704-.307-2.158-.785-.467-.49-.696-1.208-.736-2.223l6.314.007s.166-.004.183-.174c.006-.073.217-1.373-.19-2.878z"/><path fill="#FFF" fill-rule="nonzero" d="M28.887 40.833c-.27-.211-.308-.265-.4-.401-.135-.209-.205-.505-.205-.882 0-.597.2-1.025.617-1.313-.005.001.594-.509 2.003-.49.99.013 1.875.156 1.875.156v3.084h.002s-.878.185-1.866.243c-1.406.083-2.031-.398-2.026-.397m2.749-4.765a15.64 15.64 0 00-1.078-.031 6.67 6.67 0 00-1.702.215 4.475 4.475 0 00-1.443.656 3.29 3.29 0 00-1.002 1.119c-.245.446-.369.973-.369 1.563 0 .6.106 1.122.316 1.548.21.429.515.785.902 1.06.384.275.858.477 1.408.599a8.403 8.403 0 001.829.183c.708 0 1.414-.057 2.098-.172a43.27 43.27 0 001.741-.33c.23-.053.484-.121.484-.121.172-.042.158-.222.158-.222l-.003-6.202c0-1.36-.37-2.368-1.1-2.993-.724-.623-1.792-.938-3.173-.938-.518 0-1.352.07-1.85.168 0 0-1.51.287-2.132.763 0 0-.136.084-.061.27l.489 1.29c.061.167.226.11.226.11s.052-.02.114-.055c1.33-.71 3.01-.688 3.01-.688.747 0 1.321.147 1.709.438.377.284.568.712.568 1.615v.287a25.492 25.492 0 00-1.139-.132"/><path fill="#FFF" d="M84.846 32.508c.048-.156-.052-.23-.094-.247-.106-.046-.638-.17-1.049-.198-.786-.053-1.223.093-1.614.286-.387.193-.818.504-1.058.858v-.838c0-.117-.076-.21-.18-.21h-1.605c-.104 0-.18.093-.18.21v10.27c0 .116.086.21.19.21h1.646c.104 0 .189-.094.189-.21v-5.13c0-.69.069-1.376.207-1.808.136-.426.32-.768.548-1.014.23-.243.49-.414.774-.51.29-.099.612-.131.84-.131.328 0 .688.093.688.093.12.015.187-.066.227-.186.108-.315.413-1.257.471-1.445M68.833 28.33a5.869 5.869 0 00-.67-.158c-.26-.046-.57-.07-.921-.07-1.227 0-2.194.344-2.872 1.022-.675.674-1.133 1.7-1.363 3.051l-.084.455h-1.54s-.186-.007-.226.195l-.252 1.4c-.018.132.04.216.22.216h1.498l-1.52 8.417c-.118.678-.255 1.235-.406 1.658-.149.416-.294.729-.474.957-.173.218-.336.38-.62.474a2.542 2.542 0 01-.798.114 3.02 3.02 0 01-.543-.06 1.616 1.616 0 01-.367-.117s-.175-.066-.245.108a226.95 226.95 0 00-.503 1.367c-.047.134.02.238.105.27.2.069.348.115.62.18.376.087.695.092.993.092.623 0 1.193-.088 1.665-.256.473-.17.887-.466 1.253-.866.395-.434.644-.886.88-1.506.235-.612.437-1.372.597-2.258l1.528-8.574h2.234s.188.007.226-.196l.254-1.399c.016-.134-.04-.216-.222-.216h-2.168c.011-.048.11-.805.358-1.518.107-.302.307-.548.475-.717a1.42 1.42 0 01.568-.35c.215-.07.46-.103.729-.103.203 0 .405.023.556.055.21.044.292.067.347.084.222.066.252.002.295-.104l.518-1.412c.054-.152-.078-.216-.125-.234M39 42.67c0 .112-.07.203-.167.203H37.29c-.097 0-.165-.09-.165-.203V28.356c0-.112.068-.203.165-.203h1.542c.097 0 .167.091.167.203V42.67z"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_babel.svg b/website/static/images/users/used_by_babel.svg
index b19aa252d..a427ffe3b 100644
--- a/website/static/images/users/used_by_babel.svg
+++ b/website/static/images/users/used_by_babel.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 151 58" xmlns="http://www.w3.org/2000/svg">
-  <path d="M103.16 4.871l-.06-.881-.94.121.06.882zm3.068 7.996l.023.206.75-.039c-.023-.128.068-.334.227-.591l-.068-.373c-.318.013-.636.283-.932.797zM92.523 23.395c-.022-.3-.956-1.467-2.8-3.523-.034-.378.6-.945 1.9-1.69l3.712-3.234c.834-1.055 1.323-2.767 1.468-5.145l-.045-.545c-.144-1.645-1.334-2.967-3.59-3.979-1.334-.9-3.735-1.4-7.203-1.49-2.868.245-6.613 1.268-11.226 3.08a46.09 46.09 0 01-4.335 2.733l.022.278c.1-.01.256-.066.434-.189.189-.022.3.067.31.245l.279-.145.133-.01.011.122c.011.144-.99.933-3.012 2.345l.156.289-.134.01-.333-.122c.01.1-.134.167-.412.19l.012.122.322.4c-.1.01-.256-.034-.467-.111-.467.044-.922.289-1.378.755l.189-.822c.678-2.923 1.145-5.513 1.39-7.758l-.034-.144c-.467-.3-.923-.723-1.345-1.256.011-.345.011-.545 0-.59l-.033-.121-.134.033c-1.467 2.2-4.29 5.957-8.48 11.27-3.19 3.778-4.836 5.879-4.936 6.301-1.3 1.345-1.923 2.156-1.856 2.434-.345.223-.49.445-.434.69-.1.022-.166-.012-.189-.112-.555.9-1.378 1.478-2.478 1.734l-1.156.267c-.156.033-.234.144-.223.333l.034.145.433-.1.034.122-.979.378-1.734.4-.911.055c-.133.134.722-.01.389.067l-1.134.267c-.689.155-1.067.1-1.133-.178l-.134.033c.022.123.033.211.011.29l-.066-.279-.912.212c-.067-.423-1.3-1.956-3.69-4.602-.045-.51.8-1.255 2.523-2.222l4.868-4.28c1.09-1.4 1.734-3.645 1.946-6.734l-.067-.723c-.189-2.178-1.767-3.934-4.735-5.29-1.756-1.19-4.913-1.823-9.47-1.923-3.78.323-8.715 1.667-14.784 4.012-1.667 1.212-3.568 2.412-5.702 3.601l.034.378c.144-.01.333-.089.567-.222.244-.022.377.089.4.311l.378-.211.189-.011.01.178c.012.177-1.31 1.211-3.99 3.1l.212.334-.19.011-.41-.145c.01.112-.179.19-.568.223l.023.2.444.489c-.144.011-.344-.033-.6-.122-.867.077-1.712.7-2.545 1.878l.21.333c.723-.667 1.146-1 1.268-1.011l.044.544c-.122.012-.31.09-.566.223l.455.689a15.06 15.06 0 012.901-2.434c.523.133.8.3.812.478l.4-.034c2.868-2.122 5.702-3.656 8.514-4.6l.034.377c-.523.778-.879 1.178-1.068 1.2.023.267.112.5.278.7.045.479-1.233 3.702-3.823 9.659C8.948 35.654 4.013 45.9 0 52.525c.011.133.089.311.233.533.99-.233 1.612-.478 1.879-.711l.211-.022.033.378.367-.034.378-.21c.011.11.134.166.39.144l.033.377c.033.367-.178.923-.623 1.69-.4.455-.834 1.411-1.29 2.867l.012.178.367-.033c1.6-1.79 2.812-3.546 3.645-5.257 4.669-1.367 8.226-2.712 10.693-4.035 2.479-.21 4.369-.867 5.658-1.945l-.022-.2-.934.278-.211.022-.022-.2c1.822-.277 3.079-.678 3.779-1.233 3.546-2.734 6.224-4.668 8.036-5.813 3.724-2.734 6.147-5.401 7.247-7.99.2-.045.4-.09.623-.145.522-.023.811-.034.889-.056-.022-.1.022-.156.122-.178.834-.089.434.056.967-.066l1.4-.323c-.088.023-.122.067-.1.156l.212-.133c-.045 0-.078-.012-.111-.023l.233-.055-.111.066c.156.023.322.012.511-.033l.1.411-6.369 10.125-1.411 1.767-.69 2.312.134-.033.689-.29-.222.9.066.268.19.233c-.09.022-.123.078-.1.178l.033.144.289-.066c.422-.367.6-.7.533-1 .456.077.756.11.912.066l.033.145c-.278.066-.422.289-.445.666l.034.145.155-.033c2.312-2.523 7.981-11.159 12.527-17.016-.144-.634 2.223-1.512 7.114-2.645l.156-.033c.177.766-.2 2.622-1.134 5.568-.6 1.778-.89 2.756-.845 2.912-.778 2.367-1.145 3.645-1.1 3.845l-1.734 5.68a51.846 51.846 0 00-2.58 9.19c.101-.022.257-.01.479.045l.244-.211c.023.1.09.133.19.11l-.1-.41.755-.023c.222-.055.411-.333.567-.844-.033-.767.122-1.178.467-1.267.467-1.823.756-2.734.856-2.768.433-1.811.756-2.845.967-3.1.656-2.357 1.134-3.568 1.445-3.646l.066.29-.477 1.233c-.834 3.7-1.679 6.624-2.535 8.769l.245 1.067.155-.034c2.068-4.445 5.047-13.248 8.926-26.406.111-1.156.667-2.057 1.656-2.69l-.222-.233-.034-.123c.445-.1.756-.278.934-.522-.022-.1-.411-.245-1.167-.445l1.934-8.29c.422-.379.667-.579.745-.579l.033.423c-.1.01-.256.066-.433.189l.366.522a11.898 11.898 0 012.179-1.867c.4.111.6.244.622.378l.29-.022c2.2-1.612 4.357-2.768 6.48-3.468l.022.278c-.39.589-.656.889-.8.9.022.2.077.378.177.534.034.366-.922 2.811-2.878 7.346-4.469 10.503-8.215 18.271-11.26 23.317.011.1.078.233.2.411.745-.178 1.223-.367 1.412-.544l.133-.011.022.277.311-.022.278-.144c.011.077.111.11.3.1l.023.3c.022.267-.134.689-.478 1.267-.323.344-.656 1.067-1.012 2.167l.011.145.29-.023c1.21-1.356 2.133-2.69 2.767-4 3.546-1.045 6.247-2.057 8.114-3.057 1.9-.167 3.335-.656 4.313-1.478l-.011-.145-.723.211-.155.012-.012-.145c1.379-.2 2.346-.511 2.868-.922 2.69-2.068 4.724-3.546 6.102-4.413 4.291-3.123 6.292-6.123 6.047-9.002zm-.384.189l.173 1.122c-.231.278-.481.423-.712.434l-.288-1.912c.538.111.807.223.827.356zm-84.45-8.471l-.243.027-.043-.84.985-.163.015.434c-.157.027-.4.19-.715.542zm-3.81 36.89c-.444-.2-.845-.278-1.19-.245l-.044-.545c-.022-.21.1-.355.367-.41.245-.023.39.155.411.51.645-.789 1-1.189 1.068-1.2l.41.167c-.133 1.111-.477 1.678-1.022 1.722zm40.026-41.867c-.189.022-.567-.567-1.111-1.734l-.034-.344c.356-.034.723.544 1.112 1.733zm-.533-4.146l-.156.367-5.435-2.267c3.623.122 5.49.756 5.59 1.9zM20.618 26.191l-.958.163-.042-.84.959-.163zm-.64-12.332l.257-.011.061.545c-.242.01-.56.277-.955.789l-.045-.378c.47-.411.712-.723.682-.945zm-1.243 3.801l.26.988-.739.015-.26-.988zm-1.25 1.358l.532-.035c-.048.63-.29.968-.725.991l-.275.012c.34-.42.5-.747.468-.968zm-.587 1.893l.293-.028.015.226-.477.735-.508.042-.015-.226c.508-.042.738-.282.692-.749zm-.192 1.695l-.294.99-.5.013-.206-.979zm-6.668 17.727c-.302 1.244-.631 1.878-.974 1.9l-.014-.178c-.082-.61.247-1.189.988-1.722zm-.71 2.478l.031.309c.064.424-.254.675-.952.694l-.032-.309c-.064-.366.254-.597.952-.694zm-.935 5.213l.617-.123.024.44c-.155.025-.356.196-.606.49l-.392.073c-.023-.416.107-.734.357-.88zm16.427-5.146c-3.245 1.6-5.157 2.69-5.724 3.256-3.512 1.223-5.258 1.979-5.224 2.279-3.124 1.233-5.18 2.145-6.17 2.711-.233.023-.566-.066-1.01-.266-.056-.634.233-1.145.844-1.556a3.282 3.282 0 011.567.244c.578-.3 1.59-.633 3.024-.989l-.034-.378-1.156.1c.145-.2 1.256-.722 3.346-1.567l.578-.055.011.177c-.99.09-1.534.378-1.656.9.022.234.156.334.4.312.745-.467 1.112-.745 1.1-.823 1.412-.266 5.314-2.311 11.705-6.123l.033.344c.011.167-.533.634-1.634 1.434zM15.017 46.1a3.785 3.785 0 002.4-1.112c.267-.022.412.078.423.312-.456.044-1.334.422-2.612 1.156l-.19.01zm15.817-12.148l-4.902 3.88c-3.646 2.389-5.602 3.589-5.88 3.611-5.802 3.19-9.415 4.846-10.815 4.968l-.211.022c.177-.655 2.756-5.935 7.758-15.87 2.2-.19 5.669-1.212 10.393-3.08l1.156-.1c2.39-.21 4.179.257 5.357 1.368l.067.722c-.89 2.557-1.867 4.046-2.923 4.48zm-9.582-5.183l.986-.274.014.73-.986.273-.014-.73zm11.082-2.076l.578-.065c.534.298.812.557.834.79l.01.208c-.51.051-.988-.26-1.422-.933zm1.567-8.934c-.51.611-1.911 1.656-4.201 3.123-.756.067-3.568 1.156-8.437 3.29a1.54 1.54 0 00-.778-.133l-.033-.345c-.056-.7.256-1.578.945-2.645.378-2 .789-3.145 1.245-3.423l4.057-9.125c-.045-.567.822-1 2.6-1.3l.579-.056.044.523c1.745-.267 2.835-.423 3.257-.456 3.223-.278 4.902.378 5.035 1.945l.367-.033-.078-.923.4-.033c.945.522 1.456 1.156 1.523 1.9.045.512-.233 1.145-.822 1.9-.245.023-.39-.155-.412-.51l-.4.033-.089 1.111c-1.634 2.445-2.823 3.701-3.557 3.768-.667.922-1.078 1.378-1.245 1.39zm2.49 6.505c-.333-.251-.6-.364-.8-.351l-.045-.615.367-.037.812.539c.033.288-.078.438-.334.464zm2.579 2.942c.582.198.927.41 1 .608l-.29.06.017.016a.758.758 0 00-.182.03l-.436.289zm.278 2.281l-.067-.567.934-.436.066.567zm1.09.783c.477-.147.71-.21 1.6-.585l.033.271-1.69.731c.023-.146.045-.292.056-.417zm1.644.597c-.711.088-.556-.03-1.69.31l-.033-.192 1.412-.605.678-.206.067.353c-.3.089-.078.089-.434.34zm1.602.106c-.212.129-.38-.096-.48-.643l.55-.289c.24-.129.395.096.45.643l-.52.29zm3.977-4.32l-.043-.466.913-.537.087.86zm4.336 26.471c.078-.408.098-.703.059-.907l.274-.068c.334-.091.53.045.608.408l.059.295zm3.046-26.012l-.312-.056c-.5.203-.922.349-1.267.427l-.289.068c-.167.045-.3-.023-.367-.202l2.034-.473.667-.315.223.26c-.323.067-.556.168-.69.291zm1.567-.226l-.034-.2c.1-.031.234-.139.378-.34l1.445-.462.034.2c-.767.262-1.379.525-1.823.802zm.222-3.203c-.1.022-.233.111-.4.244-.022-.1-.222-.1-.6-.01-.067-.279 1-.668 3.212-1.179l.311-.066.067.266c-1.556.456-2.423.712-2.59.745zm3.89-4.201c-.155 1.767-.778 2.767-1.878 3.023l-.033-.145-.979.378-.433.1a1.091 1.091 0 01-.6-.01l-.09-.39c-.032-.144 1.38-2.1 4.247-5.857l.333.056c.123.51-.066 1.456-.567 2.845zm6.99-5.243l-.227.033-.038-.836.981-.167.02.435c-.17.067-.416.234-.737.535zm-2.944 27.815c-.333-.155-.633-.222-.889-.2l-.033-.422c-.011-.144.078-.245.267-.3.189-.022.3.111.322.4.478-.611.745-.922.8-.922l.3.122c-.11.844-.366 1.289-.767 1.322zM95.18 10.27c-.164.011-.48-.433-.974-1.333l-.026-.278c.317-.022.646.411.975 1.3zm-.522-3.178l-.133.289-4.113-1.723c2.746.089 4.168.567 4.246 1.434zm-17.04 15.534l-.963.172-.037-.864.963-.138zm-.584-9.555l.28-.011.06.422c-.26.011-.58.211-.96.6l-.04-.277c.46-.323.68-.567.66-.734zm-.883 2.89l.222.983-.777.02-.223-.983zM75.086 17l.553-.03c-.064.629-.298.958-.702.988l-.298.015c.319-.42.468-.748.447-.973zm-.352 1.422l.24-.018.02.237-.46.73-.52.036-.02-.237c.54-.037.78-.292.74-.748zm-.085 1.282l-.346.988-.461.015-.193-.972 1-.03zm-5.072 13.481c-.307.934-.632 1.412-.976 1.434l-.018-.122c-.054-.467.271-.911.994-1.312zm-.582 1.879l.04.275c.078.452-.237.703-.946.728l-.04-.326c-.039-.326.277-.552.946-.677zm-.823 3.979l.615-.1.015.434c-.138.033-.353.2-.6.502l-.399.066c-.015-.468.108-.769.369-.902zm12.38-3.924c-2.445 1.212-3.901 2.034-4.357 2.456-2.668.934-3.99 1.512-3.968 1.745-2.368.945-3.924 1.623-4.658 2.056-.177.012-.433-.055-.766-.21-.045-.479.177-.868.644-1.157a2.52 2.52 0 011.19.178c.444-.222 1.211-.467 2.3-.744l-.022-.278-.911.066c.11-.155.967-.555 2.556-1.2l.445-.033.01.122c-.755.067-1.177.289-1.266.69.01.177.122.266.311.244.556-.367.823-.578.823-.645 1.067-.189 4.023-1.745 8.88-4.657l.023.278c.011.122-.4.478-1.234 1.09zm-7.447 2.445a2.984 2.984 0 001.845-.833c.189-.022.3.066.311.244-.333.034-.989.311-1.978.845l-.156.011zm12.027-9.235l-3.702 2.978c-2.768 1.812-4.268 2.723-4.502 2.745-4.401 2.423-7.135 3.679-8.214 3.768l-.155.011c.133-.5 2.1-4.512 5.902-12.048 1.656-.144 4.28-.933 7.88-2.356l.9-.077c1.813-.156 3.169.2 4.058 1.055l.044.545c-.678 1.912-1.411 3.034-2.211 3.379zm-7.27-3.867l.981-.279.02.724-.982.279zm8.414-1.639l.445-.051c.411.31.622.584.634.808l.01.189c-.388.052-.755-.258-1.089-.946zm1.167-6.786c-.389.466-1.444 1.267-3.167 2.378-.578.055-2.712.878-6.403 2.478a1.458 1.458 0 00-.589-.077l-.022-.278c-.045-.534.189-1.2.7-2.012.29-1.534.612-2.39.945-2.59l3.101-6.935c-.033-.41.623-.744 1.956-1l.445-.033.033.422c1.312-.211 2.135-.333 2.468-.367 2.445-.21 3.724.278 3.824 1.478l.289-.022-.056-.667.289-.022c.711.39 1.09.856 1.134 1.412.033.4-.167.889-.59 1.456-.188.022-.3-.112-.322-.4l-.289.022-.089.833c-1.233 1.879-2.134 2.845-2.7 2.89-.5.678-.812 1.022-.957 1.034zm1.304 4.836l-.036-.625.316-.033.683.56c.012.262-.086.41-.293.443-.292-.246-.511-.361-.67-.345zM37.39 47.657l-.499.136-.422.431c.077.363.269.5.595.409s.46-.318.384-.681zm-1.468-1.823l.121.303c.686-.093.969-.327.807-.7l-.12-.303c-.647.093-.93.326-.808.7zm7.905-18.346l.834-.213-.167-.79-.833.212.166.79zm100.76 7.832c-3.38.793-3.802.653-4.513.712l.022.291.312-.023.166-.012-.044-.035.367-.151c3.345-.385 3.734-.245 3.701-.642zm-18.196 2.412l.2 1.003h.4l-.2-1.003zm-1.746-7.324l-.457-.1c-.373.656-.559 1.045-.542 1.156l.017.122c.356-.011.677-.411.982-1.178zm20.631 4.857l.044.76.956.243-.043-.76zm-22.997 2.976l-.756-.136-.134.442.012.221 4.501-.578-.022-.425zm-1.497-9.849l-.025-.318-.347.024-.621.392.347.587c.472-.049.696-.27.646-.685zm26.628 4.828l.211-.022c.123-.012.178-.112.167-.29l-.122-.266c-.767.067-1.123.1-1.745.444l-.011-.144-.923.089c-.022-.278-.1-.423-.222-.411l-.478.044c-.556.045-.823.022-1.1.233-.012-.1-.045-.144-.1-.144l-.534.044-.311.178c-.012-.1-.045-.144-.1-.144l-.19.166-.01-.144-.745-.056-.178.012.022.277.378.1.356-.022a.65.65 0 00.411.09l.311-.157.011.123c-1.745.433-1.734.355-2.934.555-.133-.088-.234-.133-.3-.122l-.022.022c-.134-.01-.212-.1-.223-.244l.623-.078c.044 0 .078.045.422.111.5-.244.523-.344.79-.367l-.023-.277c-1.712.333-1.023.11-3.168.3l-.1.01-.022-.277c2.757-.333 1.834-.144 2.779-.411.01.1.044.144.1.144a.648.648 0 01.378-.189l.189-.01c.967-.079 1.289.11 3.2-.423l.012.122.311-.155.29-.023c-.023-.278.4-.322.544-.333l-.022-.3c-3.357.678-4.235.489-5.169.756l-.011-.123c-.878.156-.912.09-1.134.1-.067.011-.167.067-.278.178-.01-.1-.044-.144-.11-.144-.034 0-.045.01-.056.01l-2.846.468c-.011-.078-.044-.123-.111-.112-1.478.312-1.078.367-3.057.545a.928.928 0 00-.367.156c-.01-.078-.055-.123-.155-.112l-1.212.1-.811.2c-.011-.077-.056-.122-.156-.11-.456.122-.856.2-1.178.222h-.022c-.2.022.1-.056-.056-.123l-.244.145c-.356.033-.167-.022-1.39-.011-2.145.267-1.912.3-2.145.311l-.8-.056c.01.078-.034.134-.123.134-.911-.122-1.378-.267-1.389-.434.122-.867.333-1.311.634-1.333l.155-.011-.133.289.155-.012c.29-.155.423-.3.412-.433l-.023-.3-.289.022-.022-.278a1 1 0 01.09-.555l.655-1.056.022.278.311-.023-.022-.277-.178-.256c.234-.2.412-.311.556-.322l-.011-.145-.422.033-.034-.422c.845-1.756 1.245-2.778 1.223-3.067l.3.122c.189-.011.278-.122.267-.322l-.29.022-.01-.122a1.06 1.06 0 01.11-.59c.457-.477.668-.955.623-1.455.09-.012.134.033.145.133.389-.222.689-.811.911-1.79.69-1.244 1.668-3.734 2.946-7.457 2.445-6.58 2.345-7.28 2.69-8.836l-.29.023c.023.2-.022.389-.11.567-.2-.078-.356-.123-.467-.112l-.011-.122c-.045-.567.189-1.245.722-2.045l.133-.011.245.956.289-.022c-.011-.067.067-.445.222-1.145-.01-.145-.122-.234-.344-.245l-.278.178c-.022-.2-.011-.722.022-1.556l-.144.011c-.245-.244-.367-.444-.378-.61l-1.59.155c-.01-.111-.067-.278-.178-.49-.01-.144.345-.288 1.079-.433l.322.122.3-.177c.011.1.067.144.178.133l.3-.178c.011.1.067.145.178.134l.144-.012-.022-.322c-.222.022-.811.022-1.745-.011l-.3.2-.011-.178c-7.459.611-11.693.956-12.705 1.056-.133.011-.656 0-1.578-.022.01.122-.1.189-.323.211l-.322-.144-1.09.277c-.255.023-.688.011-1.289-.055a1.108 1.108 0 01-.611.233c-.133.011 1.59-.089 3.19-.2-.167.134-.422.211-.778.245-.245.022-.456-.011-.634-.111-.244.11-1.033.288-2.356.555l-.322-.122-5.202.8c-.2-.1-.434-.133-.7-.111-.278.022-.745.122-1.39.3l-2.512 1.045.189.311c.122-.011.3-.078.511-.2l.89.078-.112.833c-.822.367-1.3.912-1.434 1.6-1.233.545-1.845.934-1.845 1.168l.011.144.19-.01.333-.179.389.467.055.645c.023.2-2.056 4.567-6.213 13.103-3.601 8.224-5.49 12.726-5.669 13.537-1.233.344-1.945.845-2.156 1.511.022.212.389.356 1.1.412l.034.322-.323.533.056.645c.033.333.934.59 2.7.767-.01-.111.045-.178.168-.19.033.401-.078 1.179-.334 2.335l.19-.011c.733-1 1.077-1.69 1.044-2.067l.156-.012c.177-.01.366.19.589.623-.223.089-1 1.856-2.334 5.312l.188.312.19-.012c1.633-4.134 2.656-6.423 3.078-6.857 2.146-.189 5.858-.567 11.127-1.134l.333-.2c.011.112.078.167.2.156l.345-.033.333-.2c.011.11.078.166.2.155l3.99-.344c1.057-.09 1.557-.412 1.512-.956-.01-.145.612-.311 1.868-.49.122-.01.3.023.544.1-.01-.1.623-.2 1.89-.31.033-.667.245-1.023.622-1.056l-.033-.322a5.522 5.522 0 00-1.223.277c-.833-.044-1.367-.11-1.59-.189-.221.123-.388.19-.51.2l-2.78.09-.333.177c-.01-.1-.077-.144-.2-.133l-.155.011-.356.178c-.011-.1-.3-.178-.878-.256l-.356.211-.689.056-.011-.178c3.579-.389 5.346-.878 5.302-1.456.233-.022.356.09.378.322l1.045-.266-.034-.323-8.57.234c.012.11-.044.178-.166.189l-1.045-.09c-.267.023-.49.1-.667.234l-.389-.144c-1.078.089-1.879.222-2.412.389a15.193 15.193 0 00-2.445.033l-1.923.167-.89-.1c-.044-.567 1.056-3.357 3.324-8.358.656-1.69 1.256-2.745 1.834-3.145.122-.011.3.033.545.133l1.367-.467.7.111c1.178-.1 2.545-.433 4.113-1.01.389-.034.678-.012.889.077l1.045-.245 3.112-.266c1.323-.111 2.757-.4 4.313-.878l-.034-.323c-.578.056-.878-.044-.9-.277-.033-.434-.456-.612-1.267-.545l-.034-.322.856-.245 2.246-.189-.034-.322c-.089.011-.544 0-1.39-.033l-.032-.345.867-.078c.233-.022.333-.133.31-.355-1.166.033-1.755-.023-1.767-.178-8.136.4-12.215.478-12.237.222-.123.011-.29.089-.512.222l-.21-.333c2.155-4.58 3.423-6.89 3.79-6.924.01.178-.078.467-.279.856l.012.144.344-.033c.856-2.045 1.579-3.101 2.179-3.146 2.556-.222-.356-.389 5.113-1.244.222.1.378.144.489.133 2.145-.433 5.135-.889 8.97-1.356l-.022-.322-2.046.189-.022-.322c.245-.023.445-.1.611-.234l.012.178c.11-.011.266-.089.466-.222.356-.034.623 0 .812.1.711-.19 1.29-.3 1.712-.345l1.278-.122c.311-.2.456-.378.444-.545l-.01-.144c-.323.033-.69.01-1.123-.067-.011-.178.078-.3.289-.356l2.378-.222 1.09-.278c.01.123.066.167.155.167.111-.011.267-.089.467-.222.056.01.122.01.178.022a8.83 8.83 0 00-.478 1.3l-.311.023a1.36 1.36 0 00-.178-.567l-.156.01c-2.89 8.047-4.179 11.793-6.847 17.972-.489 1.578-.9 2.456-1.256 2.645.011.178.123.267.312.245.066.778-.112 1.545-.545 2.3-1.234 3.557-2.056 5.502-2.479 5.858l.278 1.678c.011.178-.078.278-.267.3l-.289.022c-.044-.467-.21-.689-.511-.656l-.156.011a6.616 6.616 0 00-.855 2.057l.289-.023c.389-.255.566-.555.533-.9l.578-.055.334.122c-.267.422-.39.756-.367 1.011l.155.267-.378.889.012.144c.333-.033.7.078 1.089.312.267-.023.556-.145.878-.356.333-.033 1.578-.044 3.724-.044l1.078-.367c1.311-.011 1.522.022 2.656-.078l.467-.044.245-.167.01.144c1.19-.1 1.268-.022 2.202.09l.01.144-.655.055.022.278a.942.942 0 00.523-.2c.166-.011.266.078.277.278a3.915 3.915 0 00-.9.2l-.289-.1c-.456.122-.356.156-.667.178l-.456-.09c.012.079-.033.134-.11.134.01.178.11.267.277.256l.467-.045 2.434-.21.923-.2c.01.077.044.121.122.11l.445-.166.833-.067c.645-.056.634-.1 2.034-.322-.01-.09.023-.123.09-.134l.01.123c2.279-.39 2.424-.412 2.79-.534l.034.067c.567-.134.244-.1.4-.211.011.1.044.144.1.144l.4-.033-.022-.3-.812-.011-.01-.023c-.034.011-.056.011-.09.023h-.11v.022c-.545.11-.557.033-.912.066l-2.034.112-.011-.145 1.133-.156.412-.033.233-.167.011.145c1.6-.133 2.168.267 9.57-1.312.4-.033.367-.366.623-1.055a.692.692 0 01-.39-.09c-.61.234-.933.123-2.111.312-.1.011-.178-.078-.211-.256l-.011-.122 1.133.033c.211-.022.623-.055 1.234-.4 0 .1-.222.156-.089.145zm-54.731.878l-.523.044c-.022-.21.256-1.011.834-2.378l.345-.034c.01.323-.2 1.112-.656 2.368zm.655-2.031l-.031-.29c-.032-.357.28-.602.964-.713l.031.29c.031.423-.28.668-.964.713zm7.046 4.865l.012.652-.987.35-.013-.651zm-1.165-.09c.01.31-.256.657-.834 1.004l-1.067-.135-.345.058-.033-.56 2.279-.366zm7.113-31.909l-.61.082-.012-.327c-.013-.328.104-.553.363-.655l.22-.02.415.265c.013.39-.104.614-.376.655zm8.174-1.957l.348-.03.047.88-.998.122c-.023-.486.162-.82.603-.972zm-2.316 1.072l-.79-.146-.01-.237c1.033-.146 1.378-.328 2.012-.62.01.2.122.274.322.237l.022.53-.311.054a.726.726 0 01-.634-.183c-.189.201-.389.329-.611.365zm.99 3.223l-.012-.543 1.278-.46.012.544-1.279.46zm1.373-1.078l-.018-.764.983-.239.017.764-.982.24zm.138-2.435l-.167.023.145-.723 1.422-.28.012.374c-.367.07-.845.28-1.412.606zm.723 3.177l-.023-.849.651-.146c.221-.059.338.205.35.79zm3.767-5.757l-.8.884-.144.044c-.378.133-.867.089-1.445-.132 1.033-.265 2.023-.575 2.39-.796zm-.855 3.557l.01.592-1.1.41-.01-.592zm1.8 1.215c-.01-.228-.222-.379-.656-.455l-1.1.53-.845.057c-.189-.227-.289-.378-.3-.492l.978.095 2.201-.606 1.123.076.01.303a4.16 4.16 0 00-1.41.492zm11.327-3.283c.133.011.222.011.255.011a4.263 4.263 0 011.323-.889c-.4 1.756-1.023 3.057-1.878 3.901l-.623-.378c.523-1.322.834-2.2.923-2.645zm-1.61 3.286l.264-.018c-.358.645-.679.985-.943 1.003l-.057-.68c.17 0 .415-.108.736-.305zm-1.536 2.938c.3-1.2.59-1.878.856-2.056l.011.145c-.156 1.111-.4 1.7-.722 1.744l.055.7c-.267.379-.389.668-.378.89l-.155.01-.09-.966c.179-.022.323-.178.423-.467zm.01 1.6c.021.167-.196.556-.63 1.156l-.304.012-.065-.423c.412-.489.76-.733.998-.744zm-9.435 26.227l-.034-.29.897-.052.103 1c-.483.027-.828-.183-.966-.658zm12.793.783c-.011-.282-.056-.407-.156-.376l-.722.188-.011-.407h.066l1.712-.408.011.408c-.5.063-.8.282-.9.595zm-.51-1.003c.6.301.3.602 0 .803-.3-.1-.7-.401 0-.803zm-.257-1.6l-.956.146-.011-.271.867-.146.756-.355c.011.167.055.23.155.209.9-.292.812-.375 1.245-.438.145-.02.234.146.245.48zm3.352.047c-.537-.209-.57-.376-.951-.25l-.011-.46.861-.293.011.46c-.09.042.235.125.09.543zm.073-.055l-.024-.736.977-.267.023.735zm1.026-.26l-.016-.392c.11-.035.266-.213.469-.569.328-.071.5.427.531.996zm1.326-.018l-.02-.767.981-.236.02.767zm.782-.403c-.018-.442.089-.708.32-.767l.304.649c-.018-.207.035-.324.142-.354l.232.708zm-7.504 3.832l-.2-.965-.8.039.2.964zm19.016-5.637c.17-.097.256-.193-.148-.251-.192.193.212.25-.213.27l.021.173c.043-.038.149-.096.234-.154l-.234.174v.019l-.447.52.894-.289h.106l-.042-.482-.17.02zm.478.527l-.131.038.033.965.967-.193c-.016-.617-.656-.81-.869-.81zm-1.054-.31l.1-.101v-.1s-.1.1-.1.2z" fill="#6f7b81"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 151 58"><path fill="#6f7b81" d="M103.16 4.871l-.06-.881-.94.121.06.882zm3.068 7.996l.023.206.75-.039c-.023-.128.068-.334.227-.591l-.068-.373c-.318.013-.636.283-.932.797zM92.523 23.395c-.022-.3-.956-1.467-2.8-3.523-.034-.378.6-.945 1.9-1.69l3.712-3.234c.834-1.055 1.323-2.767 1.468-5.145l-.045-.545c-.144-1.645-1.334-2.967-3.59-3.979-1.334-.9-3.735-1.4-7.203-1.49-2.868.245-6.613 1.268-11.226 3.08a46.09 46.09 0 01-4.335 2.733l.022.278c.1-.01.256-.066.434-.189.189-.022.3.067.31.245l.279-.145.133-.01.011.122c.011.144-.99.933-3.012 2.345l.156.289-.134.01-.333-.122c.01.1-.134.167-.412.19l.012.122.322.4c-.1.01-.256-.034-.467-.111-.467.044-.922.289-1.378.755l.189-.822c.678-2.923 1.145-5.513 1.39-7.758l-.034-.144c-.467-.3-.923-.723-1.345-1.256.011-.345.011-.545 0-.59l-.033-.121-.134.033c-1.467 2.2-4.29 5.957-8.48 11.27-3.19 3.778-4.836 5.879-4.936 6.301-1.3 1.345-1.923 2.156-1.856 2.434-.345.223-.49.445-.434.69-.1.022-.166-.012-.189-.112-.555.9-1.378 1.478-2.478 1.734l-1.156.267c-.156.033-.234.144-.223.333l.034.145.433-.1.034.122-.979.378-1.734.4-.911.055c-.133.134.722-.01.389.067l-1.134.267c-.689.155-1.067.1-1.133-.178l-.134.033c.022.123.033.211.011.29l-.066-.279-.912.212c-.067-.423-1.3-1.956-3.69-4.602-.045-.51.8-1.255 2.523-2.222l4.868-4.28c1.09-1.4 1.734-3.645 1.946-6.734l-.067-.723c-.189-2.178-1.767-3.934-4.735-5.29-1.756-1.19-4.913-1.823-9.47-1.923-3.78.323-8.715 1.667-14.784 4.012-1.667 1.212-3.568 2.412-5.702 3.601l.034.378c.144-.01.333-.089.567-.222.244-.022.377.089.4.311l.378-.211.189-.011.01.178c.012.177-1.31 1.211-3.99 3.1l.212.334-.19.011-.41-.145c.01.112-.179.19-.568.223l.023.2.444.489c-.144.011-.344-.033-.6-.122-.867.077-1.712.7-2.545 1.878l.21.333c.723-.667 1.146-1 1.268-1.011l.044.544c-.122.012-.31.09-.566.223l.455.689a15.06 15.06 0 012.901-2.434c.523.133.8.3.812.478l.4-.034c2.868-2.122 5.702-3.656 8.514-4.6l.034.377c-.523.778-.879 1.178-1.068 1.2.023.267.112.5.278.7.045.479-1.233 3.702-3.823 9.659C8.948 35.654 4.013 45.9 0 52.525c.011.133.089.311.233.533.99-.233 1.612-.478 1.879-.711l.211-.022.033.378.367-.034.378-.21c.011.11.134.166.39.144l.033.377c.033.367-.178.923-.623 1.69-.4.455-.834 1.411-1.29 2.867l.012.178.367-.033c1.6-1.79 2.812-3.546 3.645-5.257 4.669-1.367 8.226-2.712 10.693-4.035 2.479-.21 4.369-.867 5.658-1.945l-.022-.2-.934.278-.211.022-.022-.2c1.822-.277 3.079-.678 3.779-1.233 3.546-2.734 6.224-4.668 8.036-5.813 3.724-2.734 6.147-5.401 7.247-7.99.2-.045.4-.09.623-.145.522-.023.811-.034.889-.056-.022-.1.022-.156.122-.178.834-.089.434.056.967-.066l1.4-.323c-.088.023-.122.067-.1.156l.212-.133c-.045 0-.078-.012-.111-.023l.233-.055-.111.066c.156.023.322.012.511-.033l.1.411-6.369 10.125-1.411 1.767-.69 2.312.134-.033.689-.29-.222.9.066.268.19.233c-.09.022-.123.078-.1.178l.033.144.289-.066c.422-.367.6-.7.533-1 .456.077.756.11.912.066l.033.145c-.278.066-.422.289-.445.666l.034.145.155-.033c2.312-2.523 7.981-11.159 12.527-17.016-.144-.634 2.223-1.512 7.114-2.645l.156-.033c.177.766-.2 2.622-1.134 5.568-.6 1.778-.89 2.756-.845 2.912-.778 2.367-1.145 3.645-1.1 3.845l-1.734 5.68a51.846 51.846 0 00-2.58 9.19c.101-.022.257-.01.479.045l.244-.211c.023.1.09.133.19.11l-.1-.41.755-.023c.222-.055.411-.333.567-.844-.033-.767.122-1.178.467-1.267.467-1.823.756-2.734.856-2.768.433-1.811.756-2.845.967-3.1.656-2.357 1.134-3.568 1.445-3.646l.066.29-.477 1.233c-.834 3.7-1.679 6.624-2.535 8.769l.245 1.067.155-.034c2.068-4.445 5.047-13.248 8.926-26.406.111-1.156.667-2.057 1.656-2.69l-.222-.233-.034-.123c.445-.1.756-.278.934-.522-.022-.1-.411-.245-1.167-.445l1.934-8.29c.422-.379.667-.579.745-.579l.033.423c-.1.01-.256.066-.433.189l.366.522a11.898 11.898 0 012.179-1.867c.4.111.6.244.622.378l.29-.022c2.2-1.612 4.357-2.768 6.48-3.468l.022.278c-.39.589-.656.889-.8.9.022.2.077.378.177.534.034.366-.922 2.811-2.878 7.346-4.469 10.503-8.215 18.271-11.26 23.317.011.1.078.233.2.411.745-.178 1.223-.367 1.412-.544l.133-.011.022.277.311-.022.278-.144c.011.077.111.11.3.1l.023.3c.022.267-.134.689-.478 1.267-.323.344-.656 1.067-1.012 2.167l.011.145.29-.023c1.21-1.356 2.133-2.69 2.767-4 3.546-1.045 6.247-2.057 8.114-3.057 1.9-.167 3.335-.656 4.313-1.478l-.011-.145-.723.211-.155.012-.012-.145c1.379-.2 2.346-.511 2.868-.922 2.69-2.068 4.724-3.546 6.102-4.413 4.291-3.123 6.292-6.123 6.047-9.002zm-.384.189l.173 1.122c-.231.278-.481.423-.712.434l-.288-1.912c.538.111.807.223.827.356zm-84.45-8.471l-.243.027-.043-.84.985-.163.015.434c-.157.027-.4.19-.715.542zm-3.81 36.89c-.444-.2-.845-.278-1.19-.245l-.044-.545c-.022-.21.1-.355.367-.41.245-.023.39.155.411.51.645-.789 1-1.189 1.068-1.2l.41.167c-.133 1.111-.477 1.678-1.022 1.722zm40.026-41.867c-.189.022-.567-.567-1.111-1.734l-.034-.344c.356-.034.723.544 1.112 1.733zm-.533-4.146l-.156.367-5.435-2.267c3.623.122 5.49.756 5.59 1.9zM20.618 26.191l-.958.163-.042-.84.959-.163zm-.64-12.332l.257-.011.061.545c-.242.01-.56.277-.955.789l-.045-.378c.47-.411.712-.723.682-.945zm-1.243 3.801l.26.988-.739.015-.26-.988zm-1.25 1.358l.532-.035c-.048.63-.29.968-.725.991l-.275.012c.34-.42.5-.747.468-.968zm-.587 1.893l.293-.028.015.226-.477.735-.508.042-.015-.226c.508-.042.738-.282.692-.749zm-.192 1.695l-.294.99-.5.013-.206-.979zm-6.668 17.727c-.302 1.244-.631 1.878-.974 1.9l-.014-.178c-.082-.61.247-1.189.988-1.722zm-.71 2.478l.031.309c.064.424-.254.675-.952.694l-.032-.309c-.064-.366.254-.597.952-.694zm-.935 5.213l.617-.123.024.44c-.155.025-.356.196-.606.49l-.392.073c-.023-.416.107-.734.357-.88zm16.427-5.146c-3.245 1.6-5.157 2.69-5.724 3.256-3.512 1.223-5.258 1.979-5.224 2.279-3.124 1.233-5.18 2.145-6.17 2.711-.233.023-.566-.066-1.01-.266-.056-.634.233-1.145.844-1.556a3.282 3.282 0 011.567.244c.578-.3 1.59-.633 3.024-.989l-.034-.378-1.156.1c.145-.2 1.256-.722 3.346-1.567l.578-.055.011.177c-.99.09-1.534.378-1.656.9.022.234.156.334.4.312.745-.467 1.112-.745 1.1-.823 1.412-.266 5.314-2.311 11.705-6.123l.033.344c.011.167-.533.634-1.634 1.434zM15.017 46.1a3.785 3.785 0 002.4-1.112c.267-.022.412.078.423.312-.456.044-1.334.422-2.612 1.156l-.19.01zm15.817-12.148l-4.902 3.88c-3.646 2.389-5.602 3.589-5.88 3.611-5.802 3.19-9.415 4.846-10.815 4.968l-.211.022c.177-.655 2.756-5.935 7.758-15.87 2.2-.19 5.669-1.212 10.393-3.08l1.156-.1c2.39-.21 4.179.257 5.357 1.368l.067.722c-.89 2.557-1.867 4.046-2.923 4.48zm-9.582-5.183l.986-.274.014.73-.986.273-.014-.73zm11.082-2.076l.578-.065c.534.298.812.557.834.79l.01.208c-.51.051-.988-.26-1.422-.933zm1.567-8.934c-.51.611-1.911 1.656-4.201 3.123-.756.067-3.568 1.156-8.437 3.29a1.54 1.54 0 00-.778-.133l-.033-.345c-.056-.7.256-1.578.945-2.645.378-2 .789-3.145 1.245-3.423l4.057-9.125c-.045-.567.822-1 2.6-1.3l.579-.056.044.523c1.745-.267 2.835-.423 3.257-.456 3.223-.278 4.902.378 5.035 1.945l.367-.033-.078-.923.4-.033c.945.522 1.456 1.156 1.523 1.9.045.512-.233 1.145-.822 1.9-.245.023-.39-.155-.412-.51l-.4.033-.089 1.111c-1.634 2.445-2.823 3.701-3.557 3.768-.667.922-1.078 1.378-1.245 1.39zm2.49 6.505c-.333-.251-.6-.364-.8-.351l-.045-.615.367-.037.812.539c.033.288-.078.438-.334.464zm2.579 2.942c.582.198.927.41 1 .608l-.29.06.017.016a.758.758 0 00-.182.03l-.436.289zm.278 2.281l-.067-.567.934-.436.066.567zm1.09.783c.477-.147.71-.21 1.6-.585l.033.271-1.69.731c.023-.146.045-.292.056-.417zm1.644.597c-.711.088-.556-.03-1.69.31l-.033-.192 1.412-.605.678-.206.067.353c-.3.089-.078.089-.434.34zm1.602.106c-.212.129-.38-.096-.48-.643l.55-.289c.24-.129.395.096.45.643l-.52.29zm3.977-4.32l-.043-.466.913-.537.087.86zm4.336 26.471c.078-.408.098-.703.059-.907l.274-.068c.334-.091.53.045.608.408l.059.295zm3.046-26.012l-.312-.056c-.5.203-.922.349-1.267.427l-.289.068c-.167.045-.3-.023-.367-.202l2.034-.473.667-.315.223.26c-.323.067-.556.168-.69.291zm1.567-.226l-.034-.2c.1-.031.234-.139.378-.34l1.445-.462.034.2c-.767.262-1.379.525-1.823.802zm.222-3.203c-.1.022-.233.111-.4.244-.022-.1-.222-.1-.6-.01-.067-.279 1-.668 3.212-1.179l.311-.066.067.266c-1.556.456-2.423.712-2.59.745zm3.89-4.201c-.155 1.767-.778 2.767-1.878 3.023l-.033-.145-.979.378-.433.1a1.091 1.091 0 01-.6-.01l-.09-.39c-.032-.144 1.38-2.1 4.247-5.857l.333.056c.123.51-.066 1.456-.567 2.845zm6.99-5.243l-.227.033-.038-.836.981-.167.02.435c-.17.067-.416.234-.737.535zm-2.944 27.815c-.333-.155-.633-.222-.889-.2l-.033-.422c-.011-.144.078-.245.267-.3.189-.022.3.111.322.4.478-.611.745-.922.8-.922l.3.122c-.11.844-.366 1.289-.767 1.322zM95.18 10.27c-.164.011-.48-.433-.974-1.333l-.026-.278c.317-.022.646.411.975 1.3zm-.522-3.178l-.133.289-4.113-1.723c2.746.089 4.168.567 4.246 1.434zm-17.04 15.534l-.963.172-.037-.864.963-.138zm-.584-9.555l.28-.011.06.422c-.26.011-.58.211-.96.6l-.04-.277c.46-.323.68-.567.66-.734zm-.883 2.89l.222.983-.777.02-.223-.983zM75.086 17l.553-.03c-.064.629-.298.958-.702.988l-.298.015c.319-.42.468-.748.447-.973zm-.352 1.422l.24-.018.02.237-.46.73-.52.036-.02-.237c.54-.037.78-.292.74-.748zm-.085 1.282l-.346.988-.461.015-.193-.972 1-.03zm-5.072 13.481c-.307.934-.632 1.412-.976 1.434l-.018-.122c-.054-.467.271-.911.994-1.312zm-.582 1.879l.04.275c.078.452-.237.703-.946.728l-.04-.326c-.039-.326.277-.552.946-.677zm-.823 3.979l.615-.1.015.434c-.138.033-.353.2-.6.502l-.399.066c-.015-.468.108-.769.369-.902zm12.38-3.924c-2.445 1.212-3.901 2.034-4.357 2.456-2.668.934-3.99 1.512-3.968 1.745-2.368.945-3.924 1.623-4.658 2.056-.177.012-.433-.055-.766-.21-.045-.479.177-.868.644-1.157a2.52 2.52 0 011.19.178c.444-.222 1.211-.467 2.3-.744l-.022-.278-.911.066c.11-.155.967-.555 2.556-1.2l.445-.033.01.122c-.755.067-1.177.289-1.266.69.01.177.122.266.311.244.556-.367.823-.578.823-.645 1.067-.189 4.023-1.745 8.88-4.657l.023.278c.011.122-.4.478-1.234 1.09zm-7.447 2.445a2.984 2.984 0 001.845-.833c.189-.022.3.066.311.244-.333.034-.989.311-1.978.845l-.156.011zm12.027-9.235l-3.702 2.978c-2.768 1.812-4.268 2.723-4.502 2.745-4.401 2.423-7.135 3.679-8.214 3.768l-.155.011c.133-.5 2.1-4.512 5.902-12.048 1.656-.144 4.28-.933 7.88-2.356l.9-.077c1.813-.156 3.169.2 4.058 1.055l.044.545c-.678 1.912-1.411 3.034-2.211 3.379zm-7.27-3.867l.981-.279.02.724-.982.279zm8.414-1.639l.445-.051c.411.31.622.584.634.808l.01.189c-.388.052-.755-.258-1.089-.946zm1.167-6.786c-.389.466-1.444 1.267-3.167 2.378-.578.055-2.712.878-6.403 2.478a1.458 1.458 0 00-.589-.077l-.022-.278c-.045-.534.189-1.2.7-2.012.29-1.534.612-2.39.945-2.59l3.101-6.935c-.033-.41.623-.744 1.956-1l.445-.033.033.422c1.312-.211 2.135-.333 2.468-.367 2.445-.21 3.724.278 3.824 1.478l.289-.022-.056-.667.289-.022c.711.39 1.09.856 1.134 1.412.033.4-.167.889-.59 1.456-.188.022-.3-.112-.322-.4l-.289.022-.089.833c-1.233 1.879-2.134 2.845-2.7 2.89-.5.678-.812 1.022-.957 1.034zm1.304 4.836l-.036-.625.316-.033.683.56c.012.262-.086.41-.293.443-.292-.246-.511-.361-.67-.345zM37.39 47.657l-.499.136-.422.431c.077.363.269.5.595.409s.46-.318.384-.681zm-1.468-1.823l.121.303c.686-.093.969-.327.807-.7l-.12-.303c-.647.093-.93.326-.808.7zm7.905-18.346l.834-.213-.167-.79-.833.212.166.79zm100.76 7.832c-3.38.793-3.802.653-4.513.712l.022.291.312-.023.166-.012-.044-.035.367-.151c3.345-.385 3.734-.245 3.701-.642zm-18.196 2.412l.2 1.003h.4l-.2-1.003zm-1.746-7.324l-.457-.1c-.373.656-.559 1.045-.542 1.156l.017.122c.356-.011.677-.411.982-1.178zm20.631 4.857l.044.76.956.243-.043-.76zm-22.997 2.976l-.756-.136-.134.442.012.221 4.501-.578-.022-.425zm-1.497-9.849l-.025-.318-.347.024-.621.392.347.587c.472-.049.696-.27.646-.685zm26.628 4.828l.211-.022c.123-.012.178-.112.167-.29l-.122-.266c-.767.067-1.123.1-1.745.444l-.011-.144-.923.089c-.022-.278-.1-.423-.222-.411l-.478.044c-.556.045-.823.022-1.1.233-.012-.1-.045-.144-.1-.144l-.534.044-.311.178c-.012-.1-.045-.144-.1-.144l-.19.166-.01-.144-.745-.056-.178.012.022.277.378.1.356-.022a.65.65 0 00.411.09l.311-.157.011.123c-1.745.433-1.734.355-2.934.555-.133-.088-.234-.133-.3-.122l-.022.022c-.134-.01-.212-.1-.223-.244l.623-.078c.044 0 .078.045.422.111.5-.244.523-.344.79-.367l-.023-.277c-1.712.333-1.023.11-3.168.3l-.1.01-.022-.277c2.757-.333 1.834-.144 2.779-.411.01.1.044.144.1.144a.648.648 0 01.378-.189l.189-.01c.967-.079 1.289.11 3.2-.423l.012.122.311-.155.29-.023c-.023-.278.4-.322.544-.333l-.022-.3c-3.357.678-4.235.489-5.169.756l-.011-.123c-.878.156-.912.09-1.134.1-.067.011-.167.067-.278.178-.01-.1-.044-.144-.11-.144-.034 0-.045.01-.056.01l-2.846.468c-.011-.078-.044-.123-.111-.112-1.478.312-1.078.367-3.057.545a.928.928 0 00-.367.156c-.01-.078-.055-.123-.155-.112l-1.212.1-.811.2c-.011-.077-.056-.122-.156-.11-.456.122-.856.2-1.178.222h-.022c-.2.022.1-.056-.056-.123l-.244.145c-.356.033-.167-.022-1.39-.011-2.145.267-1.912.3-2.145.311l-.8-.056c.01.078-.034.134-.123.134-.911-.122-1.378-.267-1.389-.434.122-.867.333-1.311.634-1.333l.155-.011-.133.289.155-.012c.29-.155.423-.3.412-.433l-.023-.3-.289.022-.022-.278a1 1 0 01.09-.555l.655-1.056.022.278.311-.023-.022-.277-.178-.256c.234-.2.412-.311.556-.322l-.011-.145-.422.033-.034-.422c.845-1.756 1.245-2.778 1.223-3.067l.3.122c.189-.011.278-.122.267-.322l-.29.022-.01-.122a1.06 1.06 0 01.11-.59c.457-.477.668-.955.623-1.455.09-.012.134.033.145.133.389-.222.689-.811.911-1.79.69-1.244 1.668-3.734 2.946-7.457 2.445-6.58 2.345-7.28 2.69-8.836l-.29.023c.023.2-.022.389-.11.567-.2-.078-.356-.123-.467-.112l-.011-.122c-.045-.567.189-1.245.722-2.045l.133-.011.245.956.289-.022c-.011-.067.067-.445.222-1.145-.01-.145-.122-.234-.344-.245l-.278.178c-.022-.2-.011-.722.022-1.556l-.144.011c-.245-.244-.367-.444-.378-.61l-1.59.155c-.01-.111-.067-.278-.178-.49-.01-.144.345-.288 1.079-.433l.322.122.3-.177c.011.1.067.144.178.133l.3-.178c.011.1.067.145.178.134l.144-.012-.022-.322c-.222.022-.811.022-1.745-.011l-.3.2-.011-.178c-7.459.611-11.693.956-12.705 1.056-.133.011-.656 0-1.578-.022.01.122-.1.189-.323.211l-.322-.144-1.09.277c-.255.023-.688.011-1.289-.055a1.108 1.108 0 01-.611.233c-.133.011 1.59-.089 3.19-.2-.167.134-.422.211-.778.245-.245.022-.456-.011-.634-.111-.244.11-1.033.288-2.356.555l-.322-.122-5.202.8c-.2-.1-.434-.133-.7-.111-.278.022-.745.122-1.39.3l-2.512 1.045.189.311c.122-.011.3-.078.511-.2l.89.078-.112.833c-.822.367-1.3.912-1.434 1.6-1.233.545-1.845.934-1.845 1.168l.011.144.19-.01.333-.179.389.467.055.645c.023.2-2.056 4.567-6.213 13.103-3.601 8.224-5.49 12.726-5.669 13.537-1.233.344-1.945.845-2.156 1.511.022.212.389.356 1.1.412l.034.322-.323.533.056.645c.033.333.934.59 2.7.767-.01-.111.045-.178.168-.19.033.401-.078 1.179-.334 2.335l.19-.011c.733-1 1.077-1.69 1.044-2.067l.156-.012c.177-.01.366.19.589.623-.223.089-1 1.856-2.334 5.312l.188.312.19-.012c1.633-4.134 2.656-6.423 3.078-6.857 2.146-.189 5.858-.567 11.127-1.134l.333-.2c.011.112.078.167.2.156l.345-.033.333-.2c.011.11.078.166.2.155l3.99-.344c1.057-.09 1.557-.412 1.512-.956-.01-.145.612-.311 1.868-.49.122-.01.3.023.544.1-.01-.1.623-.2 1.89-.31.033-.667.245-1.023.622-1.056l-.033-.322a5.522 5.522 0 00-1.223.277c-.833-.044-1.367-.11-1.59-.189-.221.123-.388.19-.51.2l-2.78.09-.333.177c-.01-.1-.077-.144-.2-.133l-.155.011-.356.178c-.011-.1-.3-.178-.878-.256l-.356.211-.689.056-.011-.178c3.579-.389 5.346-.878 5.302-1.456.233-.022.356.09.378.322l1.045-.266-.034-.323-8.57.234c.012.11-.044.178-.166.189l-1.045-.09c-.267.023-.49.1-.667.234l-.389-.144c-1.078.089-1.879.222-2.412.389a15.193 15.193 0 00-2.445.033l-1.923.167-.89-.1c-.044-.567 1.056-3.357 3.324-8.358.656-1.69 1.256-2.745 1.834-3.145.122-.011.3.033.545.133l1.367-.467.7.111c1.178-.1 2.545-.433 4.113-1.01.389-.034.678-.012.889.077l1.045-.245 3.112-.266c1.323-.111 2.757-.4 4.313-.878l-.034-.323c-.578.056-.878-.044-.9-.277-.033-.434-.456-.612-1.267-.545l-.034-.322.856-.245 2.246-.189-.034-.322c-.089.011-.544 0-1.39-.033l-.032-.345.867-.078c.233-.022.333-.133.31-.355-1.166.033-1.755-.023-1.767-.178-8.136.4-12.215.478-12.237.222-.123.011-.29.089-.512.222l-.21-.333c2.155-4.58 3.423-6.89 3.79-6.924.01.178-.078.467-.279.856l.012.144.344-.033c.856-2.045 1.579-3.101 2.179-3.146 2.556-.222-.356-.389 5.113-1.244.222.1.378.144.489.133 2.145-.433 5.135-.889 8.97-1.356l-.022-.322-2.046.189-.022-.322c.245-.023.445-.1.611-.234l.012.178c.11-.011.266-.089.466-.222.356-.034.623 0 .812.1.711-.19 1.29-.3 1.712-.345l1.278-.122c.311-.2.456-.378.444-.545l-.01-.144c-.323.033-.69.01-1.123-.067-.011-.178.078-.3.289-.356l2.378-.222 1.09-.278c.01.123.066.167.155.167.111-.011.267-.089.467-.222.056.01.122.01.178.022a8.83 8.83 0 00-.478 1.3l-.311.023a1.36 1.36 0 00-.178-.567l-.156.01c-2.89 8.047-4.179 11.793-6.847 17.972-.489 1.578-.9 2.456-1.256 2.645.011.178.123.267.312.245.066.778-.112 1.545-.545 2.3-1.234 3.557-2.056 5.502-2.479 5.858l.278 1.678c.011.178-.078.278-.267.3l-.289.022c-.044-.467-.21-.689-.511-.656l-.156.011a6.616 6.616 0 00-.855 2.057l.289-.023c.389-.255.566-.555.533-.9l.578-.055.334.122c-.267.422-.39.756-.367 1.011l.155.267-.378.889.012.144c.333-.033.7.078 1.089.312.267-.023.556-.145.878-.356.333-.033 1.578-.044 3.724-.044l1.078-.367c1.311-.011 1.522.022 2.656-.078l.467-.044.245-.167.01.144c1.19-.1 1.268-.022 2.202.09l.01.144-.655.055.022.278a.942.942 0 00.523-.2c.166-.011.266.078.277.278a3.915 3.915 0 00-.9.2l-.289-.1c-.456.122-.356.156-.667.178l-.456-.09c.012.079-.033.134-.11.134.01.178.11.267.277.256l.467-.045 2.434-.21.923-.2c.01.077.044.121.122.11l.445-.166.833-.067c.645-.056.634-.1 2.034-.322-.01-.09.023-.123.09-.134l.01.123c2.279-.39 2.424-.412 2.79-.534l.034.067c.567-.134.244-.1.4-.211.011.1.044.144.1.144l.4-.033-.022-.3-.812-.011-.01-.023c-.034.011-.056.011-.09.023h-.11v.022c-.545.11-.557.033-.912.066l-2.034.112-.011-.145 1.133-.156.412-.033.233-.167.011.145c1.6-.133 2.168.267 9.57-1.312.4-.033.367-.366.623-1.055a.692.692 0 01-.39-.09c-.61.234-.933.123-2.111.312-.1.011-.178-.078-.211-.256l-.011-.122 1.133.033c.211-.022.623-.055 1.234-.4 0 .1-.222.156-.089.145zm-54.731.878l-.523.044c-.022-.21.256-1.011.834-2.378l.345-.034c.01.323-.2 1.112-.656 2.368zm.655-2.031l-.031-.29c-.032-.357.28-.602.964-.713l.031.29c.031.423-.28.668-.964.713zm7.046 4.865l.012.652-.987.35-.013-.651zm-1.165-.09c.01.31-.256.657-.834 1.004l-1.067-.135-.345.058-.033-.56 2.279-.366zm7.113-31.909l-.61.082-.012-.327c-.013-.328.104-.553.363-.655l.22-.02.415.265c.013.39-.104.614-.376.655zm8.174-1.957l.348-.03.047.88-.998.122c-.023-.486.162-.82.603-.972zm-2.316 1.072l-.79-.146-.01-.237c1.033-.146 1.378-.328 2.012-.62.01.2.122.274.322.237l.022.53-.311.054a.726.726 0 01-.634-.183c-.189.201-.389.329-.611.365zm.99 3.223l-.012-.543 1.278-.46.012.544-1.279.46zm1.373-1.078l-.018-.764.983-.239.017.764-.982.24zm.138-2.435l-.167.023.145-.723 1.422-.28.012.374c-.367.07-.845.28-1.412.606zm.723 3.177l-.023-.849.651-.146c.221-.059.338.205.35.79zm3.767-5.757l-.8.884-.144.044c-.378.133-.867.089-1.445-.132 1.033-.265 2.023-.575 2.39-.796zm-.855 3.557l.01.592-1.1.41-.01-.592zm1.8 1.215c-.01-.228-.222-.379-.656-.455l-1.1.53-.845.057c-.189-.227-.289-.378-.3-.492l.978.095 2.201-.606 1.123.076.01.303a4.16 4.16 0 00-1.41.492zm11.327-3.283c.133.011.222.011.255.011a4.263 4.263 0 011.323-.889c-.4 1.756-1.023 3.057-1.878 3.901l-.623-.378c.523-1.322.834-2.2.923-2.645zm-1.61 3.286l.264-.018c-.358.645-.679.985-.943 1.003l-.057-.68c.17 0 .415-.108.736-.305zm-1.536 2.938c.3-1.2.59-1.878.856-2.056l.011.145c-.156 1.111-.4 1.7-.722 1.744l.055.7c-.267.379-.389.668-.378.89l-.155.01-.09-.966c.179-.022.323-.178.423-.467zm.01 1.6c.021.167-.196.556-.63 1.156l-.304.012-.065-.423c.412-.489.76-.733.998-.744zm-9.435 26.227l-.034-.29.897-.052.103 1c-.483.027-.828-.183-.966-.658zm12.793.783c-.011-.282-.056-.407-.156-.376l-.722.188-.011-.407h.066l1.712-.408.011.408c-.5.063-.8.282-.9.595zm-.51-1.003c.6.301.3.602 0 .803-.3-.1-.7-.401 0-.803zm-.257-1.6l-.956.146-.011-.271.867-.146.756-.355c.011.167.055.23.155.209.9-.292.812-.375 1.245-.438.145-.02.234.146.245.48zm3.352.047c-.537-.209-.57-.376-.951-.25l-.011-.46.861-.293.011.46c-.09.042.235.125.09.543zm.073-.055l-.024-.736.977-.267.023.735zm1.026-.26l-.016-.392c.11-.035.266-.213.469-.569.328-.071.5.427.531.996zm1.326-.018l-.02-.767.981-.236.02.767zm.782-.403c-.018-.442.089-.708.32-.767l.304.649c-.018-.207.035-.324.142-.354l.232.708zm-7.504 3.832l-.2-.965-.8.039.2.964zm19.016-5.637c.17-.097.256-.193-.148-.251-.192.193.212.25-.213.27l.021.173c.043-.038.149-.096.234-.154l-.234.174v.019l-.447.52.894-.289h.106l-.042-.482-.17.02zm.478.527l-.131.038.033.965.967-.193c-.016-.617-.656-.81-.869-.81zm-1.054-.31l.1-.101v-.1s-.1.1-.1.2z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_danger.svg b/website/static/images/users/used_by_danger.svg
index a82e4e4a9..1953b8f9c 100644
--- a/website/static/images/users/used_by_danger.svg
+++ b/website/static/images/users/used_by_danger.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 165 53">
-  <path fill="#6F7B81" d="M34.29.398c-1.05.347-1.823.866-2.77 1.923-.946 1.04-1.445 2.01-1.737 3.343-.12.623-.19 4.035-.19 10.392v9.491l-.688.676-.688.675v26.085h6.469l.671-.693c.62-.641.74-.693 1.583-.693h.912v-1.974l-.688.675-.689.676V34.502l2.977-1.576 2.96-1.576.051 6.755c.017 3.706.086 6.737.155 6.737s.378-.242.688-.554l.568-.554v7.863h8.258v-16.35l-.688.675-.688.676v-14.67c0-14.359 0-14.705-.361-15.745l-.344-1.056.619-.641c.482-.502.602-.745.516-1.022-.206-.658-1.858-2.182-2.925-2.72L47.23.243 41.12.208c-4.68-.035-6.28.017-6.83.19zm56.606 0c-2.116.676-3.991 2.876-4.508 5.266-.12.589-.189 3.412-.189 7.967v7.067l-.688.675-.688.676v12.314c0 13.406 0 13.372.98 15.19.568 1.057 1.79 2.217 2.994 2.858l.93.485 5.505.052 5.506.052.688-.71.671-.693h6.641v-6.824l-.688.675-.688.676-.035-13.545-.051-13.527-5.712 2.962-5.73 2.98v4.554c0 2.512.035 4.556.086 4.556.052 0 .792-.347 1.635-.78.843-.433 1.583-.78 1.634-.78.052 0 .086 2.841.086 6.323v6.322h-6.194V13.96l.689-.745.688-.762V7.95h4.37l-.671.693-.671.693h1.789v4.59c0 2.528.052 4.59.104 4.59.051 0 1.875-.953 4.043-2.096l3.957-2.096-.052-3.845-.051-3.828-.55-1.16c-.328-.693-.913-1.542-1.429-2.062l-.894-.9.636-.641.637-.658-.413-.277c-1.136-.745-1.635-.797-7.777-.78-4.319 0-6.056.07-6.59.225zm61.458.433l-.671.71h-13.868v14.1l.689-.676.688-.676v10.392l-.688.676-.689.675v26.951h.568c.43 0 .723-.156 1.239-.693l.671-.693h7.157v-3.55c0-1.958-.051-3.551-.12-3.551s-.378.242-.688.554l-.568.554V34.71l.843-.45.843-.45 1.514 3.48c.826 1.923 1.532 3.517 1.566 3.551.034.052.361-.225.74-.589l.67-.658.5 1.109c.275.606 1.135 2.58 1.927 4.364l1.428 3.257-.62.64c-.344.364-.636.728-.636.814 0 .104.292.85.636 1.68l.654 1.525h4.44c2.425 0 4.421-.052 4.421-.139 0-.07-.912-2.165-2.013-4.676l-2.013-4.556.637-.64c.344-.364.636-.728.636-.814 0-.104-.86-2.148-1.927-4.556l-1.927-4.364-.705.692-.689.693-.997-2.286c-.551-1.247-.964-2.286-.947-2.304.035-.034 1.24-.64 2.684-1.368l2.616-1.316v-9.682c0-5.456-.07-10.046-.173-10.548a8.291 8.291 0 00-.533-1.68l-.378-.797.636-.658c.344-.347.62-.728.62-.814 0-.347-2.065-2.165-2.874-2.546-.636-.278-1.239-.382-2.718-.433l-1.893-.07-.688.71zM18.393.953l-.62.606-8.878-.017L0 1.524v18.099l.688-.675.688-.675v33.324h2.306l-.671.693-.688.71 7.656-.052 7.657-.052 1.066-.589c1.927-1.039 3.252-2.875 3.665-5.04.103-.52.172-3.862.172-7.673V32.84l.688-.745.689-.762V19.07c0-7.535-.07-12.644-.173-13.198-.395-2.148-1.737-4.001-3.595-5.006-.551-.294-1.033-.537-1.084-.537-.035 0-.327.277-.671.624zm-2.736 22.81v15.814l-.688.675-.688.676v4.26h-4.027l.671-.692.671-.693H9.463V9.959l-.688.676-.688.675V9.336H9.17c1.033 0 1.119-.035 1.755-.693l.671-.693h4.06v15.813zm40.949-7.551v14.67l.688-.675.688-.676v19.572l-.688.675c-.671.676-.688.693-.688 1.94v1.265h8.086V42.487l.689-.676.688-.675V21.217l-.568.555c-.31.311-.62.554-.688.554-.069 0-.12-2.927-.12-6.495V9.336h6.193V12.8c0 1.905.052 3.464.12 3.464.07 0 .38-.243.689-.555l.568-.554v19.572l-.688.676-.689.675v16.905h8.259V27.99l.688-.745.688-.762V6.668l-.688.676c-.722.71-.74.693-.929-.433-.292-1.767-1.927-3.897-3.665-4.78-.929-.45-1.17-.503-3.355-.555-1.927-.052-2.563-.017-3.338.243-1.204.38-2.512 1.35-3.269 2.424l-.585.832V1.542h-8.086v14.67zm60.873-14.255c-1.738.71-2.84 1.819-3.717 3.707l-.464.987-.052 16.887-.034 16.87.688-.675.688-.676V49.45l-.688.676c-.654.64-.688.727-.688 1.767v1.09h19.614V45.19h-11.528v-1.18c0-1.143.017-1.195.688-1.853l.689-.676.034-5.283.052-5.3 5.677-2.944 5.678-2.945.052-2.823c.017-1.541-.017-2.806-.086-2.806-.069 0-.379.243-.688.555l-.568.554v-1.594c0-1.09-.069-1.593-.19-1.593-.12 0-2.683 1.282-5.694 2.858-3.029 1.576-5.523 2.858-5.575 2.858-.034 0-.069-3.083-.069-6.842v-6.84h11.528V1.542h-7.175c-7.14 0-7.192.017-8.172.415z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 165 53"><path fill="#6F7B81" d="M34.29.398c-1.05.347-1.823.866-2.77 1.923-.946 1.04-1.445 2.01-1.737 3.343-.12.623-.19 4.035-.19 10.392v9.491l-.688.676-.688.675v26.085h6.469l.671-.693c.62-.641.74-.693 1.583-.693h.912v-1.974l-.688.675-.689.676V34.502l2.977-1.576 2.96-1.576.051 6.755c.017 3.706.086 6.737.155 6.737s.378-.242.688-.554l.568-.554v7.863h8.258v-16.35l-.688.675-.688.676v-14.67c0-14.359 0-14.705-.361-15.745l-.344-1.056.619-.641c.482-.502.602-.745.516-1.022-.206-.658-1.858-2.182-2.925-2.72L47.23.243 41.12.208c-4.68-.035-6.28.017-6.83.19zm56.606 0c-2.116.676-3.991 2.876-4.508 5.266-.12.589-.189 3.412-.189 7.967v7.067l-.688.675-.688.676v12.314c0 13.406 0 13.372.98 15.19.568 1.057 1.79 2.217 2.994 2.858l.93.485 5.505.052 5.506.052.688-.71.671-.693h6.641v-6.824l-.688.675-.688.676-.035-13.545-.051-13.527-5.712 2.962-5.73 2.98v4.554c0 2.512.035 4.556.086 4.556.052 0 .792-.347 1.635-.78.843-.433 1.583-.78 1.634-.78.052 0 .086 2.841.086 6.323v6.322h-6.194V13.96l.689-.745.688-.762V7.95h4.37l-.671.693-.671.693h1.789v4.59c0 2.528.052 4.59.104 4.59.051 0 1.875-.953 4.043-2.096l3.957-2.096-.052-3.845-.051-3.828-.55-1.16c-.328-.693-.913-1.542-1.429-2.062l-.894-.9.636-.641.637-.658-.413-.277c-1.136-.745-1.635-.797-7.777-.78-4.319 0-6.056.07-6.59.225zm61.458.433l-.671.71h-13.868v14.1l.689-.676.688-.676v10.392l-.688.676-.689.675v26.951h.568c.43 0 .723-.156 1.239-.693l.671-.693h7.157v-3.55c0-1.958-.051-3.551-.12-3.551s-.378.242-.688.554l-.568.554V34.71l.843-.45.843-.45 1.514 3.48c.826 1.923 1.532 3.517 1.566 3.551.034.052.361-.225.74-.589l.67-.658.5 1.109c.275.606 1.135 2.58 1.927 4.364l1.428 3.257-.62.64c-.344.364-.636.728-.636.814 0 .104.292.85.636 1.68l.654 1.525h4.44c2.425 0 4.421-.052 4.421-.139 0-.07-.912-2.165-2.013-4.676l-2.013-4.556.637-.64c.344-.364.636-.728.636-.814 0-.104-.86-2.148-1.927-4.556l-1.927-4.364-.705.692-.689.693-.997-2.286c-.551-1.247-.964-2.286-.947-2.304.035-.034 1.24-.64 2.684-1.368l2.616-1.316v-9.682c0-5.456-.07-10.046-.173-10.548a8.291 8.291 0 00-.533-1.68l-.378-.797.636-.658c.344-.347.62-.728.62-.814 0-.347-2.065-2.165-2.874-2.546-.636-.278-1.239-.382-2.718-.433l-1.893-.07-.688.71zM18.393.953l-.62.606-8.878-.017L0 1.524v18.099l.688-.675.688-.675v33.324h2.306l-.671.693-.688.71 7.656-.052 7.657-.052 1.066-.589c1.927-1.039 3.252-2.875 3.665-5.04.103-.52.172-3.862.172-7.673V32.84l.688-.745.689-.762V19.07c0-7.535-.07-12.644-.173-13.198-.395-2.148-1.737-4.001-3.595-5.006-.551-.294-1.033-.537-1.084-.537-.035 0-.327.277-.671.624zm-2.736 22.81v15.814l-.688.675-.688.676v4.26h-4.027l.671-.692.671-.693H9.463V9.959l-.688.676-.688.675V9.336H9.17c1.033 0 1.119-.035 1.755-.693l.671-.693h4.06v15.813zm40.949-7.551v14.67l.688-.675.688-.676v19.572l-.688.675c-.671.676-.688.693-.688 1.94v1.265h8.086V42.487l.689-.676.688-.675V21.217l-.568.555c-.31.311-.62.554-.688.554-.069 0-.12-2.927-.12-6.495V9.336h6.193V12.8c0 1.905.052 3.464.12 3.464.07 0 .38-.243.689-.555l.568-.554v19.572l-.688.676-.689.675v16.905h8.259V27.99l.688-.745.688-.762V6.668l-.688.676c-.722.71-.74.693-.929-.433-.292-1.767-1.927-3.897-3.665-4.78-.929-.45-1.17-.503-3.355-.555-1.927-.052-2.563-.017-3.338.243-1.204.38-2.512 1.35-3.269 2.424l-.585.832V1.542h-8.086v14.67zm60.873-14.255c-1.738.71-2.84 1.819-3.717 3.707l-.464.987-.052 16.887-.034 16.87.688-.675.688-.676V49.45l-.688.676c-.654.64-.688.727-.688 1.767v1.09h19.614V45.19h-11.528v-1.18c0-1.143.017-1.195.688-1.853l.689-.676.034-5.283.052-5.3 5.677-2.944 5.678-2.945.052-2.823c.017-1.541-.017-2.806-.086-2.806-.069 0-.379.243-.688.555l-.568.554v-1.594c0-1.09-.069-1.593-.19-1.593-.12 0-2.683 1.282-5.694 2.858-3.029 1.576-5.523 2.858-5.575 2.858-.034 0-.069-3.083-.069-6.842v-6.84h11.528V1.542h-7.175c-7.14 0-7.192.017-8.172.415z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_facebook.svg b/website/static/images/users/used_by_facebook.svg
index 1b4cdba13..a97800e00 100644
--- a/website/static/images/users/used_by_facebook.svg
+++ b/website/static/images/users/used_by_facebook.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 219 42">
-  <path fill="#6F7B81" fill-rule="evenodd" d="M17.298 6.682c-2.602 0-3.357 1.153-3.357 3.687v4.205h6.944l-.694 6.8h-6.25V42h-8.33V21.374H0v-6.8h5.61v-4.09C5.61 3.628 8.388 0 16.14 0c1.68 0 3.645.114 4.86.287v6.395m8.272 22.278c0 4.01 1.495 6.66 5.342 6.66 3.39 0 5.114-2.426 5.114-6.263v-2.711c0-3.84-1.723-6.267-5.114-6.267-3.847 0-5.342 2.655-5.342 6.663v1.919zM21 27.156C21 19.646 24.619 14 32.202 14c4.136 0 6.662 2.09 7.869 4.685v-4.12H48v26.87h-7.93v-4.061C38.923 39.969 36.339 42 32.203 42 24.619 42 21 36.357 21 28.848v-1.693zM64.095 14c3.207 0 6.246.677 7.905 1.806l-1.833 5.758c-1.26-.62-3.321-1.241-5.5-1.241-4.47 0-6.417 2.539-6.417 6.888v1.578c0 4.349 1.947 6.888 6.418 6.888 2.178 0 4.239-.621 5.499-1.242L72 40.193C70.341 41.323 67.302 42 64.095 42 54.413 42 50 36.862 50 28.62v-1.24C50 19.138 54.413 14 64.095 14m18.282 11.494h10.121v-.675c0-2.93-1.221-5.24-4.886-5.24-3.783 0-5.235 2.31-5.235 5.915M74 28.987v-2.366C74 19.016 78.477 14 87.612 14 96.22 14 100 19.071 100 26.509v4.28H82.377c.173 3.665 1.86 5.296 6.515 5.296 3.14 0 6.457-.62 8.9-1.63l1.51 5.575C97.094 41.157 92.556 42 88.542 42 77.956 42 74 36.876 74 28.987m47.797-2.125c0-3.815-1.482-6.658-5.41-6.658-3.362 0-5.184 2.39-5.184 6.258v2.846c0 3.87 1.822 6.26 5.184 6.26 3.928 0 5.41-2.845 5.41-6.66v-2.046zM130 28.739C130 36.308 126.355 42 118.835 42c-4.1 0-6.95-2.05-8.089-4.667v4.097H103V.74l8.203-.74v18.097c1.196-2.39 3.814-4.323 7.632-4.323 7.52 0 11.165 5.688 11.165 13.257v1.708zm21.798-1.981c0-3.556-1.483-6.379-5.298-6.379-3.818 0-5.297 2.823-5.297 6.38v2.482c0 3.556 1.48 6.38 5.297 6.38 3.815 0 5.298-2.824 5.298-6.38v-2.483zM133 28.677v-1.354C133 19.59 137.441 14 146.5 14c9.056 0 13.5 5.59 13.5 13.323v1.354C160 36.413 155.556 42 146.5 42c-9.059 0-13.5-5.587-13.5-13.323zm48.798-1.919c0-3.556-1.483-6.379-5.298-6.379-3.818 0-5.298 2.823-5.298 6.38v2.482c0 3.556 1.48 6.38 5.298 6.38 3.815 0 5.298-2.824 5.298-6.38v-2.483zM163 28.677v-1.354C163 19.59 167.441 14 176.5 14c9.056 0 13.5 5.59 13.5 13.323v1.354C190 36.413 185.556 42 176.5 42c-9.059 0-13.5-5.587-13.5-13.323zm38.414-1.042l8.297-13.095h8.94l-8.707 13.558L219 42h-8.937l-8.649-13.44V42H193V.753L201.414 0"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 219 42"><path fill="#6F7B81" fill-rule="evenodd" d="M17.298 6.682c-2.602 0-3.357 1.153-3.357 3.687v4.205h6.944l-.694 6.8h-6.25V42h-8.33V21.374H0v-6.8h5.61v-4.09C5.61 3.628 8.388 0 16.14 0c1.68 0 3.645.114 4.86.287v6.395m8.272 22.278c0 4.01 1.495 6.66 5.342 6.66 3.39 0 5.114-2.426 5.114-6.263v-2.711c0-3.84-1.723-6.267-5.114-6.267-3.847 0-5.342 2.655-5.342 6.663v1.919zM21 27.156C21 19.646 24.619 14 32.202 14c4.136 0 6.662 2.09 7.869 4.685v-4.12H48v26.87h-7.93v-4.061C38.923 39.969 36.339 42 32.203 42 24.619 42 21 36.357 21 28.848v-1.693zM64.095 14c3.207 0 6.246.677 7.905 1.806l-1.833 5.758c-1.26-.62-3.321-1.241-5.5-1.241-4.47 0-6.417 2.539-6.417 6.888v1.578c0 4.349 1.947 6.888 6.418 6.888 2.178 0 4.239-.621 5.499-1.242L72 40.193C70.341 41.323 67.302 42 64.095 42 54.413 42 50 36.862 50 28.62v-1.24C50 19.138 54.413 14 64.095 14m18.282 11.494h10.121v-.675c0-2.93-1.221-5.24-4.886-5.24-3.783 0-5.235 2.31-5.235 5.915M74 28.987v-2.366C74 19.016 78.477 14 87.612 14 96.22 14 100 19.071 100 26.509v4.28H82.377c.173 3.665 1.86 5.296 6.515 5.296 3.14 0 6.457-.62 8.9-1.63l1.51 5.575C97.094 41.157 92.556 42 88.542 42 77.956 42 74 36.876 74 28.987m47.797-2.125c0-3.815-1.482-6.658-5.41-6.658-3.362 0-5.184 2.39-5.184 6.258v2.846c0 3.87 1.822 6.26 5.184 6.26 3.928 0 5.41-2.845 5.41-6.66v-2.046zM130 28.739C130 36.308 126.355 42 118.835 42c-4.1 0-6.95-2.05-8.089-4.667v4.097H103V.74l8.203-.74v18.097c1.196-2.39 3.814-4.323 7.632-4.323 7.52 0 11.165 5.688 11.165 13.257v1.708zm21.798-1.981c0-3.556-1.483-6.379-5.298-6.379-3.818 0-5.297 2.823-5.297 6.38v2.482c0 3.556 1.48 6.38 5.297 6.38 3.815 0 5.298-2.824 5.298-6.38v-2.483zM133 28.677v-1.354C133 19.59 137.441 14 146.5 14c9.056 0 13.5 5.59 13.5 13.323v1.354C160 36.413 155.556 42 146.5 42c-9.059 0-13.5-5.587-13.5-13.323zm48.798-1.919c0-3.556-1.483-6.379-5.298-6.379-3.818 0-5.298 2.823-5.298 6.38v2.482c0 3.556 1.48 6.38 5.298 6.38 3.815 0 5.298-2.824 5.298-6.38v-2.483zM163 28.677v-1.354C163 19.59 167.441 14 176.5 14c9.056 0 13.5 5.59 13.5 13.323v1.354C190 36.413 185.556 42 176.5 42c-9.059 0-13.5-5.587-13.5-13.323zm38.414-1.042l8.297-13.095h8.94l-8.707 13.558L219 42h-8.937l-8.649-13.44V42H193V.753L201.414 0"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_jest.svg b/website/static/images/users/used_by_jest.svg
index 283449672..d7bcc5ea2 100644
--- a/website/static/images/users/used_by_jest.svg
+++ b/website/static/images/users/used_by_jest.svg
@@ -1,13 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 141 156">
-  <g fill="none" fill-rule="evenodd" transform="translate(3 3)">
-    <path stroke="#6F7B81" stroke-width="5" d="M116.211 74.322c-.193.117-6.553-.95-14.523-1.49-6.51-.44-14.092-.424-20.266-.006-5.007.34-11.585-2.177-12.37.814-2.943 11.196-9.273 20.948-17.326 28.545-6.059 5.716-12.992 10.05-20.491 12.72-8.929-4.586-13.145-14.787-9.34-23.731 3.017-7.094 6.528-14.907.046-16.695-4.719-1.301-7.31 3.22-9.124 8.052C9.342 91.79 2.74 101.37.857 112.717c-1.986 11.98-.006 24.695 10.354 31.876 24.13 16.724 50.322-10.367 77.938-17.177 10.008-2.468 20.995-2.07 29.812-7.177 6.622-3.836 10.988-10.192 12.227-17.328 1.992-11.477-3.979-22.88-14.977-28.589z"/>
-    <path fill="#182025" fill-rule="nonzero" d="M91.201 28.99l19.4 39.575L133.85 0H48.496L71.69 68.443z"/>
-    <path stroke="#6F7B81" stroke-width="6" d="M91.201 28.99l19.4 39.575L133.85 0H48.496L71.69 68.443z"/>
-    <circle cx="67.664" cy="73.78" r="14.623" fill="#182025" fill-rule="nonzero" stroke="#82D7DA"/>
-    <circle cx="67.664" cy="73.78" r="14.623" stroke="#6F7B81" stroke-width="10"/>
-    <circle cx="115.301" cy="73.78" r="14.623" fill="#182025" fill-rule="nonzero"/>
-    <circle cx="115.301" cy="73.78" r="14.623" stroke="#6F7B81" stroke-width="10"/>
-    <circle cx="19.847" cy="73.885" r="14.623" fill="#182025" fill-rule="nonzero"/>
-    <circle cx="19.847" cy="73.885" r="14.623" stroke="#6F7B81" stroke-width="10"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 141 156"><g fill="none" fill-rule="evenodd" transform="translate(3 3)"><path stroke="#6F7B81" stroke-width="5" d="M116.211 74.322c-.193.117-6.553-.95-14.523-1.49-6.51-.44-14.092-.424-20.266-.006-5.007.34-11.585-2.177-12.37.814-2.943 11.196-9.273 20.948-17.326 28.545-6.059 5.716-12.992 10.05-20.491 12.72-8.929-4.586-13.145-14.787-9.34-23.731 3.017-7.094 6.528-14.907.046-16.695-4.719-1.301-7.31 3.22-9.124 8.052C9.342 91.79 2.74 101.37.857 112.717c-1.986 11.98-.006 24.695 10.354 31.876 24.13 16.724 50.322-10.367 77.938-17.177 10.008-2.468 20.995-2.07 29.812-7.177 6.622-3.836 10.988-10.192 12.227-17.328 1.992-11.477-3.979-22.88-14.977-28.589z"/><path fill="#182025" fill-rule="nonzero" d="M91.201 28.99l19.4 39.575L133.85 0H48.496L71.69 68.443z"/><path stroke="#6F7B81" stroke-width="6" d="M91.201 28.99l19.4 39.575L133.85 0H48.496L71.69 68.443z"/><circle cx="67.664" cy="73.78" r="14.623" fill="#182025" fill-rule="nonzero" stroke="#82D7DA"/><circle cx="67.664" cy="73.78" r="14.623" stroke="#6F7B81" stroke-width="10"/><circle cx="115.301" cy="73.78" r="14.623" fill="#182025" fill-rule="nonzero"/><circle cx="115.301" cy="73.78" r="14.623" stroke="#6F7B81" stroke-width="10"/><circle cx="19.847" cy="73.885" r="14.623" fill="#182025" fill-rule="nonzero"/><circle cx="19.847" cy="73.885" r="14.623" stroke="#6F7B81" stroke-width="10"/></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_react.svg b/website/static/images/users/used_by_react.svg
index 4002c26db..18d2620be 100644
--- a/website/static/images/users/used_by_react.svg
+++ b/website/static/images/users/used_by_react.svg
@@ -1,10 +1 @@
-<svg viewBox="0 0 156 139" xmlns="http://www.w3.org/2000/svg">
-  <g fill="none" fill-rule="evenodd" transform="translate(3 3)">
-    <circle cx="74.733" cy="66.192" fill="#6f7b81" fill-rule="nonzero" r="13.879"/>
-    <g stroke="#6f7b81" stroke-width="6">
-      <path d="M124.397 45.119C140.252 50.57 150 58.836 150 66.319c0 7.8-10.331 16.58-27.357 22.215-12.872 4.26-29.81 6.484-47.643 6.484-18.284 0-35.598-2.088-48.612-6.531C9.92 82.863 0 73.97 0 66.32c0-7.423 9.307-15.624 24.939-21.068C38.147 40.652 56.03 37.9 75 37.9c18.786 0 36.239 2.693 49.397 7.219z"/>
-      <path d="M50.344 52.186c9.365-16.307 20.395-30.107 30.87-39.262 12.622-11.03 24.634-15.35 31.11-11.6 6.748 3.909 9.196 17.276 5.585 34.878-2.73 13.309-9.25 29.126-18.14 44.606-9.115 15.87-19.552 29.853-29.885 38.923-13.076 11.478-25.717 15.631-32.336 11.798-6.424-3.72-8.88-15.908-5.799-32.205 2.604-13.77 9.138-30.672 18.595-47.138z"/>
-      <path d="M31.878 34.118c-3.224-16.434-.945-29 5.546-32.748 6.764-3.906 19.562.625 32.99 12.518 10.15 8.992 20.575 22.518 29.52 37.931 9.172 15.804 16.046 31.814 18.72 45.288 3.383 17.051.644 30.08-5.991 33.911-6.438 3.718-18.22-.218-30.783-11.002-10.614-9.112-21.97-23.19-31.486-39.587-9.423-16.237-15.841-32.67-18.516-46.31z"/>
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 156 139"><g fill="none" fill-rule="evenodd" transform="translate(3 3)"><circle cx="74.733" cy="66.192" r="13.879" fill="#6f7b81" fill-rule="nonzero"/><g stroke="#6f7b81" stroke-width="6"><path d="M124.397 45.119C140.252 50.57 150 58.836 150 66.319c0 7.8-10.331 16.58-27.357 22.215-12.872 4.26-29.81 6.484-47.643 6.484-18.284 0-35.598-2.088-48.612-6.531C9.92 82.863 0 73.97 0 66.32c0-7.423 9.307-15.624 24.939-21.068C38.147 40.652 56.03 37.9 75 37.9c18.786 0 36.239 2.693 49.397 7.219z"/><path d="M50.344 52.186c9.365-16.307 20.395-30.107 30.87-39.262 12.622-11.03 24.634-15.35 31.11-11.6 6.748 3.909 9.196 17.276 5.585 34.878-2.73 13.309-9.25 29.126-18.14 44.606-9.115 15.87-19.552 29.853-29.885 38.923-13.076 11.478-25.717 15.631-32.336 11.798-6.424-3.72-8.88-15.908-5.799-32.205 2.604-13.77 9.138-30.672 18.595-47.138z"/><path d="M31.878 34.118c-3.224-16.434-.945-29 5.546-32.748 6.764-3.906 19.562.625 32.99 12.518 10.15 8.992 20.575 22.518 29.52 37.931 9.172 15.804 16.046 31.814 18.72 45.288 3.383 17.051.644 30.08-5.991 33.911-6.438 3.718-18.22-.218-30.783-11.002-10.614-9.112-21.97-23.19-31.486-39.587-9.423-16.237-15.841-32.67-18.516-46.31z"/></g></g></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_storybook.svg b/website/static/images/users/used_by_storybook.svg
index 064d192a7..d770ab0ca 100644
--- a/website/static/images/users/used_by_storybook.svg
+++ b/website/static/images/users/used_by_storybook.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 114 151">
-  <path fill="#6F7B81" d="M88.01 1.927l-1.053 18.842 7.67-6.001 6.391 6.001V.962L114 0v151l-99.51-5.052L8 7.858l80.01-5.931zM70.53 57.86l21.172-.529c.526-20.629-10.126-30.811-28.668-30.811s-28.93 10.58-28.93 26.449c0 27.638 35.505 28.167 35.505 43.242 0 4.232-1.972 6.744-6.312 6.744-5.654 0-7.89-3.703-7.627-14.017H33.446c-1.71 25.522 13.15 31.34 30.114 31.34 16.438 0 29.325-7.67 29.325-24.332 0-29.621-36.031-28.828-36.031-43.506 0-5.951 4.208-6.745 6.706-6.745 2.63 0 7.364 1.058 6.97 12.166zM11 146L4.714 8H0l4.714 138z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 114 151"><path fill="#6F7B81" d="M88.01 1.927l-1.053 18.842 7.67-6.001 6.391 6.001V.962L114 0v151l-99.51-5.052L8 7.858l80.01-5.931zM70.53 57.86l21.172-.529c.526-20.629-10.126-30.811-28.668-30.811s-28.93 10.58-28.93 26.449c0 27.638 35.505 28.167 35.505 43.242 0 4.232-1.972 6.744-6.312 6.744-5.654 0-7.89-3.703-7.627-14.017H33.446c-1.71 25.522 13.15 31.34 30.114 31.34 16.438 0 29.325-7.67 29.325-24.332 0-29.621-36.031-28.828-36.031-43.506 0-5.951 4.208-6.745 6.706-6.745 2.63 0 7.364 1.058 6.97 12.166zM11 146L4.714 8H0l4.714 138z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_webpack.svg b/website/static/images/users/used_by_webpack.svg
index 04dee91d0..f63bf0a54 100644
--- a/website/static/images/users/used_by_webpack.svg
+++ b/website/static/images/users/used_by_webpack.svg
@@ -1,3 +1 @@
-<svg viewBox="0 0 133 150" xmlns="http://www.w3.org/2000/svg">
-  <path d="M66.5 0L133 37.496v75.008L66.5 150 0 112.504V37.496zm54.626 109.918l-19.76-11.374-32.667 17.917v23.022zm3.592-3.238V44.861L105.54 55.91v39.74l19.177 11.03zm-113.05 3.238l52.426 29.565V116.46L31.411 98.544zm-3.592-3.238l19.177-11.03V55.91L8.076 44.86zm2.251-65.827l19.04 10.98.274-.154 34.453-18.894v-22.25L10.327 40.852zm112.14 0L68.699 10.534v22.251l34.453 18.877.275.154zM64.094 111.22V77.098l-32.236-18.55v34.994zm4.605 0l32.237-17.66V58.546L68.699 77.098zM34.04 54.505l32.357 18.62 32.356-18.62-32.356-17.729z" fill="#6f7b81"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 133 150"><path fill="#6f7b81" d="M66.5 0L133 37.496v75.008L66.5 150 0 112.504V37.496zm54.626 109.918l-19.76-11.374-32.667 17.917v23.022zm3.592-3.238V44.861L105.54 55.91v39.74l19.177 11.03zm-113.05 3.238l52.426 29.565V116.46L31.411 98.544zm-3.592-3.238l19.177-11.03V55.91L8.076 44.86zm2.251-65.827l19.04 10.98.274-.154 34.453-18.894v-22.25L10.327 40.852zm112.14 0L68.699 10.534v22.251l34.453 18.877.275.154zM64.094 111.22V77.098l-32.236-18.55v34.994zm4.605 0l32.237-17.66V58.546L68.699 77.098zM34.04 54.505l32.357 18.62 32.356-18.62-32.356-17.729z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_yarn.svg b/website/static/images/users/used_by_yarn.svg
index 982b1f709..707d87cec 100644
--- a/website/static/images/users/used_by_yarn.svg
+++ b/website/static/images/users/used_by_yarn.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 140 150">
-  <path fill="#6F7B81" d="M139.737 109.443c-.79-6.247-6.057-10.557-12.815-10.47-10.094.133-18.565 5.367-24.182 8.842-2.195 1.364-4.082 2.376-5.706 3.123.352-5.102.044-11.788-2.589-19.134-3.204-8.798-7.505-14.209-10.577-17.332 3.555-5.19 8.427-12.756 10.709-24.457 1.975-9.986 1.36-25.514-3.16-34.223-.922-1.76-2.458-3.035-4.389-3.563-.79-.22-2.282-.66-5.222.176-4.301-9.194-5.837-10.162-7.022-10.91C72.326-.087 69.429-.44 66.708.573c-3.642 1.32-6.758 4.839-9.699 11.085a45.866 45.866 0 00-1.185 2.683c-5.573.396-14.35 2.42-21.768 10.47-.921 1.011-2.72 1.759-4.608 2.463h.044c-3.862 1.32-5.661 4.487-7.768 10.205-2.984 8.006.088 15.88 3.116 20.982-4.125 3.695-9.611 9.59-12.508 16.496C8.734 83.49 8.34 91.848 8.47 96.378 5.398 99.633.658 105.748.132 112.61c-.703 9.59 2.765 16.1 4.3 18.475.44.704.922 1.276 1.449 1.848-.176 1.187-.22 2.463.044 3.783.57 3.079 2.501 5.586 5.442 7.17 5.793 3.079 13.868 4.398 20.1 1.275 2.238 2.376 6.32 4.663 13.737 4.663h.439c1.887 0 25.85-1.276 32.827-2.991 3.116-.748 5.267-2.068 6.671-3.255 4.477-1.408 16.853-5.63 28.527-13.197 8.25-5.366 11.103-6.51 17.247-8.006 5.837-1.451 9.612-6.862 8.822-12.932zm-29.668 15.352c-13.605 8.797-28.439 12.888-28.439 12.888s-1.229 1.848-4.784 2.684c-6.144 1.495-29.272 2.77-31.379 2.815-5.661.044-9.128-1.452-10.094-3.783-2.94-7.038 4.213-10.117 4.213-10.117s-1.58-.968-2.501-1.848c-.834-.836-1.712-2.507-1.975-1.891-1.097 2.683-1.668 9.237-4.608 12.184-4.038 4.091-11.674 2.728-16.195.352-4.959-2.64.351-8.841.351-8.841s-2.677 1.583-4.827-1.672c-1.931-2.991-3.73-8.094-3.248-14.384.527-7.17 8.514-14.12 8.514-14.12s-1.404-10.602 3.204-21.467c4.17-9.897 15.404-17.859 15.404-17.859s-9.435-10.47-5.924-19.883c2.282-6.158 3.203-6.114 3.95-6.378 2.633-1.012 5.178-2.111 7.065-4.179 9.436-10.205 21.461-8.27 21.461-8.27S65.962 3.651 71.23 7.038c1.624 1.056 7.46 14.076 7.46 14.076s6.233-3.65 6.935-2.287c3.774 7.346 4.213 21.378 2.545 29.912-2.808 14.076-9.83 21.642-12.64 26.393-.658 1.1 7.55 4.575 12.728 18.959 4.784 13.152.527 24.193 1.273 25.425.175.308 5.661.748 16.677-6.07 5.88-3.651 12.859-7.742 20.802-7.83 7.68-.132 8.076 8.93 2.326 10.293-7.022 1.672-10.576 3.211-19.266 8.886z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 140 150"><path fill="#6F7B81" d="M139.737 109.443c-.79-6.247-6.057-10.557-12.815-10.47-10.094.133-18.565 5.367-24.182 8.842-2.195 1.364-4.082 2.376-5.706 3.123.352-5.102.044-11.788-2.589-19.134-3.204-8.798-7.505-14.209-10.577-17.332 3.555-5.19 8.427-12.756 10.709-24.457 1.975-9.986 1.36-25.514-3.16-34.223-.922-1.76-2.458-3.035-4.389-3.563-.79-.22-2.282-.66-5.222.176-4.301-9.194-5.837-10.162-7.022-10.91C72.326-.087 69.429-.44 66.708.573c-3.642 1.32-6.758 4.839-9.699 11.085a45.866 45.866 0 00-1.185 2.683c-5.573.396-14.35 2.42-21.768 10.47-.921 1.011-2.72 1.759-4.608 2.463h.044c-3.862 1.32-5.661 4.487-7.768 10.205-2.984 8.006.088 15.88 3.116 20.982-4.125 3.695-9.611 9.59-12.508 16.496C8.734 83.49 8.34 91.848 8.47 96.378 5.398 99.633.658 105.748.132 112.61c-.703 9.59 2.765 16.1 4.3 18.475.44.704.922 1.276 1.449 1.848-.176 1.187-.22 2.463.044 3.783.57 3.079 2.501 5.586 5.442 7.17 5.793 3.079 13.868 4.398 20.1 1.275 2.238 2.376 6.32 4.663 13.737 4.663h.439c1.887 0 25.85-1.276 32.827-2.991 3.116-.748 5.267-2.068 6.671-3.255 4.477-1.408 16.853-5.63 28.527-13.197 8.25-5.366 11.103-6.51 17.247-8.006 5.837-1.451 9.612-6.862 8.822-12.932zm-29.668 15.352c-13.605 8.797-28.439 12.888-28.439 12.888s-1.229 1.848-4.784 2.684c-6.144 1.495-29.272 2.77-31.379 2.815-5.661.044-9.128-1.452-10.094-3.783-2.94-7.038 4.213-10.117 4.213-10.117s-1.58-.968-2.501-1.848c-.834-.836-1.712-2.507-1.975-1.891-1.097 2.683-1.668 9.237-4.608 12.184-4.038 4.091-11.674 2.728-16.195.352-4.959-2.64.351-8.841.351-8.841s-2.677 1.583-4.827-1.672c-1.931-2.991-3.73-8.094-3.248-14.384.527-7.17 8.514-14.12 8.514-14.12s-1.404-10.602 3.204-21.467c4.17-9.897 15.404-17.859 15.404-17.859s-9.435-10.47-5.924-19.883c2.282-6.158 3.203-6.114 3.95-6.378 2.633-1.012 5.178-2.111 7.065-4.179 9.436-10.205 21.461-8.27 21.461-8.27S65.962 3.651 71.23 7.038c1.624 1.056 7.46 14.076 7.46 14.076s6.233-3.65 6.935-2.287c3.774 7.346 4.213 21.378 2.545 29.912-2.808 14.076-9.83 21.642-12.64 26.393-.658 1.1 7.55 4.575 12.728 18.959 4.784 13.152.527 24.193 1.273 25.425.175.308 5.661.748 16.677-6.07 5.88-3.651 12.859-7.742 20.802-7.83 7.68-.132 8.076 8.93 2.326 10.293-7.022 1.672-10.576 3.211-19.266 8.886z"/></svg>
\ No newline at end of file
diff --git a/website/static/images/users/used_by_zeit.svg b/website/static/images/users/used_by_zeit.svg
index cdc48f7fd..16c6ab281 100644
--- a/website/static/images/users/used_by_zeit.svg
+++ b/website/static/images/users/used_by_zeit.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 74 74">
-  <path fill="#6F7B81" fill-rule="evenodd" d="M37 0l37 74H0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 74 74"><path fill="#6F7B81" fill-rule="evenodd" d="M37 0l37 74H0z"/></svg>
\ No newline at end of file
diff --git a/website/static/prettier-centered-logo-static.svg b/website/static/prettier-centered-logo-static.svg
index fd6b9c54e..f7fdec50d 100644
--- a/website/static/prettier-centered-logo-static.svg
+++ b/website/static/prettier-centered-logo-static.svg
@@ -1,9 +1 @@
-<svg viewBox="0 0 685 250" xmlns="http://www.w3.org/2000/svg">
-  <g clip-rule="evenodd" fill-rule="evenodd">
-    <path d="M385 140h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-120 40h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0-80h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm90-40h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-90 100h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5z" fill="#c693c6"/>
-    <path d="M265 220h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm60-80h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zM265 40h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0 80h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zm120-40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5z" fill="#ea5e5e"/>
-    <path d="M315 40h100c2.8 0 5 2.2 5 5s-2.2 5-5 5H315c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-10 160h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-10-80h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0 40h90c2.8 0 5 2.2 5 5s-2.2 5-5 5h-90c-2.8 0-5-2.2-5-5s2.2-5 5-5zm90-60h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zM265 80h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5z" fill="#fbbf47"/>
-    <path d="M265 140h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0 60h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zM415 60h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-70 60h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-80-60h70c2.8 0 5 2.2 5 5s-2.2 5-5 5h-70c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0-40h120c2.8 0 5 2.2 5 5s-2.2 5-5 5H265c-2.8 0-5-2.2-5-5s2.2-5 5-5z" fill="#56b3b4"/>
-    <path d="M483 20h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-78 0h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-300 0h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm80 0h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm15-20h135c2.8 0 5 2.2 5 5s-2.2 5-5 5H200c-2.8 0-5-2.2-5-5s2.2-5 5-5zm155 0h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zM110 0h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm55 220h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm20-160h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zM564 0h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zM46 20h40c2.8 0 5 2.2 5 5s-2.2 5-5 5H46c-2.8 0-5-2.2-5-5s2.2-5 5-5zM415 0h129c2.8 0 5 2.2 5 5s-2.2 5-5 5H415c-2.8 0-5-2.2-5-5s2.2-5 5-5zm105 20h114c2.8 0 5 2.2 5 5s-2.2 5-5 5H520c-2.8 0-5-2.2-5-5s2.2-5 5-5zM180 240h100c2.8 0 5 2.2 5 5s-2.2 5-5 5H180c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-80 0h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm305-80h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm80 0h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-380-20h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm20-20h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-100 0h80c2.8 0 5 2.2 5 5s-2.2 5-5 5H25c-2.8 0-5-2.2-5-5s2.2-5 5-5zm560 40h25c2.8 0 5 2.2 5 5s-2.2 5-5 5h-25c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-150-20h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm160-20h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zM435 40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-290 0h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-70 0h50c2.8 0 5 2.2 5 5s-2.2 5-5 5H75c-2.8 0-5-2.2-5-5s2.2-5 5-5zm90 40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm340-40h105c2.8 0 5 2.2 5 5s-2.2 5-5 5H505c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-90 160h105c2.8 0 5 2.2 5 5s-2.2 5-5 5H415c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-305 0h135c2.8 0 5 2.2 5 5s-2.2 5-5 5H110c-2.8 0-5-2.2-5-5s2.2-5 5-5zm30-40h105c2.8 0 5 2.2 5 5s-2.2 5-5 5H140c-2.8 0-5-2.2-5-5s2.2-5 5-5zm75-120h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zM30 60h30c2.8 0 5 2.2 5 5s-2.2 5-5 5H30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm85 20h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm120 0h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zm210 40h100c2.8 0 5 2.2 5 5s-2.2 5-5 5H445c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-300-20h100c2.8 0 5 2.2 5 5s-2.2 5-5 5H145c-2.8 0-5-2.2-5-5s2.2-5 5-5zm340-20h195c2.8 0 5 2.2 5 5s-2.2 5-5 5H485c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-40-20h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm100 0h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zM15 80h80c2.8 0 5 2.2 5 5s-2.2 5-5 5H15c-2.8 0-5-2.2-5-5s2.2-5 5-5zm60-20h90c2.8 0 5 2.2 5 5s-2.2 5-5 5H75c-2.8 0-5-2.2-5-5s2.2-5 5-5zm410 160h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zM80 160h40c2.8 0 5 2.2 5 5s-2.2 5-5 5H80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm145 60h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0-100h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zm340 0h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zM455 80h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zM170 0h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-5 180h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zM65 220h80c2.8 0 5 2.2 5 5s-2.2 5-5 5H65c-2.8 0-5-2.2-5-5s2.2-5 5-5zm390-120h135c2.8 0 5 2.2 5 5s-2.2 5-5 5H455c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-110 80h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm100 0h145c2.8 0 5 2.2 5 5s-2.2 5-5 5H445c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-100 20h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm55 40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-205-60h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-125 0h75c2.8 0 5 2.2 5 5s-2.2 5-5 5H70c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-35-40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5H35c-2.8 0-5-2.2-5-5s2.2-5 5-5zm480 0h120c2.8 0 5 2.2 5 5s-2.2 5-5 5H515c-2.8 0-5-2.2-5-5s2.2-5 5-5zM5 100h120c2.8 0 5 2.2 5 5s-2.2 5-5 5H5c-2.8 0-5-2.2-5-5s2.2-5 5-5zm340 120h120c2.8 0 5 2.2 5 5s-2.2 5-5 5H345c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-45 20h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm25-160h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0 20h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-120 40h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5z" fill="#c6cbd0" opacity=".5"/>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 685 250"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="#c693c6" d="M385 140h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-120 40h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0-80h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm90-40h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-90 100h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5z"/><path fill="#ea5e5e" d="M265 220h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm60-80h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zM265 40h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0 80h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zm120-40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5z"/><path fill="#fbbf47" d="M315 40h100c2.8 0 5 2.2 5 5s-2.2 5-5 5H315c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-10 160h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-10-80h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0 40h90c2.8 0 5 2.2 5 5s-2.2 5-5 5h-90c-2.8 0-5-2.2-5-5s2.2-5 5-5zm90-60h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zM265 80h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5z"/><path fill="#56b3b4" d="M265 140h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0 60h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zM415 60h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-70 60h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-80-60h70c2.8 0 5 2.2 5 5s-2.2 5-5 5h-70c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0-40h120c2.8 0 5 2.2 5 5s-2.2 5-5 5H265c-2.8 0-5-2.2-5-5s2.2-5 5-5z"/><path fill="#c6cbd0" d="M483 20h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-78 0h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-300 0h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm80 0h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm15-20h135c2.8 0 5 2.2 5 5s-2.2 5-5 5H200c-2.8 0-5-2.2-5-5s2.2-5 5-5zm155 0h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zM110 0h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm55 220h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm20-160h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zM564 0h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zM46 20h40c2.8 0 5 2.2 5 5s-2.2 5-5 5H46c-2.8 0-5-2.2-5-5s2.2-5 5-5zM415 0h129c2.8 0 5 2.2 5 5s-2.2 5-5 5H415c-2.8 0-5-2.2-5-5s2.2-5 5-5zm105 20h114c2.8 0 5 2.2 5 5s-2.2 5-5 5H520c-2.8 0-5-2.2-5-5s2.2-5 5-5zM180 240h100c2.8 0 5 2.2 5 5s-2.2 5-5 5H180c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-80 0h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm305-80h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm80 0h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-380-20h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm20-20h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-100 0h80c2.8 0 5 2.2 5 5s-2.2 5-5 5H25c-2.8 0-5-2.2-5-5s2.2-5 5-5zm560 40h25c2.8 0 5 2.2 5 5s-2.2 5-5 5h-25c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-150-20h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zm160-20h60c2.8 0 5 2.2 5 5s-2.2 5-5 5h-60c-2.8 0-5-2.2-5-5s2.2-5 5-5zM435 40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-290 0h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-70 0h50c2.8 0 5 2.2 5 5s-2.2 5-5 5H75c-2.8 0-5-2.2-5-5s2.2-5 5-5zm90 40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm340-40h105c2.8 0 5 2.2 5 5s-2.2 5-5 5H505c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-90 160h105c2.8 0 5 2.2 5 5s-2.2 5-5 5H415c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-305 0h135c2.8 0 5 2.2 5 5s-2.2 5-5 5H110c-2.8 0-5-2.2-5-5s2.2-5 5-5zm30-40h105c2.8 0 5 2.2 5 5s-2.2 5-5 5H140c-2.8 0-5-2.2-5-5s2.2-5 5-5zm75-120h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zM30 60h30c2.8 0 5 2.2 5 5s-2.2 5-5 5H30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm85 20h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zm120 0h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zm210 40h100c2.8 0 5 2.2 5 5s-2.2 5-5 5H445c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-300-20h100c2.8 0 5 2.2 5 5s-2.2 5-5 5H145c-2.8 0-5-2.2-5-5s2.2-5 5-5zm340-20h195c2.8 0 5 2.2 5 5s-2.2 5-5 5H485c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-40-20h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm100 0h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zM15 80h80c2.8 0 5 2.2 5 5s-2.2 5-5 5H15c-2.8 0-5-2.2-5-5s2.2-5 5-5zm60-20h90c2.8 0 5 2.2 5 5s-2.2 5-5 5H75c-2.8 0-5-2.2-5-5s2.2-5 5-5zm410 160h30c2.8 0 5 2.2 5 5s-2.2 5-5 5h-30c-2.8 0-5-2.2-5-5s2.2-5 5-5zM80 160h40c2.8 0 5 2.2 5 5s-2.2 5-5 5H80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm145 60h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0-100h20c2.8 0 5 2.2 5 5s-2.2 5-5 5h-20c-2.8 0-5-2.2-5-5s2.2-5 5-5zm340 0h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zM455 80h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zM170 0h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-5 180h10c2.8 0 5 2.2 5 5s-2.2 5-5 5h-10c-2.8 0-5-2.2-5-5s2.2-5 5-5zM65 220h80c2.8 0 5 2.2 5 5s-2.2 5-5 5H65c-2.8 0-5-2.2-5-5s2.2-5 5-5zm390-120h135c2.8 0 5 2.2 5 5s-2.2 5-5 5H455c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-110 80h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm100 0h145c2.8 0 5 2.2 5 5s-2.2 5-5 5H445c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-100 20h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm55 40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-205-60h50c2.8 0 5 2.2 5 5s-2.2 5-5 5h-50c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-125 0h75c2.8 0 5 2.2 5 5s-2.2 5-5 5H70c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-35-40h50c2.8 0 5 2.2 5 5s-2.2 5-5 5H35c-2.8 0-5-2.2-5-5s2.2-5 5-5zm480 0h120c2.8 0 5 2.2 5 5s-2.2 5-5 5H515c-2.8 0-5-2.2-5-5s2.2-5 5-5zM5 100h120c2.8 0 5 2.2 5 5s-2.2 5-5 5H5c-2.8 0-5-2.2-5-5s2.2-5 5-5zm340 120h120c2.8 0 5 2.2 5 5s-2.2 5-5 5H345c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-45 20h80c2.8 0 5 2.2 5 5s-2.2 5-5 5h-80c-2.8 0-5-2.2-5-5s2.2-5 5-5zm25-160h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm0 20h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5zm-120 40h40c2.8 0 5 2.2 5 5s-2.2 5-5 5h-40c-2.8 0-5-2.2-5-5s2.2-5 5-5z" opacity=".5"/></g></svg>
\ No newline at end of file

From 90a454e139beb9521182060785b5b4632c9a65b8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2019 10:44:25 +0100
Subject: [PATCH 42/88] Bump resolve from 1.12.2 to 1.13.1 (#7065)

Bumps [resolve](https://github.com/browserify/resolve) from 1.12.2 to 1.13.1.
- [Release notes](https://github.com/browserify/resolve/releases)
- [Commits](https://github.com/browserify/resolve/compare/v1.12.2...v1.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 90faea8f4..68282c36e 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "regexp-util": "1.2.2",
     "remark-math": "1.0.6",
     "remark-parse": "5.0.0",
-    "resolve": "1.12.2",
+    "resolve": "1.13.1",
     "semver": "6.3.0",
     "string-width": "4.1.0",
     "typescript": "3.7.2",
diff --git a/yarn.lock b/yarn.lock
index 7595d743d..e06c539f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5905,10 +5905,10 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@1.12.2, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.2.tgz#08b12496d9aa8659c75f534a8f05f0d892fff594"
-  integrity sha512-cAVTI2VLHWYsGOirfeYVVQ7ZDejtQ9fp4YhYckWDEkFfqbVjaT11iM8k6xSAfGFMM+gDpZjMnFssPu8we+mqFw==
+resolve@1.13.1, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
+  integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
   dependencies:
     path-parse "^1.0.6"
 

From 021eec8d73f076fb019a3a49591ef4b76ac64592 Mon Sep 17 00:00:00 2001
From: Cyrille David <dcyriller@users.noreply.github.com>
Date: Thu, 28 Nov 2019 17:12:57 +0100
Subject: [PATCH 43/88] Fix a falling mustache issue (#7052)

* Add a test highlighting the falling mustache issue

* Use concat helper instead of manual concat

* Fix the falling mustache issue

* Add a CHANGELOG
---
 changelog_unreleased/handlebars/pr-7052.md    | 18 ++++++++++
 src/language-handlebars/printer-glimmer.js    | 13 +++++---
 .../__snapshots__/jsfmt.spec.js.snap          | 33 +++++++++++++++++++
 .../handlebars-mustache-statement/basics.hbs  |  2 ++
 4 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 changelog_unreleased/handlebars/pr-7052.md
 create mode 100644 tests/handlebars-mustache-statement/basics.hbs

diff --git a/changelog_unreleased/handlebars/pr-7052.md b/changelog_unreleased/handlebars/pr-7052.md
new file mode 100644
index 000000000..7111bc678
--- /dev/null
+++ b/changelog_unreleased/handlebars/pr-7052.md
@@ -0,0 +1,18 @@
+#### Fix a falling mustache issue ([#7052](https://github.com/prettier/prettier/pull/7052) by [@dcyriller](https://github.com/dcyriller))
+
+<!-- prettier-ignore -->
+```hbs
+{{!-- input --}}
+<GlimmerComponent @progress={{aPropertyEndingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}} />
+
+{{!-- stable --}}
+<GlimmerComponent
+  @progress={{aPropertyEndingAfterEightiethColumnToHighlightAWeirdClosingParenIssue
+  }}
+/>
+
+{{!-- master --}}
+<GlimmerComponent
+  @progress={{aPropertyEndingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
+/>
+```
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 55631ea7b..2eca2f448 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -173,13 +173,14 @@ function print(path, options, print) {
     }
     case "ElementModifierStatement":
     case "MustacheStatement": {
-      const pp = path.getParentNode(1);
-      const isConcat = pp && pp.type === "ConcatStatement";
+      const p = path.getParentNode(0);
+      const isParentConcat = p && p.type === "ConcatStatement";
+      const isParentAttr = p && p.type === "AttrNode";
       return group(
         concat([
           n.escaped === false ? "{{{" : "{{",
           printPathParams(path, print, { group: false }),
-          isConcat ? "" : softline,
+          isParentConcat || isParentAttr ? "" : softline,
           n.escaped === false ? "}}}" : "}}"
         ])
       );
@@ -404,7 +405,11 @@ function printStringLiteral(stringLiteral, options) {
     `\\${enclosingQuote.quote}`
   );
 
-  return `${enclosingQuote.quote}${escapedStringLiteral}${enclosingQuote.quote}`;
+  return concat([
+    enclosingQuote.quote,
+    escapedStringLiteral,
+    enclosingQuote.quote
+  ]);
 }
 
 function printPath(path, print) {
diff --git a/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
index 13a4e586c..22d286039 100644
--- a/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,38 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`basics.hbs 1`] = `
+====================================options=====================================
+parsers: ["glimmer"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<GlimmerComponent @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
+/>
+
+=====================================output=====================================
+<GlimmerComponent
+  @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
+/>
+================================================================================
+`;
+
+exports[`basics.hbs 2`] = `
+====================================options=====================================
+parsers: ["glimmer"]
+printWidth: 80
+singleQuote: true
+                                                                                | printWidth
+=====================================input======================================
+<GlimmerComponent @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
+/>
+
+=====================================output=====================================
+<GlimmerComponent
+  @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
+/>
+================================================================================
+`;
+
 exports[`element-modifier-statement.hbs 1`] = `
 ====================================options=====================================
 parsers: ["glimmer"]
diff --git a/tests/handlebars-mustache-statement/basics.hbs b/tests/handlebars-mustache-statement/basics.hbs
new file mode 100644
index 000000000..6a4c78680
--- /dev/null
+++ b/tests/handlebars-mustache-statement/basics.hbs
@@ -0,0 +1,2 @@
+<GlimmerComponent @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
+/>

From ca0ff0f2801677f81b149b0381e3de388caaa411 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 29 Nov 2019 12:31:55 +0300
Subject: [PATCH 44/88] Bump eslint-plugin-react from 7.16.0 to 7.17.0 (#7071)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.16.0 to 7.17.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.16.0...v7.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 93 ++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 68282c36e..e7e8449ed 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-prettier": "3.1.1",
-    "eslint-plugin-react": "7.16.0",
+    "eslint-plugin-react": "7.17.0",
     "execa": "3.4.0",
     "jest": "23.3.0",
     "jest-junit": "9.0.0",
diff --git a/yarn.lock b/yarn.lock
index e06c539f5..966e6378c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2434,7 +2434,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
+es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
   integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -2446,6 +2446,22 @@ es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0
     is-regex "^1.0.4"
     object-keys "^1.0.12"
 
+es-abstract@^1.15.0:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz#4e874331645e9925edef141e74fc4bd144669d34"
+  integrity sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    string.prototype.trimleft "^2.1.0"
+    string.prototype.trimright "^2.1.0"
+
 es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
@@ -2455,6 +2471,15 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
 es6-promise@^4.0.3:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -2516,6 +2541,11 @@ eslint-module-utils@^2.4.0:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
 
+eslint-plugin-eslint-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
+  integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
+
 eslint-plugin-import@2.18.2:
   version "2.18.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"
@@ -2540,20 +2570,21 @@ eslint-plugin-prettier@3.1.1:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-react@7.16.0:
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz#9928e4f3e2122ed3ba6a5b56d0303ba3e41d8c09"
-  integrity sha512-GacBAATewhhptbK3/vTP09CbFrgUJmBSaaRcWdbQLFvUZy9yVcQxigBNHGPU/KE2AyHpzj3AWXpxoMTsIDiHug==
+eslint-plugin-react@7.17.0:
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"
+  integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==
   dependencies:
     array-includes "^3.0.3"
     doctrine "^2.1.0"
+    eslint-plugin-eslint-plugin "^2.1.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.2.1"
+    jsx-ast-utils "^2.2.3"
     object.entries "^1.1.0"
-    object.fromentries "^2.0.0"
+    object.fromentries "^2.0.1"
     object.values "^1.1.0"
     prop-types "^15.7.2"
-    resolve "^1.12.0"
+    resolve "^1.13.1"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -3225,6 +3256,11 @@ has-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
   integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
+has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -4387,7 +4423,7 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.3.6"
 
-jsx-ast-utils@^2.2.1:
+jsx-ast-utils@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
   integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==
@@ -5029,7 +5065,12 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11, object-keys@^1.0.12:
+object-inspect@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -5060,15 +5101,15 @@ object.entries@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-object.fromentries@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab"
-  integrity sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==
+object.fromentries@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
+  integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.11.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.15.0"
     function-bind "^1.1.1"
-    has "^1.0.1"
+    has "^1.0.3"
 
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
@@ -5905,7 +5946,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@1.13.1, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0:
+resolve@1.13.1, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
   integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
@@ -6462,6 +6503,22 @@ string-width@^3.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string.prototype.trimleft@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
+  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
+string.prototype.trimright@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
+  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
 string_decoder@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"

From 2eca6193d71b022502cb4c1aa112390b39fa6731 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Sun, 1 Dec 2019 20:59:15 +0900
Subject: [PATCH 45/88] JavaScript: Format ThrowStatement like ReturnStatement
 (#7070)

---
 changelog_unreleased/javascript/pr-7070.md    |  24 +++
 src/language-js/needs-parens.js               |   1 +
 src/language-js/printer-estree.js             | 100 +++++-----
 .../__snapshots__/jsfmt.spec.js.snap          | 173 ++++++++++++++++++
 tests/throw_statement/binaryish.js            |  23 +++
 tests/throw_statement/comment.js              |  21 +++
 tests/throw_statement/jsfmt.spec.js           |   1 +
 tests/throw_statement/jsx.js                  |  23 +++
 8 files changed, 323 insertions(+), 43 deletions(-)
 create mode 100644 changelog_unreleased/javascript/pr-7070.md
 create mode 100644 tests/throw_statement/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/throw_statement/binaryish.js
 create mode 100644 tests/throw_statement/comment.js
 create mode 100644 tests/throw_statement/jsfmt.spec.js
 create mode 100644 tests/throw_statement/jsx.js

diff --git a/changelog_unreleased/javascript/pr-7070.md b/changelog_unreleased/javascript/pr-7070.md
new file mode 100644
index 000000000..e105b65f2
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-7070.md
@@ -0,0 +1,24 @@
+# Format `throw` like `return` ([#7070](https://github.com/prettier/prettier/pull/7070) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+<!-- prettier-ignore -->
+```js
+// Input
+function foo() {
+  throw this.hasPlugin("dynamicImports") && this.lookahead().type === tt.parenLeft.right;
+}
+
+// Prettier stable
+function foo() {
+  throw this.hasPlugin("dynamicImports") &&
+    this.lookahead().type === tt.parenLeft.right;
+}
+
+
+// Prettier master
+function foo() {
+  throw (
+    this.hasPlugin("dynamicImports") &&
+    this.lookahead().type === tt.parenLeft.right
+  );
+}
+``` 
diff --git a/src/language-js/needs-parens.js b/src/language-js/needs-parens.js
index 9ff9bba87..207103988 100644
--- a/src/language-js/needs-parens.js
+++ b/src/language-js/needs-parens.js
@@ -759,6 +759,7 @@ function needsParens(path, options) {
           parent.type !== "OptionalCallExpression" &&
           parent.type !== "Property" &&
           parent.type !== "ReturnStatement" &&
+          parent.type !== "ThrowStatement" &&
           parent.type !== "TypeCastExpression" &&
           parent.type !== "VariableDeclarator")
       );
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 49b4552e3..784786a7c 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -597,6 +597,7 @@ function printPathNoParens(path, options, print, args) {
       // indented accordingly. We should indent sub-expressions where the first case isn't indented.
       const shouldNotIndent =
         parent.type === "ReturnStatement" ||
+        parent.type === "ThrowStatement" ||
         (parent.type === "JSXExpressionContainer" &&
           parentParent.type === "JSXAttribute") ||
         (n.type !== "NGPipeExpression" &&
@@ -608,6 +609,7 @@ function printPathNoParens(path, options, print, args) {
         (n !== parent.body && parent.type === "ForStatement") ||
         (parent.type === "ConditionalExpression" &&
           parentParent.type !== "ReturnStatement" &&
+          parentParent.type !== "ThrowStatement" &&
           parentParent.type !== "CallExpression" &&
           parentParent.type !== "OptionalCallExpression") ||
         parent.type === "TemplateLiteral";
@@ -1121,48 +1123,10 @@ function printPathNoParens(path, options, print, args) {
       return concat(parts);
     }
     case "ReturnStatement":
-      parts.push("return");
-
-      if (n.argument) {
-        if (returnArgumentHasLeadingComment(options, n.argument)) {
-          parts.push(
-            concat([
-              " (",
-              indent(concat([hardline, path.call(print, "argument")])),
-              hardline,
-              ")"
-            ])
-          );
-        } else if (
-          n.argument.type === "LogicalExpression" ||
-          n.argument.type === "BinaryExpression" ||
-          n.argument.type === "SequenceExpression"
-        ) {
-          parts.push(
-            group(
-              concat([
-                ifBreak(" (", " "),
-                indent(concat([softline, path.call(print, "argument")])),
-                softline,
-                ifBreak(")")
-              ])
-            )
-          );
-        } else {
-          parts.push(" ", path.call(print, "argument"));
-        }
-      }
-
-      if (hasDanglingComments(n)) {
-        parts.push(
-          " ",
-          comments.printDanglingComments(path, options, /* sameIndent */ true)
-        );
-      }
-
-      parts.push(semi);
-
-      return concat(parts);
+      return concat([
+        "return",
+        printReturnAndThrowArgument(path, options, print)
+      ]);
     case "NewExpression":
     case "OptionalCallExpression":
     case "CallExpression": {
@@ -2030,7 +1994,10 @@ function printPathNoParens(path, options, print, args) {
 
       return concat(["catch ", path.call(print, "body")]);
     case "ThrowStatement":
-      return concat(["throw ", path.call(print, "argument"), semi]);
+      return concat([
+        "throw",
+        printReturnAndThrowArgument(path, options, print)
+      ]);
     // Note: ignoring n.lexical because it has no printing consequences.
     case "SwitchStatement":
       return concat([
@@ -5957,6 +5924,53 @@ function printArrayItems(path, options, printPath, print) {
   return concat(printedElements);
 }
 
+function printReturnAndThrowArgument(path, options, print) {
+  const node = path.getValue();
+  const semi = options.semi ? ";" : "";
+  const parts = [];
+
+  if (node.argument) {
+    if (returnArgumentHasLeadingComment(options, node.argument)) {
+      parts.push(
+        concat([
+          " (",
+          indent(concat([hardline, path.call(print, "argument")])),
+          hardline,
+          ")"
+        ])
+      );
+    } else if (
+      node.argument.type === "LogicalExpression" ||
+      node.argument.type === "BinaryExpression" ||
+      node.argument.type === "SequenceExpression"
+    ) {
+      parts.push(
+        group(
+          concat([
+            ifBreak(" (", " "),
+            indent(concat([softline, path.call(print, "argument")])),
+            softline,
+            ifBreak(")")
+          ])
+        )
+      );
+    } else {
+      parts.push(" ", path.call(print, "argument"));
+    }
+  }
+
+  if (hasDanglingComments(node)) {
+    parts.push(
+      " ",
+      comments.printDanglingComments(path, options, /* sameIndent */ true)
+    );
+  }
+
+  parts.push(semi);
+
+  return concat(parts);
+}
+
 function willPrintOwnComments(path /*, options */) {
   const node = path.getValue();
   const parent = path.getParentNode();
diff --git a/tests/throw_statement/__snapshots__/jsfmt.spec.js.snap b/tests/throw_statement/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..5d7e4ff57
--- /dev/null
+++ b/tests/throw_statement/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,173 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`binaryish.js 1`] = `
+====================================options=====================================
+parsers: ["flow", "typescript", "babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+function f() {
+  throw (
+    property.isIdentifier() &&
+     FUNCTIONS[property.node.name] &&
+     (object.isIdentifier(JEST_GLOBAL) ||
+       (callee.isMemberExpression() && shouldHoistExpression(object))) &&
+    FUNCTIONS[property.node.name](expr.get('arguments'))
+  );
+
+  throw (
+    chalk.bold(
+      'No tests found related to files changed since last commit.\\n',
+    ) +
+    chalk.dim(
+      patternInfo.watch ?
+        'Press \`a\` to run all tests, or run Jest with \`--watchAll\`.' :
+        'Run Jest without \`-o\` to run all tests.',
+    )
+  );
+
+  throw !filePath.includes(coverageDirectory) &&
+    !filePath.endsWith(\`.\${SNAPSHOT_EXTENSION}\`);
+}
+
+=====================================output=====================================
+function f() {
+  throw (
+    property.isIdentifier() &&
+    FUNCTIONS[property.node.name] &&
+    (object.isIdentifier(JEST_GLOBAL) ||
+      (callee.isMemberExpression() && shouldHoistExpression(object))) &&
+    FUNCTIONS[property.node.name](expr.get("arguments"))
+  );
+
+  throw (
+    chalk.bold("No tests found related to files changed since last commit.\\n") +
+    chalk.dim(
+      patternInfo.watch
+        ? "Press \`a\` to run all tests, or run Jest with \`--watchAll\`."
+        : "Run Jest without \`-o\` to run all tests."
+    )
+  );
+
+  throw (
+    !filePath.includes(coverageDirectory) &&
+    !filePath.endsWith(\`.\${SNAPSHOT_EXTENSION}\`)
+  );
+}
+
+================================================================================
+`;
+
+exports[`comment.js 1`] = `
+====================================options=====================================
+parsers: ["flow", "typescript", "babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+function x() {
+  throw func2
+      //comment
+      .bar();
+}
+ 
+function f() {
+  throw (
+    foo
+      // comment
+      .bar()
+  );
+}
+ 
+fn(function f() {
+  throw (
+    foo
+      // comment
+      .bar()
+  );
+});
+
+=====================================output=====================================
+function x() {
+  throw (
+    func2
+      //comment
+      .bar()
+  );
+}
+
+function f() {
+  throw (
+    foo
+      // comment
+      .bar()
+  );
+}
+
+fn(function f() {
+  throw (
+    foo
+      // comment
+      .bar()
+  );
+});
+
+================================================================================
+`;
+
+exports[`jsx.js 1`] = `
+====================================options=====================================
+parsers: ["flow", "typescript", "babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+function foo() {
+  throw <Bar />;
+}
+
+function foo() {
+  throw <Bar>baz</Bar>;
+}
+
+function foo() {
+  throw <Bar baz={baz} />;
+}
+
+function foo() {
+  throw <Bar baz={baz}>foo</Bar>;
+}
+
+function foo() {
+  throw <></>;
+}
+
+function foo() {
+  throw <>foo</>;
+}
+
+=====================================output=====================================
+function foo() {
+  throw <Bar />;
+}
+
+function foo() {
+  throw <Bar>baz</Bar>;
+}
+
+function foo() {
+  throw <Bar baz={baz} />;
+}
+
+function foo() {
+  throw <Bar baz={baz}>foo</Bar>;
+}
+
+function foo() {
+  throw <></>;
+}
+
+function foo() {
+  throw <>foo</>;
+}
+
+================================================================================
+`;
diff --git a/tests/throw_statement/binaryish.js b/tests/throw_statement/binaryish.js
new file mode 100644
index 000000000..a56877573
--- /dev/null
+++ b/tests/throw_statement/binaryish.js
@@ -0,0 +1,23 @@
+function f() {
+  throw (
+    property.isIdentifier() &&
+     FUNCTIONS[property.node.name] &&
+     (object.isIdentifier(JEST_GLOBAL) ||
+       (callee.isMemberExpression() && shouldHoistExpression(object))) &&
+    FUNCTIONS[property.node.name](expr.get('arguments'))
+  );
+
+  throw (
+    chalk.bold(
+      'No tests found related to files changed since last commit.\n',
+    ) +
+    chalk.dim(
+      patternInfo.watch ?
+        'Press `a` to run all tests, or run Jest with `--watchAll`.' :
+        'Run Jest without `-o` to run all tests.',
+    )
+  );
+
+  throw !filePath.includes(coverageDirectory) &&
+    !filePath.endsWith(`.${SNAPSHOT_EXTENSION}`);
+}
diff --git a/tests/throw_statement/comment.js b/tests/throw_statement/comment.js
new file mode 100644
index 000000000..fd74f067c
--- /dev/null
+++ b/tests/throw_statement/comment.js
@@ -0,0 +1,21 @@
+function x() {
+  throw func2
+      //comment
+      .bar();
+}
+ 
+function f() {
+  throw (
+    foo
+      // comment
+      .bar()
+  );
+}
+ 
+fn(function f() {
+  throw (
+    foo
+      // comment
+      .bar()
+  );
+});
diff --git a/tests/throw_statement/jsfmt.spec.js b/tests/throw_statement/jsfmt.spec.js
new file mode 100644
index 000000000..f268e6d0f
--- /dev/null
+++ b/tests/throw_statement/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["flow", "typescript", "babel"]);
diff --git a/tests/throw_statement/jsx.js b/tests/throw_statement/jsx.js
new file mode 100644
index 000000000..2275b17ae
--- /dev/null
+++ b/tests/throw_statement/jsx.js
@@ -0,0 +1,23 @@
+function foo() {
+  throw <Bar />;
+}
+
+function foo() {
+  throw <Bar>baz</Bar>;
+}
+
+function foo() {
+  throw <Bar baz={baz} />;
+}
+
+function foo() {
+  throw <Bar baz={baz}>foo</Bar>;
+}
+
+function foo() {
+  throw <></>;
+}
+
+function foo() {
+  throw <>foo</>;
+}

From 26a0bc330515344f0ac1943ba7843f24b2b1be18 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Mon, 2 Dec 2019 12:34:04 +0200
Subject: [PATCH 46/88] Don't print trailing commas after rest elements in
 tuples (#7075)

---
 changelog_unreleased/typescript/pr-7075.md    | 35 ++++++++
 src/language-js/printer-estree.js             |  5 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 86 +++++++++++++++++++
 .../no-trailing-comma-after-rest.ts           |  8 ++
 4 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/typescript/pr-7075.md
 create mode 100644 tests/typescript_tuple/no-trailing-comma-after-rest.ts

diff --git a/changelog_unreleased/typescript/pr-7075.md b/changelog_unreleased/typescript/pr-7075.md
new file mode 100644
index 000000000..60c3da14e
--- /dev/null
+++ b/changelog_unreleased/typescript/pr-7075.md
@@ -0,0 +1,35 @@
+#### Don't print trailing commas after rest elements in tuples ([#7075](https://github.com/prettier/prettier/pull/7075) by [@thorn](https://github.com/thorn0))
+
+* A rest element is always the last element of a tuple type. Nothing can be added after it.
+* While TS is okay with this comma, [Babel doesn't parse it](https://github.com/babel/babel/issues/10769)
+* In function parameters and array destructuring, such a comma is a syntax error. Keeping it in tuples is inconsistent.
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+type ValidateArgs = [
+	{
+		[key: string]: any;
+	},
+	string,
+	...string[],
+];
+
+// Prettier stable
+type ValidateArgs = [
+  {
+    [key: string]: any;
+  },
+  string,
+  ...string[],
+];
+
+// Prettier master
+type ValidateArgs = [
+  {
+    [key: string]: any;
+  },
+  string,
+  ...string[]
+];
+```
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 784786a7c..64f7b8c1b 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -2509,6 +2509,9 @@ function printPathNoParens(path, options, print, args) {
     case "TSTupleType":
     case "TupleTypeAnnotation": {
       const typesField = n.type === "TSTupleType" ? "elementTypes" : "types";
+      const hasRest =
+        n[typesField].length > 0 &&
+        getLast(n[typesField]).type === "TSRestType";
       return group(
         concat([
           "[",
@@ -2518,7 +2521,7 @@ function printPathNoParens(path, options, print, args) {
               printArrayItems(path, options, typesField, print)
             ])
           ),
-          ifBreak(shouldPrintComma(options, "all") ? "," : ""),
+          ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
           comments.printDanglingComments(path, options, /* sameIndent */ true),
           softline,
           "]"
diff --git a/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap
index 4a7cbef55..e93ee2525 100644
--- a/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,91 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`no-trailing-comma-after-rest.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+type ValidateArgs = [
+	{
+		[key: string]: any;
+	},
+	string,
+	string,
+	...string[],
+];
+
+=====================================output=====================================
+type ValidateArgs = [
+  {
+    [key: string]: any;
+  },
+  string,
+  string,
+  ...string[]
+];
+
+================================================================================
+`;
+
+exports[`no-trailing-comma-after-rest.ts 2`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+trailingComma: "es5"
+                                                                                | printWidth
+=====================================input======================================
+type ValidateArgs = [
+	{
+		[key: string]: any;
+	},
+	string,
+	string,
+	...string[],
+];
+
+=====================================output=====================================
+type ValidateArgs = [
+  {
+    [key: string]: any;
+  },
+  string,
+  string,
+  ...string[]
+];
+
+================================================================================
+`;
+
+exports[`no-trailing-comma-after-rest.ts 3`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+type ValidateArgs = [
+	{
+		[key: string]: any;
+	},
+	string,
+	string,
+	...string[],
+];
+
+=====================================output=====================================
+type ValidateArgs = [
+  {
+    [key: string]: any;
+  },
+  string,
+  string,
+  ...string[]
+];
+
+================================================================================
+`;
+
 exports[`trailing-comma.ts 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]
diff --git a/tests/typescript_tuple/no-trailing-comma-after-rest.ts b/tests/typescript_tuple/no-trailing-comma-after-rest.ts
new file mode 100644
index 000000000..f4350a3e9
--- /dev/null
+++ b/tests/typescript_tuple/no-trailing-comma-after-rest.ts
@@ -0,0 +1,8 @@
+type ValidateArgs = [
+	{
+		[key: string]: any;
+	},
+	string,
+	string,
+	...string[],
+];

From 121c1db1a18fe31ee4de9b7c413972a7227dc21a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 16:04:03 +0100
Subject: [PATCH 47/88] Bump rollup from 1.27.5 to 1.27.8 (#7078)

Bumps [rollup](https://github.com/rollup/rollup) from 1.27.5 to 1.27.8.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v1.27.5...v1.27.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e7e8449ed..18cc1c9d4 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "mkdirp": "0.5.1",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
-    "rollup": "1.27.5",
+    "rollup": "1.27.8",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 966e6378c..97949770b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6053,10 +6053,10 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0,
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@1.27.5:
-  version "1.27.5"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.5.tgz#d100fb0ffd8353575cb2057152547b9abfddfe59"
-  integrity sha512-8rfVdzuTg2kt8ObD9LNJpEwUN7B6lsl3sHc5fddtgICpLjpYeSf4m2+RftBzcCaBTMi1iYX3Ez8zFT4Gj2nJjg==
+rollup@1.27.8:
+  version "1.27.8"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.8.tgz#94288a957af9f4c2380b73a17494d87705997d0f"
+  integrity sha512-EVoEV5rAWl+5clnGznt1KY8PeVkzVQh/R0d2s3gHEkN7gfoyC4JmvIVuCtPbYE8NM5Ep/g+nAmvKXBjzaqTsHA==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"

From c6f4add134c019a266300cb1e1e40b827968ed40 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 16:04:18 +0100
Subject: [PATCH 48/88] Bump docusaurus from 1.14.2 to 1.14.3 in /website
 (#7076)

Bumps [docusaurus](https://github.com/facebook/docusaurus) from 1.14.2 to 1.14.3.
- [Release notes](https://github.com/facebook/docusaurus/releases)
- [Changelog](https://github.com/facebook/docusaurus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/docusaurus/compare/v1.14.2...v1.14.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json |   2 +-
 website/yarn.lock    | 277 +++++++++++++++++--------------------------
 2 files changed, 107 insertions(+), 172 deletions(-)

diff --git a/website/package.json b/website/package.json
index bb3ed65f3..2afad792b 100644
--- a/website/package.json
+++ b/website/package.json
@@ -24,7 +24,7 @@
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
     "concurrently": "5.0.0",
-    "docusaurus": "1.14.2",
+    "docusaurus": "1.14.3",
     "js-yaml": "3.13.1",
     "svgo": "1.3.2",
     "webpack": "4.41.2",
diff --git a/website/yarn.lock b/website/yarn.lock
index a3e10559a..7ac64579d 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -16,18 +16,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.2.tgz#ea5b99693bcfc058116f42fa1dd54da412b29d91"
-  integrity sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==
+"@babel/core@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.4.tgz#37e864532200cb6b50ee9a4045f5f817840166ab"
+  integrity sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.2"
-    "@babel/helpers" "^7.7.0"
-    "@babel/parser" "^7.7.2"
-    "@babel/template" "^7.7.0"
-    "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.7.2"
+    "@babel/generator" "^7.7.4"
+    "@babel/helpers" "^7.7.4"
+    "@babel/parser" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -36,16 +36,6 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af"
-  integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==
-  dependencies:
-    "@babel/types" "^7.7.2"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
@@ -88,17 +78,17 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-create-class-features-plugin@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz#bcdc223abbfdd386f94196ae2544987f8df775e8"
-  integrity sha512-MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA==
+"@babel/helper-create-class-features-plugin@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d"
+  integrity sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==
   dependencies:
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/helper-member-expression-to-functions" "^7.7.0"
-    "@babel/helper-optimise-call-expression" "^7.7.0"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-member-expression-to-functions" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.0"
-    "@babel/helper-split-export-declaration" "^7.7.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
 
 "@babel/helper-create-regexp-features-plugin@^7.7.4":
   version "7.7.4"
@@ -125,15 +115,6 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-function-name@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz#44a5ad151cfff8ed2599c91682dda2ec2c8430a3"
-  integrity sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.7.0"
-    "@babel/template" "^7.7.0"
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-function-name@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
@@ -143,13 +124,6 @@
     "@babel/template" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-get-function-arity@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz#c604886bc97287a1d1398092bc666bc3d7d7aa2d"
-  integrity sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==
-  dependencies:
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-get-function-arity@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
@@ -164,13 +138,6 @@
   dependencies:
     "@babel/types" "^7.7.4"
 
-"@babel/helper-member-expression-to-functions@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz#472b93003a57071f95a541ea6c2b098398bcad8a"
-  integrity sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==
-  dependencies:
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-member-expression-to-functions@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
@@ -197,13 +164,6 @@
     "@babel/types" "^7.7.4"
     lodash "^4.17.13"
 
-"@babel/helper-optimise-call-expression@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz#4f66a216116a66164135dc618c5d8b7a959f9365"
-  integrity sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==
-  dependencies:
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-optimise-call-expression@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
@@ -241,16 +201,6 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-replace-supers@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz#d5365c8667fe7cbd13b8ddddceb9bd7f2b387512"
-  integrity sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.7.0"
-    "@babel/helper-optimise-call-expression" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-replace-supers@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
@@ -269,13 +219,6 @@
     "@babel/template" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-split-export-declaration@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300"
-  integrity sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==
-  dependencies:
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-split-export-declaration@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
@@ -293,14 +236,14 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helpers@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.0.tgz#359bb5ac3b4726f7c1fde0ec75f64b3f4275d60b"
-  integrity sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==
+"@babel/helpers@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
+  integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==
   dependencies:
-    "@babel/template" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -311,11 +254,6 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.2.tgz#ea8334dc77416bfd9473eb470fd00d8245b3943b"
-  integrity sha512-DDaR5e0g4ZTb9aP7cpSZLkACEBdoLGwJDWgHtBhrGX7Q1RjhdoMOfexICj5cqTAtpowjGQWfcvfnQG7G2kAB5w==
-
 "@babel/parser@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
@@ -330,12 +268,12 @@
     "@babel/helper-remap-async-to-generator" "^7.7.4"
     "@babel/plugin-syntax-async-generators" "^7.7.4"
 
-"@babel/plugin-proposal-class-properties@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz#ac54e728ecf81d90e8f4d2a9c05a890457107917"
-  integrity sha512-tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A==
+"@babel/plugin-proposal-class-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba"
+  integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.7.0"
+    "@babel/helper-create-class-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.7.4":
@@ -354,7 +292,7 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.7.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4":
+"@babel/plugin-proposal-object-rest-spread@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
   integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
@@ -703,7 +641,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/polyfill@^7.6.0":
+"@babel/polyfill@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.7.0.tgz#e1066e251e17606ec7908b05617f9b7f8180d8f3"
   integrity sha512-/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==
@@ -711,7 +649,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/preset-env@7.7.4", "@babel/preset-env@^7.7.1":
+"@babel/preset-env@7.7.4", "@babel/preset-env@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.4.tgz#ccaf309ae8d1ee2409c85a4e2b5e280ceee830f8"
   integrity sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==
@@ -768,7 +706,7 @@
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
-"@babel/preset-react@7.7.4", "@babel/preset-react@^7.7.0":
+"@babel/preset-react@7.7.4", "@babel/preset-react@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.4.tgz#3fe2ea698d8fb536d8e7881a592c3c1ee8bf5707"
   integrity sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g==
@@ -779,10 +717,10 @@
     "@babel/plugin-transform-react-jsx-self" "^7.7.4"
     "@babel/plugin-transform-react-jsx-source" "^7.7.4"
 
-"@babel/register@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.0.tgz#4e23ecf840296ef79c605baaa5c89e1a2426314b"
-  integrity sha512-HV3GJzTvSoyOMWGYn2TAh6uL6g+gqKTgEZ99Q3+X9UURT1VPT/WcU46R61XftIc5rXytcOHZ4Z0doDlsjPomIg==
+"@babel/register@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.4.tgz#45a4956471a9df3b012b747f5781cc084ee8f128"
+  integrity sha512-/fmONZqL6ZMl9KJUYajetCrID6m0xmL4odX7v+Xvoxcv0DdbP/oO0TWIeLUCHqczQ6L6njDMqmqHFy2cp3FFsA==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
@@ -790,15 +728,6 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
-"@babel/template@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0"
-  integrity sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/types" "^7.7.0"
-
 "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
@@ -808,21 +737,6 @@
     "@babel/parser" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09"
-  integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.2"
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/helper-split-export-declaration" "^7.7.0"
-    "@babel/parser" "^7.7.2"
-    "@babel/types" "^7.7.2"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
 "@babel/traverse@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
@@ -838,7 +752,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.7.0", "@babel/types@^7.7.2", "@babel/types@^7.7.4":
+"@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
   integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
@@ -1290,13 +1204,13 @@ autolinker@~0.28.0:
   dependencies:
     gulp-header "^1.7.1"
 
-autoprefixer@^9.7.0:
-  version "9.7.2"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.2.tgz#26cf729fbb709323b40171a874304884dcceffed"
-  integrity sha512-LCAfcdej1182uVvPOZnytbq61AhnOZ/4JelDaJGDeNwewyU1AMaNthcHsyz1NRjTmd2FkurMckLWfkHg3Z//KA==
+autoprefixer@^9.7.2:
+  version "9.7.3"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.3.tgz#fd42ed03f53de9beb4ca0d61fb4f7268a9bb50b4"
+  integrity sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==
   dependencies:
-    browserslist "^4.7.3"
-    caniuse-lite "^1.0.30001010"
+    browserslist "^4.8.0"
+    caniuse-lite "^1.0.30001012"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
@@ -1569,7 +1483,7 @@ browserslist@4.7.0:
     electron-to-chromium "^1.3.247"
     node-releases "^1.1.29"
 
-browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.6, browserslist@^4.7.3:
+browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.6:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.3.tgz#02341f162b6bcc1e1028e30624815d4924442dc3"
   integrity sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==
@@ -1578,6 +1492,15 @@ browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.6, browserslist@^4.7
     electron-to-chromium "^1.3.306"
     node-releases "^1.1.40"
 
+browserslist@^4.8.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.0.tgz#6f06b0f974a7cc3a84babc2ccc56493668e3c789"
+  integrity sha512-HYnxc/oLRWvJ3TsGegR0SRL/UDnknGq2s/a8dYYEO+kOQ9m9apKoS5oiathLKZdh/e9uE+/J3j92qPlGD/vTqA==
+  dependencies:
+    caniuse-lite "^1.0.30001012"
+    electron-to-chromium "^1.3.317"
+    node-releases "^1.1.41"
+
 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"
@@ -1750,6 +1673,11 @@ caniuse-lite@^1.0.30001010:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz#0d6c4549c78c4a800bb043a83ca0cbe0aee6c6e1"
   integrity sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg==
 
+caniuse-lite@^1.0.30001012:
+  version "1.0.30001013"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001013.tgz#da2440d4d266a17d40eb79bd19c0c8cc1d029c72"
+  integrity sha512-hOAXaWKuq/UVFgYawxIOdPdyMQdYcwOCDOjnZcKn7wCgFUrhP7smuNZjGLuJlPSgE6aRA4cRJ+bGSrhtEt7ZAg==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1984,13 +1912,6 @@ color-string@^1.5.2:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-2.0.1.tgz#e4ed78a3c4603d0891eba5430b04b86314f4c839"
-  dependencies:
-    color-convert "^1.9.1"
-    color-string "^1.5.2"
-
 color@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
@@ -2210,7 +2131,7 @@ cross-fetch@2.2.2:
     node-fetch "2.1.2"
     whatwg-fetch "2.0.4"
 
-cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@6.0.5, cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
@@ -2624,37 +2545,35 @@ dir-glob@2.0.0:
     arrify "^1.0.1"
     path-type "^3.0.0"
 
-docusaurus@1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.14.2.tgz#6631a1cb34f82345147ed12af8233a3b2b43428e"
-  integrity sha512-hPn2v8UDsxZ+rAB+HdrNg4iK0VccubB2y9fJle4kag5MKlk1jele07hyXKhGgOvW2KSroRMHQVFF9EIeS0yYRg==
+docusaurus@1.14.3:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.14.3.tgz#640ffc37ae14fe58c175fd14e66c3a2dd36e19a3"
+  integrity sha512-PoEB8uBLLVrWmv41Rvq9OqfOUUIk+tnscCNIuw/wI31tjALAfP3IfsliLc6ZBUvAtTF3S2Dk/quuzmdSCYgjaA==
   dependencies:
-    "@babel/core" "^7.7.2"
-    "@babel/plugin-proposal-class-properties" "^7.7.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
-    "@babel/polyfill" "^7.6.0"
-    "@babel/preset-env" "^7.7.1"
-    "@babel/preset-react" "^7.7.0"
-    "@babel/register" "^7.7.0"
-    "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.7.2"
-    autoprefixer "^9.7.0"
+    "@babel/core" "^7.7.4"
+    "@babel/plugin-proposal-class-properties" "^7.7.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
+    "@babel/polyfill" "^7.7.0"
+    "@babel/preset-env" "^7.7.4"
+    "@babel/preset-react" "^7.7.4"
+    "@babel/register" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    autoprefixer "^9.7.2"
     babylon "^6.18.0"
     chalk "^3.0.0"
     classnames "^2.2.6"
-    color "^2.0.1"
     commander "^4.0.1"
-    cross-spawn "^6.0.5"
     crowdin-cli "^0.3.0"
     cssnano "^4.1.10"
     escape-string-regexp "^2.0.0"
     express "^4.17.1"
-    feed "^1.1.0"
+    feed "^4.0.0"
     fs-extra "^8.1.0"
     gaze "^1.1.3"
     github-slugger "^1.2.1"
-    glob "^7.1.5"
-    highlight.js "^9.16.1"
+    glob "^7.1.6"
+    highlight.js "^9.16.2"
     imagemin "^6.0.0"
     imagemin-gifsicle "^6.0.1"
     imagemin-jpegtran "^6.0.0"
@@ -2664,7 +2583,7 @@ docusaurus@1.14.2:
     markdown-toc "^1.2.0"
     mkdirp "^0.5.1"
     portfinder "^1.0.25"
-    postcss "^7.0.21"
+    postcss "^7.0.23"
     prismjs "^1.17.1"
     react "^16.8.4"
     react-dev-utils "^9.1.0"
@@ -2805,6 +2724,11 @@ electron-to-chromium@^1.3.306:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.308.tgz#73c2cd8f865abc1c31623725e4f89225e9e209e6"
   integrity sha512-IwU/0LTzTa03Q0YDzg11RlK8e/V92tmPqFOaTEsdv7JJXtC/+v/H4bT2FmsA/xaFQWJvi0ZVcRppw8o0AD9XJQ==
 
+electron-to-chromium@^1.3.317:
+  version "1.3.321"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.321.tgz#913869f5ec85daabba0e75c9c314b4bf26cdb01e"
+  integrity sha512-jJy/BZK2s2eAjMPXVMSaCmo7/pSY2aKkfQ+LoAb5Wk39qAhyP9r8KU74c4qTgr9cD/lPUhJgReZxxqU0n5puog==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -3201,11 +3125,12 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-feed@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/feed/-/feed-1.1.1.tgz#914897517e94fa327cc6f73bb585a47c4a9ed321"
+feed@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/feed/-/feed-4.0.0.tgz#d3c2bfb9aba3c0efacab1ed15be06b67f5c02539"
+  integrity sha512-VWtvINgG7cA91BtrGychMvxHj84nc8xS9W/PuAHlY62I8owZtcoxNaKFN+zkGl8tBsaYbxrrp4yB9DhqKNQSPw==
   dependencies:
-    xml "^1.0.1"
+    xml-js "^1.6.11"
 
 figgy-pudding@^3.5.1:
   version "3.5.1"
@@ -3566,7 +3491,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.5, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -3907,7 +3832,7 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-highlight.js@^9.16.1:
+highlight.js@^9.16.2:
   version "9.16.2"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
   integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
@@ -5286,6 +5211,13 @@ node-releases@^1.1.40:
   dependencies:
     semver "^6.3.0"
 
+node-releases@^1.1.41:
+  version "1.1.41"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.41.tgz#57674a82a37f812d18e3b26118aefaf53a00afed"
+  integrity sha512-+IctMa7wIs8Cfsa8iYzeaLTFwv5Y4r5jZud+4AnfymzeEXKBCavFX0KBgzVaPVqf0ywa6PrO8/b+bPqdwjGBSg==
+  dependencies:
+    semver "^6.3.0"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -6095,7 +6027,7 @@ postcss-value-parser@^4.0.2:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
   integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.21, postcss@^7.0.23, postcss@^7.0.5:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.23, postcss@^7.0.5:
   version "7.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.23.tgz#9f9759fad661b15964f3cfc3140f66f1e05eadc1"
   integrity sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==
@@ -7928,9 +7860,12 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-xml@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
+xml-js@^1.6.11:
+  version "1.6.11"
+  resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9"
+  integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==
+  dependencies:
+    sax "^1.2.4"
 
 xmlbuilder@^13.0.0:
   version "13.0.2"

From df523555f68868570cc6552ae4c46aeb589c28b6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2019 17:31:05 +0100
Subject: [PATCH 49/88] Bump @typescript-eslint/typescript-estree from 2.9.0 to
 2.10.0 (#7086)

Bumps [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-estree) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/typescript-estree/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v2.10.0/packages/typescript-estree)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 18cc1c9d4..17881179f 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@babel/parser": "7.7.4",
     "@glimmer/syntax": "0.41.0",
     "@iarna/toml": "2.2.3",
-    "@typescript-eslint/typescript-estree": "2.9.0",
+    "@typescript-eslint/typescript-estree": "2.10.0",
     "angular-estree-parser": "1.1.5",
     "angular-html-parser": "1.3.0",
     "camelcase": "5.3.1",
diff --git a/yarn.lock b/yarn.lock
index 97949770b..b78601a57 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -890,10 +890,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/typescript-estree@2.9.0":
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.9.0.tgz#09138daf8f47d0e494ba7db9e77394e928803017"
-  integrity sha512-v6btSPXEWCP594eZbM+JCXuFoXWXyF/z8kaSBSdCb83DF+Y7+xItW29SsKtSULgLemqJBT+LpT+0ZqdfH7QVmA==
+"@typescript-eslint/typescript-estree@2.10.0":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.10.0.tgz#89cdabd5e8c774e9d590588cb42fb9afd14dcbd9"
+  integrity sha512-oOYnplddQNm/LGVkqbkAwx4TIBuuZ36cAQq9v3nFIU9FmhemHuVzAesMSXNQDdAzCa5bFgCrfD3JWhYVKlRN2g==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"

From 3c13329f4f08570ceb322d73cb78b5510b45be69 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Wed, 4 Dec 2019 11:39:29 +0200
Subject: [PATCH 50/88] fix indentation in ternaries nested in conditions of
 other ternaries (#7087)

* fix indentation in ternaries nested in conditions of other ternaries

* fix giant indent when tabWidth=4

* refactoring: remove breakNested as it was always true

* break between parens

* add changelog

* microfix

* fix TS conditional types

* Update pr-7087.md
---
 changelog_unreleased/javascript/pr-7087.md    |  25 ++
 src/language-js/printer-estree.js             |  42 ++-
 .../__snapshots__/jsfmt.spec.js.snap          | 356 ++++++++++++++++++
 tests/ternaries/nested-in-condition.js        |  36 ++
 .../__snapshots__/jsfmt.spec.js.snap          |  56 +++
 .../nested-in-condition.ts                    |  17 +
 6 files changed, 512 insertions(+), 20 deletions(-)
 create mode 100644 changelog_unreleased/javascript/pr-7087.md
 create mode 100644 tests/ternaries/nested-in-condition.js
 create mode 100644 tests/typescript_conditional_types/nested-in-condition.ts

diff --git a/changelog_unreleased/javascript/pr-7087.md b/changelog_unreleased/javascript/pr-7087.md
new file mode 100644
index 000000000..3b77cf511
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-7087.md
@@ -0,0 +1,25 @@
+#### Fix indentation in ternaries nested in conditions of other ternaries ([#7087](https://github.com/prettier/prettier/pull/7087) by [@thorn0](https://github.com/thorn0))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+const foo = (number % 10 >= 2 && (number % 100 < 10 || number % 100 >= 20) ?
+kochabCooieGameOnOboleUnweave : annularCooeedSplicesWalksWayWay)
+? anodyneCondosMalateOverateRetinol : averredBathersBoxroomBuggyNurl;
+
+// Prettier stable
+const foo = (number % 10 >= 2 && (number % 100 < 10 || number % 100 >= 20)
+? kochabCooieGameOnOboleUnweave
+: annularCooeedSplicesWalksWayWay)
+  ? anodyneCondosMalateOverateRetinol
+  : averredBathersBoxroomBuggyNurl;
+
+// Prettier master
+const foo = (
+  number % 10 >= 2 && (number % 100 < 10 || number % 100 >= 20)
+    ? kochabCooieGameOnOboleUnweave
+    : annularCooeedSplicesWalksWayWay
+)
+  ? anodyneCondosMalateOverateRetinol
+  : averredBathersBoxroomBuggyNurl;
+```
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 64f7b8c1b..21cc37f0d 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -276,8 +276,7 @@ function printDecorators(path, options, print) {
  * @property {string} conditionalNodeType - The type of the conditional expression node, ie "ConditionalExpression" or "TSConditionalType".
  * @property {string} consequentNodePropertyName - The property at which the consequent node can be found on the main node, eg "consequent".
  * @property {string} alternateNodePropertyName - The property at which the alternate node can be found on the main node, eg "alternate".
- * @property {string} testNodePropertyName - The property at which the test node can be found on the main node, eg "test".
- * @property {boolean} breakNested - Whether to break all nested ternaries when one breaks.
+ * @property {string[]} testNodePropertyNames - The properties at which the test nodes can be found on the main node, eg "test".
  * @param {FastPath} path - The path to the ConditionalExpression/TSConditionalType node.
  * @param {Options} options - Prettier options
  * @param {Function} print - Print function to call recursively
@@ -286,7 +285,6 @@ function printDecorators(path, options, print) {
  */
 function printTernaryOperator(path, options, print, operatorOptions) {
   const node = path.getValue();
-  const testNode = node[operatorOptions.testNodePropertyName];
   const consequentNode = node[operatorOptions.consequentNodePropertyName];
   const alternateNode = node[operatorOptions.alternateNodePropertyName];
   const parts = [];
@@ -295,7 +293,11 @@ function printTernaryOperator(path, options, print, operatorOptions) {
   // See tests/jsx/conditional-expression.js for more info.
   let jsxMode = false;
   const parent = path.getParentNode();
-  let forceNoIndent = parent.type === operatorOptions.conditionalNodeType;
+  const isParentTest =
+    parent.type === operatorOptions.conditionalNodeType &&
+    operatorOptions.testNodePropertyNames.some(prop => parent[prop] === node);
+  let forceNoIndent =
+    parent.type === operatorOptions.conditionalNodeType && !isParentTest;
 
   // Find the outermost non-ConditionalExpression parent, and the outermost
   // ConditionalExpression parent. We'll use these to determine if we should
@@ -309,14 +311,17 @@ function printTernaryOperator(path, options, print, operatorOptions) {
     i++;
   } while (
     currentParent &&
-    currentParent.type === operatorOptions.conditionalNodeType
+    currentParent.type === operatorOptions.conditionalNodeType &&
+    operatorOptions.testNodePropertyNames.every(
+      prop => currentParent[prop] !== previousParent
+    )
   );
   const firstNonConditionalParent = currentParent || parent;
   const lastConditionalParent = previousParent;
 
   if (
     operatorOptions.shouldCheckJsx &&
-    (isJSXNode(testNode) ||
+    (isJSXNode(node[operatorOptions.testNodePropertyNames[0]]) ||
       isJSXNode(consequentNode) ||
       isJSXNode(alternateNode) ||
       conditionalExpressionChainContainsJSX(lastConditionalParent))
@@ -373,7 +378,8 @@ function printTernaryOperator(path, options, print, operatorOptions) {
     ]);
     parts.push(
       parent.type !== operatorOptions.conditionalNodeType ||
-        parent[operatorOptions.alternateNodePropertyName] === node
+        parent[operatorOptions.alternateNodePropertyName] === node ||
+        isParentTest
         ? part
         : options.useTabs
         ? dedent(indent(part))
@@ -385,11 +391,7 @@ function printTernaryOperator(path, options, print, operatorOptions) {
   // break if any of them break. That means we should only group around the
   // outer-most ConditionalExpression.
   const maybeGroup = doc =>
-    operatorOptions.breakNested
-      ? parent === firstNonConditionalParent
-        ? group(doc)
-        : doc
-      : group(doc);
+    parent === firstNonConditionalParent ? group(doc) : doc;
 
   // Break the closing paren to keep the chain right after it:
   // (a
@@ -400,12 +402,10 @@ function printTernaryOperator(path, options, print, operatorOptions) {
     !jsxMode &&
     (parent.type === "MemberExpression" ||
       parent.type === "OptionalMemberExpression" ||
-      (parent.type === "NGPipeExpression" &&
-        parent.left === node &&
-        operatorOptions.breakNested)) &&
+      (parent.type === "NGPipeExpression" && parent.left === node)) &&
     !parent.computed;
 
-  return maybeGroup(
+  const result = maybeGroup(
     concat(
       [].concat(
         (testDoc =>
@@ -428,6 +428,10 @@ function printTernaryOperator(path, options, print, operatorOptions) {
       )
     )
   );
+
+  return isParentTest
+    ? group(concat([indent(concat([softline, result])), softline]))
+    : result;
 }
 
 function printPathNoParens(path, options, print, args) {
@@ -1669,8 +1673,7 @@ function printPathNoParens(path, options, print, args) {
         conditionalNodeType: "ConditionalExpression",
         consequentNodePropertyName: "consequent",
         alternateNodePropertyName: "alternate",
-        testNodePropertyName: "test",
-        breakNested: true
+        testNodePropertyNames: ["test"]
       });
     case "VariableDeclaration": {
       const printed = path.map(childPath => {
@@ -3513,8 +3516,7 @@ function printPathNoParens(path, options, print, args) {
         conditionalNodeType: "TSConditionalType",
         consequentNodePropertyName: "trueType",
         alternateNodePropertyName: "falseType",
-        testNodePropertyName: "checkType",
-        breakNested: true
+        testNodePropertyNames: ["checkType", "extendsType"]
       });
 
     case "TSInferType":
diff --git a/tests/ternaries/__snapshots__/jsfmt.spec.js.snap b/tests/ternaries/__snapshots__/jsfmt.spec.js.snap
index 1a5fcf27a..641985e49 100644
--- a/tests/ternaries/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/ternaries/__snapshots__/jsfmt.spec.js.snap
@@ -2424,6 +2424,362 @@ a
 ================================================================================
 `;
 
+exports[`nested-in-condition.js 1`] = `
+====================================options=====================================
+parsers: ["flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+$var = ($number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+? kochabCooieGameOnOboleUnweave
+: annularCooeedSplicesWalksWayWay)
+  ? anodyneCondosMalateOverateRetinol
+  : averredBathersBoxroomBuggyNurl;
+
+const value = (bifornCringerMoshedPerplexSawder
+? askTrovenaBeenaDependsRowans
+: glimseGlyphsHazardNoopsTieTie)
+  ? true
+    ? true
+    : false
+  : true
+  ? true
+  : false;
+
+(bifornCringerMoshedPerplexSawder ? (
+  askTrovenaBeenaDependsRowans
+) : (
+  glimseGlyphsHazardNoopsTieTie
+)) ? (
+  <Element>
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element>
+) : (
+  <Element2>
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element2>
+);
+
+=====================================output=====================================
+$var = (
+  $number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+    ? kochabCooieGameOnOboleUnweave
+    : annularCooeedSplicesWalksWayWay
+)
+  ? anodyneCondosMalateOverateRetinol
+  : averredBathersBoxroomBuggyNurl;
+
+const value = (
+  bifornCringerMoshedPerplexSawder
+    ? askTrovenaBeenaDependsRowans
+    : glimseGlyphsHazardNoopsTieTie
+)
+  ? true
+    ? true
+    : false
+  : true
+  ? true
+  : false;
+
+(
+  bifornCringerMoshedPerplexSawder
+    ? askTrovenaBeenaDependsRowans
+    : glimseGlyphsHazardNoopsTieTie
+) ? (
+  <Element>
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element>
+) : (
+  <Element2>
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element2>
+);
+
+================================================================================
+`;
+
+exports[`nested-in-condition.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "typescript"]
+printWidth: 80
+tabWidth: 4
+                                                                                | printWidth
+=====================================input======================================
+$var = ($number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+? kochabCooieGameOnOboleUnweave
+: annularCooeedSplicesWalksWayWay)
+  ? anodyneCondosMalateOverateRetinol
+  : averredBathersBoxroomBuggyNurl;
+
+const value = (bifornCringerMoshedPerplexSawder
+? askTrovenaBeenaDependsRowans
+: glimseGlyphsHazardNoopsTieTie)
+  ? true
+    ? true
+    : false
+  : true
+  ? true
+  : false;
+
+(bifornCringerMoshedPerplexSawder ? (
+  askTrovenaBeenaDependsRowans
+) : (
+  glimseGlyphsHazardNoopsTieTie
+)) ? (
+  <Element>
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element>
+) : (
+  <Element2>
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element2>
+);
+
+=====================================output=====================================
+$var = (
+    $number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+        ? kochabCooieGameOnOboleUnweave
+        : annularCooeedSplicesWalksWayWay
+)
+    ? anodyneCondosMalateOverateRetinol
+    : averredBathersBoxroomBuggyNurl;
+
+const value = (
+    bifornCringerMoshedPerplexSawder
+        ? askTrovenaBeenaDependsRowans
+        : glimseGlyphsHazardNoopsTieTie
+)
+    ? true
+        ? true
+        : false
+    : true
+    ? true
+    : false;
+
+(
+    bifornCringerMoshedPerplexSawder
+        ? askTrovenaBeenaDependsRowans
+        : glimseGlyphsHazardNoopsTieTie
+) ? (
+    <Element>
+        <Sub />
+        <Sub />
+        <Sub />
+        <Sub />
+        <Sub />
+        <Sub />
+    </Element>
+) : (
+    <Element2>
+        <Sub />
+        <Sub />
+        <Sub />
+    </Element2>
+);
+
+================================================================================
+`;
+
+exports[`nested-in-condition.js 3`] = `
+====================================options=====================================
+parsers: ["flow", "typescript"]
+printWidth: 80
+useTabs: true
+                                                                                | printWidth
+=====================================input======================================
+$var = ($number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+? kochabCooieGameOnOboleUnweave
+: annularCooeedSplicesWalksWayWay)
+  ? anodyneCondosMalateOverateRetinol
+  : averredBathersBoxroomBuggyNurl;
+
+const value = (bifornCringerMoshedPerplexSawder
+? askTrovenaBeenaDependsRowans
+: glimseGlyphsHazardNoopsTieTie)
+  ? true
+    ? true
+    : false
+  : true
+  ? true
+  : false;
+
+(bifornCringerMoshedPerplexSawder ? (
+  askTrovenaBeenaDependsRowans
+) : (
+  glimseGlyphsHazardNoopsTieTie
+)) ? (
+  <Element>
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element>
+) : (
+  <Element2>
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element2>
+);
+
+=====================================output=====================================
+$var = (
+	$number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+		? kochabCooieGameOnOboleUnweave
+		: annularCooeedSplicesWalksWayWay
+)
+	? anodyneCondosMalateOverateRetinol
+	: averredBathersBoxroomBuggyNurl;
+
+const value = (
+	bifornCringerMoshedPerplexSawder
+		? askTrovenaBeenaDependsRowans
+		: glimseGlyphsHazardNoopsTieTie
+)
+	? true
+		? true
+		: false
+	: true
+	? true
+	: false;
+
+(
+	bifornCringerMoshedPerplexSawder
+		? askTrovenaBeenaDependsRowans
+		: glimseGlyphsHazardNoopsTieTie
+) ? (
+	<Element>
+		<Sub />
+		<Sub />
+		<Sub />
+		<Sub />
+		<Sub />
+		<Sub />
+	</Element>
+) : (
+	<Element2>
+		<Sub />
+		<Sub />
+		<Sub />
+	</Element2>
+);
+
+================================================================================
+`;
+
+exports[`nested-in-condition.js 4`] = `
+====================================options=====================================
+parsers: ["flow", "typescript"]
+printWidth: 80
+tabWidth: 4
+useTabs: true
+                                                                                | printWidth
+=====================================input======================================
+$var = ($number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+? kochabCooieGameOnOboleUnweave
+: annularCooeedSplicesWalksWayWay)
+  ? anodyneCondosMalateOverateRetinol
+  : averredBathersBoxroomBuggyNurl;
+
+const value = (bifornCringerMoshedPerplexSawder
+? askTrovenaBeenaDependsRowans
+: glimseGlyphsHazardNoopsTieTie)
+  ? true
+    ? true
+    : false
+  : true
+  ? true
+  : false;
+
+(bifornCringerMoshedPerplexSawder ? (
+  askTrovenaBeenaDependsRowans
+) : (
+  glimseGlyphsHazardNoopsTieTie
+)) ? (
+  <Element>
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element>
+) : (
+  <Element2>
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element2>
+);
+
+=====================================output=====================================
+$var = (
+	$number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+		? kochabCooieGameOnOboleUnweave
+		: annularCooeedSplicesWalksWayWay
+)
+	? anodyneCondosMalateOverateRetinol
+	: averredBathersBoxroomBuggyNurl;
+
+const value = (
+	bifornCringerMoshedPerplexSawder
+		? askTrovenaBeenaDependsRowans
+		: glimseGlyphsHazardNoopsTieTie
+)
+	? true
+		? true
+		: false
+	: true
+	? true
+	: false;
+
+(
+	bifornCringerMoshedPerplexSawder
+		? askTrovenaBeenaDependsRowans
+		: glimseGlyphsHazardNoopsTieTie
+) ? (
+	<Element>
+		<Sub />
+		<Sub />
+		<Sub />
+		<Sub />
+		<Sub />
+		<Sub />
+	</Element>
+) : (
+	<Element2>
+		<Sub />
+		<Sub />
+		<Sub />
+	</Element2>
+);
+
+================================================================================
+`;
+
 exports[`parenthesis.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
diff --git a/tests/ternaries/nested-in-condition.js b/tests/ternaries/nested-in-condition.js
new file mode 100644
index 000000000..002a6aded
--- /dev/null
+++ b/tests/ternaries/nested-in-condition.js
@@ -0,0 +1,36 @@
+$var = ($number % 10 >= 2 && ($number % 100 < 10 || $number % 100 >= 20)
+? kochabCooieGameOnOboleUnweave
+: annularCooeedSplicesWalksWayWay)
+  ? anodyneCondosMalateOverateRetinol
+  : averredBathersBoxroomBuggyNurl;
+
+const value = (bifornCringerMoshedPerplexSawder
+? askTrovenaBeenaDependsRowans
+: glimseGlyphsHazardNoopsTieTie)
+  ? true
+    ? true
+    : false
+  : true
+  ? true
+  : false;
+
+(bifornCringerMoshedPerplexSawder ? (
+  askTrovenaBeenaDependsRowans
+) : (
+  glimseGlyphsHazardNoopsTieTie
+)) ? (
+  <Element>
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element>
+) : (
+  <Element2>
+    <Sub />
+    <Sub />
+    <Sub />
+  </Element2>
+);
diff --git a/tests/typescript_conditional_types/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_conditional_types/__snapshots__/jsfmt.spec.js.snap
index e06f96aee..0b69d9862 100644
--- a/tests/typescript_conditional_types/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_conditional_types/__snapshots__/jsfmt.spec.js.snap
@@ -125,3 +125,59 @@ type Unpacked<T> = T extends (infer U)[]
 
 ================================================================================
 `;
+
+exports[`nested-in-condition.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+type Foo =
+  (ThingamabobberFactory extends AbstractThingamabobberFactory ? GobbledygookProvider : CompositeGobbledygookProvider) extends
+  DoubleGobbledygookProvider
+    ? UniqueDalgametreService
+    : CompositeZamazingoResolver;
+
+type Foo2 =
+  DoubleGobbledygookProvider extends
+  (ThingamabobberFactory extends AbstractThingamabobberFactory ? GobbledygookProvider : CompositeGobbledygookProvider)
+    ? UniqueDalgametreService
+    : CompositeZamazingoResolver;
+
+type Foo3 =
+  (ThingamabobberFactory extends AbstractThingamabobberFactory ? GobbledygookProvider : CompositeGobbledygookProvider) extends
+  (DoubleGobbledygookProvider extends MockGobbledygookProvider ? MockThingamabobberFactory : ThingamabobberFactory)
+    ? UniqueDalgametreService
+    : CompositeZamazingoResolver;
+
+=====================================output=====================================
+type Foo = (
+  ThingamabobberFactory extends AbstractThingamabobberFactory
+    ? GobbledygookProvider
+    : CompositeGobbledygookProvider
+) extends DoubleGobbledygookProvider
+  ? UniqueDalgametreService
+  : CompositeZamazingoResolver;
+
+type Foo2 = DoubleGobbledygookProvider extends (
+  ThingamabobberFactory extends AbstractThingamabobberFactory
+    ? GobbledygookProvider
+    : CompositeGobbledygookProvider
+)
+  ? UniqueDalgametreService
+  : CompositeZamazingoResolver;
+
+type Foo3 = (
+  ThingamabobberFactory extends AbstractThingamabobberFactory
+    ? GobbledygookProvider
+    : CompositeGobbledygookProvider
+) extends (
+  DoubleGobbledygookProvider extends MockGobbledygookProvider
+    ? MockThingamabobberFactory
+    : ThingamabobberFactory
+)
+  ? UniqueDalgametreService
+  : CompositeZamazingoResolver;
+
+================================================================================
+`;
diff --git a/tests/typescript_conditional_types/nested-in-condition.ts b/tests/typescript_conditional_types/nested-in-condition.ts
new file mode 100644
index 000000000..0434f2c4e
--- /dev/null
+++ b/tests/typescript_conditional_types/nested-in-condition.ts
@@ -0,0 +1,17 @@
+type Foo =
+  (ThingamabobberFactory extends AbstractThingamabobberFactory ? GobbledygookProvider : CompositeGobbledygookProvider) extends
+  DoubleGobbledygookProvider
+    ? UniqueDalgametreService
+    : CompositeZamazingoResolver;
+
+type Foo2 =
+  DoubleGobbledygookProvider extends
+  (ThingamabobberFactory extends AbstractThingamabobberFactory ? GobbledygookProvider : CompositeGobbledygookProvider)
+    ? UniqueDalgametreService
+    : CompositeZamazingoResolver;
+
+type Foo3 =
+  (ThingamabobberFactory extends AbstractThingamabobberFactory ? GobbledygookProvider : CompositeGobbledygookProvider) extends
+  (DoubleGobbledygookProvider extends MockGobbledygookProvider ? MockThingamabobberFactory : ThingamabobberFactory)
+    ? UniqueDalgametreService
+    : CompositeZamazingoResolver;

From b9743b4c6c31d23f76f747a1e61bac04d461ecfa Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2019 11:27:11 +0100
Subject: [PATCH 51/88] Bump jest-junit from 9.0.0 to 10.0.0 (#7092)

Bumps [jest-junit](https://github.com/jest-community/jest-junit) from 9.0.0 to 10.0.0.
- [Release notes](https://github.com/jest-community/jest-junit/releases)
- [Commits](https://github.com/jest-community/jest-junit/compare/v9.0.0...v10.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 17881179f..f1e2baf35 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "eslint-plugin-react": "7.17.0",
     "execa": "3.4.0",
     "jest": "23.3.0",
-    "jest-junit": "9.0.0",
+    "jest-junit": "10.0.0",
     "jest-snapshot-serializer-ansi": "1.0.0",
     "jest-snapshot-serializer-raw": "1.1.0",
     "jest-watch-typeahead": "0.4.2",
diff --git a/yarn.lock b/yarn.lock
index b78601a57..29c3b421f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4028,10 +4028,10 @@ jest-jasmine2@^23.4.2:
     jest-util "^23.4.0"
     pretty-format "^23.2.0"
 
-jest-junit@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-9.0.0.tgz#9eb247dda7a8d2e1647a92f58a03a1490c74aea5"
-  integrity sha512-jnABGjL5pd2lhE1w3RIslZSufFbWQZGx8O3eluDES7qKxQuonXMtsPIi+4AKl4rtjb4DvMAjwLi4eHukc2FP/Q==
+jest-junit@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-10.0.0.tgz#c94b91c24920a327c9d2a075e897b2dba4af494b"
+  integrity sha512-dbOVRyxHprdSpwSAR9/YshLwmnwf+RSl5hf0kCGlhAcEeZY9aRqo4oNmaT0tLC16Zy9D0zekDjWkjHGjXlglaQ==
   dependencies:
     jest-validate "^24.9.0"
     mkdirp "^0.5.1"

From 20d1521417e9eb986f74787ad0f49b93ad0c9ca6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 5 Dec 2019 14:21:54 +0300
Subject: [PATCH 52/88] Bump flow-parser from 0.112.0 to 0.113.0 (#7095)

* Bump flow-parser from 0.112.0 to 0.113.0

Bumps [flow-parser](https://github.com/facebook/flow) from 0.112.0 to 0.113.0.
- [Release notes](https://github.com/facebook/flow/releases)
- [Changelog](https://github.com/facebook/flow/blob/master/Changelog.md)
- [Commits](https://github.com/facebook/flow/compare/v0.112.0...v0.113.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* remove unneeded workaround
---
 package.json                   |  2 +-
 src/language-js/postprocess.js | 16 ----------------
 yarn.lock                      |  8 ++++----
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index f1e2baf35..48cf8daee 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "esutils": "2.0.3",
     "find-parent-dir": "0.3.0",
     "find-project-root": "1.1.1",
-    "flow-parser": "0.112.0",
+    "flow-parser": "0.113.0",
     "get-stream": "4.1.0",
     "globby": "6.1.0",
     "graphql": "14.5.8",
diff --git a/src/language-js/postprocess.js b/src/language-js/postprocess.js
index bf4a9d178..5828ae3fe 100644
--- a/src/language-js/postprocess.js
+++ b/src/language-js/postprocess.js
@@ -35,22 +35,6 @@ function postprocess(ast, options) {
           });
         }
         break;
-      case "EnumDeclaration":
-        // A workaround for what looks like a bug in Flow.
-        // Flow assigns the same range to enum nodes and enum body nodes.
-        if (
-          options.parser === "flow" &&
-          node.body.range[0] === node.range[0] &&
-          node.body.range[1] === node.range[1]
-        ) {
-          node.body.range = [node.id.range[1], node.range[1] - 1];
-        }
-        // Babel does strange things as well. E.g. node.body.start > node.body.end can be true.
-        if (options.parser === "babel-flow") {
-          node.body.start = node.id.end;
-          node.body.end = node.end - 1;
-        }
-        break;
     }
   });
 
diff --git a/yarn.lock b/yarn.lock
index 29c3b421f..fddd2cb08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2993,10 +2993,10 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
-flow-parser@0.112.0:
-  version "0.112.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.112.0.tgz#938d7949068f147a196ebc2bd982ea066b024df5"
-  integrity sha512-sxjnwhR76B/fUN6n/XerYzn8R1HvtVo3SM8Il3WiZ4nkAlb2BBzKe1TSVKGSyZgD6FW9Bsxom/57ktkqrqmXGA==
+flow-parser@0.113.0:
+  version "0.113.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.113.0.tgz#5b5913c54833918d0c3136ba69f6cf0cdd85fc20"
+  integrity sha512-+hRyEB1sVLNMTMniDdM1JIS8BJ3HUL7IFIJaxX+t/JUy0GNYdI0Tg1QLx8DJmOF8HeoCrUDcREpnDAc/pPta3w==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"

From fa723deee29a3ee21d5bec5210c688c7d499a408 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Fri, 6 Dec 2019 18:18:38 +0900
Subject: [PATCH 53/88] TypeScript: remove extra indentation for arrow function
 on variable declaration with comment (#7094)

* Remove extra indent

* add changelog

* Fix postprocess for range of TypeScript

* Remove locend from postprocess

* Add test for no-smei

* Remove hasLeadingComment
---
 changelog_unreleased/typescript/pr-7094.md    |  26 +++++
 src/language-js/postprocess.js                |   8 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 105 ++++++++++++++++++
 tests/typescript_arrow/comments.js            |  10 ++
 tests/typescript_arrow/jsfmt.spec.js          |   1 +
 5 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 changelog_unreleased/typescript/pr-7094.md
 create mode 100644 tests/typescript_arrow/comments.js

diff --git a/changelog_unreleased/typescript/pr-7094.md b/changelog_unreleased/typescript/pr-7094.md
new file mode 100644
index 000000000..ee30e2bf4
--- /dev/null
+++ b/changelog_unreleased/typescript/pr-7094.md
@@ -0,0 +1,26 @@
+#### Remove extra indentation for arrow function on variable declaration with comment([#7094](https://github.com/prettier/prettier/pull/7094) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+<!-- prettier-ignore -->
+```ts
+// Input
+const foo = () => {
+  return;
+}
+
+// foo
+;
+
+// Prettier stable
+const foo = () => {
+    return;
+  };
+
+  // foo
+
+// Prettier master
+const foo = () => {
+  return;
+};
+
+// foo
+```
diff --git a/src/language-js/postprocess.js b/src/language-js/postprocess.js
index 5828ae3fe..e2daf1396 100644
--- a/src/language-js/postprocess.js
+++ b/src/language-js/postprocess.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const { getLast } = require("../common/util");
-const { composeLoc } = require("./loc");
+const { composeLoc, locEnd } = require("./loc");
 
 function postprocess(ast, options) {
   visitNode(ast, node => {
@@ -48,7 +48,7 @@ function postprocess(ast, options) {
     if (options.originalText[locEnd(toOverrideNode)] === ";") {
       return;
     }
-    if (options.parser === "flow") {
+    if (Array.isArray(toBeOverriddenNode.range)) {
       toBeOverriddenNode.range = [
         toBeOverriddenNode.range[0],
         toOverrideNode.range[1]
@@ -60,10 +60,6 @@ function postprocess(ast, options) {
       end: toBeOverriddenNode.loc.end
     });
   }
-
-  function locEnd(node) {
-    return options.parser === "flow" ? node.range[1] : node.end;
-  }
 }
 
 function visitNode(node, fn, parent, property) {
diff --git a/tests/typescript_arrow/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_arrow/__snapshots__/jsfmt.spec.js.snap
index 394c70a0b..837d1324e 100644
--- a/tests/typescript_arrow/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_arrow/__snapshots__/jsfmt.spec.js.snap
@@ -40,3 +40,108 @@ app.get("/", (req, res): void => {
 
 ================================================================================
 `;
+
+exports[`arrow_regression.js 2`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+const bar = (...varargs:any[]) => {
+  console.log(varargs);
+};
+
+const foo = (x:string):void => (
+  bar(
+    x,
+    () => {},
+    () => {}
+  )
+);
+
+app.get("/", (req, res): void => {
+  res.send("Hello world");
+});
+
+=====================================output=====================================
+const bar = (...varargs: any[]) => {
+  console.log(varargs)
+}
+
+const foo = (x: string): void =>
+  bar(
+    x,
+    () => {},
+    () => {}
+  )
+
+app.get("/", (req, res): void => {
+  res.send("Hello world")
+})
+
+================================================================================
+`;
+
+exports[`comments.js 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+const fn1 = () => {
+  return;
+} /* foo */;
+
+const fn2 = () => {
+  return;
+}
+
+// foo
+;
+
+=====================================output=====================================
+const fn1 = () => {
+  return;
+}; /* foo */
+
+const fn2 = () => {
+  return;
+};
+
+// foo
+
+================================================================================
+`;
+
+exports[`comments.js 2`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+const fn1 = () => {
+  return;
+} /* foo */;
+
+const fn2 = () => {
+  return;
+}
+
+// foo
+;
+
+=====================================output=====================================
+const fn1 = () => {
+  return
+} /* foo */
+
+const fn2 = () => {
+  return
+}
+
+// foo
+
+================================================================================
+`;
diff --git a/tests/typescript_arrow/comments.js b/tests/typescript_arrow/comments.js
new file mode 100644
index 000000000..f4fc55cb1
--- /dev/null
+++ b/tests/typescript_arrow/comments.js
@@ -0,0 +1,10 @@
+const fn1 = () => {
+  return;
+} /* foo */;
+
+const fn2 = () => {
+  return;
+}
+
+// foo
+;
diff --git a/tests/typescript_arrow/jsfmt.spec.js b/tests/typescript_arrow/jsfmt.spec.js
index 2ea3bb6eb..ba52aeb62 100644
--- a/tests/typescript_arrow/jsfmt.spec.js
+++ b/tests/typescript_arrow/jsfmt.spec.js
@@ -1 +1,2 @@
 run_spec(__dirname, ["typescript"]);
+run_spec(__dirname, ["typescript"], { semi: false });

From e606dcf4253aafbe867288be9a8742a0588f78de Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2019 12:29:57 +0300
Subject: [PATCH 54/88] Bump typescript from 3.7.2 to 3.7.3 (#7102)

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.7.2 to 3.7.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v3.7.2...v3.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 48cf8daee..afbc4d97c 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "resolve": "1.13.1",
     "semver": "6.3.0",
     "string-width": "4.1.0",
-    "typescript": "3.7.2",
+    "typescript": "3.7.3",
     "unicode-regex": "3.0.0",
     "unified": "8.4.2",
     "vnopts": "1.0.2",
diff --git a/yarn.lock b/yarn.lock
index fddd2cb08..bf95456ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6850,10 +6850,10 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
-  integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
+typescript@3.7.3:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
+  integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==
 
 uglify-js@^3.1.4:
   version "3.6.0"

From f421c7f6133761ad63ae2b86251ebba8e4f0ba7d Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Fri, 6 Dec 2019 20:03:26 +0200
Subject: [PATCH 55/88] =?UTF-8?q?fix(typescript):=20align=20printing=20of?=
 =?UTF-8?q?=20comments=20in=20function=20types=20w=E2=80=A6=20(#7104)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(typescript): align printing of comments in function types with Flow and Babel

* add changelog

* add tests for --no-semi
---
 changelog_unreleased/typescript/pr-7104.md    |   22 +
 src/language-js/comments.js                   |   12 +-
 .../comments/__snapshots__/jsfmt.spec.js.snap | 2572 ++++++++++++++++-
 tests/comments/issues.js                      |   30 -
 tests/comments/jsfmt.spec.js                  |    3 +-
 .../__snapshots__/jsfmt.spec.js.snap          |  152 +
 tests/flow_comments/interface.js              |    6 +
 tests/flow_comments/issues.js                 |   29 +
 .../flow_union.js => flow_comments/union.js}  |    0
 .../__snapshots__/jsfmt.spec.js.snap          |  216 ++
 tests/typescript_comments/declare_function.ts |    4 +
 tests/typescript_comments/interface.ts        |   28 +
 tests/typescript_comments/issues.ts           |   29 +
 tests/typescript_comments/union.ts            |   19 +
 14 files changed, 2950 insertions(+), 172 deletions(-)
 create mode 100644 changelog_unreleased/typescript/pr-7104.md
 create mode 100644 tests/flow_comments/interface.js
 create mode 100644 tests/flow_comments/issues.js
 rename tests/{comments/flow_union.js => flow_comments/union.js} (100%)
 create mode 100644 tests/typescript_comments/declare_function.ts
 create mode 100644 tests/typescript_comments/interface.ts
 create mode 100644 tests/typescript_comments/issues.ts
 create mode 100644 tests/typescript_comments/union.ts

diff --git a/changelog_unreleased/typescript/pr-7104.md b/changelog_unreleased/typescript/pr-7104.md
new file mode 100644
index 000000000..07f5f2115
--- /dev/null
+++ b/changelog_unreleased/typescript/pr-7104.md
@@ -0,0 +1,22 @@
+#### Fix printing of comments in function types ([#7104](https://github.com/prettier/prettier/pull/7104) by [@thorn0](https://github.com/thorn0))
+
+<!-- prettier-ignore -->
+```ts
+// Input
+type f1 = (
+  currentRequest: {a: number},
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+) => number;
+
+// Prettier stable
+type f1 = (currentRequest: {
+  a: number;
+}) => // TODO this is a very very very very long comment that makes it go > 80 columns
+number;
+
+// Prettier master
+type f1 = (
+  currentRequest: { a: number }
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+) => number;
+```
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index f5cefb375..60c8848e3 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -592,7 +592,7 @@ function handleLastFunctionArgComments(
   comment,
   options
 ) {
-  // Type definitions functions
+  // Flow function type definitions
   if (
     precedingNode &&
     precedingNode.type === "FunctionTypeParam" &&
@@ -605,7 +605,7 @@ function handleLastFunctionArgComments(
     return true;
   }
 
-  // Real functions
+  // Real functions and TypeScript function type definitions
   if (
     precedingNode &&
     (precedingNode.type === "Identifier" ||
@@ -615,7 +615,13 @@ function handleLastFunctionArgComments(
       enclosingNode.type === "FunctionExpression" ||
       enclosingNode.type === "FunctionDeclaration" ||
       enclosingNode.type === "ObjectMethod" ||
-      enclosingNode.type === "ClassMethod") &&
+      enclosingNode.type === "ClassMethod" ||
+      enclosingNode.type === "TSDeclareFunction" ||
+      enclosingNode.type === "TSCallSignatureDeclaration" ||
+      enclosingNode.type === "TSConstructSignatureDeclaration" ||
+      enclosingNode.type === "TSMethodSignature" ||
+      enclosingNode.type === "TSConstructorType" ||
+      enclosingNode.type === "TSFunctionType") &&
     privateUtil.getNextNonSpaceNonCommentCharacter(
       text,
       comment,
diff --git a/tests/comments/__snapshots__/jsfmt.spec.js.snap b/tests/comments/__snapshots__/jsfmt.spec.js.snap
index 099b640e1..b96df2538 100644
--- a/tests/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/comments/__snapshots__/jsfmt.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`arrow.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -18,9 +18,28 @@ const fn2 = (/*event, data*/) => doSomething(anything);
 ================================================================================
 `;
 
+exports[`arrow.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+const fn = (/*event, data*/) => doSomething();
+
+const fn2 = (/*event, data*/) => doSomething(anything);
+
+=====================================output=====================================
+const fn = (/*event, data*/) => doSomething()
+
+const fn2 = (/*event, data*/) => doSomething(anything)
+
+================================================================================
+`;
+
 exports[`assignment-pattern.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -43,9 +62,35 @@ let {
 ================================================================================
 `;
 
+exports[`assignment-pattern.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+const { a /* comment */ = 1 } = b;
+
+const { c = 1 /* comment */ } = d;
+
+let {d //comment
+= b} = c
+
+=====================================output=====================================
+const { a /* comment */ = 1 } = b
+
+const { c = 1 /* comment */ } = d
+
+let {
+  d = b //comment
+} = c
+
+================================================================================
+`;
+
 exports[`before-comma.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -67,9 +112,34 @@ const foo = {
 ================================================================================
 `;
 
+exports[`before-comma.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+const foo = {
+  a: 'a' /* comment for this line */,
+
+  /* Section B */
+  b: 'b',
+};
+
+=====================================output=====================================
+const foo = {
+  a: "a" /* comment for this line */,
+
+  /* Section B */
+  b: "b"
+}
+
+================================================================================
+`;
+
 exports[`binary-expressions.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -221,9 +291,164 @@ function bitwiseXor() {
 ================================================================================
 `;
 
+exports[`binary-expressions.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+function addition() {
+	0
+	// Comment
+	+ x
+}
+
+function multiplication() {
+	0
+	// Comment
+	* x
+}
+
+function division() {
+	0
+	// Comment
+	/ x
+}
+
+function substraction() {
+	0
+	// Comment
+	- x
+}
+
+function remainder() {
+	0
+	// Comment
+	% x
+}
+
+function exponentiation() {
+	0
+	// Comment
+	** x
+}
+
+function leftShift() {
+	0
+	// Comment
+	<< x
+}
+
+function rightShift() {
+	0
+	// Comment
+	>> x
+}
+
+function unsignedRightShift() {
+	0
+	// Comment
+	>>> x
+}
+
+function bitwiseAnd() {
+	0
+	// Comment
+	& x
+}
+
+function bitwiseOr() {
+	0
+	// Comment
+	| x
+}
+
+function bitwiseXor() {
+	0
+	// Comment
+	^ x
+}
+
+=====================================output=====================================
+function addition() {
+  0 +
+    // Comment
+    x
+}
+
+function multiplication() {
+  0 *
+    // Comment
+    x
+}
+
+function division() {
+  0 /
+    // Comment
+    x
+}
+
+function substraction() {
+  0 -
+    // Comment
+    x
+}
+
+function remainder() {
+  0 %
+    // Comment
+    x
+}
+
+function exponentiation() {
+  0 **
+    // Comment
+    x
+}
+
+function leftShift() {
+  0 <<
+    // Comment
+    x
+}
+
+function rightShift() {
+  0 >>
+    // Comment
+    x
+}
+
+function unsignedRightShift() {
+  0 >>>
+    // Comment
+    x
+}
+
+function bitwiseAnd() {
+  0 &
+    // Comment
+    x
+}
+
+function bitwiseOr() {
+  0 |
+    // Comment
+    x
+}
+
+function bitwiseXor() {
+  0 ^
+    // Comment
+    x
+}
+
+================================================================================
+`;
+
 exports[`blank.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -275,9 +500,64 @@ printWidth: 80
 ================================================================================
 `;
 
+exports[`blank.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+// This file only
+// has comments. This comment
+// should still exist
+//
+// when printed.
+
+/**
+ * @typedef {DataDrivenMapping|ConstantMapping} Mapping
+ */
+/**
+ * @typedef {Object.<String, Mapping>} ConfigurationMapping
+ */
+
+/**
+ * @typedef {Function} D3Scale - a D3 scale
+ * @property {Function} ticks
+ * @property {Function} tickFormat
+ */
+// comment
+
+// comment
+
+=====================================output=====================================
+// This file only
+// has comments. This comment
+// should still exist
+//
+// when printed.
+
+/**
+ * @typedef {DataDrivenMapping|ConstantMapping} Mapping
+ */
+/**
+ * @typedef {Object.<String, Mapping>} ConfigurationMapping
+ */
+
+/**
+ * @typedef {Function} D3Scale - a D3 scale
+ * @property {Function} ticks
+ * @property {Function} tickFormat
+ */
+// comment
+
+// comment
+
+================================================================================
+`;
+
 exports[`break-continue-statements.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -309,9 +589,44 @@ loop: for (;;) {
 ================================================================================
 `;
 
+exports[`break-continue-statements.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+for (;;) {
+  break /* comment */;
+  continue /* comment */;
+}
+
+loop: for (;;) {
+  break /* comment */ loop;
+  break loop /* comment */;
+  continue /* comment */ loop;
+  continue loop /* comment */;
+}
+
+=====================================output=====================================
+for (;;) {
+  break /* comment */
+  continue /* comment */
+}
+
+loop: for (;;) {
+  break /* comment */ loop
+  break loop /* comment */
+  continue /* comment */ loop
+  continue loop /* comment */
+}
+
+================================================================================
+`;
+
 exports[`call_comment.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -352,9 +667,53 @@ render?.(
 ================================================================================
 `;
 
+exports[`call_comment.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+render( // Warm any cache
+  <ChildUpdates renderAnchor={true} anchorClassOn={true} />,
+  container
+);
+
+React.render( // Warm any cache
+  <ChildUpdates renderAnchor={true} anchorClassOn={true} />,
+  container
+);
+
+render?.( // Warm any cache
+  <ChildUpdates renderAnchor={true} anchorClassOn={true} />,
+  container
+);
+
+=====================================output=====================================
+render(
+  // Warm any cache
+  <ChildUpdates renderAnchor={true} anchorClassOn={true} />,
+  container
+)
+
+React.render(
+  // Warm any cache
+  <ChildUpdates renderAnchor={true} anchorClassOn={true} />,
+  container
+)
+
+render?.(
+  // Warm any cache
+  <ChildUpdates renderAnchor={true} anchorClassOn={true} />,
+  container
+)
+
+================================================================================
+`;
+
 exports[`dangling.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -396,9 +755,54 @@ export /* dangling */{};
 ================================================================================
 `;
 
+exports[`dangling.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+var a = {/* dangling */};
+var b = {
+  // dangling
+};
+var b = [/* dangling */];
+function d() {
+  /* dangling */
+}
+new Thing(/* dangling */);
+Thing(/* dangling */);
+Thing?.(/* dangling */);
+declare class Foo extends Qux<string> {/* dangling */}
+export /* dangling */{};
+
+=====================================output=====================================
+var a = {
+  /* dangling */
+}
+var b = {
+  // dangling
+}
+var b = [
+  /* dangling */
+]
+function d() {
+  /* dangling */
+}
+new Thing(/* dangling */)
+Thing(/* dangling */)
+Thing?.(/* dangling */)
+declare class Foo extends Qux<string> {
+  /* dangling */
+}
+export /* dangling */{}
+
+================================================================================
+`;
+
 exports[`dangling_array.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -418,9 +822,32 @@ expect(() => {}).toTriggerReadyStateChanges([
 ================================================================================
 `;
 
+exports[`dangling_array.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+expect(() => {}).toTriggerReadyStateChanges([
+  // Nothing.
+]);
+
+[1 /* first comment */, 2 /* second comment */, 3];
+
+=====================================output=====================================
+expect(() => {}).toTriggerReadyStateChanges([
+  // Nothing.
+])
+
+;[1 /* first comment */, 2 /* second comment */, 3]
+
+================================================================================
+`;
+
 exports[`dangling_for.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -439,9 +866,31 @@ for (;;);
 ================================================================================
 `;
 
+exports[`dangling_for.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+for // comment
+(;;);
+
+for /* comment */(;;);
+
+=====================================output=====================================
+// comment
+for (;;);
+
+/* comment */
+for (;;);
+
+================================================================================
+`;
+
 exports[`dynamic_imports.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -490,9 +939,61 @@ wrap(
 ================================================================================
 `;
 
+exports[`dynamic_imports.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+import(/* Hello */ 'something')
+
+import('something' /* Hello */)
+
+import(/* Hello */ 'something' /* Hello */)
+
+import('something' /* Hello */ + 'else')
+
+import(
+  /* Hello */
+  'something'
+  /* Hello */
+)
+
+wrap(
+  import(/* Hello */
+    'something'
+  )
+)
+
+=====================================output=====================================
+import(/* Hello */ "something")
+
+import("something" /* Hello */)
+
+import(/* Hello */ "something" /* Hello */)
+
+import("something" /* Hello */ + "else")
+
+import(
+  /* Hello */
+  "something"
+  /* Hello */
+)
+
+wrap(
+  import(
+    /* Hello */
+    "something"
+  )
+)
+
+================================================================================
+`;
+
 exports[`export.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -546,9 +1047,66 @@ export {
 ================================================================================
 `;
 
+exports[`export.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+export //comment
+{}
+
+export /* comment */ {};
+
+const foo = ''
+export {
+  foo // comment
+}
+
+const bar = ''
+export {
+  // comment
+  bar
+}
+
+const fooo = ''
+const barr = ''
+export {
+  fooo, // comment
+  barr, // comment
+}
+
+=====================================output=====================================
+export //comment
+{}
+
+export /* comment */{}
+
+const foo = ""
+export {
+  foo // comment
+}
+
+const bar = ""
+export {
+  // comment
+  bar
+}
+
+const fooo = ""
+const barr = ""
+export {
+  fooo, // comment
+  barr // comment
+}
+
+================================================================================
+`;
+
 exports[`first-line.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -562,59 +1120,26 @@ b;
 ================================================================================
 `;
 
-exports[`flow_union.js 1`] = `
+exports[`first-line.js 2`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
+semi: false
                                                                                 | printWidth
 =====================================input======================================
-type UploadState<E, EM, D>
-  // The upload hasnt begun yet
-  = {type: "Not_begun"}
-  // The upload timed out
-  | {type: "Timed_out"}
-  // Failed somewhere on the line
-  | {type: "Failed", error: E, errorMsg: EM}
-  // Uploading to aws3 and CreatePostMutation succeeded
-  | {type: "Success", data: D};
-
-type UploadState2<E, EM, D>
-  // The upload hasnt begun yet
-  = A
-  // The upload timed out
-  | B
-  // Failed somewhere on the line
-  | C
-  // Uploading to aws3 and CreatePostMutation succeeded
-  | D;
+a // comment
+b
 
 =====================================output=====================================
-type UploadState<E, EM, D> =
-  // The upload hasnt begun yet
-  | { type: "Not_begun" }
-  // The upload timed out
-  | { type: "Timed_out" }
-  // Failed somewhere on the line
-  | { type: "Failed", error: E, errorMsg: EM }
-  // Uploading to aws3 and CreatePostMutation succeeded
-  | { type: "Success", data: D };
-
-type UploadState2<E, EM, D> =
-  // The upload hasnt begun yet
-  | A
-  // The upload timed out
-  | B
-  // Failed somewhere on the line
-  | C
-  // Uploading to aws3 and CreatePostMutation succeeded
-  | D;
+a // comment
+b
 
 ================================================================================
 `;
 
 exports[`function-declaration.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -746,9 +1271,144 @@ function foo4() {
 ================================================================================
 `;
 
+exports[`function-declaration.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+function a(/* comment */) {} // comment
+function b() {} // comment
+function c(/* comment */ argA, argB, argC) {} // comment
+call((/*object*/ row) => {});
+KEYPAD_NUMBERS.map(num => ( // Buttons 0-9
+  <div />
+));
+
+function f1 /* f */() {}
+function f2 (/* args */) {}
+function f3 () /* returns */ {}
+function f4 /* f */(/* args */) /* returns */ {}
+
+function f5 /* f */(/* a */ a) {}
+function f6 /* f */(a /* a */) {}
+function f7 /* f */(/* a */ a) /* returns */ {}
+
+const obj = {
+  f1 /* f */() {},
+  f2 (/* args */) {},
+  f3 () /* returns */ {},
+  f4 /* f */(/* args */) /* returns */ {},
+};
+
+(function f /* f */() {})();
+(function f (/* args */) {})();
+(function f () /* returns */ {})();
+(function f /* f */(/* args */) /* returns */ {})();
+
+class C1 {
+  f/* f */() {}
+}
+class C2 {
+  f(/* args */) {}
+}
+class C3 {
+  f() /* returns */ {}
+}
+class C4 {
+  f/* f */(/* args */) /* returns */ {}
+}
+
+function foo1() 
+// this is a function
+{
+  return 42
+}
+
+function foo2() // this is a function
+{
+  return 42
+}
+
+function foo3() { // this is a function
+  return 42
+}
+
+function foo4() {
+  // this is a function
+  return 42;
+}
+
+=====================================output=====================================
+function a(/* comment */) {} // comment
+function b() {} // comment
+function c(/* comment */ argA, argB, argC) {} // comment
+call((/*object*/ row) => {})
+KEYPAD_NUMBERS.map((
+  num // Buttons 0-9
+) => <div />)
+
+function f1 /* f */() {}
+function f2(/* args */) {}
+function f3() /* returns */ {}
+function f4 /* f */(/* args */) /* returns */ {}
+
+function f5 /* f */(/* a */ a) {}
+function f6 /* f */(a /* a */) {}
+function f7 /* f */(/* a */ a) /* returns */ {}
+
+const obj = {
+  f1 /* f */() {},
+  f2(/* args */) {},
+  f3() /* returns */ {},
+  f4 /* f */(/* args */) /* returns */ {}
+}
+
+;(function f /* f */() {})()
+;(function f(/* args */) {})()
+;(function f() /* returns */ {})()
+;(function f /* f */(/* args */) /* returns */ {})()
+
+class C1 {
+  f /* f */() {}
+}
+class C2 {
+  f(/* args */) {}
+}
+class C3 {
+  f() /* returns */ {}
+}
+class C4 {
+  f /* f */(/* args */) /* returns */ {}
+}
+
+function foo1() {
+  // this is a function
+  return 42
+}
+
+function foo2() {
+  // this is a function
+  return 42
+}
+
+function foo3() {
+  // this is a function
+  return 42
+}
+
+function foo4() {
+  // this is a function
+  return 42
+}
+
+================================================================================
+`;
+
 exports[`if.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -894,9 +1554,158 @@ if (14) {
 ================================================================================
 `;
 
+exports[`if.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+if (1)
+// comment
+{
+  false
+}
+// comment
+else if (2)
+  true
+// multi
+// ple
+// lines
+else if (3)
+  // existing comment
+  true
+// okay?
+else if (4) {
+  // empty with existing comment
+}
+// comment
+else {
+}
+
+if (5) // comment
+true
+
+if (6) // comment
+{true}
+else if (7) // comment
+true
+else // comment
+{true}
+
+if (8) // comment
+// comment
+{true}
+else if (9) // comment
+// comment
+true
+else // comment
+// comment
+{true}
+
+if (10) /* comment */ // comment
+{true}
+else if (11) /* comment */
+true
+else if (12) // comment /* comment */ // comment
+true
+else if (13) /* comment */ /* comment */ // comment
+true
+else /* comment */
+{true}
+
+if (14) // comment
+/* comment */
+// comment
+{true}
+else if (15) // comment
+/* comment */
+/* comment */ // comment
+true
+
+=====================================output=====================================
+if (1) {
+  // comment
+  false
+}
+// comment
+else if (2) true
+// multi
+// ple
+// lines
+else if (3)
+  // existing comment
+  true
+// okay?
+else if (4) {
+  // empty with existing comment
+}
+// comment
+else {
+}
+
+if (5)
+  // comment
+  true
+
+if (6) {
+  // comment
+  true
+} else if (7)
+  // comment
+  true
+// comment
+else {
+  true
+}
+
+if (8) {
+  // comment
+  // comment
+  true
+} else if (9)
+  // comment
+  // comment
+  true
+// comment
+// comment
+else {
+  true
+}
+
+if (10) {
+  /* comment */ // comment
+  true
+} else if (11)
+  /* comment */
+  true
+else if (12)
+  // comment /* comment */ // comment
+  true
+else if (13)
+  /* comment */ /* comment */ // comment
+  true
+/* comment */ else {
+  true
+}
+
+if (14) {
+  // comment
+  /* comment */
+  // comment
+  true
+} else if (15)
+  // comment
+  /* comment */
+  /* comment */ // comment
+  true
+
+================================================================================
+`;
+
 exports[`issues.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -916,29 +1725,6 @@ throw new ProcessSystemError({
   originalError: acc.error, // Just in case.
 });
 
-// Adding a comment stops the pretty printing process and everything is
-// squished in a single line afterward
-export type BuckWebSocketMessage = {
-  // Not actually from Buck - this is to let the receiver know that the socket is connected.
-  type: 'SocketConnected',
-} | {
-  type: 'BuildProgressUpdated',
-  progressValue: number,
-} | {
-  type: 'BuildFinished',
-  exitCode: number,
-} | {
-  type: 'BuildStarted',
-} | {
-  type: 'ParseStarted',
-} | {
-  type: 'ParseFinished',
-} | {
-  type: 'RunStarted',
-} | {
-  type: 'RunComplete',
-};
-
 // Missing one level of indentation because of the comment
 const rootEpic = (actions, store) => (
   combineEpics(...epics)(actions, store)
@@ -949,13 +1735,6 @@ const rootEpic = (actions, store) => (
     })
 );
 
-// Two extra levels of indentation because of the comment
-export type AsyncExecuteOptions = child_process$execFileOpts & {
-  // The contents to write to stdin.
-  stdin?: ?string,
-  dontLogInNuclide?: ?boolean,
-};
-
 // optional trailing comma gets moved all the way to the beginning
 const regex = new RegExp(
   '^\\\\s*' + // beginning of the line
@@ -1025,37 +1804,6 @@ throw new ProcessSystemError({
   originalError: acc.error // Just in case.
 });
 
-// Adding a comment stops the pretty printing process and everything is
-// squished in a single line afterward
-export type BuckWebSocketMessage =
-  | {
-      // Not actually from Buck - this is to let the receiver know that the socket is connected.
-      type: "SocketConnected"
-    }
-  | {
-      type: "BuildProgressUpdated",
-      progressValue: number
-    }
-  | {
-      type: "BuildFinished",
-      exitCode: number
-    }
-  | {
-      type: "BuildStarted"
-    }
-  | {
-      type: "ParseStarted"
-    }
-  | {
-      type: "ParseFinished"
-    }
-  | {
-      type: "RunStarted"
-    }
-  | {
-      type: "RunComplete"
-    };
-
 // Missing one level of indentation because of the comment
 const rootEpic = (actions, store) =>
   combineEpics(...epics)(actions, store)
@@ -1065,13 +1813,6 @@ const rootEpic = (actions, store) =>
       return stream;
     });
 
-// Two extra levels of indentation because of the comment
-export type AsyncExecuteOptions = child_process$execFileOpts & {
-  // The contents to write to stdin.
-  stdin?: ?string,
-  dontLogInNuclide?: ?boolean
-};
-
 // optional trailing comma gets moved all the way to the beginning
 const regex = new RegExp(
   "^\\\\s*" + // beginning of the line
@@ -1125,9 +1866,173 @@ foo(
 ================================================================================
 `;
 
+exports[`issues.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+// Does not need to break as it fits in 80 columns
+this.call(a, /* comment */ b);
+
+function f(
+  someReallyLongArgument: WithSomeLongType,
+  someReallyLongArgument2: WithSomeLongType,
+  // Trailing comment should stay after
+) {}
+
+// Comments should either stay at the end of the line or always before, but
+// not one before and one after.
+throw new ProcessSystemError({
+  code: acc.error.code, // Alias of errno
+  originalError: acc.error, // Just in case.
+});
+
+// Missing one level of indentation because of the comment
+const rootEpic = (actions, store) => (
+  combineEpics(...epics)(actions, store)
+    // Log errors and continue.
+    .catch((err, stream) => {
+      getLogger().error(err);
+      return stream;
+    })
+);
+
+// optional trailing comma gets moved all the way to the beginning
+const regex = new RegExp(
+  '^\\\\s*' + // beginning of the line
+  'name\\\\s*=\\\\s*' + // name =
+  '[\\'"]' + // opening quotation mark
+  escapeStringRegExp(target.name) + // target name
+  '[\\'"]' + // closing quotation mark
+  ',?$', // optional trailing comma
+);
+
+// The comment is moved and doesn't trigger the eslint rule anymore
+import path from 'path'; // eslint-disable-line nuclide-internal/prefer-nuclide-uri
+
+// Comments disappear in-between MemberExpressions
+Observable.of(process)
+  // Don't complete until we say so!
+  .merge(Observable.never())
+  // Get the errors.
+  .takeUntil(throwOnError ? errors.flatMap(Observable.throw) : errors)
+  .takeUntil(exit);
+
+// Comments disappear inside of JSX
+<div>
+  {/* Some comment */}
+</div>;
+
+// Comments in JSX tag are placed in a non optimal way
+<div
+  // comment
+/>;
+
+// Comments disappear in empty blocks
+if (1) {
+  // Comment
+}
+
+// Comments trigger invalid JavaScript in-between else if
+if (1) {
+}
+// Comment
+else {
+
+}
+
+// The comment makes the line break in a weird way
+const result = asyncExecute('non_existing_command', /* args */ []);
+
+// The closing paren is printed on the same line as the comment
+foo({}
+  // Hi
+);
+
+=====================================output=====================================
+// Does not need to break as it fits in 80 columns
+this.call(a, /* comment */ b)
+
+function f(
+  someReallyLongArgument: WithSomeLongType,
+  someReallyLongArgument2: WithSomeLongType
+  // Trailing comment should stay after
+) {}
+
+// Comments should either stay at the end of the line or always before, but
+// not one before and one after.
+throw new ProcessSystemError({
+  code: acc.error.code, // Alias of errno
+  originalError: acc.error // Just in case.
+})
+
+// Missing one level of indentation because of the comment
+const rootEpic = (actions, store) =>
+  combineEpics(...epics)(actions, store)
+    // Log errors and continue.
+    .catch((err, stream) => {
+      getLogger().error(err)
+      return stream
+    })
+
+// optional trailing comma gets moved all the way to the beginning
+const regex = new RegExp(
+  "^\\\\s*" + // beginning of the line
+  "name\\\\s*=\\\\s*" + // name =
+  "['\\"]" + // opening quotation mark
+  escapeStringRegExp(target.name) + // target name
+  "['\\"]" + // closing quotation mark
+    ",?$" // optional trailing comma
+)
+
+// The comment is moved and doesn't trigger the eslint rule anymore
+import path from "path" // eslint-disable-line nuclide-internal/prefer-nuclide-uri
+
+// Comments disappear in-between MemberExpressions
+Observable.of(process)
+  // Don't complete until we say so!
+  .merge(Observable.never())
+  // Get the errors.
+  .takeUntil(throwOnError ? errors.flatMap(Observable.throw) : errors)
+  .takeUntil(exit)
+
+// Comments disappear inside of JSX
+;<div>{/* Some comment */}</div>
+
+// Comments in JSX tag are placed in a non optimal way
+;<div
+// comment
+/>
+
+// Comments disappear in empty blocks
+if (1) {
+  // Comment
+}
+
+// Comments trigger invalid JavaScript in-between else if
+if (1) {
+}
+// Comment
+else {
+}
+
+// The comment makes the line break in a weird way
+const result = asyncExecute("non_existing_command", /* args */ [])
+
+// The closing paren is printed on the same line as the comment
+foo(
+  {}
+  // Hi
+)
+
+================================================================================
+`;
+
 exports[`jsdoc.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -1188,9 +2093,73 @@ function HelloWorld() {
 ================================================================================
 `;
 
+exports[`jsdoc.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+/** @type {any} */
+const x = (
+    <div>
+        <div />
+    </div>
+);
+
+/**
+ * @type {object}
+ */
+() => (
+    <div>
+        sajdfpoiasdjfpoiasdjfpoiasdjfpoiadsjfpaoisdjfapsdiofjapioisadfaskfaspiofjp
+    </div>
+);
+
+/**
+ * @type {object}
+ */
+function HelloWorld() {
+    return (
+        <div>
+           <span>Test</span>
+        </div>
+    );
+}
+=====================================output=====================================
+/** @type {any} */
+const x = (
+  <div>
+    <div />
+  </div>
+)
+
+/**
+ * @type {object}
+ */
+;() => (
+  <div>
+    sajdfpoiasdjfpoiasdjfpoiasdjfpoiadsjfpaoisdjfapsdiofjapioisadfaskfaspiofjp
+  </div>
+)
+
+/**
+ * @type {object}
+ */
+function HelloWorld() {
+  return (
+    <div>
+      <span>Test</span>
+    </div>
+  )
+}
+
+================================================================================
+`;
+
 exports[`jsx.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -1429,9 +2398,251 @@ onClick={() => {}}>
 ================================================================================
 `;
 
+exports[`jsx.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+<div>
+  {
+    /* comment */
+  }
+</div>;
+
+<div>
+  {/* comment */
+  }
+</div>;
+
+<div>
+  {/* comment
+*/
+  }
+</div>;
+
+<div>
+  {a/* comment
+*/
+  }
+</div>;
+
+<div>
+  {/* comment
+*/
+  a
+  }
+</div>;
+
+<div>
+  {/* comment */
+  }
+</div>;
+
+<div>
+  {/* comment */}
+</div>;
+
+<div>
+  {
+    // single line comment
+  }
+</div>;
+
+<div>
+  {
+    // multiple line comments 1
+    // multiple line comments 2
+  }
+</div>;
+
+<div>
+  {
+    // multiple mixed comments 1
+    /* multiple mixed comments 2 */
+    /* multiple mixed comments 3 */
+    // multiple mixed comments 4
+  }
+</div>;
+
+<div>
+  {
+    // Some very v  ery very very merry (xmas) very very long line to break line width limit
+  }
+</div>;
+
+<div>{/*<div>  Some very v  ery very very long line to break line width limit </div>*/}</div>;
+
+<div>
+  {/**
+   * JSDoc-y comment in JSX. I wonder what will happen to it?
+  */}
+</div>;
+
+<div>
+  {
+    /**
+   * Another JSDoc comment in JSX.
+  */
+  }
+</div>;
+
+<div
+  /**
+ * Handles clicks.
+*/
+onClick={() => {}}>
+
+</div>;
+
+<div
+  // comment
+>
+  {foo}
+</div>;
+
+<div
+  className="foo" // comment
+>
+  {foo}
+</div>;
+
+<div
+  className="foo"
+  // comment
+>
+  {foo}
+</div>;
+
+<div // comment
+  id="foo"
+>
+  {children}
+</div>;
+
+<Wrapper>
+  {}
+  <Component />
+</Wrapper>
+
+=====================================output=====================================
+;<div>{/* comment */}</div>
+
+;<div>{/* comment */}</div>
+
+;<div>
+  {/* comment
+   */}
+</div>
+
+;<div>
+  {
+    a
+    /* comment
+     */
+  }
+</div>
+
+;<div>
+  {
+    /* comment
+     */
+    a
+  }
+</div>
+
+;<div>{/* comment */}</div>
+
+;<div>{/* comment */}</div>
+
+;<div>
+  {
+    // single line comment
+  }
+</div>
+
+;<div>
+  {
+    // multiple line comments 1
+    // multiple line comments 2
+  }
+</div>
+
+;<div>
+  {
+    // multiple mixed comments 1
+    /* multiple mixed comments 2 */
+    /* multiple mixed comments 3 */
+    // multiple mixed comments 4
+  }
+</div>
+
+;<div>
+  {
+    // Some very v  ery very very merry (xmas) very very long line to break line width limit
+  }
+</div>
+
+;<div>
+  {/*<div>  Some very v  ery very very long line to break line width limit </div>*/}
+</div>
+
+;<div>
+  {/**
+   * JSDoc-y comment in JSX. I wonder what will happen to it?
+   */}
+</div>
+
+;<div>
+  {/**
+   * Another JSDoc comment in JSX.
+   */}
+</div>
+
+;<div
+  /**
+   * Handles clicks.
+   */
+  onClick={() => {}}
+></div>
+
+;<div
+// comment
+>
+  {foo}
+</div>
+
+;<div
+  className="foo" // comment
+>
+  {foo}
+</div>
+
+;<div
+  className="foo"
+  // comment
+>
+  {foo}
+</div>
+
+;<div // comment
+  id="foo"
+>
+  {children}
+</div>
+
+;<Wrapper>
+  {}
+  <Component />
+</Wrapper>
+
+================================================================================
+`;
+
 exports[`last-arg.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -1621,9 +2832,202 @@ class Foo {
 ================================================================================
 `;
 
+exports[`last-arg.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+type f1 = (
+  currentRequest: {a: number},
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+) => number;
+
+f2 = (
+  currentRequest: {a: number},
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+): number => {};
+
+f3 = (
+  currentRequest: {a: number},
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+) => {};
+
+f4 = function(
+  currentRequest: {a: number},
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+) {};
+
+class X {
+  f(
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ) {}
+}
+
+function f5(
+  a: number
+// some comment here
+): number {
+  return a + 1;
+}
+
+var x = {
+  getSectionMode(
+    pageMetaData: PageMetaData,
+    sectionMetaData: SectionMetaData
+    /* $FlowFixMe This error was exposed while converting keyMirror
+     * to keyMirrorRecursive */
+  ): $Enum<SectionMode> {
+  }
+}
+
+class X2 {
+  getSectionMode(
+    pageMetaData: PageMetaData,
+    sectionMetaData: SectionMetaData = ['unknown']
+    /* $FlowFixMe This error was exposed while converting keyMirror
+     * to keyMirrorRecursive */
+  ): $Enum<SectionMode> {
+  }
+}
+
+class Foo {
+  a(lol /*string*/) {}
+
+  b(lol /*string*/
+  ) {}
+
+  d(
+    lol /*string*/,
+    lol2 /*string*/,
+    lol3 /*string*/,
+    lol4 /*string*/
+  ) {}
+
+  d(
+    lol /*string*/,
+    lol2 /*string*/,
+    lol3 /*string*/,
+    lol4 /*string*/
+  ) /*string*/ {}
+
+  // prettier-ignore
+  c(lol /*string*/
+  ) {}
+
+  // prettier-ignore
+  d(
+    lol /*string*/,
+    lol2 /*string*/,
+    lol3 /*string*/,
+    lol4 /*string*/
+  ) {}
+
+  // prettier-ignore
+  e(
+    lol /*string*/,
+    lol2 /*string*/,
+    lol3 /*string*/,
+    lol4 /*string*/
+  ) {} /* string*/
+}
+
+=====================================output=====================================
+type f1 = (
+  currentRequest: { a: number }
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+) => number
+
+f2 = (
+  currentRequest: { a: number }
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+): number => {}
+
+f3 = (
+  currentRequest: { a: number }
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+) => {}
+
+f4 = function(
+  currentRequest: { a: number }
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+) {}
+
+class X {
+  f(
+    currentRequest: { a: number }
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ) {}
+}
+
+function f5(
+  a: number
+  // some comment here
+): number {
+  return a + 1
+}
+
+var x = {
+  getSectionMode(
+    pageMetaData: PageMetaData,
+    sectionMetaData: SectionMetaData
+    /* $FlowFixMe This error was exposed while converting keyMirror
+     * to keyMirrorRecursive */
+  ): $Enum<SectionMode> {}
+}
+
+class X2 {
+  getSectionMode(
+    pageMetaData: PageMetaData,
+    sectionMetaData: SectionMetaData = ["unknown"]
+    /* $FlowFixMe This error was exposed while converting keyMirror
+     * to keyMirrorRecursive */
+  ): $Enum<SectionMode> {}
+}
+
+class Foo {
+  a(lol /*string*/) {}
+
+  b(lol /*string*/) {}
+
+  d(lol /*string*/, lol2 /*string*/, lol3 /*string*/, lol4 /*string*/) {}
+
+  d(
+    lol /*string*/,
+    lol2 /*string*/,
+    lol3 /*string*/,
+    lol4 /*string*/
+  ) /*string*/ {}
+
+  // prettier-ignore
+  c(lol /*string*/
+  ) {}
+
+  // prettier-ignore
+  d(
+    lol /*string*/,
+    lol2 /*string*/,
+    lol3 /*string*/,
+    lol4 /*string*/
+  ) {}
+
+  // prettier-ignore
+  e(
+    lol /*string*/,
+    lol2 /*string*/,
+    lol3 /*string*/,
+    lol4 /*string*/
+  ) {} /* string*/
+}
+
+================================================================================
+`;
+
 exports[`preserve-new-line-last.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -1675,9 +3079,64 @@ function name() {
 ================================================================================
 `;
 
+exports[`preserve-new-line-last.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+function f() {
+  a
+  /* eslint-disable */
+}
+
+function f() {
+  a
+
+  /* eslint-disable */
+}
+
+function name() {
+  // comment1
+  func1()
+
+  // comment2
+  func2()
+
+  // comment3 why func3 commented
+  // func3()
+}
+
+=====================================output=====================================
+function f() {
+  a
+  /* eslint-disable */
+}
+
+function f() {
+  a
+
+  /* eslint-disable */
+}
+
+function name() {
+  // comment1
+  func1()
+
+  // comment2
+  func2()
+
+  // comment3 why func3 commented
+  // func3()
+}
+
+================================================================================
+`;
+
 exports[`return-statement.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -1937,9 +3396,272 @@ function inlineComment() {
 ================================================================================
 `;
 
+exports[`return-statement.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+function jsx() {
+  return (
+    // Comment
+    <div />
+  );
+}
+
+function unary() {
+  return (
+    // Comment
+    !!x
+  );
+}
+
+function numericLiteralNoParen() {
+  return 1337; // Comment
+}
+
+function logical() {
+  return (
+    // Reason for 42
+    42
+  ) && 84
+}
+
+function binary() {
+  return (
+    // Reason for 42
+    42
+  ) * 84
+}
+
+function binaryInBinaryLeft() {
+  return (
+    // Reason for 42
+    42
+  ) * 84 + 2
+}
+
+function binaryInBinaryRight() {
+  return (
+    // Reason for 42
+    42
+  ) + 84 * 2
+}
+
+function conditional() {
+  return (
+    // Reason for 42
+    42
+  ) ? 1 : 2
+}
+
+function binaryInConditional() {
+  return (
+    // Reason for 42
+    42
+  ) * 3 ? 1 : 2
+}
+
+function call() {
+  return (
+    // Reason for a
+    a
+  )()
+}
+
+function memberInside() {
+  return (
+    // Reason for a.b
+    a.b
+  ).c
+}
+
+function memberOutside() {
+  return (
+    // Reason for a
+    a
+  ).b.c
+}
+
+function memberInAndOutWithCalls() {
+  return (
+    // Reason for a
+    aFunction.b()
+  ).c.d()
+}
+
+function excessiveEverything() {
+  return (
+    // Reason for stuff
+    a.b() * 3 + 4 ? (a\`hi\`, 1) ? 1 : 1 : 1
+  )
+}
+
+// See https://github.com/prettier/prettier/issues/2392
+// function sequenceExpression() {
+//   return (
+//     // Reason for a
+//     a
+//   ), b
+// }
+
+function sequenceExpressionInside() {
+  return ( // Reason for a
+    a, b
+  );
+}
+
+function taggedTemplate() {
+  return (
+    // Reason for a
+    a
+  )\`b\`
+}
+
+function inlineComment() {
+  return (
+    /* hi */ 42
+  ) || 42
+}
+
+=====================================output=====================================
+function jsx() {
+  return (
+    // Comment
+    <div />
+  )
+}
+
+function unary() {
+  return (
+    // Comment
+    !!x
+  )
+}
+
+function numericLiteralNoParen() {
+  return 1337 // Comment
+}
+
+function logical() {
+  return (
+    // Reason for 42
+    42 && 84
+  )
+}
+
+function binary() {
+  return (
+    // Reason for 42
+    42 * 84
+  )
+}
+
+function binaryInBinaryLeft() {
+  return (
+    // Reason for 42
+    42 *
+      84 +
+    2
+  )
+}
+
+function binaryInBinaryRight() {
+  return (
+    // Reason for 42
+    42 +
+    84 * 2
+  )
+}
+
+function conditional() {
+  return (
+    // Reason for 42
+    42
+      ? 1
+      : 2
+  )
+}
+
+function binaryInConditional() {
+  return (
+    // Reason for 42
+    42 * 3
+      ? 1
+      : 2
+  )
+}
+
+function call() {
+  return (
+    // Reason for a
+    a()
+  )
+}
+
+function memberInside() {
+  return (
+    // Reason for a.b
+    a.b.c
+  )
+}
+
+function memberOutside() {
+  return (
+    // Reason for a
+    a.b.c
+  )
+}
+
+function memberInAndOutWithCalls() {
+  return (
+    aFunction
+      .b// Reason for a
+      ()
+      .c.d()
+  )
+}
+
+function excessiveEverything() {
+  return (
+    // Reason for stuff
+    a.b() * 3 + 4 ? ((a\`hi\`, 1) ? 1 : 1) : 1
+  )
+}
+
+// See https://github.com/prettier/prettier/issues/2392
+// function sequenceExpression() {
+//   return (
+//     // Reason for a
+//     a
+//   ), b
+// }
+
+function sequenceExpressionInside() {
+  return (
+    // Reason for a
+    a, b
+  )
+}
+
+function taggedTemplate() {
+  return (
+    // Reason for a
+    a\`b\`
+  )
+}
+
+function inlineComment() {
+  return /* hi */ 42 || 42
+}
+
+================================================================================
+`;
+
 exports[`single-star-jsdoc.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2009,9 +3731,82 @@ if (true) {
 ================================================================================
 `;
 
+exports[`single-star-jsdoc.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+/*
+ * Looking good!
+ */
+
+if(true) {
+    /*
+     * Oh no
+     */
+}
+
+  /** first line
+* second line
+   * third line */
+
+  /* first line
+* second line
+   * third line */
+
+  /*! first line
+*second line
+   *  third line */
+
+/*!
+* Extracted from vue codebase
+* https://github.com/vuejs/vue/blob/cfd73c2386623341fdbb3ac636c4baf84ea89c2c/src/compiler/parser/html-parser.js
+* HTML Parser By John Resig (ejohn.org)
+* Modified by Juriy "kangax" Zaytsev
+* Original code by Erik Arvidsson, Mozilla Public License
+* http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+*/
+
+=====================================output=====================================
+/*
+ * Looking good!
+ */
+
+if (true) {
+  /*
+   * Oh no
+   */
+}
+
+/** first line
+ * second line
+ * third line */
+
+/* first line
+ * second line
+ * third line */
+
+/*! first line
+ *second line
+ *  third line */
+
+/*!
+ * Extracted from vue codebase
+ * https://github.com/vuejs/vue/blob/cfd73c2386623341fdbb3ac636c4baf84ea89c2c/src/compiler/parser/html-parser.js
+ * HTML Parser By John Resig (ejohn.org)
+ * Modified by Juriy "kangax" Zaytsev
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ */
+
+================================================================================
+`;
+
 exports[`switch.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2096,9 +3891,97 @@ switch (foo) {
 ================================================================================
 `;
 
+exports[`switch.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+switch (node && node.type) {
+  case "Property":
+  case "MethodDefinition":
+    prop = node.key;
+    break;
+
+  case "MemberExpression":
+    prop = node.property;
+    break;
+
+  // no default
+}
+
+switch (foo) {
+  case "bar":
+    doThing()
+
+  // no default
+}
+
+switch (foo) {
+  case "bar": //comment
+    doThing(); //comment
+
+  case "baz":
+    doOtherThing(); //comment
+
+}
+
+switch (foo) {
+  case "bar": {
+    doThing();
+  } //comment
+
+  case "baz": {
+    doThing();
+  } //comment
+}
+
+=====================================output=====================================
+switch (node && node.type) {
+  case "Property":
+  case "MethodDefinition":
+    prop = node.key
+    break
+
+  case "MemberExpression":
+    prop = node.property
+    break
+
+  // no default
+}
+
+switch (foo) {
+  case "bar":
+    doThing()
+
+  // no default
+}
+
+switch (foo) {
+  case "bar": //comment
+    doThing() //comment
+
+  case "baz":
+    doOtherThing() //comment
+}
+
+switch (foo) {
+  case "bar": {
+    doThing()
+  } //comment
+
+  case "baz": {
+    doThing()
+  } //comment
+}
+
+================================================================================
+`;
+
 exports[`tagged-template-literal.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2137,9 +4020,51 @@ foo /* comment */\`
 ================================================================================
 `;
 
+exports[`tagged-template-literal.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+foo\`\`; // comment
+
+foo // comment
+\`\`;
+
+foo // comment
+\`
+\`;
+
+foo /* comment */\`
+\`;
+
+foo /* comment */
+\`
+\`;
+
+=====================================output=====================================
+foo\`\` // comment
+
+foo // comment
+\`\`
+
+foo // comment
+\`
+\`
+
+foo/* comment */ \`
+\`
+
+foo /* comment */\`
+\`
+
+================================================================================
+`;
+
 exports[`template-literal.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2175,9 +4100,48 @@ d //comment
 ================================================================================
 `;
 
+exports[`template-literal.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+\`
+\${a // comment
+}
+
+\${b /* comment */}
+
+\${/* comment */ c /* comment */}
+
+\${// comment
+d //comment
+};
+\`
+
+=====================================output=====================================
+;\`
+\${
+  a // comment
+}
+
+\${b /* comment */}
+
+\${/* comment */ c /* comment */}
+
+\${
+  // comment
+  d //comment
+};
+\`
+
+================================================================================
+`;
+
 exports[`trailing_space.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2197,9 +4161,32 @@ printWidth: 80
 ================================================================================
 `;
 
+exports[`trailing_space.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+#!/there/is-space-here->         
+
+// Do not trim trailing whitespace from this source file!
+
+// There is some space here ->                        
+
+=====================================output=====================================
+#!/there/is-space-here->
+
+// Do not trim trailing whitespace from this source file!
+
+// There is some space here ->
+
+================================================================================
+`;
+
 exports[`trailing-jsdocs.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2258,9 +4245,71 @@ const CONNECTION_STATUS = (exports.CONNECTION_STATUS = {
 ================================================================================
 `;
 
+exports[`trailing-jsdocs.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+const CONNECTION_STATUS = exports.CONNECTION_STATUS = {
+  CLOSED: Object.freeze({ kind: 'CLOSED' }),
+  CONNECTED: Object.freeze({ kind: 'CONNECTED' }),
+  CONNECTING: Object.freeze({ kind: 'CONNECTING' }),
+  NOT_CONNECTED: Object.freeze({ kind: 'NOT_CONNECTED' }) };
+
+/* A comment */ /**
+* A type that can be written to a buffer.
+*/ /**
+* Describes the connection status of a ReactiveSocket/DuplexConnection.
+* - NOT_CONNECTED: no connection established or pending.
+* - CONNECTING: when \`connect()\` has been called but a connection is not yet
+*   established.
+* - CONNECTED: when a connection is established.
+* - CLOSED: when the connection has been explicitly closed via \`close()\`.
+* - ERROR: when the connection has been closed for any other reason.
+*/ /**
+* A contract providing different interaction models per the [ReactiveSocket protocol]
+* (https://github.com/ReactiveSocket/reactivesocket/blob/master/Protocol.md).
+*/ /**
+* A single unit of data exchanged between the peers of a \`ReactiveSocket\`.
+*/
+
+=====================================output=====================================
+const CONNECTION_STATUS = (exports.CONNECTION_STATUS = {
+  CLOSED: Object.freeze({ kind: "CLOSED" }),
+  CONNECTED: Object.freeze({ kind: "CONNECTED" }),
+  CONNECTING: Object.freeze({ kind: "CONNECTING" }),
+  NOT_CONNECTED: Object.freeze({ kind: "NOT_CONNECTED" })
+})
+
+/* A comment */
+/**
+ * A type that can be written to a buffer.
+ */
+/**
+ * Describes the connection status of a ReactiveSocket/DuplexConnection.
+ * - NOT_CONNECTED: no connection established or pending.
+ * - CONNECTING: when \`connect()\` has been called but a connection is not yet
+ *   established.
+ * - CONNECTED: when a connection is established.
+ * - CLOSED: when the connection has been explicitly closed via \`close()\`.
+ * - ERROR: when the connection has been closed for any other reason.
+ */
+/**
+ * A contract providing different interaction models per the [ReactiveSocket protocol]
+ * (https://github.com/ReactiveSocket/reactivesocket/blob/master/Protocol.md).
+ */
+/**
+ * A single unit of data exchanged between the peers of a \`ReactiveSocket\`.
+ */
+
+================================================================================
+`;
+
 exports[`try.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2297,9 +4346,49 @@ try {
 ================================================================================
 `;
 
+exports[`try.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+// Comment 1
+try { // Comment 2
+  // Comment 3
+}
+// Comment 4
+catch(e) { // Comment 5
+  // Comment 6
+}
+// Comment 7
+finally { // Comment 8
+  // Comment 9
+}
+// Comment 10
+
+=====================================output=====================================
+// Comment 1
+try {
+  // Comment 2
+  // Comment 3
+} catch (e) {
+  // Comment 4
+  // Comment 5
+  // Comment 6
+} finally {
+  // Comment 7
+  // Comment 8
+  // Comment 9
+}
+// Comment 10
+
+================================================================================
+`;
+
 exports[`variable_declarator.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2447,9 +4536,160 @@ const foo3 = 123;
 ================================================================================
 `;
 
+exports[`variable_declarator.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+let obj1 = // Comment
+{
+  key: 'val'
+}
+
+let obj2 // Comment
+= {
+  key: 'val'
+}
+
+let obj3 = { // Comment
+  key: 'val'
+}
+
+let obj4 = {
+  // Comment
+  key: 'val'
+}
+
+let obj5 = // Comment
+[
+  'val'
+]
+
+let obj6 // Comment
+= [
+  'val'
+]
+
+let obj7 = [ // Comment
+  'val'
+]
+
+let obj8 = [
+  // Comment
+  'val'
+]
+
+let obj9 = // Comment
+\`val\`;
+
+let obj10 = // Comment
+\`
+val
+val
+\`;
+
+let obj11 = // Comment
+tag\`val\`;
+
+let obj12 = // Comment
+tag\`
+val
+val
+\`;
+
+let // Comment
+  foo1 = 'val';
+
+let // Comment
+  foo2 = 'val',
+  bar = 'val';
+
+const foo3 = 123
+// Nothing to see here.
+;["2", "3"].forEach(x => console.log(x))
+
+=====================================output=====================================
+let obj1 =
+  // Comment
+  {
+    key: "val"
+  }
+
+let obj2 =
+  // Comment
+  {
+    key: "val"
+  }
+
+let obj3 = {
+  // Comment
+  key: "val"
+}
+
+let obj4 = {
+  // Comment
+  key: "val"
+}
+
+let obj5 =
+  // Comment
+  ["val"]
+
+let obj6 =
+  // Comment
+  ["val"]
+
+let obj7 = [
+  // Comment
+  "val"
+]
+
+let obj8 = [
+  // Comment
+  "val"
+]
+
+let obj9 =
+  // Comment
+  \`val\`
+
+let obj10 =
+  // Comment
+  \`
+val
+val
+\`
+
+let obj11 =
+  // Comment
+  tag\`val\`
+
+let obj12 =
+  // Comment
+  tag\`
+val
+val
+\`
+
+let // Comment
+  foo1 = "val"
+
+let // Comment
+  foo2 = "val",
+  bar = "val"
+
+const foo3 = 123
+// Nothing to see here.
+;["2", "3"].forEach(x => console.log(x))
+
+================================================================================
+`;
+
 exports[`while.js 1`] = `
 ====================================options=====================================
-parsers: ["flow", "babel"]
+parsers: ["flow", "babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -2501,3 +4741,59 @@ while (true) /* comment */ ++x;
 
 ================================================================================
 `;
+
+exports[`while.js 2`] = `
+====================================options=====================================
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+while(
+    true
+    // Comment
+  ) {}
+
+while(true)// Comment
+{}
+
+while(true){}// Comment
+
+while(true)/*Comment*/{}
+
+while(
+  true // Comment
+  && true // Comment
+  ){}
+
+while(true) {} // comment
+
+while(true) /* comment */ ++x; 
+
+=====================================output=====================================
+while (
+  true
+  // Comment
+) {}
+
+while (true) {
+  // Comment
+}
+
+while (true) {} // Comment
+
+while (true) {
+  /*Comment*/
+}
+
+while (
+  true && // Comment
+  true // Comment
+) {}
+
+while (true) {} // comment
+
+while (true) /* comment */ ++x
+
+================================================================================
+`;
diff --git a/tests/comments/issues.js b/tests/comments/issues.js
index c95f79c4a..8fd1ea659 100644
--- a/tests/comments/issues.js
+++ b/tests/comments/issues.js
@@ -14,29 +14,6 @@ throw new ProcessSystemError({
   originalError: acc.error, // Just in case.
 });
 
-// Adding a comment stops the pretty printing process and everything is
-// squished in a single line afterward
-export type BuckWebSocketMessage = {
-  // Not actually from Buck - this is to let the receiver know that the socket is connected.
-  type: 'SocketConnected',
-} | {
-  type: 'BuildProgressUpdated',
-  progressValue: number,
-} | {
-  type: 'BuildFinished',
-  exitCode: number,
-} | {
-  type: 'BuildStarted',
-} | {
-  type: 'ParseStarted',
-} | {
-  type: 'ParseFinished',
-} | {
-  type: 'RunStarted',
-} | {
-  type: 'RunComplete',
-};
-
 // Missing one level of indentation because of the comment
 const rootEpic = (actions, store) => (
   combineEpics(...epics)(actions, store)
@@ -47,13 +24,6 @@ const rootEpic = (actions, store) => (
     })
 );
 
-// Two extra levels of indentation because of the comment
-export type AsyncExecuteOptions = child_process$execFileOpts & {
-  // The contents to write to stdin.
-  stdin?: ?string,
-  dontLogInNuclide?: ?boolean,
-};
-
 // optional trailing comma gets moved all the way to the beginning
 const regex = new RegExp(
   '^\\s*' + // beginning of the line
diff --git a/tests/comments/jsfmt.spec.js b/tests/comments/jsfmt.spec.js
index fbfa6501a..133b453c7 100644
--- a/tests/comments/jsfmt.spec.js
+++ b/tests/comments/jsfmt.spec.js
@@ -1 +1,2 @@
-run_spec(__dirname, ["flow", "babel"]);
+run_spec(__dirname, ["flow", "babel", "typescript"]);
+run_spec(__dirname, ["flow", "babel", "typescript"], { semi: false });
diff --git a/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap b/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap
index 9dff2c626..48fa35218 100644
--- a/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap
@@ -100,6 +100,108 @@ foo/*:: <bar> */();
 ================================================================================
 `;
 
+exports[`interface.js 1`] = `
+====================================options=====================================
+parsers: ["flow", "babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+interface Foo {
+  bar(
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+}
+
+=====================================output=====================================
+interface Foo {
+  bar(
+    currentRequest: { a: number }
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+}
+
+================================================================================
+`;
+
+exports[`issues.js 1`] = `
+====================================options=====================================
+parsers: ["flow", "babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// Adding a comment stops the pretty printing process and everything is
+// squished in a single line afterward
+export type BuckWebSocketMessage = {
+  // Not actually from Buck - this is to let the receiver know that the socket is connected.
+  type: 'SocketConnected',
+} | {
+  type: 'BuildProgressUpdated',
+  progressValue: number,
+} | {
+  type: 'BuildFinished',
+  exitCode: number,
+} | {
+  type: 'BuildStarted',
+} | {
+  type: 'ParseStarted',
+} | {
+  type: 'ParseFinished',
+} | {
+  type: 'RunStarted',
+} | {
+  type: 'RunComplete',
+};
+
+// Two extra levels of indentation because of the comment
+export type AsyncExecuteOptions = child_process$execFileOpts & {
+  // The contents to write to stdin.
+  stdin?: ?string,
+  dontLogInNuclide?: ?boolean,
+};
+
+=====================================output=====================================
+// Adding a comment stops the pretty printing process and everything is
+// squished in a single line afterward
+export type BuckWebSocketMessage =
+  | {
+      // Not actually from Buck - this is to let the receiver know that the socket is connected.
+      type: "SocketConnected"
+    }
+  | {
+      type: "BuildProgressUpdated",
+      progressValue: number
+    }
+  | {
+      type: "BuildFinished",
+      exitCode: number
+    }
+  | {
+      type: "BuildStarted"
+    }
+  | {
+      type: "ParseStarted"
+    }
+  | {
+      type: "ParseFinished"
+    }
+  | {
+      type: "RunStarted"
+    }
+  | {
+      type: "RunComplete"
+    };
+
+// Two extra levels of indentation because of the comment
+export type AsyncExecuteOptions = child_process$execFileOpts & {
+  // The contents to write to stdin.
+  stdin?: ?string,
+  dontLogInNuclide?: ?boolean
+};
+
+================================================================================
+`;
+
 exports[`let.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "babel"]
@@ -190,3 +292,53 @@ const x = (input /*: string */) /*: string */ => {};
 
 ================================================================================
 `;
+
+exports[`union.js 1`] = `
+====================================options=====================================
+parsers: ["flow", "babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+type UploadState<E, EM, D>
+  // The upload hasnt begun yet
+  = {type: "Not_begun"}
+  // The upload timed out
+  | {type: "Timed_out"}
+  // Failed somewhere on the line
+  | {type: "Failed", error: E, errorMsg: EM}
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | {type: "Success", data: D};
+
+type UploadState2<E, EM, D>
+  // The upload hasnt begun yet
+  = A
+  // The upload timed out
+  | B
+  // Failed somewhere on the line
+  | C
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | D;
+
+=====================================output=====================================
+type UploadState<E, EM, D> =
+  // The upload hasnt begun yet
+  | { type: "Not_begun" }
+  // The upload timed out
+  | { type: "Timed_out" }
+  // Failed somewhere on the line
+  | { type: "Failed", error: E, errorMsg: EM }
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | { type: "Success", data: D };
+
+type UploadState2<E, EM, D> =
+  // The upload hasnt begun yet
+  | A
+  // The upload timed out
+  | B
+  // Failed somewhere on the line
+  | C
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | D;
+
+================================================================================
+`;
diff --git a/tests/flow_comments/interface.js b/tests/flow_comments/interface.js
new file mode 100644
index 000000000..cbc069b0b
--- /dev/null
+++ b/tests/flow_comments/interface.js
@@ -0,0 +1,6 @@
+interface Foo {
+  bar(
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+}
diff --git a/tests/flow_comments/issues.js b/tests/flow_comments/issues.js
new file mode 100644
index 000000000..b7f05dc86
--- /dev/null
+++ b/tests/flow_comments/issues.js
@@ -0,0 +1,29 @@
+// Adding a comment stops the pretty printing process and everything is
+// squished in a single line afterward
+export type BuckWebSocketMessage = {
+  // Not actually from Buck - this is to let the receiver know that the socket is connected.
+  type: 'SocketConnected',
+} | {
+  type: 'BuildProgressUpdated',
+  progressValue: number,
+} | {
+  type: 'BuildFinished',
+  exitCode: number,
+} | {
+  type: 'BuildStarted',
+} | {
+  type: 'ParseStarted',
+} | {
+  type: 'ParseFinished',
+} | {
+  type: 'RunStarted',
+} | {
+  type: 'RunComplete',
+};
+
+// Two extra levels of indentation because of the comment
+export type AsyncExecuteOptions = child_process$execFileOpts & {
+  // The contents to write to stdin.
+  stdin?: ?string,
+  dontLogInNuclide?: ?boolean,
+};
diff --git a/tests/comments/flow_union.js b/tests/flow_comments/union.js
similarity index 100%
rename from tests/comments/flow_union.js
rename to tests/flow_comments/union.js
diff --git a/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
index 48f6cd136..876484e6c 100644
--- a/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
@@ -90,6 +90,172 @@ let comp = (
 ================================================================================
 `;
 
+exports[`declare_function.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+declare function fn(
+  currentRequest: {a: number},
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+): number;
+
+=====================================output=====================================
+declare function fn(
+  currentRequest: { a: number }
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+): number;
+
+================================================================================
+`;
+
+exports[`interface.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+interface Foo {
+  bar(
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  (
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  new (
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  foo: {
+    x(
+      currentRequest: {a: number},
+      // TODO this is a very very very very long comment that makes it go > 80 columns
+    ): number;
+
+    y: (
+      currentRequest: {a: number},
+      // TODO this is a very very very very long comment that makes it go > 80 columns
+    ) => number;
+  }
+}
+
+=====================================output=====================================
+interface Foo {
+  bar(
+    currentRequest: { a: number }
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  (
+    currentRequest: { a: number }
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  new (
+    currentRequest: { a: number }
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  foo: {
+    x(
+      currentRequest: { a: number }
+      // TODO this is a very very very very long comment that makes it go > 80 columns
+    ): number;
+
+    y: (
+      currentRequest: { a: number }
+      // TODO this is a very very very very long comment that makes it go > 80 columns
+    ) => number;
+  };
+}
+
+================================================================================
+`;
+
+exports[`issues.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// Adding a comment stops the pretty printing process and everything is
+// squished in a single line afterward
+export type BuckWebSocketMessage = {
+  // Not actually from Buck - this is to let the receiver know that the socket is connected.
+  type: 'SocketConnected',
+} | {
+  type: 'BuildProgressUpdated',
+  progressValue: number,
+} | {
+  type: 'BuildFinished',
+  exitCode: number,
+} | {
+  type: 'BuildStarted',
+} | {
+  type: 'ParseStarted',
+} | {
+  type: 'ParseFinished',
+} | {
+  type: 'RunStarted',
+} | {
+  type: 'RunComplete',
+};
+
+// Two extra levels of indentation because of the comment
+export type AsyncExecuteOptions = child_process$execFileOpts & {
+  // The contents to write to stdin.
+  stdin?: string,
+  dontLogInNuclide?: boolean,
+};
+
+=====================================output=====================================
+// Adding a comment stops the pretty printing process and everything is
+// squished in a single line afterward
+export type BuckWebSocketMessage =
+  | {
+      // Not actually from Buck - this is to let the receiver know that the socket is connected.
+      type: "SocketConnected";
+    }
+  | {
+      type: "BuildProgressUpdated";
+      progressValue: number;
+    }
+  | {
+      type: "BuildFinished";
+      exitCode: number;
+    }
+  | {
+      type: "BuildStarted";
+    }
+  | {
+      type: "ParseStarted";
+    }
+  | {
+      type: "ParseFinished";
+    }
+  | {
+      type: "RunStarted";
+    }
+  | {
+      type: "RunComplete";
+    };
+
+// Two extra levels of indentation because of the comment
+export type AsyncExecuteOptions = child_process$execFileOpts & {
+  // The contents to write to stdin.
+  stdin?: string;
+  dontLogInNuclide?: boolean;
+};
+
+================================================================================
+`;
+
 exports[`jsx.ts 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]
@@ -425,3 +591,53 @@ printWidth: 80
 
 ================================================================================
 `;
+
+exports[`union.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+type UploadState<E, EM, D>
+  // The upload hasnt begun yet
+  = {type: "Not_begun"}
+  // The upload timed out
+  | {type: "Timed_out"}
+  // Failed somewhere on the line
+  | {type: "Failed", error: E, errorMsg: EM}
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | {type: "Success", data: D};
+
+type UploadState2<E, EM, D>
+  // The upload hasnt begun yet
+  = A
+  // The upload timed out
+  | B
+  // Failed somewhere on the line
+  | C
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | D;
+
+=====================================output=====================================
+type UploadState<E, EM, D> =
+  // The upload hasnt begun yet
+  | { type: "Not_begun" }
+  // The upload timed out
+  | { type: "Timed_out" }
+  // Failed somewhere on the line
+  | { type: "Failed"; error: E; errorMsg: EM }
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | { type: "Success"; data: D };
+
+type UploadState2<E, EM, D> =
+  // The upload hasnt begun yet
+  | A
+  // The upload timed out
+  | B
+  // Failed somewhere on the line
+  | C
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | D;
+
+================================================================================
+`;
diff --git a/tests/typescript_comments/declare_function.ts b/tests/typescript_comments/declare_function.ts
new file mode 100644
index 000000000..6ceeb7d7f
--- /dev/null
+++ b/tests/typescript_comments/declare_function.ts
@@ -0,0 +1,4 @@
+declare function fn(
+  currentRequest: {a: number},
+  // TODO this is a very very very very long comment that makes it go > 80 columns
+): number;
diff --git a/tests/typescript_comments/interface.ts b/tests/typescript_comments/interface.ts
new file mode 100644
index 000000000..95ff65798
--- /dev/null
+++ b/tests/typescript_comments/interface.ts
@@ -0,0 +1,28 @@
+interface Foo {
+  bar(
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  (
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  new (
+    currentRequest: {a: number},
+    // TODO this is a very very very very long comment that makes it go > 80 columns
+  ): number;
+
+  foo: {
+    x(
+      currentRequest: {a: number},
+      // TODO this is a very very very very long comment that makes it go > 80 columns
+    ): number;
+
+    y: (
+      currentRequest: {a: number},
+      // TODO this is a very very very very long comment that makes it go > 80 columns
+    ) => number;
+  }
+}
diff --git a/tests/typescript_comments/issues.ts b/tests/typescript_comments/issues.ts
new file mode 100644
index 000000000..bb5307c24
--- /dev/null
+++ b/tests/typescript_comments/issues.ts
@@ -0,0 +1,29 @@
+// Adding a comment stops the pretty printing process and everything is
+// squished in a single line afterward
+export type BuckWebSocketMessage = {
+  // Not actually from Buck - this is to let the receiver know that the socket is connected.
+  type: 'SocketConnected',
+} | {
+  type: 'BuildProgressUpdated',
+  progressValue: number,
+} | {
+  type: 'BuildFinished',
+  exitCode: number,
+} | {
+  type: 'BuildStarted',
+} | {
+  type: 'ParseStarted',
+} | {
+  type: 'ParseFinished',
+} | {
+  type: 'RunStarted',
+} | {
+  type: 'RunComplete',
+};
+
+// Two extra levels of indentation because of the comment
+export type AsyncExecuteOptions = child_process$execFileOpts & {
+  // The contents to write to stdin.
+  stdin?: string,
+  dontLogInNuclide?: boolean,
+};
diff --git a/tests/typescript_comments/union.ts b/tests/typescript_comments/union.ts
new file mode 100644
index 000000000..7fd267e52
--- /dev/null
+++ b/tests/typescript_comments/union.ts
@@ -0,0 +1,19 @@
+type UploadState<E, EM, D>
+  // The upload hasnt begun yet
+  = {type: "Not_begun"}
+  // The upload timed out
+  | {type: "Timed_out"}
+  // Failed somewhere on the line
+  | {type: "Failed", error: E, errorMsg: EM}
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | {type: "Success", data: D};
+
+type UploadState2<E, EM, D>
+  // The upload hasnt begun yet
+  = A
+  // The upload timed out
+  | B
+  // Failed somewhere on the line
+  | C
+  // Uploading to aws3 and CreatePostMutation succeeded
+  | D;

From 8110e1f72a7c271e6235c8c827f4f04a946f5b9c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2019 22:34:31 +0100
Subject: [PATCH 56/88] Bump @babel/preset-env from 7.7.4 to 7.7.6 in /website
 (#7112)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json |   2 +-
 website/yarn.lock    | 127 ++++++++++++++++++++-----------------------
 2 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/website/package.json b/website/package.json
index 2afad792b..8e4a8c895 100644
--- a/website/package.json
+++ b/website/package.json
@@ -19,7 +19,7 @@
     "react-dom": "16.12.0"
   },
   "devDependencies": {
-    "@babel/preset-env": "7.7.4",
+    "@babel/preset-env": "7.7.6",
     "@babel/preset-react": "7.7.4",
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
diff --git a/website/yarn.lock b/website/yarn.lock
index 7ac64579d..7737248e1 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -164,6 +164,18 @@
     "@babel/types" "^7.7.4"
     lodash "^4.17.13"
 
+"@babel/helper-module-transforms@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
+  integrity sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-simple-access" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    lodash "^4.17.13"
+
 "@babel/helper-optimise-call-expression@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
@@ -476,21 +488,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-amd@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.4.tgz#276b3845ca2b228f2995e453adc2e6f54d72fb71"
-  integrity sha512-/542/5LNA18YDtg1F+QHvvUSlxdvjZoD/aldQwkq+E3WCkbEjNSN9zdrOXaSlfg3IfGi22ijzecklF/A7kVZFQ==
+"@babel/plugin-transform-modules-amd@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c"
+  integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.4"
+    "@babel/helper-module-transforms" "^7.7.5"
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.4.tgz#bee4386e550446343dd52a571eda47851ff857a3"
-  integrity sha512-k8iVS7Jhc367IcNF53KCwIXtKAH7czev866ThsTgy8CwlXjnKZna2VHwChglzLleYrcHz1eQEIJlGRQxB53nqA==
+"@babel/plugin-transform-modules-commonjs@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz#1d27f5eb0bcf7543e774950e5b2fa782e637b345"
+  integrity sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==
   dependencies:
-    "@babel/helper-module-transforms" "^7.7.4"
+    "@babel/helper-module-transforms" "^7.7.5"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.7.4"
     babel-plugin-dynamic-import-node "^2.3.0"
@@ -582,10 +594,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.7.4"
 
-"@babel/plugin-transform-regenerator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.4.tgz#d18eac0312a70152d7d914cbed2dc3999601cfc0"
-  integrity sha512-e7MWl5UJvmPEwFJTwkBlPmqixCtr9yAASBqff4ggXTNicZiwbF8Eefzm6NVgfiBp7JdAGItecnctKTgH44q2Jw==
+"@babel/plugin-transform-regenerator@^7.7.5":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz#3a8757ee1a2780f390e89f246065ecf59c26fce9"
+  integrity sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==
   dependencies:
     regenerator-transform "^0.14.0"
 
@@ -649,10 +661,10 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/preset-env@7.7.4", "@babel/preset-env@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.4.tgz#ccaf309ae8d1ee2409c85a4e2b5e280ceee830f8"
-  integrity sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==
+"@babel/preset-env@7.7.6", "@babel/preset-env@^7.7.4":
+  version "7.7.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2"
+  integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==
   dependencies:
     "@babel/helper-module-imports" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -682,8 +694,8 @@
     "@babel/plugin-transform-function-name" "^7.7.4"
     "@babel/plugin-transform-literals" "^7.7.4"
     "@babel/plugin-transform-member-expression-literals" "^7.7.4"
-    "@babel/plugin-transform-modules-amd" "^7.7.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.7.4"
+    "@babel/plugin-transform-modules-amd" "^7.7.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.7.5"
     "@babel/plugin-transform-modules-systemjs" "^7.7.4"
     "@babel/plugin-transform-modules-umd" "^7.7.4"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
@@ -691,7 +703,7 @@
     "@babel/plugin-transform-object-super" "^7.7.4"
     "@babel/plugin-transform-parameters" "^7.7.4"
     "@babel/plugin-transform-property-literals" "^7.7.4"
-    "@babel/plugin-transform-regenerator" "^7.7.4"
+    "@babel/plugin-transform-regenerator" "^7.7.5"
     "@babel/plugin-transform-reserved-words" "^7.7.4"
     "@babel/plugin-transform-shorthand-properties" "^7.7.4"
     "@babel/plugin-transform-spread" "^7.7.4"
@@ -701,7 +713,7 @@
     "@babel/plugin-transform-unicode-regex" "^7.7.4"
     "@babel/types" "^7.7.4"
     browserslist "^4.6.0"
-    core-js-compat "^3.1.1"
+    core-js-compat "^3.4.7"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
@@ -1483,23 +1495,14 @@ browserslist@4.7.0:
     electron-to-chromium "^1.3.247"
     node-releases "^1.1.29"
 
-browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.6:
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.3.tgz#02341f162b6bcc1e1028e30624815d4924442dc3"
-  integrity sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==
+browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.8.0, browserslist@^4.8.2:
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
+  integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==
   dependencies:
-    caniuse-lite "^1.0.30001010"
-    electron-to-chromium "^1.3.306"
-    node-releases "^1.1.40"
-
-browserslist@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.0.tgz#6f06b0f974a7cc3a84babc2ccc56493668e3c789"
-  integrity sha512-HYnxc/oLRWvJ3TsGegR0SRL/UDnknGq2s/a8dYYEO+kOQ9m9apKoS5oiathLKZdh/e9uE+/J3j92qPlGD/vTqA==
-  dependencies:
-    caniuse-lite "^1.0.30001012"
-    electron-to-chromium "^1.3.317"
-    node-releases "^1.1.41"
+    caniuse-lite "^1.0.30001015"
+    electron-to-chromium "^1.3.322"
+    node-releases "^1.1.42"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
@@ -1668,16 +1671,16 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000989:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000998.tgz#7227a8046841e7d01e156ae7227a504d065f6744"
   integrity sha512-8Tj5sPZR9kMHeDD9SZXIVr5m9ofufLLCG2Y4QwQrH18GIwG+kCc+zYdlR036ZRkuKjVVetyxeAgGA1xF7XdmzQ==
 
-caniuse-lite@^1.0.30001010:
-  version "1.0.30001011"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz#0d6c4549c78c4a800bb043a83ca0cbe0aee6c6e1"
-  integrity sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg==
-
 caniuse-lite@^1.0.30001012:
   version "1.0.30001013"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001013.tgz#da2440d4d266a17d40eb79bd19c0c8cc1d029c72"
   integrity sha512-hOAXaWKuq/UVFgYawxIOdPdyMQdYcwOCDOjnZcKn7wCgFUrhP7smuNZjGLuJlPSgE6aRA4cRJ+bGSrhtEt7ZAg==
 
+caniuse-lite@^1.0.30001015:
+  version "1.0.30001015"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
+  integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -2064,12 +2067,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.1.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.2.1.tgz#0cbdbc2e386e8e00d3b85dc81c848effec5b8150"
-  integrity sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==
+core-js-compat@^3.4.7:
+  version "3.4.8"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.8.tgz#f72e6a4ed76437ea710928f44615f926a81607d5"
+  integrity sha512-l3WTmnXHV2Sfu5VuD7EHE2w7y+K68+kULKt5RJg8ZJk3YhHF1qLD4O8v8AmNq+8vbOwnPFFDvds25/AoEvMqlQ==
   dependencies:
-    browserslist "^4.6.6"
+    browserslist "^4.8.2"
     semver "^6.3.0"
 
 core-js@^2.6.5:
@@ -2719,15 +2722,10 @@ electron-to-chromium@^1.3.247:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.273.tgz#94872d6823219f2812f2e35a2ce2a7d03c1eaa3f"
   integrity sha512-0kUppiHQvHEENHh+nTtvTt4eXMwcPyWmMaj73GPrSEm3ldKhmmHuOH6IjrmuW6YmyS/fpXcLvMQLNVpqRhpNWw==
 
-electron-to-chromium@^1.3.306:
-  version "1.3.308"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.308.tgz#73c2cd8f865abc1c31623725e4f89225e9e209e6"
-  integrity sha512-IwU/0LTzTa03Q0YDzg11RlK8e/V92tmPqFOaTEsdv7JJXtC/+v/H4bT2FmsA/xaFQWJvi0ZVcRppw8o0AD9XJQ==
-
-electron-to-chromium@^1.3.317:
-  version "1.3.321"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.321.tgz#913869f5ec85daabba0e75c9c314b4bf26cdb01e"
-  integrity sha512-jJy/BZK2s2eAjMPXVMSaCmo7/pSY2aKkfQ+LoAb5Wk39qAhyP9r8KU74c4qTgr9cD/lPUhJgReZxxqU0n5puog==
+electron-to-chromium@^1.3.322:
+  version "1.3.322"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
+  integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -5204,17 +5202,10 @@ node-releases@^1.1.29:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.40:
-  version "1.1.40"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.40.tgz#a94facfa8e2d612302601ca1361741d529c4515a"
-  integrity sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==
-  dependencies:
-    semver "^6.3.0"
-
-node-releases@^1.1.41:
-  version "1.1.41"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.41.tgz#57674a82a37f812d18e3b26118aefaf53a00afed"
-  integrity sha512-+IctMa7wIs8Cfsa8iYzeaLTFwv5Y4r5jZud+4AnfymzeEXKBCavFX0KBgzVaPVqf0ywa6PrO8/b+bPqdwjGBSg==
+node-releases@^1.1.42:
+  version "1.1.42"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7"
+  integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==
   dependencies:
     semver "^6.3.0"
 

From f8928ec32a49d7700ae74c67f3dbd6015b6c5c42 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2019 22:36:16 +0100
Subject: [PATCH 57/88] Bump terser-webpack-plugin from 2.2.1 to 2.2.2 (#7113)

Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v2.2.1...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index afbc4d97c..24b69f57f 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "strip-ansi": "5.2.0",
     "synchronous-promise": "2.0.10",
     "tempy": "0.2.1",
-    "terser-webpack-plugin": "2.2.1",
+    "terser-webpack-plugin": "2.2.2",
     "webpack": "4.41.2"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index bf95456ac..30eb7cf9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2930,10 +2930,10 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz#cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"
-  integrity sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==
+find-cache-dir@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.1.0.tgz#9935894999debef4cf9f677fdf646d002c4cdecb"
+  integrity sha512-zw+EFiNBNPgI2NTrKkDd1xd7q0cs6wr/iWnr/oUkI0yF9K9GqQ+riIt4aiyFaaqpaWbxPrJXHI+QvmNUQbX+0Q==
   dependencies:
     commondir "^1.0.1"
     make-dir "^3.0.0"
@@ -6136,10 +6136,10 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f"
-  integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==
+schema-utils@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
+  integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==
   dependencies:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
@@ -6158,10 +6158,10 @@ serialize-javascript@^1.7.0:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
   integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
 
-serialize-javascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.0.tgz#9310276819efd0eb128258bb341957f6eb2fc570"
-  integrity sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==
+serialize-javascript@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.1.tgz#952907a04a3e3a75af7f73d92d15e233862048b2"
+  integrity sha512-MPLPRpD4FNqWq9tTIjYG5LesFouDhdyH0EPY3gVK4DRD5+g4aDqdNSzLIwceulo3Yj+PL1bPh6laE5+H6LTcrQ==
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -6660,18 +6660,18 @@ tempy@0.2.1:
     temp-dir "^1.0.0"
     unique-string "^1.0.0"
 
-terser-webpack-plugin@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz#5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd"
-  integrity sha512-jwdauV5Al7zopR6OAYvIIRcxXCSvLjZjr7uZE8l2tIWb/ryrGN48sJftqGf5k9z09tWhajx53ldp0XPI080YnA==
+terser-webpack-plugin@2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.2.tgz#2a6e00237125564a455ad69b22e08ee59420473a"
+  integrity sha512-/CHMNswPMAwuD2kd++qys8UmBRmsshPSzHw4BlDwurPtK9YjeK93OV89YWkJulHk972cs07K/7Z92V6PNjWF8A==
   dependencies:
     cacache "^13.0.1"
-    find-cache-dir "^3.0.0"
+    find-cache-dir "^3.1.0"
     jest-worker "^24.9.0"
-    schema-utils "^2.5.0"
-    serialize-javascript "^2.1.0"
+    schema-utils "^2.6.1"
+    serialize-javascript "^2.1.1"
     source-map "^0.6.1"
-    terser "^4.3.9"
+    terser "^4.4.2"
     webpack-sources "^1.4.3"
 
 terser-webpack-plugin@^1.4.1:
@@ -6689,10 +6689,10 @@ terser-webpack-plugin@^1.4.1:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.1.0, terser@^4.1.2, terser@^4.3.9:
-  version "4.3.9"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8"
-  integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==
+terser@^4.1.0, terser@^4.1.2, terser@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8"
+  integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"

From db78483df19af1e31e69b9af1eb2ac59da41a0b6 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Tue, 10 Dec 2019 01:41:03 +0200
Subject: [PATCH 58/88] refactoring: introduce path.match (#7108)

---
 src/common/fast-path.js           | 36 ++++++++++++
 src/common/util.js                | 15 -----
 src/language-js/embed.js          | 93 ++++++++++---------------------
 src/language-js/printer-estree.js | 41 ++++++--------
 4 files changed, 83 insertions(+), 102 deletions(-)

diff --git a/src/common/fast-path.js b/src/common/fast-path.js
index 4c152b2f8..eaf9a84f2 100644
--- a/src/common/fast-path.js
+++ b/src/common/fast-path.js
@@ -138,4 +138,40 @@ FastPath.prototype.map = function map(callback /*, name1, name2, ... */) {
   return result;
 };
 
+/**
+ * @param {...(
+ *   | ((node: any, name: string | null, number: number | null) => boolean)
+ *   | undefined
+ * )} predicates
+ */
+FastPath.prototype.match = function match(/* predicates */) {
+  let stackPointer = this.stack.length - 1;
+
+  let name = null;
+  let node = this.stack[stackPointer--];
+
+  for (let i = 0; i < arguments.length; ++i) {
+    if (node === undefined) {
+      return false;
+    }
+
+    // skip index/array
+    let number = null;
+    if (typeof name === "number") {
+      number = name;
+      name = this.stack[stackPointer--];
+      node = this.stack[stackPointer--];
+    }
+
+    if (arguments[i] && !arguments[i](node, name, number)) {
+      return false;
+    }
+
+    name = this.stack[stackPointer--];
+    node = this.stack[stackPointer--];
+  }
+
+  return true;
+};
+
 module.exports = FastPath;
diff --git a/src/common/util.js b/src/common/util.js
index 9f13f83c6..a6af62b24 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -779,20 +779,6 @@ function hasNodeIgnoreComment(node) {
   );
 }
 
-function matchAncestorTypes(path, types, index) {
-  index = index || 0;
-  types = types.slice();
-  while (types.length) {
-    const parent = path.getParentNode(index);
-    const type = types.shift();
-    if (!parent || parent.type !== type) {
-      return false;
-    }
-    index++;
-  }
-  return true;
-}
-
 function addCommentHelper(node, comment) {
   const comments = node.comments || (node.comments = []);
   comments.push(comment);
@@ -891,7 +877,6 @@ module.exports = {
   hasIgnoreComment,
   hasNodeIgnoreComment,
   makeString,
-  matchAncestorTypes,
   addLeadingComment,
   addDanglingComment,
   addTrailingComment,
diff --git a/src/language-js/embed.js b/src/language-js/embed.js
index 0e5454648..0954451dd 100644
--- a/src/language-js/embed.js
+++ b/src/language-js/embed.js
@@ -389,43 +389,37 @@ function isStyledJsx(path) {
  * })
  */
 function isAngularComponentStyles(path) {
-  return isPathMatch(
-    path,
-    [
-      node => node.type === "TemplateLiteral",
-      (node, name) => node.type === "ArrayExpression" && name === "elements",
-      (node, name) =>
-        node.type === "Property" &&
-        node.key.type === "Identifier" &&
-        node.key.name === "styles" &&
-        name === "value"
-    ].concat(getAngularComponentObjectExpressionPredicates())
+  return path.match(
+    node => node.type === "TemplateLiteral",
+    (node, name) => node.type === "ArrayExpression" && name === "elements",
+    (node, name) =>
+      node.type === "Property" &&
+      node.key.type === "Identifier" &&
+      node.key.name === "styles" &&
+      name === "value",
+    ...angularComponentObjectExpressionPredicates
   );
 }
 function isAngularComponentTemplate(path) {
-  return isPathMatch(
-    path,
-    [
-      node => node.type === "TemplateLiteral",
-      (node, name) =>
-        node.type === "Property" &&
-        node.key.type === "Identifier" &&
-        node.key.name === "template" &&
-        name === "value"
-    ].concat(getAngularComponentObjectExpressionPredicates())
+  return path.match(
+    node => node.type === "TemplateLiteral",
+    (node, name) =>
+      node.type === "Property" &&
+      node.key.type === "Identifier" &&
+      node.key.name === "template" &&
+      name === "value",
+    ...angularComponentObjectExpressionPredicates
   );
 }
-function getAngularComponentObjectExpressionPredicates() {
-  return [
-    (node, name) => node.type === "ObjectExpression" && name === "properties",
-    (node, name) =>
-      node.type === "CallExpression" &&
-      node.callee.type === "Identifier" &&
-      node.callee.name === "Component" &&
-      name === "arguments",
-    (node, name) => node.type === "Decorator" && name === "expression"
-  ];
-}
+const angularComponentObjectExpressionPredicates = [
+  (node, name) => node.type === "ObjectExpression" && name === "properties",
+  (node, name) =>
+    node.type === "CallExpression" &&
+    node.callee.type === "Identifier" &&
+    node.callee.name === "Component" &&
+    name === "arguments",
+  (node, name) => node.type === "Decorator" && name === "expression"
+];
 
 /**
  * styled-components template literals
@@ -536,50 +530,21 @@ function hasLanguageComment(node, languageName) {
   );
 }
 
-function isPathMatch(path, predicateStack) {
-  const stack = path.stack.slice();
-
-  let name = null;
-  let node = stack.pop();
-
-  for (const predicate of predicateStack) {
-    if (node === undefined) {
-      return false;
-    }
-
-    // skip index/array
-    if (typeof name === "number") {
-      name = stack.pop();
-      node = stack.pop();
-    }
-
-    if (!predicate(node, name)) {
-      return false;
-    }
-
-    name = stack.pop();
-    node = stack.pop();
-  }
-
-  return true;
-}
-
 /**
  *     - html`...`
  *     - HTML comment block
  */
 function isHtml(path) {
-  const node = path.getValue();
   return (
-    hasLanguageComment(node, "HTML") ||
-    isPathMatch(path, [
+    hasLanguageComment(path.getValue(), "HTML") ||
+    path.match(
       node => node.type === "TemplateLiteral",
       (node, name) =>
         node.type === "TaggedTemplateExpression" &&
         node.tag.type === "Identifier" &&
         node.tag.name === "html" &&
         name === "quasi"
-    ])
+    )
   );
 }
 
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 21cc37f0d..b951fae1b 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -20,7 +20,6 @@ const {
   getPenultimate,
   startsWithNoLookaheadToken,
   getIndentSize,
-  matchAncestorTypes,
   getPreferredQuote
 } = require("../common/util");
 const {
@@ -1406,18 +1405,19 @@ function printPathNoParens(path, options, print, args) {
       // If we inline the object as first argument of the parent, we don't want
       // to create another group so that the object breaks before the return
       // type
-      const parentParentParent = path.getParentNode(2);
       if (
-        (n.type === "ObjectPattern" &&
-          parent &&
-          shouldHugArguments(parent) &&
-          !n.decorators &&
-          parent.params[0] === n) ||
-        (shouldHugType(n) &&
-          parentParentParent &&
-          shouldHugArguments(parentParentParent) &&
-          parentParentParent.params[0].typeAnnotation &&
-          parentParentParent.params[0].typeAnnotation.typeAnnotation === n)
+        path.match(
+          node => node.type === "ObjectPattern" && !node.decorators,
+          (node, name, number) =>
+            shouldHugArguments(node) && name === "params" && number === 0
+        ) ||
+        path.match(
+          shouldHugType,
+          (node, name) => name === "typeAnnotation",
+          (node, name) => name === "typeAnnotation",
+          (node, name, number) =>
+            shouldHugArguments(node) && name === "params" && number === 0
+        )
       ) {
         return content;
       }
@@ -5563,17 +5563,12 @@ function maybeWrapJSXElementInParens(path, elem, options) {
     return elem;
   }
 
-  const shouldBreak =
-    matchAncestorTypes(path, [
-      "ArrowFunctionExpression",
-      "CallExpression",
-      "JSXExpressionContainer"
-    ]) ||
-    matchAncestorTypes(path, [
-      "ArrowFunctionExpression",
-      "OptionalCallExpression",
-      "JSXExpressionContainer"
-    ]);
+  const shouldBreak = path.match(
+    undefined,
+    node => node.type === "ArrowFunctionExpression",
+    isCallOrOptionalCallExpression,
+    node => node.type === "JSXExpressionContainer"
+  );
 
   const needsParens = pathNeedsParens(path, options);
 

From 823616fdce104b60cb5dc3b2b85a2e336390672e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2019 08:09:49 +0100
Subject: [PATCH 59/88] Bump concurrently from 5.0.0 to 5.0.1 in /website
 (#7121)

Bumps [concurrently](https://github.com/kimmobrunfeldt/concurrently) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/kimmobrunfeldt/concurrently/releases)
- [Commits](https://github.com/kimmobrunfeldt/concurrently/compare/v5.0.0...v5.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 85 +++++++++++---------------------------------
 2 files changed, 21 insertions(+), 66 deletions(-)

diff --git a/website/package.json b/website/package.json
index 8e4a8c895..880ac442c 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "@babel/preset-react": "7.7.4",
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
-    "concurrently": "5.0.0",
+    "concurrently": "5.0.1",
     "docusaurus": "1.14.3",
     "js-yaml": "3.13.1",
     "svgo": "1.3.2",
diff --git a/website/yarn.lock b/website/yarn.lock
index 7737248e1..a902a3590 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1821,14 +1821,6 @@ clipboard@2.0.4, clipboard@^2.0.0:
     select "^1.1.2"
     tiny-emitter "^2.0.0"
 
-cliui@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -1975,10 +1967,10 @@ concat-with-sourcemaps@*:
   dependencies:
     source-map "^0.6.1"
 
-concurrently@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.0.0.tgz#99c7567d009411fbdc98299d553c4b99a978612c"
-  integrity sha512-1yDvK8mduTIdxIxV9C60KoiOySUl/lfekpdbI+U5GXaPrgdffEavFa9QZB3vh68oWOpbCC+TuvxXV9YRPMvUrA==
+concurrently@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.0.1.tgz#9d15e0e7bb7ebe5c3bcd86deb8393501c35dd003"
+  integrity sha512-fPKUlOAXEXpktp3z7RqIvzTSCowfDo8oQbdKoGKGZVm+G2hGFbIIAFm4qwWcGl/sIHmpMSgPqeCbjld3kdPXvA==
   dependencies:
     chalk "^2.4.2"
     date-fns "^2.0.1"
@@ -1986,9 +1978,9 @@ concurrently@5.0.0:
     read-pkg "^4.0.1"
     rxjs "^6.5.2"
     spawn-command "^0.0.2-1"
-    supports-color "^4.5.0"
+    supports-color "^6.1.0"
     tree-kill "^1.2.1"
-    yargs "^12.0.5"
+    yargs "^13.3.0"
 
 config-chain@^1.1.11:
   version "1.1.12"
@@ -3410,10 +3402,6 @@ gaze@^1.1.3:
   dependencies:
     globule "^1.0.0"
 
-get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -3731,11 +3719,6 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5435,7 +5418,7 @@ os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
-os-locale@^3.0.0, os-locale@^3.1.0:
+os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -6493,10 +6476,6 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-
 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"
@@ -7066,7 +7045,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -7192,13 +7171,6 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=
-  dependencies:
-    has-flag "^2.0.0"
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -7831,13 +7803,6 @@ worker-rpc@^0.1.0:
   dependencies:
     microevent.ts "~0.1.1"
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -7872,7 +7837,7 @@ xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
@@ -7893,15 +7858,7 @@ yamljs@^0.2.1:
     argparse "^1.0.7"
     glob "^7.0.5"
 
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^13.1.0:
+yargs-parser@^13.1.0, yargs-parser@^13.1.1:
   version "13.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
   integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
@@ -7926,23 +7883,21 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+yargs@^13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
+  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
   dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
+    cliui "^5.0.0"
     find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
+    get-caller-file "^2.0.1"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.1"
 
 yargs@^2.3.0:
   version "2.3.0"

From 1f5e8488fde8bb50be29cd38abc474e244e1a5fb Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Tue, 10 Dec 2019 18:37:50 +0200
Subject: [PATCH 60/88] tests: "Expected" and "Received" are mixed up in parser
 verification tests (#7125)

---
 tests_config/run_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js
index ae61b7bb0..d62fb7965 100644
--- a/tests_config/run_spec.js
+++ b/tests_config/run_spec.js
@@ -94,7 +94,7 @@ global.run_spec = (dirname, parsers, options) => {
       const verifyOptions = Object.assign({}, baseOptions, { parser });
       test(`${basename} - ${parser}-verify`, () => {
         const verifyOutput = format(input, filename, verifyOptions);
-        expect(visualizedOutput).toEqual(visualizeEndOfLine(verifyOutput));
+        expect(visualizeEndOfLine(verifyOutput)).toEqual(visualizedOutput);
       });
     }
 

From 204752dadb433bf02f630ccf0bf9d3b8be5d1959 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2019 17:40:20 +0100
Subject: [PATCH 61/88] Bump eslint-plugin-import from 2.18.2 to 2.19.1 (#7123)

Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.2 to 2.19.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.2...v2.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 34 ++++++++++++++++++++++------------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 24b69f57f..988eccd91 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "eslint": "6.6.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-formatter-friendly": "7.0.0",
-    "eslint-plugin-import": "2.18.2",
+    "eslint-plugin-import": "2.19.1",
     "eslint-plugin-prettier": "3.1.1",
     "eslint-plugin-react": "7.17.0",
     "execa": "3.4.0",
diff --git a/yarn.lock b/yarn.lock
index 30eb7cf9f..8b48ad3ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1267,6 +1267,15 @@ array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
+array.prototype.flat@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.2.tgz#8f3c71d245ba349b6b64b4078f76f5576f1fd723"
+  integrity sha512-VXjh7lAL4KXKF2hY4FnEW9eRW6IhdvFW1sN/JwLbmECbCgACCnBHNyP3lFiYuttr0jxRN9Bsc5+G27dMseSWqQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.15.0"
+    function-bind "^1.1.1"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -2533,12 +2542,12 @@ eslint-import-resolver-node@^0.3.2:
     debug "^2.6.9"
     resolve "^1.5.0"
 
-eslint-module-utils@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
-  integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
+eslint-module-utils@^2.4.1:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz#cdf0b40d623032274ccd2abd7e64c4e524d6e19c"
+  integrity sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw==
   dependencies:
-    debug "^2.6.8"
+    debug "^2.6.9"
     pkg-dir "^2.0.0"
 
 eslint-plugin-eslint-plugin@^2.1.0:
@@ -2546,22 +2555,23 @@ eslint-plugin-eslint-plugin@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
   integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
 
-eslint-plugin-import@2.18.2:
-  version "2.18.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"
-  integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==
+eslint-plugin-import@2.19.1:
+  version "2.19.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz#5654e10b7839d064dd0d46cd1b88ec2133a11448"
+  integrity sha512-x68131aKoCZlCae7rDXKSAQmbT5DQuManyXo2sK6fJJ0aK5CWAkv6A6HJZGgqC8IhjQxYPgo6/IY4Oz8AFsbBw==
   dependencies:
     array-includes "^3.0.3"
+    array.prototype.flat "^1.2.1"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
     eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.0"
+    eslint-module-utils "^2.4.1"
     has "^1.0.3"
     minimatch "^3.0.4"
     object.values "^1.1.0"
     read-pkg-up "^2.0.0"
-    resolve "^1.11.0"
+    resolve "^1.12.0"
 
 eslint-plugin-prettier@3.1.1:
   version "3.1.1"
@@ -5946,7 +5956,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@1.13.1, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0:
+resolve@1.13.1, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
   integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==

From 137efbb7cc923c2d50631e4fec6694e5988773e4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2019 17:20:43 +0100
Subject: [PATCH 62/88] Bump @typescript-eslint/typescript-estree from 2.10.0
 to 2.11.0 (#7127)

Bumps [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-estree) from 2.10.0 to 2.11.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/typescript-estree/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v2.11.0/packages/typescript-estree)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 988eccd91..2058d3ea6 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@babel/parser": "7.7.4",
     "@glimmer/syntax": "0.41.0",
     "@iarna/toml": "2.2.3",
-    "@typescript-eslint/typescript-estree": "2.10.0",
+    "@typescript-eslint/typescript-estree": "2.11.0",
     "angular-estree-parser": "1.1.5",
     "angular-html-parser": "1.3.0",
     "camelcase": "5.3.1",
diff --git a/yarn.lock b/yarn.lock
index 8b48ad3ae..364af047b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -890,10 +890,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/typescript-estree@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.10.0.tgz#89cdabd5e8c774e9d590588cb42fb9afd14dcbd9"
-  integrity sha512-oOYnplddQNm/LGVkqbkAwx4TIBuuZ36cAQq9v3nFIU9FmhemHuVzAesMSXNQDdAzCa5bFgCrfD3JWhYVKlRN2g==
+"@typescript-eslint/typescript-estree@2.11.0":
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.11.0.tgz#21ada6504274cd1644855926312c798fc697e9fb"
+  integrity sha512-HGY4+d4MagO6cKMcKfIKaTMxcAv7dEVnji2Zi+vi5VV8uWAM631KjAB5GxFcexMYrwKT0EekRiiGK1/Sd7VFGA==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"

From 40b05a90198ba30dcadac703e3d5ac488e708dcd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2019 13:16:16 +0300
Subject: [PATCH 63/88] Bump @babel/parser from 7.7.4 to 7.7.5 (#7134)

Bumps [@babel/parser](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2058d3ea6..d285706d3 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@angular/compiler": "8.2.14",
     "@babel/code-frame": "7.5.5",
-    "@babel/parser": "7.7.4",
+    "@babel/parser": "7.7.5",
     "@glimmer/syntax": "0.41.0",
     "@iarna/toml": "2.2.3",
     "@typescript-eslint/typescript-estree": "2.11.0",
diff --git a/yarn.lock b/yarn.lock
index 364af047b..8f861902e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -279,10 +279,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.7.4", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
-  integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
+"@babel/parser@7.7.5", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2", "@babel/parser@^7.7.4":
+  version "7.7.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
+  integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==
 
 "@babel/plugin-proposal-async-generator-functions@^7.7.4":
   version "7.7.4"

From 025fcdea95e9bc3a8c1ec5a94d091de9134a8e59 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2019 23:21:24 +0100
Subject: [PATCH 64/88] Bump rollup from 1.27.8 to 1.27.12 (#7137)

Bumps [rollup](https://github.com/rollup/rollup) from 1.27.8 to 1.27.12.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v1.27.8...v1.27.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d285706d3..0977b7e13 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "mkdirp": "0.5.1",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
-    "rollup": "1.27.8",
+    "rollup": "1.27.12",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 8f861902e..8756a4312 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6063,10 +6063,10 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0,
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@1.27.8:
-  version "1.27.8"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.8.tgz#94288a957af9f4c2380b73a17494d87705997d0f"
-  integrity sha512-EVoEV5rAWl+5clnGznt1KY8PeVkzVQh/R0d2s3gHEkN7gfoyC4JmvIVuCtPbYE8NM5Ep/g+nAmvKXBjzaqTsHA==
+rollup@1.27.12:
+  version "1.27.12"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.12.tgz#cf84db4b4edaf187eaba95232f34de7cd4d22d9c"
+  integrity sha512-51iR7n6NQfdQJlRrIktaGmkdt395A8Vue7CdnlrK6UhY9DY2GaKsTdljWeXisJuZh+w90Gz8VFNh5X+yxP20oQ==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"

From 64d4b2f49fb3f85a3f4c221646e989ae87ea04fa Mon Sep 17 00:00:00 2001
From: Brian Kim <briankimpossible@gmail.com>
Date: Sat, 14 Dec 2019 12:41:15 -0500
Subject: [PATCH 65/88] revert function composition logic for decorators
 (#7138)

fixes #6953
---
 changelog_unreleased/javascript/pr-7138.md    | 31 +++++++++++++++++++
 src/language-js/printer-estree.js             |  5 ++-
 .../__snapshots__/jsfmt.spec.js.snap          |  5 +--
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 changelog_unreleased/javascript/pr-7138.md

diff --git a/changelog_unreleased/javascript/pr-7138.md b/changelog_unreleased/javascript/pr-7138.md
new file mode 100644
index 000000000..7fe07e540
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-7138.md
@@ -0,0 +1,31 @@
+#### Tweak function composition logic for decorators ([#7138](https://github.com/prettier/prettier/pull/7138) by [@brainkim](https://github.com/brainkim))
+
+Because decorators modify the line following, splitting a decorator call’s
+arguments onto multiple lines can obscure the relationship between the
+decorator and its intended target, producing less-readable code. Therefore, the
+function composition logic introduced in #6033 has been changed to exclude
+decorator calls.
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+export class Item {
+  @OneToOne(() => Thing, x => x.item)
+  thing!: Thing;
+}
+
+// Output (Prettier stable)
+export class Item {
+  @OneToOne(
+    () => Thing,
+    x => x.item,
+  )
+  thing!: Thing;
+}
+
+// Output (Prettier master)
+export class Item {
+  @OneToOne(() => Thing, x => x.item)
+  thing!: Thing;
+}
+```
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index b951fae1b..1bccce6bb 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -4069,7 +4069,10 @@ function printArgumentsList(path, options, print) {
     );
   }
 
-  if (isFunctionCompositionArgs(args)) {
+  if (
+    path.getParentNode().type !== "Decorator" &&
+    isFunctionCompositionArgs(args)
+  ) {
     return allArgsBrokenOut();
   }
 
diff --git a/tests/decorators-ts/__snapshots__/jsfmt.spec.js.snap b/tests/decorators-ts/__snapshots__/jsfmt.spec.js.snap
index 898ab7e2f..a34eb3977 100644
--- a/tests/decorators-ts/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/decorators-ts/__snapshots__/jsfmt.spec.js.snap
@@ -321,10 +321,7 @@ export class Board {
   @Column()
   description: string;
 
-  @OneToMany(
-    type => Topic,
-    topic => topic.board
-  )
+  @OneToMany(type => Topic, topic => topic.board)
   topics: Topic[];
 }
 

From 22782c2e326a5f8d75902f84e8d94d117dfd40c7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2019 18:02:20 +0100
Subject: [PATCH 66/88] Bump eslint-plugin-prettier from 3.1.1 to 3.1.2 (#7142)

Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0977b7e13..e4d17a2f4 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "eslint-config-prettier": "6.7.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.19.1",
-    "eslint-plugin-prettier": "3.1.1",
+    "eslint-plugin-prettier": "3.1.2",
     "eslint-plugin-react": "7.17.0",
     "execa": "3.4.0",
     "jest": "23.3.0",
diff --git a/yarn.lock b/yarn.lock
index 8756a4312..d995b1654 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2573,10 +2573,10 @@ eslint-plugin-import@2.19.1:
     read-pkg-up "^2.0.0"
     resolve "^1.12.0"
 
-eslint-plugin-prettier@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz#507b8562410d02a03f0ddc949c616f877852f2ba"
-  integrity sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA==
+eslint-plugin-prettier@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz#432e5a667666ab84ce72f945c72f77d996a5c9ba"
+  integrity sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 

From d1771e86524901a4b814c364b3d084fd14c9999e Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Tue, 17 Dec 2019 02:11:39 +0900
Subject: [PATCH 67/88] JavaScript: Fix moving semi for `return` to end of
 line-comment (#7140)

* Modify to fix semi for return with comment

* Add complex test case

* Add null check

* Add changelog
---
 changelog_unreleased/javascript/pr-7140.md    | 13 ++++++++
 src/language-js/printer-estree.js             | 14 ++++++++-
 tests/return/__snapshots__/jsfmt.spec.js.snap | 30 +++++++++++++++++++
 tests/return/comment.js                       | 16 ++++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/javascript/pr-7140.md

diff --git a/changelog_unreleased/javascript/pr-7140.md b/changelog_unreleased/javascript/pr-7140.md
new file mode 100644
index 000000000..041b52b5a
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-7140.md
@@ -0,0 +1,13 @@
+#### Fix moving semi for `return` to end of line-comment([#7140](https://github.com/prettier/prettier/pull/7140) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+```js
+// Input
+return // comment
+;
+
+// Prettier stable
+return // comment;
+
+// Prettier master
+return; // comment
+```
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 1bccce6bb..3f16b2f9f 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -5962,6 +5962,16 @@ function printReturnAndThrowArgument(path, options, print) {
     }
   }
 
+  const lastComment =
+    Array.isArray(node.comments) && node.comments[node.comments.length - 1];
+  const isLastCommentLine =
+    lastComment &&
+    (lastComment.type === "CommentLine" || lastComment.type === "Line");
+
+  if (isLastCommentLine) {
+    parts.push(semi);
+  }
+
   if (hasDanglingComments(node)) {
     parts.push(
       " ",
@@ -5969,7 +5979,9 @@ function printReturnAndThrowArgument(path, options, print) {
     );
   }
 
-  parts.push(semi);
+  if (!isLastCommentLine) {
+    parts.push(semi);
+  }
 
   return concat(parts);
 }
diff --git a/tests/return/__snapshots__/jsfmt.spec.js.snap b/tests/return/__snapshots__/jsfmt.spec.js.snap
index 5a5ea6d9e..a1ca41075 100644
--- a/tests/return/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/return/__snapshots__/jsfmt.spec.js.snap
@@ -68,6 +68,22 @@ function f() {
   return /* a */;
 }
 
+function f() {
+  return // a
+  ;
+}
+
+function f() {
+  return // a
+  /* b */;
+}
+
+function f() {
+  return /* a */
+  // b
+  ;
+}
+
 function x() {
   return func2
       //comment
@@ -95,6 +111,20 @@ function f() {
   return /* a */;
 }
 
+function f() {
+  return; // a
+}
+
+function f() {
+  return // a
+  /* b */;
+}
+
+function f() {
+  return; /* a */
+  // b
+}
+
 function x() {
   return (
     func2
diff --git a/tests/return/comment.js b/tests/return/comment.js
index 06126f9f0..d09bd5203 100644
--- a/tests/return/comment.js
+++ b/tests/return/comment.js
@@ -2,6 +2,22 @@ function f() {
   return /* a */;
 }
 
+function f() {
+  return // a
+  ;
+}
+
+function f() {
+  return // a
+  /* b */;
+}
+
+function f() {
+  return /* a */
+  // b
+  ;
+}
+
 function x() {
   return func2
       //comment

From c3b3eb5dda9c70259aba84f273b610e7cf45a51a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2019 16:30:38 +0300
Subject: [PATCH 68/88] Bump webpack from 4.41.2 to 4.41.3 in /website (#7145)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.2 to 4.41.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.2...v4.41.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/website/package.json b/website/package.json
index 880ac442c..9411745e0 100644
--- a/website/package.json
+++ b/website/package.json
@@ -27,7 +27,7 @@
     "docusaurus": "1.14.3",
     "js-yaml": "3.13.1",
     "svgo": "1.3.2",
-    "webpack": "4.41.2",
+    "webpack": "4.41.3",
     "webpack-cli": "3.3.10"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index a902a3590..81e955ed8 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -6695,10 +6695,10 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-javascript@^1.7.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
-  integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
+serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
 serve-static@1.14.1:
   version "1.14.1"
@@ -7254,16 +7254,16 @@ tempfile@^2.0.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
-terser-webpack-plugin@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4"
-  integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==
+terser-webpack-plugin@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
+  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
   dependencies:
     cacache "^12.0.2"
     find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^1.7.0"
+    serialize-javascript "^2.1.2"
     source-map "^0.6.1"
     terser "^4.1.2"
     webpack-sources "^1.4.0"
@@ -7708,10 +7708,10 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@4.41.2:
-  version "4.41.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
-  integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
+webpack@4.41.3:
+  version "4.41.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.3.tgz#cb7592c43080337dbc9be9e98fc6478eb3981026"
+  integrity sha512-EcNzP9jGoxpQAXq1VOoTet0ik7/VVU1MovIfcUSAjLowc7GhcQku/sOXALvq5nPpSei2HF6VRhibeJSC3i/Law==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
@@ -7733,7 +7733,7 @@ webpack@4.41.2:
     node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
     tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.1"
+    terser-webpack-plugin "^1.4.3"
     watchpack "^1.6.0"
     webpack-sources "^1.4.1"
 

From 9641a8d32ed4c68beb6ed4dd85b79e4804b19285 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2019 18:04:42 +0100
Subject: [PATCH 69/88] Bump rollup from 1.27.12 to 1.27.13 (#7146)

Bumps [rollup](https://github.com/rollup/rollup) from 1.27.12 to 1.27.13.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v1.27.12...v1.27.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e4d17a2f4..c3d2a53a9 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "mkdirp": "0.5.1",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
-    "rollup": "1.27.12",
+    "rollup": "1.27.13",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index d995b1654..3ce606f79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6063,10 +6063,10 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0,
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@1.27.12:
-  version "1.27.12"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.12.tgz#cf84db4b4edaf187eaba95232f34de7cd4d22d9c"
-  integrity sha512-51iR7n6NQfdQJlRrIktaGmkdt395A8Vue7CdnlrK6UhY9DY2GaKsTdljWeXisJuZh+w90Gz8VFNh5X+yxP20oQ==
+rollup@1.27.13:
+  version "1.27.13"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.13.tgz#d6d3500512daacbf8de54d2800de62d893085b90"
+  integrity sha512-hDi7M07MpmNSDE8YVwGVFA8L7n8jTLJ4lG65nMAijAyqBe//rtu4JdxjUBE7JqXfdpqxqDTbCDys9WcqdpsQvw==
   dependencies:
     "@types/estree" "*"
     "@types/node" "*"

From dfa36bacbb12ced17df5861721b2defc61299c97 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2019 08:06:56 +0100
Subject: [PATCH 70/88] Bump concurrently from 5.0.1 to 5.0.2 in /website
 (#7149)

Bumps [concurrently](https://github.com/kimmobrunfeldt/concurrently) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/kimmobrunfeldt/concurrently/releases)
- [Commits](https://github.com/kimmobrunfeldt/concurrently/compare/v5.0.1...v5.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/website/package.json b/website/package.json
index 9411745e0..27061668e 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "@babel/preset-react": "7.7.4",
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
-    "concurrently": "5.0.1",
+    "concurrently": "5.0.2",
     "docusaurus": "1.14.3",
     "js-yaml": "3.13.1",
     "svgo": "1.3.2",
diff --git a/website/yarn.lock b/website/yarn.lock
index 81e955ed8..cef9d46c5 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1967,10 +1967,10 @@ concat-with-sourcemaps@*:
   dependencies:
     source-map "^0.6.1"
 
-concurrently@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.0.1.tgz#9d15e0e7bb7ebe5c3bcd86deb8393501c35dd003"
-  integrity sha512-fPKUlOAXEXpktp3z7RqIvzTSCowfDo8oQbdKoGKGZVm+G2hGFbIIAFm4qwWcGl/sIHmpMSgPqeCbjld3kdPXvA==
+concurrently@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.0.2.tgz#4d2911018c0f15ddec34a8e668fc48dced7f3b1e"
+  integrity sha512-iUNVI6PzKO0RVXV9pHWM0khvEbELxf3XLIoChaV6hHyoIaJuxQWZiOwlNysnJX5khsfvIK66+OJqRdbYrdsR1g==
   dependencies:
     chalk "^2.4.2"
     date-fns "^2.0.1"
@@ -1979,7 +1979,7 @@ concurrently@5.0.1:
     rxjs "^6.5.2"
     spawn-command "^0.0.2-1"
     supports-color "^6.1.0"
-    tree-kill "^1.2.1"
+    tree-kill "^1.2.2"
     yargs "^13.3.0"
 
 config-chain@^1.1.11:
@@ -7394,10 +7394,10 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-tree-kill@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
-  integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
+tree-kill@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
 tree-node-cli@^1.2.5:
   version "1.2.5"

From ddcb1f963c6c81535b9f1076bf5121bfd2513432 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Dec 2019 08:40:38 +0100
Subject: [PATCH 71/88] Bump @babel/preset-env from 7.7.6 to 7.7.7 in /website
 (#7158)

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.6 to 7.7.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.6...v7.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 65 ++++++++++++++++++++++++--------------------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/website/package.json b/website/package.json
index 27061668e..1c5ca1541 100644
--- a/website/package.json
+++ b/website/package.json
@@ -19,7 +19,7 @@
     "react-dom": "16.12.0"
   },
   "devDependencies": {
-    "@babel/preset-env": "7.7.6",
+    "@babel/preset-env": "7.7.7",
     "@babel/preset-react": "7.7.4",
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.0.6",
diff --git a/website/yarn.lock b/website/yarn.lock
index cef9d46c5..6ae2651d7 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -304,10 +304,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.7.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
-  integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
+"@babel/plugin-proposal-object-rest-spread@^7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.7.7":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz#9f27075004ab99be08c5c1bd653a2985813cb370"
+  integrity sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
@@ -320,10 +320,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
-  integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==
+"@babel/plugin-proposal-unicode-property-regex@^7.7.7":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz#433fa9dac64f953c12578b29633f456b68831c4e"
+  integrity sha512-80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -436,10 +436,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96"
-  integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==
+"@babel/plugin-transform-dotall-regex@^7.7.7":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz#3e9713f1b69f339e87fa796b097d73ded16b937b"
+  integrity sha512-b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -546,10 +546,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.7.4"
 
-"@babel/plugin-transform-parameters@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce"
-  integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==
+"@babel/plugin-transform-parameters@^7.7.7":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz#7a884b2460164dc5f194f668332736584c760007"
+  integrity sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew==
   dependencies:
     "@babel/helper-call-delegate" "^7.7.4"
     "@babel/helper-get-function-arity" "^7.7.4"
@@ -661,19 +661,19 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/preset-env@7.7.6", "@babel/preset-env@^7.7.4":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2"
-  integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==
+"@babel/preset-env@7.7.7", "@babel/preset-env@^7.7.4":
+  version "7.7.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.7.tgz#c294167b91e53e7e36d820e943ece8d0c7fe46ac"
+  integrity sha512-pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg==
   dependencies:
     "@babel/helper-module-imports" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
     "@babel/plugin-proposal-dynamic-import" "^7.7.4"
     "@babel/plugin-proposal-json-strings" "^7.7.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.7.7"
     "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.7.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.7.7"
     "@babel/plugin-syntax-async-generators" "^7.7.4"
     "@babel/plugin-syntax-dynamic-import" "^7.7.4"
     "@babel/plugin-syntax-json-strings" "^7.7.4"
@@ -687,7 +687,7 @@
     "@babel/plugin-transform-classes" "^7.7.4"
     "@babel/plugin-transform-computed-properties" "^7.7.4"
     "@babel/plugin-transform-destructuring" "^7.7.4"
-    "@babel/plugin-transform-dotall-regex" "^7.7.4"
+    "@babel/plugin-transform-dotall-regex" "^7.7.7"
     "@babel/plugin-transform-duplicate-keys" "^7.7.4"
     "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
     "@babel/plugin-transform-for-of" "^7.7.4"
@@ -701,7 +701,7 @@
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
     "@babel/plugin-transform-new-target" "^7.7.4"
     "@babel/plugin-transform-object-super" "^7.7.4"
-    "@babel/plugin-transform-parameters" "^7.7.4"
+    "@babel/plugin-transform-parameters" "^7.7.7"
     "@babel/plugin-transform-property-literals" "^7.7.4"
     "@babel/plugin-transform-regenerator" "^7.7.5"
     "@babel/plugin-transform-reserved-words" "^7.7.4"
@@ -713,7 +713,7 @@
     "@babel/plugin-transform-unicode-regex" "^7.7.4"
     "@babel/types" "^7.7.4"
     browserslist "^4.6.0"
-    core-js-compat "^3.4.7"
+    core-js-compat "^3.6.0"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
@@ -2059,13 +2059,13 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.4.7:
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.8.tgz#f72e6a4ed76437ea710928f44615f926a81607d5"
-  integrity sha512-l3WTmnXHV2Sfu5VuD7EHE2w7y+K68+kULKt5RJg8ZJk3YhHF1qLD4O8v8AmNq+8vbOwnPFFDvds25/AoEvMqlQ==
+core-js-compat@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.0.tgz#4eb6cb69d03d99159ed7c860cd5fcf7d23a62ea9"
+  integrity sha512-Z3eCNjGgoYluH89Jt4wVkfYsc/VdLrA2/woX5lm0isO/pCT+P+Y+o65bOuEnjDJLthdwTBxbCVzptTXtc18fJg==
   dependencies:
     browserslist "^4.8.2"
-    semver "^6.3.0"
+    semver "7.0.0"
 
 core-js@^2.6.5:
   version "2.6.9"
@@ -6671,6 +6671,11 @@ semver-truncate@^1.1.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
 semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"

From 45b1bb702cecbb3ddb0b62427f3293098886be18 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2019 15:33:11 +0100
Subject: [PATCH 72/88] Bump webpack from 4.41.3 to 4.41.4 in /website (#7164)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.3 to 4.41.4.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.3...v4.41.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index 1c5ca1541..55681166b 100644
--- a/website/package.json
+++ b/website/package.json
@@ -27,7 +27,7 @@
     "docusaurus": "1.14.3",
     "js-yaml": "3.13.1",
     "svgo": "1.3.2",
-    "webpack": "4.41.3",
+    "webpack": "4.41.4",
     "webpack-cli": "3.3.10"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 6ae2651d7..63b14a0e6 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7713,10 +7713,10 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@4.41.3:
-  version "4.41.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.3.tgz#cb7592c43080337dbc9be9e98fc6478eb3981026"
-  integrity sha512-EcNzP9jGoxpQAXq1VOoTet0ik7/VVU1MovIfcUSAjLowc7GhcQku/sOXALvq5nPpSei2HF6VRhibeJSC3i/Law==
+webpack@4.41.4:
+  version "4.41.4"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.4.tgz#4bec4125224bdf50efa8be6226c19047599cd034"
+  integrity sha512-Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 3bdd21dbf3d13fce63e6e858eef3ce4dfd9f6813 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2019 09:11:25 +0100
Subject: [PATCH 73/88] Bump codemirror from 5.49.2 to 5.50.0 in /website
 (#7169)

Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.49.2 to 5.50.0.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codemirror/CodeMirror/compare/5.49.2...5.50.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index 55681166b..b34efb31e 100644
--- a/website/package.json
+++ b/website/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "clipboard": "2.0.4",
-    "codemirror": "5.49.2",
+    "codemirror": "5.50.0",
     "codemirror-graphql": "0.11.2",
     "lodash.groupby": "4.6.0",
     "lz-string": "1.4.4",
diff --git a/website/yarn.lock b/website/yarn.lock
index 63b14a0e6..db8d09d30 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1857,10 +1857,10 @@ codemirror-graphql@0.11.2:
     graphql-language-service-interface "^2.3.0"
     graphql-language-service-parser "^1.5.0"
 
-codemirror@5.49.2:
-  version "5.49.2"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.49.2.tgz#c84fdaf11b19803f828b0c67060c7bc6d154ccad"
-  integrity sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ==
+codemirror@5.50.0:
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.50.0.tgz#aeacd18f225735b17cbab98908edace87fedcdab"
+  integrity sha512-32LAmGcBNhKtJP4WGgkcaCVQDyChAyaWA6jasg778ziZzo3PWBuhpAQIJMO8//Id45RoaLyXjuhcRUBoS8Vg+Q==
 
 coffee-script@^1.12.4:
   version "1.12.7"

From 53c1049830d692c96c52e5d72fda4f4f0a983a87 Mon Sep 17 00:00:00 2001
From: Cyrille David <dcyriller@users.noreply.github.com>
Date: Mon, 23 Dec 2019 12:52:03 +0100
Subject: [PATCH 74/88] Refactor a few functions in glimmer printer (#7072)

---
 src/language-handlebars/printer-glimmer.js | 80 +++++++++++-----------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 2eca2f448..7dadc6be8 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -32,26 +32,6 @@ const voidTags = [
 // Formatter based on @glimmerjs/syntax's built-in test formatter:
 // https://github.com/glimmerjs/glimmer-vm/blob/master/packages/%40glimmer/syntax/lib/generation/print.ts
 
-function printChildren(path, options, print) {
-  return concat(
-    path.map((childPath, childIndex) => {
-      const childNode = path.getValue();
-      const isFirstNode = childIndex === 0;
-      const isLastNode =
-        childIndex == path.getParentNode(0).children.length - 1;
-      const isLastNodeInMultiNodeList = isLastNode && !isFirstNode;
-      const isWhitespace = isWhitespaceNode(childNode);
-
-      if (isWhitespace && isLastNodeInMultiNodeList) {
-        return print(childPath, options, print);
-      } else if (isFirstNode) {
-        return concat([softline, print(childPath, options, print)]);
-      }
-      return print(childPath, options, print);
-    }, "children")
-  );
-}
-
 function print(path, options, print) {
   const n = path.getValue();
 
@@ -82,7 +62,7 @@ function print(path, options, print) {
         voidTags.indexOf(n.tag) !== -1;
       const closeTagForNoBreak = isVoid ? concat([" />", softline]) : ">";
       const closeTagForBreak = isVoid ? "/>" : ">";
-      const getParams = (path, print) =>
+      const printParams = (path, print) =>
         indent(
           concat([
             n.attributes.length ? line : "",
@@ -103,7 +83,7 @@ function print(path, options, print) {
           concat([
             "<",
             n.tag,
-            getParams(path, print),
+            printParams(path, print),
             n.blockParams.length ? ` as |${n.blockParams.join(" ")}|` : "",
             ifBreak(softline, ""),
             ifBreak(closeTagForBreak, closeTagForNoBreak)
@@ -176,17 +156,20 @@ function print(path, options, print) {
       const p = path.getParentNode(0);
       const isParentConcat = p && p.type === "ConcatStatement";
       const isParentAttr = p && p.type === "AttrNode";
-      return group(
-        concat([
-          n.escaped === false ? "{{{" : "{{",
-          printPathParams(path, print, { group: false }),
-          isParentConcat || isParentAttr ? "" : softline,
-          n.escaped === false ? "}}}" : "}}"
-        ])
-      );
+      const isEscaped = n.escaped === false;
+
+      const opening = isEscaped ? "{{{" : "{{";
+      const closing = isEscaped ? "}}}" : "}}";
+
+      const inner = [printPathParams(path, print)];
+      if (!isParentConcat && !isParentAttr) {
+        inner.push(softline);
+      }
+
+      return group(concat([opening, ...inner, closing]));
     }
     case "SubExpression": {
-      const params = getParams(path, print);
+      const params = printParams(path, print);
       const printedParams =
         params.length > 0
           ? indent(concat([line, group(join(line, params))]))
@@ -366,6 +349,26 @@ function print(path, options, print) {
   }
 }
 
+function printChildren(path, options, print) {
+  return concat(
+    path.map((childPath, childIndex) => {
+      const childNode = path.getValue();
+      const isFirstNode = childIndex === 0;
+      const isLastNode =
+        childIndex == path.getParentNode(0).children.length - 1;
+      const isLastNodeInMultiNodeList = isLastNode && !isFirstNode;
+      const isWhitespace = isWhitespaceNode(childNode);
+
+      if (isWhitespace && isLastNodeInMultiNodeList) {
+        return print(childPath, options, print);
+      } else if (isFirstNode) {
+        return concat([softline, print(childPath, options, print)]);
+      }
+      return print(childPath, options, print);
+    }, "children")
+  );
+}
+
 /**
  * Prints a string literal with the correct surrounding quotes based on
  * `options.singleQuote` and the number of escaped quotes contained in
@@ -416,7 +419,7 @@ function printPath(path, print) {
   return path.call(print, "path");
 }
 
-function getParams(path, print) {
+function printParams(path, print) {
   const node = path.getValue();
   let parts = [];
 
@@ -430,16 +433,11 @@ function getParams(path, print) {
   return parts;
 }
 
-function printPathParams(path, print, options) {
-  let parts = [];
-  options = Object.assign({ group: true }, options || {});
+function printPathParams(path, print) {
+  const printedPath = printPath(path, print);
+  const printedParams = printParams(path, print);
 
-  parts.push(printPath(path, print));
-  parts = parts.concat(getParams(path, print));
-
-  if (!options.group) {
-    return indent(join(line, parts));
-  }
+  const parts = [printedPath, ...printedParams];
 
   return indent(group(join(line, parts)));
 }

From 456041526fd82f98b67b95e1bbe3140128a6c36b Mon Sep 17 00:00:00 2001
From: Cyrille David <dcyriller@users.noreply.github.com>
Date: Mon, 23 Dec 2019 13:32:28 +0100
Subject: [PATCH 75/88] glimmer: Split ElementModifierStatement and
 MustacheStatement (#7156)

---
 src/language-handlebars/printer-glimmer.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 7dadc6be8..935378608 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -151,7 +151,11 @@ function print(path, options, print) {
         )
       ]);
     }
-    case "ElementModifierStatement":
+    case "ElementModifierStatement": {
+      return group(
+        concat(["{{", printPathParams(path, print), softline, "}}"])
+      );
+    }
     case "MustacheStatement": {
       const p = path.getParentNode(0);
       const isParentConcat = p && p.type === "ConcatStatement";

From f280cc13b5afdc69c2d639072561ed90fe2a3518 Mon Sep 17 00:00:00 2001
From: Ahmad Al Maaz <Music47ell@gmail.com>
Date: Mon, 23 Dec 2019 17:32:44 +0300
Subject: [PATCH 76/88] Fixed ALE installation instruction (#7166)

* Fixed ALE installation instruction

Since the author of the Vim plugin ALE moved the repository to an organization account, the command used to download the plugin has changed from `Plug 'w0rp/ale'` to `Plug 'dense-analysis/ale'`

* Fixed ALE urls

Fixed all ALE urls in this document
---
 docs/vim.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/vim.md b/docs/vim.md
index 895a29192..54d9b74f6 100644
--- a/docs/vim.md
+++ b/docs/vim.md
@@ -3,7 +3,7 @@ id: vim
 title: Vim Setup
 ---
 
-Vim users can install either [vim-prettier](https://github.com/prettier/vim-prettier), which is Prettier specific, or [Neoformat](https://github.com/sbdchd/neoformat) or [ALE](https://github.com/w0rp/ale) which are generalized lint/format engines with support for Prettier.
+Vim users can install either [vim-prettier](https://github.com/prettier/vim-prettier), which is Prettier specific, or [Neoformat](https://github.com/sbdchd/neoformat) or [ALE](https://github.com/dense-analysis/ale) which are generalized lint/format engines with support for Prettier.
 
 ## [vim-prettier](https://github.com/prettier/vim-prettier)
 
@@ -48,17 +48,17 @@ let g:neoformat_try_formatprg = 1
 
 Each space in prettier options should be escaped with `\`.
 
-## [ALE](https://github.com/w0rp/ale)
+## [ALE](https://github.com/dense-analysis/ale)
 
 ALE requires either Vim 8 or Neovim as ALE makes use of the asynchronous abilities that both Vim 8 and Neovim provide.
 
 The best way to install ALE is with your favorite plugin manager for Vim, such as [vim-plug](https://github.com/junegunn/vim-plug):
 
 ```
-Plug 'w0rp/ale'
+Plug 'dense-analysis/ale'
 ```
 
-You can find further instructions on the [ALE repository](https://github.com/w0rp/ale#3-installation).
+You can find further instructions on the [ALE repository](https://github.com/dense-analysis/ale#3-installation).
 
 ALE will try to use Prettier installed locally before looking for a global installation.
 
@@ -71,7 +71,7 @@ let g:ale_fixers = {
 \}
 ```
 
-ALE supports both _linters_ and _fixers_. If you don't specify which _linters_ to run, **all available tools for all supported languages will be run**, and you might get a correctly formatted file with a bunch of lint errors. To disable this behavior you can tell ALE to run only linters you've explicitly configured (more info in the [FAQ](https://github.com/w0rp/ale/blob/ed8104b6ab10f63c78e49b60d2468ae2656250e9/README.md#faq-disable-linters)):
+ALE supports both _linters_ and _fixers_. If you don't specify which _linters_ to run, **all available tools for all supported languages will be run**, and you might get a correctly formatted file with a bunch of lint errors. To disable this behavior you can tell ALE to run only linters you've explicitly configured (more info in the [FAQ](https://github.com/dense-analysis/ale/blob/ed8104b6ab10f63c78e49b60d2468ae2656250e9/README.md#faq-disable-linters)):
 
 ```
 let g:ale_linters_explicit = 1

From 07c6deea7d31f2deb00ad01401305baf6c9082b1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2019 11:17:19 +0100
Subject: [PATCH 77/88] Bump webpack from 4.41.4 to 4.41.5 in /website (#7206)

Bumps [webpack](https://github.com/webpack/webpack) from 4.41.4 to 4.41.5.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.4...v4.41.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index b34efb31e..e55b15381 100644
--- a/website/package.json
+++ b/website/package.json
@@ -27,7 +27,7 @@
     "docusaurus": "1.14.3",
     "js-yaml": "3.13.1",
     "svgo": "1.3.2",
-    "webpack": "4.41.4",
+    "webpack": "4.41.5",
     "webpack-cli": "3.3.10"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index db8d09d30..488e77adf 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7713,10 +7713,10 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@4.41.4:
-  version "4.41.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.4.tgz#4bec4125224bdf50efa8be6226c19047599cd034"
-  integrity sha512-Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q==
+webpack@4.41.5:
+  version "4.41.5"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c"
+  integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 9c2847854819370d6f6146f99e718e18c7bea996 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Mon, 30 Dec 2019 20:02:32 +0900
Subject: [PATCH 78/88] add test for ugly array key format (#7205)

---
 .../__snapshots__/jsfmt.spec.js.snap          | 20 +++++++++++++++++++
 tests/typescript_array/key.ts                 |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 tests/typescript_array/key.ts

diff --git a/tests/typescript_array/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_array/__snapshots__/jsfmt.spec.js.snap
index edae99840..4001682f7 100644
--- a/tests/typescript_array/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_array/__snapshots__/jsfmt.spec.js.snap
@@ -27,3 +27,23 @@ export class ViewTokensChangedEvent {
 
 ================================================================================
 `;
+
+exports[`key.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+const subtractDuration = moment.duration(
+  subtractMap[interval][0],
+  subtractMap[interval][1] as unitOfTime.DurationConstructor
+);
+
+=====================================output=====================================
+const subtractDuration = moment.duration(
+  subtractMap[interval][0],
+  subtractMap[interval][1] as unitOfTime.DurationConstructor
+);
+
+================================================================================
+`;
diff --git a/tests/typescript_array/key.ts b/tests/typescript_array/key.ts
new file mode 100644
index 000000000..c3ad9227f
--- /dev/null
+++ b/tests/typescript_array/key.ts
@@ -0,0 +1,4 @@
+const subtractDuration = moment.duration(
+  subtractMap[interval][0],
+  subtractMap[interval][1] as unitOfTime.DurationConstructor
+);

From cffdd1d4f9a3e9a2b1846ce9e9bb9338dfcbfa45 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 2 Jan 2020 08:26:51 +0100
Subject: [PATCH 79/88] Bump codemirror from 5.50.0 to 5.50.2 in /website
 (#7214)

Bumps [codemirror](https://github.com/codemirror/CodeMirror) from 5.50.0 to 5.50.2.
- [Release notes](https://github.com/codemirror/CodeMirror/releases)
- [Changelog](https://github.com/codemirror/CodeMirror/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codemirror/CodeMirror/compare/5.50.0...5.50.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index e55b15381..20e23510f 100644
--- a/website/package.json
+++ b/website/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "clipboard": "2.0.4",
-    "codemirror": "5.50.0",
+    "codemirror": "5.50.2",
     "codemirror-graphql": "0.11.2",
     "lodash.groupby": "4.6.0",
     "lz-string": "1.4.4",
diff --git a/website/yarn.lock b/website/yarn.lock
index 488e77adf..f4f3988d0 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1857,10 +1857,10 @@ codemirror-graphql@0.11.2:
     graphql-language-service-interface "^2.3.0"
     graphql-language-service-parser "^1.5.0"
 
-codemirror@5.50.0:
-  version "5.50.0"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.50.0.tgz#aeacd18f225735b17cbab98908edace87fedcdab"
-  integrity sha512-32LAmGcBNhKtJP4WGgkcaCVQDyChAyaWA6jasg778ziZzo3PWBuhpAQIJMO8//Id45RoaLyXjuhcRUBoS8Vg+Q==
+codemirror@5.50.2:
+  version "5.50.2"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.50.2.tgz#32ddfe2b50193fcf573d8141c4a31d267c92b4a3"
+  integrity sha512-PPjUsC1oXSM86lunKrw609P1oM0Wu8z9rqzjbeyBYCcx44VL41aUpccdOf1PfAZtTONlmN3sT3p2etLNYa1OGg==
 
 coffee-script@^1.12.4:
   version "1.12.7"

From 47ece13d7830be1e948c53cec54e39a6d4d5b988 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Thu, 2 Jan 2020 21:02:17 +0900
Subject: [PATCH 80/88] =?UTF-8?q?Markdown:=20fix=20HTML=20formatting=20bro?=
 =?UTF-8?q?ken=20if=20the=20beginning=20tag=20start=E2=80=A6=20(#7181)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix markdown formatting broken if the beginning html tag starts after a list item

* add test for beginning-tag-after-a-list-item in markdown_html

* add changelog_unreleased of pr-7181

* fix test of ast breaking for beginning-tag-after-a-list-item

* update changelog_unreleased pr-7181

* fix changelog_unreleased

* fix beginning tag starts after a list item in markdown

* add test case for beginning-tag-after-a-list-item

* update changelog_unreleased
---
 changelog_unreleased/markdown/pr-7181.md      | 37 ++++++++++++++++
 src/language-markdown/printer-markdown.js     | 23 +++++++++-
 .../__snapshots__/jsfmt.spec.js.snap          | 43 +++++++++++++++++++
 .../beginning-tag-after-a-list-item.md        | 15 +++++++
 4 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/markdown/pr-7181.md
 create mode 100644 tests/markdown_html/beginning-tag-after-a-list-item.md

diff --git a/changelog_unreleased/markdown/pr-7181.md b/changelog_unreleased/markdown/pr-7181.md
new file mode 100644
index 000000000..1aecd8624
--- /dev/null
+++ b/changelog_unreleased/markdown/pr-7181.md
@@ -0,0 +1,37 @@
+#### fix HTML formatting broken if the beginning tag starts after a list item ([#7181](https://github.com/prettier/prettier/pull/7181) by [@sasurau4](https://github.com/sasurau4))
+
+Previously, when Prettier format the html tag that starts after a list item, it would insert indent and break the relationship of open and close tag. Now, Prettier no longer change anything.
+
+<!-- prettier-ignore -->
+```md
+<!-- Input -->
+- A list item.
+<details><summary>Summary</summary>
+<p>
+
+- A list item.
+
+</p>
+</details>
+
+<!-- Prettier stable -->
+- A list item.
+
+  <details><summary>Summary</summary>
+  <p>
+
+- A list item.
+
+</p>
+</details>
+
+<!-- Prettier master -->
+- A list item.
+<details><summary>Summary</summary>
+<p>
+
+- A list item.
+
+</p>
+</details>
+```
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index dc588f1ce..d34b829af 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -254,6 +254,19 @@ function genericPrint(path, options, print) {
       return printChildren(path, options, print, {
         processor: (childPath, index) => {
           const prefix = getPrefix();
+          const childNode = childPath.getValue();
+
+          if (
+            childNode.children.length === 2 &&
+            childNode.children[1].type === "html" &&
+            childNode.children[1].position.indent.every(indent => indent === 1)
+          ) {
+            return concat([
+              prefix,
+              printListItem(childPath, options, print, prefix)
+            ]);
+          }
+
           return concat([
             prefix,
             align(
@@ -794,13 +807,21 @@ function shouldPrePrintDoubleHardline(node, data) {
     data.prevNode.type === "html" &&
     data.prevNode.position.end.line + 1 === node.position.start.line;
 
+  const isHtmlDirectAfterListItem =
+    node.type === "html" &&
+    data.parentNode.type === "listItem" &&
+    data.prevNode &&
+    data.prevNode.type === "paragraph" &&
+    data.prevNode.position.end.line + 1 === node.position.start.line;
+
   return (
     isPrevNodeLooseListItem ||
     !(
       isSiblingNode ||
       isInTightListItem ||
       isPrevNodePrettierIgnore ||
-      isBlockHtmlWithoutBlankLineBetweenPrevHtml
+      isBlockHtmlWithoutBlankLineBetweenPrevHtml ||
+      isHtmlDirectAfterListItem
     )
   );
 }
diff --git a/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap b/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap
index 1cd0cef08..492ff792a 100644
--- a/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,48 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`beginning-tag-after-a-list-item.md 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "always"
+                                                                                | printWidth
+=====================================input======================================
+- A list item.
+<details><summary>Summary</summary>
+<p>
+
+- A list item.
+
+</p>
+</details>
+
+- A list item.
+<blockquote>
+
+<p>quoted sentence1<br>
+quoted sentence2</p>
+</blockquote>
+
+=====================================output=====================================
+- A list item.
+<details><summary>Summary</summary>
+<p>
+
+- A list item.
+
+</p>
+</details>
+
+- A list item.
+<blockquote>
+
+<p>quoted sentence1<br>
+quoted sentence2</p>
+</blockquote>
+
+================================================================================
+`;
+
 exports[`blank-line-between-htmls.md 1`] = `
 ====================================options=====================================
 parsers: ["markdown"]
diff --git a/tests/markdown_html/beginning-tag-after-a-list-item.md b/tests/markdown_html/beginning-tag-after-a-list-item.md
new file mode 100644
index 000000000..43b7b8f80
--- /dev/null
+++ b/tests/markdown_html/beginning-tag-after-a-list-item.md
@@ -0,0 +1,15 @@
+- A list item.
+<details><summary>Summary</summary>
+<p>
+
+- A list item.
+
+</p>
+</details>
+
+- A list item.
+<blockquote>
+
+<p>quoted sentence1<br>
+quoted sentence2</p>
+</blockquote>

From c1b6e1c4011185a4c88d0d80d2ef57fc1072a476 Mon Sep 17 00:00:00 2001
From: Cyrille David <dcyriller@users.noreply.github.com>
Date: Sun, 5 Jan 2020 17:36:34 +0100
Subject: [PATCH 81/88] handlebars: Improve MustacheStatement printing (#7157)

* Address https://github.com/prettier/prettier/pull/7051#discussion_r351877770

* Add isParentOfType helper fun

* Add CHANGELOG

* Fix a typo

* CHANGELOG: Remove --print-width option

* Add tests
---
 changelog_unreleased/handlebars/pr-7157.md    | 20 +++++
 src/language-handlebars/printer-glimmer.js    | 23 ++++--
 .../__snapshots__/jsfmt.spec.js.snap          | 76 ++++++++++++++++++-
 .../handlebars-mustache-statement/basics.hbs  | 14 ++++
 .../__snapshots__/jsfmt.spec.js.snap          | 14 ++--
 .../__snapshots__/jsfmt.spec.js.snap          |  3 +-
 6 files changed, 134 insertions(+), 16 deletions(-)
 create mode 100644 changelog_unreleased/handlebars/pr-7157.md

diff --git a/changelog_unreleased/handlebars/pr-7157.md b/changelog_unreleased/handlebars/pr-7157.md
new file mode 100644
index 000000000..6da450df9
--- /dev/null
+++ b/changelog_unreleased/handlebars/pr-7157.md
@@ -0,0 +1,20 @@
+#### handlebars: Improve MustacheStatement printing ([#7157](https://github.com/prettier/prettier/pull/7157) by [@dcyriller](https://github.com/dcyriller))
+
+<!-- prettier-ignore -->
+```hbs
+{{!-- input --}}
+<p>Hi here is your name, as it will be displayed  {{firstName}}  {{lastName}}   , welcome!</p>
+
+{{!-- stable --}}
+<p>
+  Hi here is your name, as it will be displayed {{firstName}} {{lastName
+  }} , welcome!
+</p>
+
+{{!-- master --}}
+<p>
+  Hi here is your name, as it will be displayed {{firstName}} {{
+    lastName
+  }} , welcome!
+</p>
+```
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 935378608..e34789e51 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -157,21 +157,23 @@ function print(path, options, print) {
       );
     }
     case "MustacheStatement": {
-      const p = path.getParentNode(0);
-      const isParentConcat = p && p.type === "ConcatStatement";
-      const isParentAttr = p && p.type === "AttrNode";
       const isEscaped = n.escaped === false;
 
       const opening = isEscaped ? "{{{" : "{{";
       const closing = isEscaped ? "}}}" : "}}";
 
-      const inner = [printPathParams(path, print)];
-      if (!isParentConcat && !isParentAttr) {
-        inner.push(softline);
-      }
+      const leading =
+        isParentOfType(path, "AttrNode") ||
+        isParentOfType(path, "ConcatStatement") ||
+        isParentOfType(path, "ElementNode")
+          ? [opening, indent(softline)]
+          : [opening];
 
-      return group(concat([opening, ...inner, closing]));
+      return group(
+        concat([...leading, printPathParams(path, print), softline, closing])
+      );
     }
+
     case "SubExpression": {
       const params = printParams(path, print);
       const printedParams =
@@ -474,6 +476,11 @@ function isWhitespaceNode(node) {
   return node.type === "TextNode" && !/\S/.test(node.chars);
 }
 
+function isParentOfType(path, nodeType) {
+  const p = path.getParentNode(0);
+  return p && p.type === nodeType;
+}
+
 function getPreviousNode(path) {
   const node = path.getValue();
   const parentNode = path.getParentNode(0);
diff --git a/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
index 22d286039..0b185ed6a 100644
--- a/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
@@ -9,9 +9,45 @@ printWidth: 80
 <GlimmerComponent @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
 />
 
+<GlimmerComponent
+  class="medium"
+  @autocomplete="off"
+  @errors={{or this.aLongProperty (and this.aProperty (v-get bike "number" "message"))}}
+  data-test-beneficiary-account-number
+/>
+
+<GlimmerComponent
+  class="medium"
+  @autocomplete="off"
+  @errors={{or this.aVeryLongProperty (and this.aProperty (v-get bike "number" "message"))}}
+  data-test-beneficiary-account-number
+/>
+
 =====================================output=====================================
 <GlimmerComponent
-  @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
+  @progress={{
+    aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue
+  }}
+/>
+
+<GlimmerComponent
+  class="medium"
+  @autocomplete="off"
+  @errors={{
+    or this.aLongProperty (and this.aProperty (v-get bike "number" "message"))
+  }}
+  data-test-beneficiary-account-number
+/>
+
+<GlimmerComponent
+  class="medium"
+  @autocomplete="off"
+  @errors={{
+    or
+    this.aVeryLongProperty
+    (and this.aProperty (v-get bike "number" "message"))
+  }}
+  data-test-beneficiary-account-number
 />
 ================================================================================
 `;
@@ -26,9 +62,45 @@ singleQuote: true
 <GlimmerComponent @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
 />
 
+<GlimmerComponent
+  class="medium"
+  @autocomplete="off"
+  @errors={{or this.aLongProperty (and this.aProperty (v-get bike "number" "message"))}}
+  data-test-beneficiary-account-number
+/>
+
+<GlimmerComponent
+  class="medium"
+  @autocomplete="off"
+  @errors={{or this.aVeryLongProperty (and this.aProperty (v-get bike "number" "message"))}}
+  data-test-beneficiary-account-number
+/>
+
 =====================================output=====================================
 <GlimmerComponent
-  @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
+  @progress={{
+    aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue
+  }}
+/>
+
+<GlimmerComponent
+  class='medium'
+  @autocomplete='off'
+  @errors={{
+    or this.aLongProperty (and this.aProperty (v-get bike 'number' 'message'))
+  }}
+  data-test-beneficiary-account-number
+/>
+
+<GlimmerComponent
+  class='medium'
+  @autocomplete='off'
+  @errors={{
+    or
+    this.aVeryLongProperty
+    (and this.aProperty (v-get bike 'number' 'message'))
+  }}
+  data-test-beneficiary-account-number
 />
 ================================================================================
 `;
diff --git a/tests/handlebars-mustache-statement/basics.hbs b/tests/handlebars-mustache-statement/basics.hbs
index 6a4c78680..db7834d51 100644
--- a/tests/handlebars-mustache-statement/basics.hbs
+++ b/tests/handlebars-mustache-statement/basics.hbs
@@ -1,2 +1,16 @@
 <GlimmerComponent @progress={{aPropertyEngdingAfterEightiethColumnToHighlightAWeirdClosingParenIssue}}
 />
+
+<GlimmerComponent
+  class="medium"
+  @autocomplete="off"
+  @errors={{or this.aLongProperty (and this.aProperty (v-get bike "number" "message"))}}
+  data-test-beneficiary-account-number
+/>
+
+<GlimmerComponent
+  class="medium"
+  @autocomplete="off"
+  @errors={{or this.aVeryLongProperty (and this.aProperty (v-get bike "number" "message"))}}
+  data-test-beneficiary-account-number
+/>
diff --git a/tests/handlebars-text-wrap/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars-text-wrap/__snapshots__/jsfmt.spec.js.snap
index 4fc3c28e9..c41e5e6c9 100644
--- a/tests/handlebars-text-wrap/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/handlebars-text-wrap/__snapshots__/jsfmt.spec.js.snap
@@ -231,7 +231,8 @@ printWidth: 80
 </div>
 
 <div>
-  before {{stuff}} after {{stuff}} after {{stuff}} after {{stuff}} after {{stuff
+  before {{stuff}} after {{stuff}} after {{stuff}} after {{stuff}} after {{
+    stuff
   }} after {{stuff}} {{stuff}} {{stuff}} after {{stuff}} after
 </div>
 
@@ -320,9 +321,11 @@ printWidth: 80
 
 {{! this really should split across lines }}
 <div>
-  before{{stuff}}after{{stuff}}after{{stuff}}after{{stuff}}after{{stuff
-  }}after{{stuff}}after{{stuff}}after{{stuff}}after{{stuff}}after{{stuff
-  }}after{{stuff}}after{{stuff}}after{{stuff}}after{{stuff}}after
+  before{{stuff}}after{{stuff}}after{{stuff}}after{{stuff}}after{{stuff}}after{{
+    stuff
+  }}after{{stuff}}after{{stuff}}after{{stuff}}after{{stuff}}after{{
+    stuff
+  }}after{{stuff}}after{{stuff}}after{{stuff}}after
 </div>
 
 {{! solitary whitespace }}
@@ -406,7 +409,8 @@ printWidth: 80
 
 {{! expression does not break }}
 <div>
-  texty text text text text text text text text text text text {{this.props.type
+  texty text text text text text text text text text text text {{
+    this.props.type
   }}
 </div>
 
diff --git a/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap
index 7f21fe231..f84a27711 100644
--- a/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap
@@ -118,7 +118,8 @@ hey
 
 =====================================output=====================================
 <p>
-  Hi {{firstName}} {{lastName
+  Hi {{firstName}} {{
+    lastName
   }} , welcome!
 </p>
 {{#component propA}}

From 7537f21b1b2a0c1b4e10367d85ad6f092da2b899 Mon Sep 17 00:00:00 2001
From: Christian Boehlke <christian@zipkey.de>
Date: Sun, 5 Jan 2020 17:37:26 +0100
Subject: [PATCH 82/88] docs: Fix broken links (#7222)

---
 docs/cli.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/cli.md b/docs/cli.md
index 5dab730fc..86f5feced 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -51,7 +51,7 @@ Human-friendly status messages help project contributors react on possible probl
 To minimise the number of times `prettier --check` finds unformatted files, you may be interested in configuring a [pre-commit hook](precommit.md) in your repo.
 Applying this practice will minimise the number of times the CI fails because of code formatting problems.
 
-If you need to pipe the list of unformatted files to another command, you can use [`--list-different`](cli.md#list-different) flag instead of `--check`.
+If you need to pipe the list of unformatted files to another command, you can use [`--list-different`](cli.md#--list-different) flag instead of `--check`.
 
 ### Exit codes
 
@@ -112,7 +112,7 @@ Another useful flag is `--list-different` (or `-l`) which prints the filenames o
 prettier --single-quote --list-different "src/**/*.js"
 ```
 
-You can also use [`--check`](cli.md#check) flag, which works the same way as `--list-different`, but also prints a human-friendly summary message to stdout.
+You can also use [`--check`](cli.md#--check) flag, which works the same way as `--list-different`, but also prints a human-friendly summary message to stdout.
 
 ## `--no-config`
 

From bda063289047bc78e2d57bda58213d0165ba1392 Mon Sep 17 00:00:00 2001
From: Armano <armano2@users.noreply.github.com>
Date: Mon, 6 Jan 2020 10:18:10 +0100
Subject: [PATCH 83/88] fix: comments for typescript function like nodes
 (#7144)

* test: add test cases for method_types comments

* fix: improve handling comments withing typescript function like nodes

* fix: correct position of trailing comments in TSMethodSignature

* fix: allow to use comments on TSAbstractMethodDefinition and fix TSDeclareFunction

* refactor: move real function node type check to function

* refactor: invert if in handleTSFunctionTrailingComments

* refactor: move isRealFunctionLikeNode into end of file

* chore: add changelog

* chore: update changelog

* chore: update changelog

* make changelog more concise

Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>
---
 changelog_unreleased/typescript/pr-7144.md    | 82 ++++++++++++++++
 src/language-js/comments.js                   | 72 ++++++++++----
 .../__snapshots__/jsfmt.spec.js.snap          | 96 +++++++++++++++++++
 tests/typescript_comments/declare_function.ts |  2 +
 tests/typescript_comments/method_types.ts     | 39 ++++++++
 tests/typescript_comments/methods.ts          |  1 +
 6 files changed, 274 insertions(+), 18 deletions(-)
 create mode 100644 changelog_unreleased/typescript/pr-7144.md
 create mode 100644 tests/typescript_comments/method_types.ts

diff --git a/changelog_unreleased/typescript/pr-7144.md b/changelog_unreleased/typescript/pr-7144.md
new file mode 100644
index 000000000..73859bfb2
--- /dev/null
+++ b/changelog_unreleased/typescript/pr-7144.md
@@ -0,0 +1,82 @@
+#### Fix formatting comments for function-like nodes ([#6901](https://github.com/prettier/prettier/pull/7144) by [@armano2](https://github.com/armano2))
+
+<!-- prettier-ignore -->
+```ts
+// Input
+interface foo1 {
+  bar1/* foo */ (/* baz */) // bat
+  bar2/* foo */ ? /* bar */ (/* baz */) /* bat */;
+  bar3/* foo */ (/* baz */) /* bat */
+  bar4/* foo */ ? /* bar */ (bar: /* baz */ string): /* bat */ string;
+  /* foo */ (/* bar */): /* baz */ string;
+  /* foo */ (bar: /* bar */ string): /* baz */ string;
+  /* foo */ new /* bar */  (a: /* baz */ string): /* bat */ string
+  /* foo */ new /* bar */ (/* baz */): /* bat */ string
+}
+
+type foo7 = /* foo */ (/* bar */) /* baz */ => void
+type foo8 = /* foo */ (a: /* bar */ string) /* baz */ => void
+let foo9: new /* foo */ (/* bar */) /* baz */ => string;
+let foo10: new /* foo */ (a: /* bar */ string) /* baz */ => string;
+
+// Prettier stable
+interface foo1 {
+  bar1 /* foo */ /* baz */(); // bat
+  bar2 /* foo */ /* bar */ /* baz */ /* bat */?();
+  bar3 /* foo */ /* baz */() /* bat */;
+  bar4 /* foo */?(/* bar */ bar: /* baz */ string): /* bat */ string;
+  /* foo */ (): /* bar */ /* baz */ string;
+  /* foo */ (bar: /* bar */ string): /* baz */ string;
+  /* foo */ new (/* bar */ a: /* baz */ string): /* bat */ string;
+  /* foo */ new (): /* bar */ /* baz */ /* bat */ string;
+}
+
+type foo7 = /* foo */ () => /* bar */ /* baz */ void;
+type foo8 = /* foo */ (a: /* bar */ string) => /* baz */ void;
+let foo9: new () => /* foo */ /* bar */ /* baz */ string;
+let foo10: new (/* foo */ a: /* bar */ string) => /* baz */ string;
+
+// Prettier master
+interface foo1 {
+  bar1 /* foo */(/* baz */); // bat
+  bar2 /* foo */ /* bar */?(/* baz */) /* bat */;
+  bar3 /* foo */(/* baz */) /* bat */;
+  bar4 /* foo */?(/* bar */ bar: /* baz */ string): /* bat */ string;
+  /* foo */ (/* bar */): /* baz */ string;
+  /* foo */ (bar: /* bar */ string): /* baz */ string;
+  /* foo */ new (/* bar */ a: /* baz */ string): /* bat */ string;
+  /* foo */ new (/* baz */): /* bar */ /* bat */ string;
+}
+
+type foo7 = /* foo */ (/* bar */) => /* baz */ void;
+type foo8 = /* foo */ (a: /* bar */ string) => /* baz */ void;
+let foo9: new (/* bar */) => /* foo */ /* baz */ string;
+let foo10: new (/* foo */ a: /* bar */ string) => /* baz */ string;
+```
+
+```ts
+// Input
+abstract class Test {
+  abstract foo12 /* foo */ (a: /* bar */ string): /* baz */ void
+  abstract foo13 /* foo */ (/* bar */) /* baz */
+}
+
+// Prettier stable
+Error: Comment "foo" was not printed. Please report this error!
+    at https://prettier.io/lib/standalone.js:15543:15
+    at Array.forEach (<anonymous>)
+    at ensureAllCommentsPrinted (https://prettier.io/lib/standalone.js:15541:17)
+    at coreFormat (https://prettier.io/lib/standalone.js:15592:5)
+    at format (https://prettier.io/lib/standalone.js:15832:75)
+    at formatWithCursor (https://prettier.io/lib/standalone.js:15848:14)
+    at https://prettier.io/lib/standalone.js:31794:17
+    at Object.format (https://prettier.io/lib/standalone.js:31802:14)
+    at formatCode (https://prettier.io/worker.js:234:21)
+    at handleMessage (https://prettier.io/worker.js:185:18)
+
+// Prettier master
+abstract class Test {
+  abstract foo12 /* foo */(a: /* bar */ string): /* baz */ void;
+  abstract foo13 /* foo */(/* bar */); /* baz */
+}
+```
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 60c8848e3..21350f286 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -174,7 +174,14 @@ function handleRemainingComment(comment, text, options, ast, isLastComment) {
       followingNode,
       comment
     ) ||
-    handleBreakAndContinueStatementComments(enclosingNode, comment)
+    handleBreakAndContinueStatementComments(enclosingNode, comment) ||
+    handleTSFunctionTrailingComments(
+      text,
+      enclosingNode,
+      followingNode,
+      comment,
+      options
+    )
   ) {
     return true;
   }
@@ -460,7 +467,8 @@ function handleMethodNameComments(
     enclosingNode &&
     precedingNode &&
     (enclosingNode.type === "Property" ||
-      enclosingNode.type === "MethodDefinition") &&
+      enclosingNode.type === "MethodDefinition" ||
+      enclosingNode.type === "TSAbstractMethodDefinition") &&
     precedingNode.type === "Identifier" &&
     enclosingNode.key === precedingNode &&
     // special Property case: { key: /*comment*/(value) };
@@ -559,11 +567,7 @@ function handleCommentInEmptyParens(text, enclosingNode, comment, options) {
   // i.e. a function without any argument.
   if (
     enclosingNode &&
-    (((enclosingNode.type === "FunctionDeclaration" ||
-      enclosingNode.type === "FunctionExpression" ||
-      enclosingNode.type === "ArrowFunctionExpression" ||
-      enclosingNode.type === "ClassMethod" ||
-      enclosingNode.type === "ObjectMethod") &&
+    ((isRealFunctionLikeNode(enclosingNode) &&
       enclosingNode.params.length === 0) ||
       ((enclosingNode.type === "CallExpression" ||
         enclosingNode.type === "OptionalCallExpression" ||
@@ -611,17 +615,7 @@ function handleLastFunctionArgComments(
     (precedingNode.type === "Identifier" ||
       precedingNode.type === "AssignmentPattern") &&
     enclosingNode &&
-    (enclosingNode.type === "ArrowFunctionExpression" ||
-      enclosingNode.type === "FunctionExpression" ||
-      enclosingNode.type === "FunctionDeclaration" ||
-      enclosingNode.type === "ObjectMethod" ||
-      enclosingNode.type === "ClassMethod" ||
-      enclosingNode.type === "TSDeclareFunction" ||
-      enclosingNode.type === "TSCallSignatureDeclaration" ||
-      enclosingNode.type === "TSConstructSignatureDeclaration" ||
-      enclosingNode.type === "TSMethodSignature" ||
-      enclosingNode.type === "TSConstructorType" ||
-      enclosingNode.type === "TSFunctionType") &&
+    isRealFunctionLikeNode(enclosingNode) &&
     privateUtil.getNextNonSpaceNonCommentCharacter(
       text,
       comment,
@@ -831,6 +825,31 @@ function handleVariableDeclaratorComments(
   return false;
 }
 
+function handleTSFunctionTrailingComments(
+  text,
+  enclosingNode,
+  followingNode,
+  comment,
+  options
+) {
+  if (
+    !followingNode &&
+    enclosingNode &&
+    (enclosingNode.type === "TSMethodSignature" ||
+      enclosingNode.type === "TSDeclareFunction" ||
+      enclosingNode.type === "TSAbstractMethodDefinition") &&
+    privateUtil.getNextNonSpaceNonCommentCharacter(
+      text,
+      comment,
+      options.locEnd
+    ) === ";"
+  ) {
+    addTrailingComment(enclosingNode, comment);
+    return true;
+  }
+  return false;
+}
+
 function handleTSMappedTypeComments(
   text,
   enclosingNode,
@@ -877,6 +896,23 @@ function hasLeadingComment(node, fn = () => true) {
   return false;
 }
 
+function isRealFunctionLikeNode(node) {
+  return (
+    node.type === "ArrowFunctionExpression" ||
+    node.type === "FunctionExpression" ||
+    node.type === "FunctionDeclaration" ||
+    node.type === "ObjectMethod" ||
+    node.type === "ClassMethod" ||
+    node.type === "TSDeclareFunction" ||
+    node.type === "TSCallSignatureDeclaration" ||
+    node.type === "TSConstructSignatureDeclaration" ||
+    node.type === "TSConstructSignatureDeclaration" ||
+    node.type === "TSMethodSignature" ||
+    node.type === "TSConstructorType" ||
+    node.type === "TSFunctionType"
+  );
+}
+
 module.exports = {
   handleOwnLineComment,
   handleEndOfLineComment,
diff --git a/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
index 876484e6c..f227b7280 100644
--- a/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
@@ -101,12 +101,15 @@ declare function fn(
   // TODO this is a very very very very long comment that makes it go > 80 columns
 ): number;
 
+declare function /* foo */ f( /* baz */ a /* taz */) /* bar */;
 =====================================output=====================================
 declare function fn(
   currentRequest: { a: number }
   // TODO this is a very very very very long comment that makes it go > 80 columns
 ): number;
 
+declare function /* foo */ f(/* baz */ a /* taz */); /* bar */
+
 ================================================================================
 `;
 
@@ -457,6 +460,96 @@ type M = { [m in M /* commentG */]: string };
 ================================================================================
 `;
 
+exports[`method_types.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+interface foo1 {
+  bar3/* foo */ (/* baz */) // bat
+  bar/* foo */ ? /* bar */ (/* baz */) /* bat */;
+  bar2/* foo */ (/* baz */) /* bat */
+}
+
+interface foo2 {
+  bar/* foo */ ? /* bar */ (bar: /* baz */ string): /* bat */ string;
+}
+
+interface foo3 {
+  /* foo */ (/* bar */): /* baz */ string;
+}
+
+interface foo4 {
+  /* foo */ (bar: /* bar */ string): /* baz */ string;
+}
+
+interface foo5 {
+  /* foo */ new /* bar */  (a: /* baz */ string): /* bat */ string
+}
+
+interface foo6 {
+  /* foo */ new /* bar */ (/* baz */): /* bat */ string
+}
+
+type foo7 = /* foo */ (/* bar */) /* baz */ => void
+
+type foo8 = /* foo */ (a: /* bar */ string) /* baz */ => void
+
+let foo9: new /* foo */ (/* bar */) /* baz */ => string;
+
+let foo10: new /* foo */ (a: /* bar */ string) /* baz */ => string;
+
+abstract class Test {
+  abstract foo12 /* foo */ (a: /* bar */ string): /* baz */ void
+
+  abstract foo13 /* foo */ (/* bar */) /* baz */
+}
+
+=====================================output=====================================
+interface foo1 {
+  bar3 /* foo */(/* baz */); // bat
+  bar /* foo */ /* bar */?(/* baz */) /* bat */;
+  bar2 /* foo */(/* baz */) /* bat */;
+}
+
+interface foo2 {
+  bar /* foo */?(/* bar */ bar: /* baz */ string): /* bat */ string;
+}
+
+interface foo3 {
+  /* foo */ (/* bar */): /* baz */ string;
+}
+
+interface foo4 {
+  /* foo */ (bar: /* bar */ string): /* baz */ string;
+}
+
+interface foo5 {
+  /* foo */ new (/* bar */ a: /* baz */ string): /* bat */ string;
+}
+
+interface foo6 {
+  /* foo */ new (/* baz */): /* bar */ /* bat */ string;
+}
+
+type foo7 = /* foo */ (/* bar */) => /* baz */ void;
+
+type foo8 = /* foo */ (a: /* bar */ string) => /* baz */ void;
+
+let foo9: new (/* bar */) => /* foo */ /* baz */ string;
+
+let foo10: new (/* foo */ a: /* bar */ string) => /* baz */ string;
+
+abstract class Test {
+  abstract foo12 /* foo */(a: /* bar */ string): /* baz */ void;
+
+  abstract foo13 /* foo */(/* bar */); /* baz */
+}
+
+================================================================================
+`;
+
 exports[`methods.ts 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]
@@ -508,6 +601,7 @@ export class Point {
    */
   mismatchedIndentation() {}
 
+  inline /* foo*/ (/* bar */) /* baz */ {}
 }
 
 =====================================output=====================================
@@ -555,6 +649,8 @@ export class Point {
    * Four
    */
   mismatchedIndentation() {}
+
+  inline /* foo*/(/* bar */) /* baz */ {}
 }
 
 ================================================================================
diff --git a/tests/typescript_comments/declare_function.ts b/tests/typescript_comments/declare_function.ts
index 6ceeb7d7f..870ce9cd8 100644
--- a/tests/typescript_comments/declare_function.ts
+++ b/tests/typescript_comments/declare_function.ts
@@ -2,3 +2,5 @@ declare function fn(
   currentRequest: {a: number},
   // TODO this is a very very very very long comment that makes it go > 80 columns
 ): number;
+
+declare function /* foo */ f( /* baz */ a /* taz */) /* bar */;
\ No newline at end of file
diff --git a/tests/typescript_comments/method_types.ts b/tests/typescript_comments/method_types.ts
new file mode 100644
index 000000000..c8ace440b
--- /dev/null
+++ b/tests/typescript_comments/method_types.ts
@@ -0,0 +1,39 @@
+interface foo1 {
+  bar3/* foo */ (/* baz */) // bat
+  bar/* foo */ ? /* bar */ (/* baz */) /* bat */;
+  bar2/* foo */ (/* baz */) /* bat */
+}
+
+interface foo2 {
+  bar/* foo */ ? /* bar */ (bar: /* baz */ string): /* bat */ string;
+}
+
+interface foo3 {
+  /* foo */ (/* bar */): /* baz */ string;
+}
+
+interface foo4 {
+  /* foo */ (bar: /* bar */ string): /* baz */ string;
+}
+
+interface foo5 {
+  /* foo */ new /* bar */  (a: /* baz */ string): /* bat */ string
+}
+
+interface foo6 {
+  /* foo */ new /* bar */ (/* baz */): /* bat */ string
+}
+
+type foo7 = /* foo */ (/* bar */) /* baz */ => void
+
+type foo8 = /* foo */ (a: /* bar */ string) /* baz */ => void
+
+let foo9: new /* foo */ (/* bar */) /* baz */ => string;
+
+let foo10: new /* foo */ (a: /* bar */ string) /* baz */ => string;
+
+abstract class Test {
+  abstract foo12 /* foo */ (a: /* bar */ string): /* baz */ void
+
+  abstract foo13 /* foo */ (/* bar */) /* baz */
+}
diff --git a/tests/typescript_comments/methods.ts b/tests/typescript_comments/methods.ts
index a6c61c1f8..b48947c79 100644
--- a/tests/typescript_comments/methods.ts
+++ b/tests/typescript_comments/methods.ts
@@ -43,4 +43,5 @@ export class Point {
    */
   mismatchedIndentation() {}
 
+  inline /* foo*/ (/* bar */) /* baz */ {}
 }

From 1a18cf7fce3affa4a0db908ef38ac080b1162214 Mon Sep 17 00:00:00 2001
From: Tim Kendall <timkendall@users.noreply.github.com>
Date: Mon, 6 Jan 2020 10:20:25 -0800
Subject: [PATCH 84/88] =?UTF-8?q?GraphQL:=20Support=20repeatable=20directi?=
 =?UTF-8?q?ve=20definition=20printing=20(clos=E2=80=A6=20(#7227)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/language-graphql/printer-graphql.js                       | 1 +
 tests/graphql_directive_decl/__snapshots__/jsfmt.spec.js.snap | 4 ++++
 tests/graphql_directive_decl/directive_decl.graphql           | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index 70f0df48a..9ee35aa48 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -380,6 +380,7 @@ function genericPrint(path, options, print) {
               ])
             )
           : "",
+        n.repeatable ? " repeatable" : "",
         concat([" on ", join(" | ", path.map(print, "locations"))])
       ]);
     }
diff --git a/tests/graphql_directive_decl/__snapshots__/jsfmt.spec.js.snap b/tests/graphql_directive_decl/__snapshots__/jsfmt.spec.js.snap
index 868f52f0f..15439bb2b 100644
--- a/tests/graphql_directive_decl/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/graphql_directive_decl/__snapshots__/jsfmt.spec.js.snap
@@ -12,8 +12,10 @@ directive @a(as: String = 1) on QUERY
 directive @a(as: String, b: Int!) on QUERY
 directive @a(as: String! = 1 @deprecated) on QUERY
 directive @a(as: String! = 1 @deprecated) on QUERY | MUTATION
+directive @a(as: String! = 1 @deprecated) repeatable on QUERY | MUTATION
 
 directive @a on QUERY
+directive @a repeatable on QUERY
 
 
 directive @a(as: String) on QUERY
@@ -30,8 +32,10 @@ directive @a(as: String = 1) on QUERY
 directive @a(as: String, b: Int!) on QUERY
 directive @a(as: String! = 1 @deprecated) on QUERY
 directive @a(as: String! = 1 @deprecated) on QUERY | MUTATION
+directive @a(as: String! = 1 @deprecated) repeatable on QUERY | MUTATION
 
 directive @a on QUERY
+directive @a repeatable on QUERY
 
 directive @a(as: String) on QUERY
 
diff --git a/tests/graphql_directive_decl/directive_decl.graphql b/tests/graphql_directive_decl/directive_decl.graphql
index 531c6112f..318e0552b 100644
--- a/tests/graphql_directive_decl/directive_decl.graphql
+++ b/tests/graphql_directive_decl/directive_decl.graphql
@@ -4,8 +4,10 @@ directive @a(as: String = 1) on QUERY
 directive @a(as: String, b: Int!) on QUERY
 directive @a(as: String! = 1 @deprecated) on QUERY
 directive @a(as: String! = 1 @deprecated) on QUERY | MUTATION
+directive @a(as: String! = 1 @deprecated) repeatable on QUERY | MUTATION
 
 directive @a on QUERY
+directive @a repeatable on QUERY
 
 
 directive @a(as: String) on QUERY

From 024f51e5f8cdffc959dc29c3e4cbddd69058a0f3 Mon Sep 17 00:00:00 2001
From: Selvazhagan <38141381+selvazhagan@users.noreply.github.com>
Date: Mon, 6 Jan 2020 11:00:09 -0800
Subject: [PATCH 85/88] =?UTF-8?q?Fixes=20:=20#5915=20HTML=20comments=20in?=
 =?UTF-8?q?=20pre=20tags=20causes=20bad=20formatting=20o=E2=80=A6=20(#5959?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog_unreleased/html/pr-5959             |  24 +++++
 src/language-html/utils.js                    |   2 +
 .../__snapshots__/jsfmt.spec.js.snap          | 100 ++++++++++++++++++
 tests/html_tags/pre.html                      |   9 ++
 4 files changed, 135 insertions(+)
 create mode 100644 changelog_unreleased/html/pr-5959

diff --git a/changelog_unreleased/html/pr-5959 b/changelog_unreleased/html/pr-5959
new file mode 100644
index 000000000..a55167123
--- /dev/null
+++ b/changelog_unreleased/html/pr-5959
@@ -0,0 +1,24 @@
+#### Comments in `pre` tags caused bad formatting of following closing tag ([#5959](https://github.com/prettier/prettier/pull/5959) by [@selvazhagan](https://github.com/selvazhagan))
+
+<!-- prettier-ignore -->
+```
+<!-- Input -->
+<details>
+<pre>
+    <!-- TEST -->
+  </pre></details>
+
+<!-- Output (Prettier stable) -->
+<details>
+  <pre>
+    <!-- TEST -->
+  </pre></details</details
+>
+
+<!-- Output (Prettier master) -->
+<details>
+  <pre>
+    <!-- TEST -->
+  </pre>
+</details>
+```
diff --git a/src/language-html/utils.js b/src/language-html/utils.js
index 0b7827312..8a9cab05c 100644
--- a/src/language-html/utils.js
+++ b/src/language-html/utils.js
@@ -194,6 +194,7 @@ function isLeadingSpaceSensitiveNode(node) {
     if (
       !node.prev &&
       (node.parent.type === "root" ||
+        (isPreLikeNode(node) && node.parent) ||
         isScriptLikeTag(node.parent) ||
         !isFirstChildLeadingSpaceSensitiveCssDisplay(node.parent.cssDisplay))
     ) {
@@ -235,6 +236,7 @@ function isTrailingSpaceSensitiveNode(node) {
   if (
     !node.next &&
     (node.parent.type === "root" ||
+      (isPreLikeNode(node) && node.parent) ||
       isScriptLikeTag(node.parent) ||
       !isLastChildTrailingSpaceSensitiveCssDisplay(node.parent.cssDisplay))
   ) {
diff --git a/tests/html_tags/__snapshots__/jsfmt.spec.js.snap b/tests/html_tags/__snapshots__/jsfmt.spec.js.snap
index 41f028cc1..7b9b5127e 100644
--- a/tests/html_tags/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_tags/__snapshots__/jsfmt.spec.js.snap
@@ -806,6 +806,15 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre></details>
+
+<details><pre>
+  <!--Comments-->
+</pre>
+</details>
+
 =====================================output=====================================
 <pre>
 --------------------------------------------------------------------------------
@@ -896,6 +905,17 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre>
+</details>
+
+<details>
+  <pre>
+  <!--Comments-->
+</pre>
+</details>
+
 ================================================================================
 `;
 
@@ -986,6 +1006,15 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre></details>
+
+<details><pre>
+  <!--Comments-->
+</pre>
+</details>
+
 =====================================output=====================================
 <pre>
 --------------------------------------------------------------------------------
@@ -1100,6 +1129,17 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre>
+</details>
+
+<details>
+  <pre>
+  <!--Comments-->
+</pre>
+</details>
+
 ================================================================================
 `;
 
@@ -1189,6 +1229,15 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre></details>
+
+<details><pre>
+  <!--Comments-->
+</pre>
+</details>
+
 =====================================output=====================================
 <pre>
 --------------------------------------------------------------------------------
@@ -1271,6 +1320,17 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre>
+</details>
+
+<details>
+  <pre>
+  <!--Comments-->
+</pre>
+</details>
+
 ================================================================================
 `;
 
@@ -1362,6 +1422,15 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre></details>
+
+<details><pre>
+  <!--Comments-->
+</pre>
+</details>
+
 =====================================output=====================================
 <pre>
 --------------------------------------------------------------------------------
@@ -1452,6 +1521,17 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre>
+</details>
+
+<details>
+  <pre>
+  <!--Comments-->
+</pre>
+</details>
+
 ================================================================================
 `;
 
@@ -1543,6 +1623,15 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre></details>
+
+<details><pre>
+  <!--Comments-->
+</pre>
+</details>
+
 =====================================output=====================================
 <pre>
 --------------------------------------------------------------------------------
@@ -1633,6 +1722,17 @@ ___________________________
 
 <pre><code #foo></code></pre>
 
+<details>
+  <pre><!--Comments-->
+  </pre>
+</details>
+
+<details>
+  <pre>
+  <!--Comments-->
+</pre>
+</details>
+
 ================================================================================
 `;
 
diff --git a/tests/html_tags/pre.html b/tests/html_tags/pre.html
index 6307de469..05b61de54 100644
--- a/tests/html_tags/pre.html
+++ b/tests/html_tags/pre.html
@@ -78,3 +78,12 @@ ___________________________
 <pre></pre>
 
 <pre><code #foo></code></pre>
+
+<details>
+  <pre><!--Comments-->
+  </pre></details>
+
+<details><pre>
+  <!--Comments-->
+</pre>
+</details>

From e11b6e8992946026383226c9886bc13eb7f835e3 Mon Sep 17 00:00:00 2001
From: Kohei Ueno <k.cola119@ezweb.ne.jp>
Date: Tue, 7 Jan 2020 05:25:22 +0900
Subject: [PATCH 86/88] Fix adding unnecessary colons on Mapped Types (#7221)

* fix #7174 by checking typeAnnotation existance

* add changelog for pr-7174

* fix typo

* revert mappedType test in conformance/

* add new directory and tests

* fix missing a line

* Update changelog_unreleased/typescript/pr-7174.md

Co-Authored-By: Georgii Dolzhykov <thorn.mailbox@gmail.com>

Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>
---
 changelog_unreleased/typescript/pr-7174.md    | 13 +++++++++++++
 src/language-js/printer-estree.js             |  2 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 19 +++++++++++++++++++
 tests/typescript_mapped_type/jsfmt.spec.js    |  1 +
 tests/typescript_mapped_type/mapped-type.ts   |  3 +++
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/typescript/pr-7174.md
 create mode 100644 tests/typescript_mapped_type/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/typescript_mapped_type/jsfmt.spec.js
 create mode 100644 tests/typescript_mapped_type/mapped-type.ts

diff --git a/changelog_unreleased/typescript/pr-7174.md b/changelog_unreleased/typescript/pr-7174.md
new file mode 100644
index 000000000..225335abc
--- /dev/null
+++ b/changelog_unreleased/typescript/pr-7174.md
@@ -0,0 +1,13 @@
+#### Fix printing of mapped types with the template type omitted ([#7221](https://github.com/prettier/prettier/pull/7221) by [@cola119](https://github.com/cola119))
+
+<!-- prettier-ignore -->
+```ts
+// Input
+type A = { [key in B] };
+
+// Prettier stable
+type A = { [key in B]: };
+
+// Prettier master
+type A = { [key in B] };
+```
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 3f16b2f9f..29a4ab142 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -3333,7 +3333,7 @@ function printPathNoParens(path, options, print, args) {
               n.optional
                 ? getTypeScriptMappedTypeModifier(n.optional, "?")
                 : "",
-              ": ",
+              n.typeAnnotation ? ": " : "",
               path.call(print, "typeAnnotation"),
               ifBreak(semi, "")
             ])
diff --git a/tests/typescript_mapped_type/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_mapped_type/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..aa88ebac3
--- /dev/null
+++ b/tests/typescript_mapped_type/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`mapped-type.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+type Keys = 'option1' | 'option2';
+type A = { [K in Keys] };
+type B = { [K in Keys]+? };
+
+=====================================output=====================================
+type Keys = "option1" | "option2";
+type A = { [K in Keys] };
+type B = { [K in Keys]+? };
+
+================================================================================
+`;
diff --git a/tests/typescript_mapped_type/jsfmt.spec.js b/tests/typescript_mapped_type/jsfmt.spec.js
new file mode 100644
index 000000000..2ea3bb6eb
--- /dev/null
+++ b/tests/typescript_mapped_type/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["typescript"]);
diff --git a/tests/typescript_mapped_type/mapped-type.ts b/tests/typescript_mapped_type/mapped-type.ts
new file mode 100644
index 000000000..83e408571
--- /dev/null
+++ b/tests/typescript_mapped_type/mapped-type.ts
@@ -0,0 +1,3 @@
+type Keys = 'option1' | 'option2';
+type A = { [K in Keys] };
+type B = { [K in Keys]+? };

From 87d532b1b60ddccd906596cd6bbe32915242a7f5 Mon Sep 17 00:00:00 2001
From: Daiki Ihara <sasurau4@gmail.com>
Date: Wed, 8 Jan 2020 06:17:52 +0900
Subject: [PATCH 87/88] Markdown: fix PR 7181 broke HTML blocks inside list
 items (#7220)

* fix PR 7181 broke HTML blocks inside list items

* add test for indented html after list item

* add changelog_unreleased for pr-7220

* update changelog of pr-7181

* fix pointed out
---
 changelog_unreleased/markdown/pr-7181.md              | 11 ++++++++++-
 src/language-markdown/printer-markdown.js             |  3 ++-
 tests/markdown_html/__snapshots__/jsfmt.spec.js.snap  |  6 ++++++
 .../markdown_html/beginning-tag-after-a-list-item.md  |  3 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/changelog_unreleased/markdown/pr-7181.md b/changelog_unreleased/markdown/pr-7181.md
index 1aecd8624..0498a031f 100644
--- a/changelog_unreleased/markdown/pr-7181.md
+++ b/changelog_unreleased/markdown/pr-7181.md
@@ -1,4 +1,4 @@
-#### fix HTML formatting broken if the beginning tag starts after a list item ([#7181](https://github.com/prettier/prettier/pull/7181) by [@sasurau4](https://github.com/sasurau4))
+#### fix HTML formatting broken if the beginning tag starts after a list item ([#7181](https://github.com/prettier/prettier/pull/7181) by [@sasurau4](https://github.com/sasurau4), [#7220](https://github.com/prettier/prettier/pull/7220) by [@sasurau4](https://github.com/sasurau4))
 
 Previously, when Prettier format the html tag that starts after a list item, it would insert indent and break the relationship of open and close tag. Now, Prettier no longer change anything.
 
@@ -14,6 +14,9 @@ Previously, when Prettier format the html tag that starts after a list item, it
 </p>
 </details>
 
+- A list item
+  <blockquote>asdf</blockquote>
+
 <!-- Prettier stable -->
 - A list item.
 
@@ -25,6 +28,9 @@ Previously, when Prettier format the html tag that starts after a list item, it
 </p>
 </details>
 
+- A list item
+  <blockquote>asdf</blockquote>
+
 <!-- Prettier master -->
 - A list item.
 <details><summary>Summary</summary>
@@ -34,4 +40,7 @@ Previously, when Prettier format the html tag that starts after a list item, it
 
 </p>
 </details>
+
+- A list item
+  <blockquote>asdf</blockquote>
 ```
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index d34b829af..220c2d5d0 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -259,7 +259,8 @@ function genericPrint(path, options, print) {
           if (
             childNode.children.length === 2 &&
             childNode.children[1].type === "html" &&
-            childNode.children[1].position.indent.every(indent => indent === 1)
+            childNode.children[0].position.start.column !==
+              childNode.children[1].position.start.column
           ) {
             return concat([
               prefix,
diff --git a/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap b/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap
index 492ff792a..675a87d05 100644
--- a/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap
@@ -23,6 +23,9 @@ proseWrap: "always"
 quoted sentence2</p>
 </blockquote>
 
+- indented html is formatted as it is
+  <blockquote>asdf</blockquote>
+
 =====================================output=====================================
 - A list item.
 <details><summary>Summary</summary>
@@ -40,6 +43,9 @@ quoted sentence2</p>
 quoted sentence2</p>
 </blockquote>
 
+- indented html is formatted as it is
+  <blockquote>asdf</blockquote>
+
 ================================================================================
 `;
 
diff --git a/tests/markdown_html/beginning-tag-after-a-list-item.md b/tests/markdown_html/beginning-tag-after-a-list-item.md
index 43b7b8f80..a530428d5 100644
--- a/tests/markdown_html/beginning-tag-after-a-list-item.md
+++ b/tests/markdown_html/beginning-tag-after-a-list-item.md
@@ -13,3 +13,6 @@
 <p>quoted sentence1<br>
 quoted sentence2</p>
 </blockquote>
+
+- indented html is formatted as it is
+  <blockquote>asdf</blockquote>

From 0bb75fd1b9bcd23f223f2fe6c969628d2ef67066 Mon Sep 17 00:00:00 2001
From: Cyrille David <dcyriller@users.noreply.github.com>
Date: Wed, 8 Jan 2020 13:24:45 +0100
Subject: [PATCH 88/88] handlebars: Fix superfluous line breaks in
 ConcatStatement (#7051)

---
 changelog_unreleased/handlebars/pr-7051.md    |  58 ++++++++
 src/language-handlebars/printer-glimmer.js    |  11 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 105 +++++++++++---
 .../in-attr-node.hbs                          |   7 +
 .../__snapshots__/jsfmt.spec.js.snap          | 132 ++++++++++++++++++
 .../handlebars-mustache-statement/basics.hbs  |  26 ++++
 6 files changed, 310 insertions(+), 29 deletions(-)
 create mode 100644 changelog_unreleased/handlebars/pr-7051.md
 create mode 100644 tests/handlebars-concat-statement/in-attr-node.hbs

diff --git a/changelog_unreleased/handlebars/pr-7051.md b/changelog_unreleased/handlebars/pr-7051.md
new file mode 100644
index 000000000..505bf926e
--- /dev/null
+++ b/changelog_unreleased/handlebars/pr-7051.md
@@ -0,0 +1,58 @@
+#### handlebars: Fix superfluous line breaks in ConcatStatement  ([7051](https://github.com/prettier/prettier/pull/7051) by [@dcyriller](https://github.com/dcyriller))
+
+<!-- prettier-ignore -->
+```hbs
+{{!-- input --}}
+<a href="a-very-long-href-from-a-third-party-marketing-platform{{id}}longer-than-eighty-chars">Link</a>
+
+{{!-- Prettier stable --}}
+<a
+  href="a-very-long-href-from-a-third-party-marketing-platform
+    {{id}}
+    longer-than-eighty-chars"
+>
+  Link
+</a>
+
+{{!-- Prettier master --}}
+<a
+  href="a-very-long-href-from-a-third-party-marketing-platform{{id}}longer-than-eighty-chars"
+>
+  Link
+</a>
+```
+
+and
+
+```hbs
+{{!-- input --}}
+<div class="hello {{if goodbye true}} {{if goodbye false}} {{if goodbye true}} {{if goodbye false}} {{if goodbye true}}">
+  Hello
+</div>
+
+{{!-- Prettier stable --}}
+<div
+  class="hello
+    {{if goodbye true}}
+
+    {{if goodbye false}}
+
+    {{if goodbye true}}
+
+    {{if goodbye false}}
+
+    {{if goodbye true}}"
+>
+  Hello
+</div>
+
+{{!-- Prettier master --}}
+<div
+  class="hello {{if goodbye true}} {{if goodbye false}} {{if goodbye true}} {{if
+      goodbye
+      false
+    }} {{if goodbye true}}"
+>
+  Hello
+</div>
+```
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index e34789e51..9c05c49fd 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -198,15 +198,8 @@ function print(path, options, print) {
     case "ConcatStatement": {
       return concat([
         '"',
-        group(
-          indent(
-            join(
-              softline,
-              path
-                .map(partPath => print(partPath), "parts")
-                .filter(a => a !== "")
-            )
-          )
+        concat(
+          path.map(partPath => print(partPath), "parts").filter(a => a !== "")
         ),
         '"'
       ]);
diff --git a/tests/handlebars-concat-statement/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars-concat-statement/__snapshots__/jsfmt.spec.js.snap
index 4be7aaf87..92a4eddeb 100644
--- a/tests/handlebars-concat-statement/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/handlebars-concat-statement/__snapshots__/jsfmt.spec.js.snap
@@ -32,16 +32,9 @@ printWidth: 80
 </div>
 
 <div
-  class="hello
-    {{if goodbye true}}
-
-    {{if goodbye false}}
-
-    {{if goodbye true}}
-
-    {{if goodbye false}}
-
-    {{if goodbye true}}"
+  class="hello {{if goodbye true}} {{if goodbye false}} {{if goodbye true}} {{
+    if goodbye false
+  }} {{if goodbye true}}"
 >
   Hello
 </div>
@@ -94,16 +87,9 @@ singleQuote: true
 </div>
 
 <div
-  class="hello
-    {{if goodbye true}}
-
-    {{if goodbye false}}
-
-    {{if goodbye true}}
-
-    {{if goodbye false}}
-
-    {{if goodbye true}}"
+  class="hello {{if goodbye true}} {{if goodbye false}} {{if goodbye true}} {{
+    if goodbye false
+  }} {{if goodbye true}}"
 >
   Hello
 </div>
@@ -122,3 +108,82 @@ singleQuote: true
 <div class='class-p  class-q'></div>
 ================================================================================
 `;
+
+exports[`in-attr-node.hbs 1`] = `
+====================================options=====================================
+parsers: ["glimmer"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<div class="a very long list of classes that exceeds {{eighty}} chars with emtpy spaces">hey</div>
+<a href="a-very-long-href-from-a-third-party-marketing-platform{{id}}longer-than-eighty-chars">Link</a>
+<button
+  class="uk-padding-remove uk-button uk-button-default uk-button-small uk-width-1-{{intl.locales.length}} {{if (contains locale intl.locale) "uk-button-primary"}}"
+>
+  test
+</button>
+
+=====================================output=====================================
+<div
+  class="a very long list of classes that exceeds {{
+    eighty
+  }} chars with emtpy spaces"
+>
+  hey
+</div>
+<a
+  href="a-very-long-href-from-a-third-party-marketing-platform{{
+    id
+  }}longer-than-eighty-chars"
+>
+  Link
+</a>
+<button
+  class="uk-padding-remove uk-button uk-button-default uk-button-small uk-width-1-{{
+    intl.locales.length
+  }} {{if (contains locale intl.locale) "uk-button-primary"}}"
+>
+  test
+</button>
+================================================================================
+`;
+
+exports[`in-attr-node.hbs 2`] = `
+====================================options=====================================
+parsers: ["glimmer"]
+printWidth: 80
+singleQuote: true
+                                                                                | printWidth
+=====================================input======================================
+<div class="a very long list of classes that exceeds {{eighty}} chars with emtpy spaces">hey</div>
+<a href="a-very-long-href-from-a-third-party-marketing-platform{{id}}longer-than-eighty-chars">Link</a>
+<button
+  class="uk-padding-remove uk-button uk-button-default uk-button-small uk-width-1-{{intl.locales.length}} {{if (contains locale intl.locale) "uk-button-primary"}}"
+>
+  test
+</button>
+
+=====================================output=====================================
+<div
+  class="a very long list of classes that exceeds {{
+    eighty
+  }} chars with emtpy spaces"
+>
+  hey
+</div>
+<a
+  href="a-very-long-href-from-a-third-party-marketing-platform{{
+    id
+  }}longer-than-eighty-chars"
+>
+  Link
+</a>
+<button
+  class="uk-padding-remove uk-button uk-button-default uk-button-small uk-width-1-{{
+    intl.locales.length
+  }} {{if (contains locale intl.locale) 'uk-button-primary'}}"
+>
+  test
+</button>
+================================================================================
+`;
diff --git a/tests/handlebars-concat-statement/in-attr-node.hbs b/tests/handlebars-concat-statement/in-attr-node.hbs
new file mode 100644
index 000000000..05ee942a5
--- /dev/null
+++ b/tests/handlebars-concat-statement/in-attr-node.hbs
@@ -0,0 +1,7 @@
+<div class="a very long list of classes that exceeds {{eighty}} chars with emtpy spaces">hey</div>
+<a href="a-very-long-href-from-a-third-party-marketing-platform{{id}}longer-than-eighty-chars">Link</a>
+<button
+  class="uk-padding-remove uk-button uk-button-default uk-button-small uk-width-1-{{intl.locales.length}} {{if (contains locale intl.locale) "uk-button-primary"}}"
+>
+  test
+</button>
diff --git a/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
index 0b185ed6a..4808e2b90 100644
--- a/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
@@ -23,6 +23,32 @@ printWidth: 80
   data-test-beneficiary-account-number
 />
 
+<div class="a long list of classes more than 80 chars with a complex mustache statement {{if (or this.a this.b) this.c this.d}}">
+</div>
+
+<div class="a multi line list of classes with a complex mustache statement
+           {{if (or this.a this.b) this.c this.d}}">
+</div>
+
+<div class="a-first-class {{if this.optionOne "optionOne"}} {{if this.optionTwo "optionTwo"}} {{if this.optionThree "optionThree"}} {{if this.optionFour "optionFour"}} {{if this.optionFive "optionFive"}} {{this.class}}" ...attributes >
+</div>
+
+<div
+  class="a-first-class
+    {{if this.optionOne "optionOne"}}
+    
+    {{if this.optionTwo "optionTwo"}}
+    
+    {{if this.optionThree "optionThree"}}
+    
+    {{if this.optionFour "optionFour"}}
+    
+    {{if this.optionFive "optionFive"}}
+    
+    {{this.class}}"
+  ...attributes >
+</div>
+
 =====================================output=====================================
 <GlimmerComponent
   @progress={{
@@ -49,6 +75,46 @@ printWidth: 80
   }}
   data-test-beneficiary-account-number
 />
+
+<div
+  class="a long list of classes more than 80 chars with a complex mustache statement {{
+    if (or this.a this.b) this.c this.d
+  }}"
+>
+</div>
+
+<div
+  class="a multi line list of classes with a complex mustache statement
+  {{if (or this.a this.b) this.c this.d}}"
+>
+</div>
+
+<div
+  class="a-first-class {{if this.optionOne "optionOne"}} {{
+    if this.optionTwo "optionTwo"
+  }} {{if this.optionThree "optionThree"}} {{
+    if this.optionFour "optionFour"
+  }} {{if this.optionFive "optionFive"}} {{this.class}}"
+  ...attributes
+>
+</div>
+
+<div
+  class="a-first-class
+  {{if this.optionOne "optionOne"}}
+
+   {{if this.optionTwo "optionTwo"}}
+
+   {{if this.optionThree "optionThree"}}
+
+   {{if this.optionFour "optionFour"}}
+
+   {{if this.optionFive "optionFive"}}
+
+   {{this.class}}"
+  ...attributes
+>
+</div>
 ================================================================================
 `;
 
@@ -76,6 +142,32 @@ singleQuote: true
   data-test-beneficiary-account-number
 />
 
+<div class="a long list of classes more than 80 chars with a complex mustache statement {{if (or this.a this.b) this.c this.d}}">
+</div>
+
+<div class="a multi line list of classes with a complex mustache statement
+           {{if (or this.a this.b) this.c this.d}}">
+</div>
+
+<div class="a-first-class {{if this.optionOne "optionOne"}} {{if this.optionTwo "optionTwo"}} {{if this.optionThree "optionThree"}} {{if this.optionFour "optionFour"}} {{if this.optionFive "optionFive"}} {{this.class}}" ...attributes >
+</div>
+
+<div
+  class="a-first-class
+    {{if this.optionOne "optionOne"}}
+    
+    {{if this.optionTwo "optionTwo"}}
+    
+    {{if this.optionThree "optionThree"}}
+    
+    {{if this.optionFour "optionFour"}}
+    
+    {{if this.optionFive "optionFive"}}
+    
+    {{this.class}}"
+  ...attributes >
+</div>
+
 =====================================output=====================================
 <GlimmerComponent
   @progress={{
@@ -102,6 +194,46 @@ singleQuote: true
   }}
   data-test-beneficiary-account-number
 />
+
+<div
+  class="a long list of classes more than 80 chars with a complex mustache statement {{
+    if (or this.a this.b) this.c this.d
+  }}"
+>
+</div>
+
+<div
+  class="a multi line list of classes with a complex mustache statement
+  {{if (or this.a this.b) this.c this.d}}"
+>
+</div>
+
+<div
+  class="a-first-class {{if this.optionOne 'optionOne'}} {{
+    if this.optionTwo 'optionTwo'
+  }} {{if this.optionThree 'optionThree'}} {{
+    if this.optionFour 'optionFour'
+  }} {{if this.optionFive 'optionFive'}} {{this.class}}"
+  ...attributes
+>
+</div>
+
+<div
+  class="a-first-class
+  {{if this.optionOne 'optionOne'}}
+
+   {{if this.optionTwo 'optionTwo'}}
+
+   {{if this.optionThree 'optionThree'}}
+
+   {{if this.optionFour 'optionFour'}}
+
+   {{if this.optionFive 'optionFive'}}
+
+   {{this.class}}"
+  ...attributes
+>
+</div>
 ================================================================================
 `;
 
diff --git a/tests/handlebars-mustache-statement/basics.hbs b/tests/handlebars-mustache-statement/basics.hbs
index db7834d51..ab4ddb54a 100644
--- a/tests/handlebars-mustache-statement/basics.hbs
+++ b/tests/handlebars-mustache-statement/basics.hbs
@@ -14,3 +14,29 @@
   @errors={{or this.aVeryLongProperty (and this.aProperty (v-get bike "number" "message"))}}
   data-test-beneficiary-account-number
 />
+
+<div class="a long list of classes more than 80 chars with a complex mustache statement {{if (or this.a this.b) this.c this.d}}">
+</div>
+
+<div class="a multi line list of classes with a complex mustache statement
+           {{if (or this.a this.b) this.c this.d}}">
+</div>
+
+<div class="a-first-class {{if this.optionOne "optionOne"}} {{if this.optionTwo "optionTwo"}} {{if this.optionThree "optionThree"}} {{if this.optionFour "optionFour"}} {{if this.optionFive "optionFive"}} {{this.class}}" ...attributes >
+</div>
+
+<div
+  class="a-first-class
+    {{if this.optionOne "optionOne"}}
+    
+    {{if this.optionTwo "optionTwo"}}
+    
+    {{if this.optionThree "optionThree"}}
+    
+    {{if this.optionFour "optionFour"}}
+    
+    {{if this.optionFive "optionFive"}}
+    
+    {{this.class}}"
+  ...attributes >
+</div>